⭐️ Impl: Sheet-Related Props

Related: * `TODO:2023-04-20-23-58-24` - Impl. sheets + detents. * `TODO:2023-04-21-23-24-47` - Impl. prop `sheetLargestUndimmedDetentIdentifier`. * `TODO:2023-04-21-23-26-13` - Impl. prop `sheetPreferredCornerRadius`. * `TODO:2023-04-21-23-24-03` - Impl. prop `sheetSelectedDetentIdentifier`. * `TODO:2023-04-21-23-24-39` - Impl. prop `sheetShouldAnimateChanges`.
dominicstop · Apr 21, 2023 · d7f2520 · d7f2520
1 parent dbf0e79
commit d7f2520
Show file tree

Hide file tree

Showing 6 changed files with 156 additions and 9 deletions.
diff --git a/ios/src_library/Extensions+Init/UISheetPresentationController+Init.swift b/ios/src_library/Extensions+Init/UISheetPresentationController+Init.swift
@@ -10,7 +10,11 @@ import Foundation
 
 @available(iOS 15.0, *)
 extension UISheetPresentationController.Detent {
-  static func fromString(_ string: String) -> UISheetPresentationController.Detent? {
+
+  static func fromString(
+    _ string: String
+  ) -> UISheetPresentationController.Detent? {
+
     switch string {
       case "medium": return .medium();
       case "large" : return .large();
@@ -19,3 +23,24 @@ extension UISheetPresentationController.Detent {
     };
   };
 };
+
+@available(iOS 15.0, *)
+extension UISheetPresentationController.Detent.Identifier {
+  init?(fromSystemIdentifierString string: String) {
+    switch string {
+      case "medium": self = .medium;
+      case "large" : self = .large;
+
+      default: return nil;
+    };
+  };
+
+  init(fromString string: String) {
+    if let systemIdentifier = Self.init(fromSystemIdentifierString: string) {
+      self = systemIdentifier;
+
+    } else {
+      self.init(string);
+    };
+  };
+};
diff --git a/ios/src_library/React Native/RNIModalView/RNIModalView.swift b/ios/src_library/React Native/RNIModalView/RNIModalView.swift
@@ -188,7 +188,9 @@ public class RNIModalView:
             let sheetController = self.sheetPresentationController
       else { return };
 
-      sheetController.prefersEdgeAttachedInCompactHeight = newValue;
+      self.sheetAnimateChangesIfNeeded {
+        sheetController.prefersEdgeAttachedInCompactHeight = newValue;
+      };
     }
   };
 
@@ -209,7 +211,50 @@ public class RNIModalView:
             let sheetController = self.sheetPresentationController
       else { return };
 
-      sheetController.prefersGrabberVisible = newValue;
+      self.sheetAnimateChangesIfNeeded {
+        sheetController.prefersGrabberVisible = newValue;
+      };
+    }
+  };
+
+  @objc var sheetShouldAnimateChanges: Bool = true;
+
+  @objc var sheetLargestUndimmedDetentIdentifier: String? {
+    willSet {
+      guard #available(iOS 15.0, *),
+            let sheetController = self.sheetPresentationController
+      else { return };
+
+      self.sheetAnimateChangesIfNeeded {
+        sheetController.largestUndimmedDetentIdentifier =
+          self.synthesizedSheetLargestUndimmedDetentIdentifier;
+      };
+    }
+  };
+
+  @objc var sheetPreferredCornerRadius: NSNumber? {
+    willSet {
+      guard #available(iOS 15.0, *),
+            let sheetController = self.sheetPresentationController,
+            let cornerRadius = newValue?.doubleValue
+      else { return };
+
+      self.sheetAnimateChangesIfNeeded {
+        sheetController.preferredCornerRadius = cornerRadius;
+      };
+    }
+  };
+
+  @objc var sheetSelectedDetentIdentifier: String? {
+    willSet {
+      guard #available(iOS 15.0, *),
+            let sheetController = self.sheetPresentationController
+      else { return };
+
+      self.sheetAnimateChangesIfNeeded {
+        sheetController.selectedDetentIdentifier =
+          self.synthesizedSheetSelectedDetentIdentifier;
+      };
     }
   };
 
@@ -315,14 +360,39 @@ public class RNIModalView:
 
       } else if #available(iOS 16.0, *),
                 let dict = $0 as? Dictionary<String, Any> {
-        let customDetent = RNIModalCustomSheetDetent(forDict: dict)
+
+        let customDetent = RNIModalCustomSheetDetent(forDict: dict);
         return customDetent?.synthesizedDetent;
       };
 
       return nil;
     };
   };
 
+  @available(iOS 15.0, *)
+  public var synthesizedSheetLargestUndimmedDetentIdentifier:
+    UISheetPresentationController.Detent.Identifier? {
+
+    guard let identifierString = self.sheetLargestUndimmedDetentIdentifier
+    else { return nil };
+
+    return UISheetPresentationController.Detent.Identifier(
+      fromString: identifierString
+    );
+  };
+
+  @available(iOS 15.0, *)
+  public var synthesizedSheetSelectedDetentIdentifier:
+    UISheetPresentationController.Detent.Identifier? {
+
+    guard let identifierString = self.sheetSelectedDetentIdentifier
+    else { return nil };
+
+    return UISheetPresentationController.Detent.Identifier(
+      fromString: identifierString
+    );
+  };
+
   // MARK: - Properties: Synthesized
   // -------------------------------
 
@@ -412,7 +482,6 @@ public class RNIModalView:
 
           oldModalContentWrapper.cleanup();
           self.modalContentWrapper = nil;
-
           self.deinitControllers();
         };
 
@@ -489,14 +558,27 @@ public class RNIModalView:
     };
   };
 
+  @available(iOS 15.0, *)
+  private func sheetAnimateChangesIfNeeded(_ block: () -> Void){
+    guard let sheetController = self.sheetPresentationController
+    else { return };
+
+    if self.sheetShouldAnimateChanges {
+      sheetController.animateChanges {
+        block();
+      };
+
+    } else {
+      block();
+    };
+  };
+
   @available(iOS 15.0, *)
   private func applyModalSheetProps(
     to sheetController: UISheetPresentationController
   ){
 
-    if let detents = self.synthesizedModalSheetDetents,
-       detents.count >= 1 {
-
+    if let detents = self.synthesizedModalSheetDetents, detents.count >= 1 {
       sheetController.detents = detents;
     };
 
@@ -510,6 +592,16 @@ public class RNIModalView:
       self.sheetWidthFollowsPreferredContentSizeWhenEdgeAttached;
 
     sheetController.prefersGrabberVisible = self.sheetPrefersGrabberVisible;
+
+    sheetController.largestUndimmedDetentIdentifier =
+      self.synthesizedSheetLargestUndimmedDetentIdentifier;
+
+    if let cornerRadius = self.sheetPreferredCornerRadius?.doubleValue {
+      sheetController.preferredCornerRadius = cornerRadius;
+    };
+
+    sheetController.selectedDetentIdentifier =
+      self.synthesizedSheetSelectedDetentIdentifier;
   };
 
   // MARK: - Functions - Public

diff --git a/ios/src_library/React Native/RNIModalView/RNIModalViewManager.m b/ios/src_library/React Native/RNIModalView/RNIModalViewManager.m
@@ -61,6 +61,11 @@ @interface RCT_EXTERN_MODULE(RNIModalViewManager, RCTViewManager)
 RCT_EXPORT_VIEW_PROPERTY(sheetPrefersEdgeAttachedInCompactHeight, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(sheetWidthFollowsPreferredContentSizeWhenEdgeAttached, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(sheetPrefersGrabberVisible, BOOL);
+RCT_EXPORT_VIEW_PROPERTY(sheetShouldAnimateChanges, BOOL);
+
+RCT_EXPORT_VIEW_PROPERTY(sheetLargestUndimmedDetentIdentifier, NSString);
+RCT_EXPORT_VIEW_PROPERTY(sheetSelectedDetentIdentifier, NSString);
+RCT_EXPORT_VIEW_PROPERTY(sheetPreferredCornerRadius, NSNumber);
 
 @end
 
diff --git a/src/components/ModalView/ModalView.tsx b/src/components/ModalView/ModalView.tsx
@@ -113,6 +113,10 @@ export class ModalView extends
       sheetPrefersEdgeAttachedInCompactHeight,
       sheetWidthFollowsPreferredContentSizeWhenEdgeAttached,
       sheetPrefersGrabberVisible,
+      sheetShouldAnimateChanges,
+      sheetLargestUndimmedDetentIdentifier,
+      sheetPreferredCornerRadius,
+      sheetSelectedDetentIdentifier,
 
       // Native Props - Events
       onModalWillPresent,
@@ -194,6 +198,10 @@ export class ModalView extends
       sheetPrefersEdgeAttachedInCompactHeight,
       sheetWidthFollowsPreferredContentSizeWhenEdgeAttached,
       sheetPrefersGrabberVisible,
+      sheetShouldAnimateChanges,
+      sheetLargestUndimmedDetentIdentifier,
+      sheetPreferredCornerRadius,
+      sheetSelectedDetentIdentifier,
       onModalWillPresent,
       onModalDidPresent,
       onModalWillDismiss,
@@ -210,7 +218,6 @@ export class ModalView extends
       onPresentationControllerDidDismiss,
       onPresentationControllerDidAttemptToDismiss,
 
-
       // C - View-Related Props
       children,
       viewProps,

diff --git a/src/components/ModalView/ModalViewTypes.ts b/src/components/ModalView/ModalViewTypes.ts
@@ -37,6 +37,10 @@ export type ModalViewBaseProps = Partial<
     | 'sheetPrefersEdgeAttachedInCompactHeight'
     | 'sheetWidthFollowsPreferredContentSizeWhenEdgeAttached'
     | 'sheetPrefersGrabberVisible'
+    | 'sheetShouldAnimateChanges'
+    | 'sheetLargestUndimmedDetentIdentifier'
+    | 'sheetPreferredCornerRadius'
+    | 'sheetSelectedDetentIdentifier'
 
     // props - events
     | 'onModalWillPresent'

diff --git a/src/native_components/RNIModalView/RNIModalViewTypes.ts b/src/native_components/RNIModalView/RNIModalViewTypes.ts
@@ -27,6 +27,7 @@ import type {
   OnPresentationControllerDidDismissEvent,
   OnPresentationControllerDidAttemptToDismissEvent,
 } from './RNIModalViewEvents';
+import type { UnionWithAutoComplete } from 'src/types/UtilityTypes';
 
 export type RNIModalViewBaseProps = {
   // Props - General
@@ -64,6 +65,19 @@ export type RNIModalViewBaseProps = {
   sheetPrefersEdgeAttachedInCompactHeight?: boolean;
   sheetWidthFollowsPreferredContentSizeWhenEdgeAttached?: boolean;
   sheetPrefersGrabberVisible?: boolean;
+  sheetShouldAnimateChanges?: boolean;
+
+  sheetPreferredCornerRadius?: number;
+
+  sheetLargestUndimmedDetentIdentifier?: UnionWithAutoComplete<
+    TUISheetPresentationControllerDetents,
+    string
+  >;
+
+  sheetSelectedDetentIdentifier?: UnionWithAutoComplete<
+    TUISheetPresentationControllerDetents,
+    string
+  >;
 
   // Props - Events
   // --------------