From 944874a3f5f16bb7f1d40310767fcdf1e291b50e Mon Sep 17 00:00:00 2001
From: Dominic Go <dominic@dominicgo.dev>
Date: Mon, 7 Oct 2024 09:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=AB=20Update:=20`RNIModalSheetViewCont?=
 =?UTF-8?q?roller`=20Content=20Layout=20Logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RNIModalSheetViewController.swift         | 81 +++++++------------
 1 file changed, 28 insertions(+), 53 deletions(-)

diff --git a/ios/RNIModalSheetView/RNIModalSheetViewController.swift b/ios/RNIModalSheetView/RNIModalSheetViewController.swift
index 93f28a2..477c136 100644
--- a/ios/RNIModalSheetView/RNIModalSheetViewController.swift
+++ b/ios/RNIModalSheetView/RNIModalSheetViewController.swift
@@ -21,13 +21,13 @@ open class RNIModalSheetViewController: ModalSheetViewControllerLifecycleNotifie
   public weak var mainSheetContentParent: RNIContentViewParentDelegate?;
   private(set) public weak var mainSheetContent: RNIWrapperViewContent?;
   
-  public var positionConfigForMainSheetContent: AlignmentPositionConfig = .default;
-
+  public var mainSheetContentController: RNIContentViewController?;
   public var bottomOverlayController: RNIModalSheetBottomAttachedOverlayController?;
   
   // MARK: - Computed Properties
   // ---------------------------
   
+  // TODO: TEMP!
   public var baseEventObject: [String: Any] {
     var eventDict: [String: Any] = [:];
     
@@ -55,24 +55,6 @@ open class RNIModalSheetViewController: ModalSheetViewControllerLifecycleNotifie
   public override func viewIsAppearing(_ animated: Bool) {
     self.setupBottomOverlayIfNeeded();
   };
-
-  public override func viewWillLayoutSubviews() {
-    super.viewWillLayoutSubviews();
-    
-    guard let mainSheetContentParent = self.mainSheetContentParent else {
-      return;
-    };
-    
-    self.positionConfigForMainSheetContent.setIntrinsicContentSizeOverrideIfNeeded(
-      forRootReactView: mainSheetContentParent,
-      withSize: self.view.bounds.size
-    );
-    
-    self.positionConfigForMainSheetContent.applySize(
-      toRootReactView: mainSheetContentParent,
-      attachingTo: self.view
-    );
-  };
   
   // MARK: Methods
   // --------------
@@ -87,41 +69,35 @@ open class RNIModalSheetViewController: ModalSheetViewControllerLifecycleNotifie
     self.mainSheetContent = mainSheetContent;
     mainSheetContentParent.reactViewLifecycleDelegates.add(self);
     
-    // MARK: Setup Constraints
-    #if !RCT_NEW_ARCH_ENABLED
-    mainSheetContentParent.removeAllAncestorConstraints();
-    #endif
-    
-    self.view.addSubview(mainSheetContentParent);
-    mainSheetContentParent.translatesAutoresizingMaskIntoConstraints = false;
-        
-    let constraints = self.positionConfigForMainSheetContent.createConstraints(
-      forView: mainSheetContentParent,
-      attachingTo: self.view,
-      enclosingView: self.view
-    );
-    
-    NSLayoutConstraint.activate(constraints);
+    let contentVC = RNIContentViewController();
+    contentVC.reactContentParentView = mainSheetContentParent;
+    contentVC.contentSizingMode = .sizingFromNative;
+    contentVC.contentPositioningMode = .stretch;
     
-    // MARK: Set Initial Size
-    let hasValidSize = !self.view.bounds.size.isZero;
-    if hasValidSize {
-      self.positionConfigForMainSheetContent.setIntrinsicContentSizeOverrideIfNeeded(
-        forRootReactView: mainSheetContentParent,
-        withSize: self.view.bounds.size
-      );
+    self.addChild(contentVC);
+    defer {
+      contentVC.didMove(toParent: self);
     };
     
-    let shouldSetSize =
-         hasValidSize
-      && self.positionConfigForMainSheetContent.isStretchingOnBothAxis;
-      
-    if shouldSetSize {
-      self.positionConfigForMainSheetContent.applySize(
-        toRootReactView: mainSheetContentParent,
-        attachingTo: self.view
-      );
-    };
+    // MARK: Setup Layout
+    
+    self.view.addSubview(contentVC.view);
+    contentVC.view.translatesAutoresizingMaskIntoConstraints = false;
+    
+    NSLayoutConstraint.activate([
+      contentVC.view.leadingAnchor.constraint(
+        equalTo: self.view.leadingAnchor
+      ),
+      contentVC.view.trailingAnchor.constraint(
+        equalTo: self.view.trailingAnchor
+      ),
+      contentVC.view.topAnchor.constraint(
+        equalTo: self.view.topAnchor
+      ),
+      contentVC.view.bottomAnchor.constraint(
+        equalTo: self.view.bottomAnchor
+      ),
+    ]);
   };
   
   func setupBottomOverlayIfNeeded(){
@@ -137,7 +113,6 @@ open class RNIModalSheetViewController: ModalSheetViewControllerLifecycleNotifie
     // wouldn't it be better if the logic for layout be handled in the child
     // vc's `didMove` lifecycle method?
     //
-    //
     bottomOverlayController.attachView(
       anchoredToBottomEdgesOf: targetView,
       withSheetContainerView: self.view