React Native New Arch (#10980)

modules/bottom-sheet/ios/SheetView.swift

@@ -6,7 +6,7 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
   // Views
   private var sheetVc: SheetViewController?
   private var innerView: UIView?
-  private var touchHandler: RCTTouchHandler?
+  private var touchHandler: RCTSurfaceTouchHandler?
 
   // Native content height observation (eliminates JS bridge round-trip)
   private var contentHeightObservation: NSKeyValueObservation?
@@ -81,33 +81,37 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
   required init (appContext: AppContext? = nil) {
     super.init(appContext: appContext)
     self.maxHeight = Util.getScreenHeight() ?? UIScreen.main.bounds.height
-    self.touchHandler = RCTTouchHandler(bridge: appContext?.reactBridge)
+    self.touchHandler = RCTSurfaceTouchHandler()
     SheetManager.shared.add(self)
   }
 
   deinit {
     self.destroy()
   }
+  
+  override func mountChildComponentView(
+    _ childComponentView: UIView,
+    index: Int
+  ) {
+    self.innerView = childComponentView
+    touchHandler?.attach(to: childComponentView)
+  }
+  
+  override func unmountChildComponentView(
+    _ childComponentView: UIView,
+    index: Int
+  ) {
+    touchHandler?.detach(from: childComponentView)
 
-  // We don't want this view to actually get added to the tree, so we'll simply store it for adding
-  // to the SheetViewController
-  override func insertReactSubview(_ subview: UIView!, at atIndex: Int) {
-    self.touchHandler?.attach(to: subview)
-    self.innerView = subview
+    childComponentView.removeFromSuperview()
+    if self.innerView === childComponentView {
+      self.innerView = nil
+    }
   }
 
   // We'll grab the content height from here so we know the initial detent to set
   override func layoutSubviews() {
     super.layoutSubviews()
-
-    guard let innerView = self.innerView else {
-      return
-    }
-
-    if innerView.subviews.count != 1 {
-      return
-    }
-
     self.present()
   }
 
@@ -117,7 +121,10 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
     self.isClosing = false
     self.isOpen = false
     self.sheetVc = nil
-    self.touchHandler?.detach(from: self.innerView)
+
+    if let innerView = self.innerView {
+      self.touchHandler?.detach(from: innerView)
+    }
     self.touchHandler = nil
     self.innerView = nil
     SheetManager.shared.remove(self)
@@ -146,8 +153,7 @@ class SheetView: ExpoView, UISheetPresentationControllerDelegate {
 
     if #available(iOS 26.0, *),
        let tag = self.sourceViewTag,
-       let bridge = self.appContext?.reactBridge,
-       let sourceView = bridge.uiManager.view(forReactTag: NSNumber(value: tag)) {
+       let sourceView = self.appContext?.findView(withTag: tag, ofType: UIView.self) {
       sheetVc.preferredTransition = .zoom { _ in
         return sourceView
       }

modules/bottom-sheet/ios/SurfaceTouchHandler.h

@@ -0,0 +1,3 @@
+#if __has_include(<React/RCTSurfaceTouchHandler.h>)
+#import <React/RCTSurfaceTouchHandler.h>
+#endif