⭐️ Impl: modalContentPreferredContentSize Prop

Related: * `TODO:2023-04-20-23-58-24` - Impl. sheet-related props. * `TODO:2023-04-21-00-31-46` - Impl. modal content prop `modalContentPreferredContentSize`.
dominicstop · Apr 28, 2023 · ccf7326 · ccf7326
1 parent 56ae8ae
commit ccf7326
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 13 deletions.
diff --git a/ios/src_library/React Native/RNIModalView/RNIModalView.swift b/ios/src_library/React Native/RNIModalView/RNIModalView.swift
@@ -31,7 +31,6 @@ public class RNIModalView:
   var modalContentWrapper: RNIWrapperView?;
   public var modalVC: RNIModalViewController?;
 
-
   public var sheetDetentStringCurrent: String?;
   public var sheetDetentStringPrevious: String?;
 
@@ -101,6 +100,12 @@ public class RNIModalView:
   /// user-provided identifier for this modal
   @objc var modalID: NSString? = nil;
 
+  @objc var modalContentPreferredContentSize: NSDictionary? {
+    didSet {
+      self.modalVC?.setPreferredContentSize();
+    }
+  };
+
   // MARK: - Properties: React Props - BG-Related
   // --------------------------------------------
 
@@ -282,6 +287,16 @@ public class RNIModalView:
   // MARK: - Properties: Synthesized From Props
   // ------------------------------------------
 
+  public var synthesizedModalContentPreferredContentSize: RNIComputableSize {
+    guard let dict = self.modalContentPreferredContentSize,
+          let computableSize = RNIComputableSize(fromDict: dict)
+    else {
+      return RNIComputableSize(mode: .unspecified)
+    };
+
+    return computableSize;
+  };
+
   public var synthesizedModalPresentationStyle: UIModalPresentationStyle {
     let defaultStyle: UIModalPresentationStyle = {
       guard #available(iOS 13.0, *) else { return .overFullScreen };
@@ -736,7 +751,8 @@ public class RNIModalView:
     ///
     switch self.synthesizedModalPresentationStyle {
       case .overFullScreen,
-           .fullScreen:
+           .fullScreen,
+           .formSheet:
         break;
 
       default:
@@ -748,7 +764,7 @@ public class RNIModalView:
 
     if #available(iOS 15.0, *),
        let sheetController = self.sheetPresentationController {
-
+       
       sheetController.delegate = self;
       self.applyModalSheetProps(to: sheetController);
     };

diff --git a/ios/src_library/React Native/RNIModalView/RNIModalViewController.swift b/ios/src_library/React Native/RNIModalView/RNIModalViewController.swift
@@ -13,11 +13,8 @@ public class RNIModalViewController: UIViewController {
   // MARK: - Properties
   // ------------------
 
-  private(set) public var prevBounds: CGRect?;
-
-  weak var lifecycleDelegate: RNIViewControllerLifeCycleNotifiable?;
-
   weak var modalViewRef: RNIModalView?;
+  weak var lifecycleDelegate: RNIViewControllerLifeCycleNotifiable?;
 
   var isBGTransparent: Bool = true {
     didSet {
@@ -26,14 +23,17 @@ public class RNIModalViewController: UIViewController {
       self.updateBackgroundBlur();
     }
   };
-
   var isBGBlurred: Bool = true {
     didSet {
       guard oldValue != self.isBGBlurred else { return };
       self.updateBackgroundBlur();
     }
   };
 
+  private(set) public var prevBounds: CGRect?;
+
+  public lazy var computableSizeEvaluator = RNIComputableSizeEvaluator();
+
   // MARK: - Properties - Computed
   // -----------------------------
 
@@ -45,6 +45,18 @@ public class RNIModalViewController: UIViewController {
     self.modalViewRef?.modalContentWrapper;
   };
 
+  var computablePreferredContentSize: RNIComputableSize? {
+    self.modalViewRef?.synthesizedModalContentPreferredContentSize;
+  };
+
+  var shouldUpdateContentSize: Bool {
+    guard let computableSize = self.computablePreferredContentSize,
+          case .current = computableSize.mode
+    else { return true };
+
+    return false;
+  };
+
   // MARK: - Properties
   // ------------------
 
@@ -106,7 +118,7 @@ public class RNIModalViewController: UIViewController {
     guard didChangeBounds,
           let modalContentWrapper = self.modalContentWrapper
     else { return };
-    
+
     let nextBounds = self.view.bounds;
 
     let prevBounds = self.prevBounds;
@@ -120,10 +132,12 @@ public class RNIModalViewController: UIViewController {
       + " - nextBounds: \(nextBounds)"
     );
     #endif
-
-    modalContentWrapper.notifyForBoundsChange(size: nextBounds.size);
-    modalContentWrapper.center = self.view.center;
 
+    if self.shouldUpdateContentSize {
+      modalContentWrapper.notifyForBoundsChange(size: nextBounds.size);
+      modalContentWrapper.center = self.view.center;
+    };
+
     self.lifecycleDelegate?.viewDidLayoutSubviews(sender: self);
   };
 
@@ -132,7 +146,9 @@ public class RNIModalViewController: UIViewController {
 
     self.lifecycleDelegate?
       .viewWillAppear(sender: self, animated: animated);
-
+
+    self.setPreferredContentSize();
+
     #if DEBUG
     print(
       "Log - RNIModalViewController.viewWillAppear"
@@ -225,6 +241,40 @@ public class RNIModalViewController: UIViewController {
     #endif
   };
 
+  // MARK: - Functions
+  // -----------------
+
+  func setPreferredContentSize(){
+    guard let computableSize = self.computablePreferredContentSize
+    else { return };
+
+    switch computableSize.mode {
+      case .unspecified:
+        return;
+
+      case .current:
+        guard let modalContentWrapper = self.modalContentWrapper
+        else { return };
+
+        self.preferredContentSize = self.view.systemLayoutSizeFitting(
+          modalContentWrapper.bounds.size
+        );
+
+      default:
+        self.computableSizeEvaluator.computableSize = computableSize;
+
+        let computedSize = self.computableSizeEvaluator.evaluate(
+          withTargetSize: self.view.bounds.size,
+          currentSize: self.modalContentWrapper?.bounds.size,
+          rootView: self.view.window?.rootViewController?.view,
+          targetView: self.view
+        );
+
+        guard let computedSize = computedSize else { return };
+        self.preferredContentSize = computedSize;
+    };
+  };
+
   // MARK: - Private Functions
   // -------------------------
 

diff --git a/ios/src_library/React Native/RNIModalView/RNIModalViewManager.m b/ios/src_library/React Native/RNIModalView/RNIModalViewManager.m
@@ -35,6 +35,7 @@ @interface RCT_EXTERN_MODULE(RNIModalViewManager, RCTViewManager)
 // -----------------------------
 
 RCT_EXPORT_VIEW_PROPERTY(modalID, NSString);
+RCT_EXPORT_VIEW_PROPERTY(modalContentPreferredContentSize, NSDictionary);
 
 // MARK: - Value Props - BG-Related
 // --------------------------------

diff --git a/src/components/ModalView/ModalView.tsx b/src/components/ModalView/ModalView.tsx
@@ -56,7 +56,9 @@ import {
   NATIVE_ID_KEYS,
   VirtualizedListContext,
 } from './ModalViewConstants';
+
 import { ModalViewEmitterEventsDeprecated } from './ModalViewEmitterDeprecated';
+import { parseRNIComputableSize } from '../../types/RNIComputable';
 
 // prettier-ignore
 export class ModalView extends
@@ -95,6 +97,7 @@ export class ModalView extends
     const {
       // Native Props - General
       modalID,
+      modalContentPreferredContentSize,
       shouldEnableAggressiveCleanup,
 
       // Native Props - BG-Related
@@ -193,6 +196,9 @@ export class ModalView extends
       shouldEnableAggressiveCleanup: (
         shouldEnableAggressiveCleanup ?? true
       ),
+      modalContentPreferredContentSize: (
+        parseRNIComputableSize(modalContentPreferredContentSize)
+      ),
 
       // B - Pass down...
       containerStyle,

diff --git a/src/components/ModalView/ModalViewProps.ts b/src/components/ModalView/ModalViewProps.ts
@@ -11,6 +11,8 @@ import type {
   DeprecatedOnModalDidDismissEvent,
 } from 'src/native_components/RNIModalView';
 
+import type { RNIComputableSize } from '../../types/RNIComputable';
+
 export type ModalViewBaseProps = Partial<
   Pick<
     RNIModalViewProps,
@@ -62,6 +64,8 @@ export type ModalViewBaseProps = Partial<
     | 'onModalDidChangeSelectedDetentIdentifier'
   >
 > & {
+  modalContentPreferredContentSize?: RNIComputableSize;
+
   // TODO: See TODO:2023-03-04-13-02-45 - Refactor: Rename to
   // shouldAutoCloseOnUnmount
   autoCloseOnUnmount?: boolean;

diff --git a/src/native_components/RNIModalView/RNIModalViewTypes.ts b/src/native_components/RNIModalView/RNIModalViewTypes.ts
@@ -29,13 +29,16 @@ import type {
   OnModalDetentDidComputeEvent,
   OnModalDidChangeSelectedDetentIdentifierEvent,
 } from './RNIModalViewEvents';
+
 import type { UnionWithAutoComplete } from 'src/types/UtilityTypes';
+import type { RNIComputableSizeNative } from 'src/types/RNIComputable';
 
 export type RNIModalViewBaseProps = {
   // Props - General
   // ---------------
 
   modalID?: string;
+  modalContentPreferredContentSize?: RNIComputableSizeNative;
 
   // Props - BG-Related
   // ------------------