fix(ios): events in new arch

Author: lodev09

example/ios/Podfile

@@ -1,4 +1,4 @@
-ENV['RCT_NEW_ARCH_ENABLED'] = '0'
+ENV['RCT_NEW_ARCH_ENABLED'] = '1'
 
 # Resolve react_native_pods.rb with node to allow for hoisting
 require Pod::Executable.execute_command('node', ['-p',

example/src/App.tsx

@@ -11,7 +11,7 @@ const App = () => {
     <NavigationContainer>
       <Stack.Navigator
         screenOptions={{ headerTransparent: true, headerTintColor: 'white' }}
-        initialRouteName="Navigation"
+        initialRouteName="Map"
       >
         <Stack.Screen options={{ headerShown: false }} name="Map" component={MapScreen} />
         <Stack.Screen

ios/TrueSheetView.swift

@@ -97,11 +97,14 @@ class TrueSheetView: UIView, RCTInvalidating, TrueSheetViewControllerDelegate {
 
     super.removeReactSubview(subview)
 
+    // Touch handler for Old Arch
     touchHandler.detach(from: subview)
+    
+    // Touch handler that works in New Arch
     surfaceTouchHandler.detach(from: subview)
 
     // Remove all constraints
-    // Fixes New Arch weird layout degration
+    // Fixes New Arch weird layout issue :/
     containerView?.unpin()
     footerView?.unpin()
     contentView?.unpin()
@@ -149,7 +152,7 @@ class TrueSheetView: UIView, RCTInvalidating, TrueSheetViewControllerDelegate {
         present(at: initialIndex, promise: nil, animated: initialIndexAnimated)
       }
 
-      dispatchEvent(name: "onMount", data: nil)
+      dispatchEvent(name: "onMount", block: onMount, data: nil)
     }
   }
 
@@ -173,19 +176,19 @@ class TrueSheetView: UIView, RCTInvalidating, TrueSheetViewControllerDelegate {
 
   func viewControllerDidChangeWidth(_ width: CGFloat) {
     // We only pass width to JS since height is handled by the constraints
-    dispatchEvent(name: "onContainerSizeChange", data: ["width": width])
+    dispatchEvent(name: "onContainerSizeChange", block: onContainerSizeChange, data: ["width": width])
   }
 
   func viewControllerDidDrag(_ state: UIGestureRecognizer.State, _ height: CGFloat) {
     let sizeInfo = SizeInfo(index: activeIndex ?? 0, value: height)
 
     switch state {
     case .began:
-      dispatchEvent(name: "onDragBegin", data: sizeInfoData(from: sizeInfo))
+      dispatchEvent(name: "onDragBegin", block: onDragBegin, data: sizeInfoData(from: sizeInfo))
     case .changed:
-      dispatchEvent(name: "onDragChange", data: sizeInfoData(from: sizeInfo))
+      dispatchEvent(name: "onDragChange", block: onDragChange, data: sizeInfoData(from: sizeInfo))
     case .ended, .cancelled:
-      dispatchEvent(name: "onDragEnd", data: sizeInfoData(from: sizeInfo))
+      dispatchEvent(name: "onDragEnd", block: onDragEnd, data: sizeInfoData(from: sizeInfo))
     default:
       Logger.info("Drag state is not supported")
     }
@@ -204,15 +207,15 @@ class TrueSheetView: UIView, RCTInvalidating, TrueSheetViewControllerDelegate {
   func viewControllerDidDismiss() {
     isPresented = false
     activeIndex = nil
-    dispatchEvent(name: "onDismiss", data: nil)
+    dispatchEvent(name: "onDismiss", block: onDismiss, data: nil)
   }
 
   func viewControllerDidChangeSize(_ sizeInfo: SizeInfo?) {
     guard let sizeInfo else { return }
 
     if sizeInfo.index != activeIndex {
       activeIndex = sizeInfo.index
-      dispatchEvent(name: "onSizeChange", data: sizeInfoData(from: sizeInfo))
+      dispatchEvent(name: "onSizeChange", block: onSizeChange, data: sizeInfoData(from: sizeInfo))
     }
   }
 
@@ -395,8 +398,14 @@ class TrueSheetView: UIView, RCTInvalidating, TrueSheetViewControllerDelegate {
     }
   }
 
-  func dispatchEvent(name: String, data: [String: Any]?) {
-    eventDispatcher?.send(TrueSheetEvent(viewTag: reactTag, name: name, data: data))
+  func dispatchEvent(name: String, block: RCTDirectEventBlock?, data: [String: Any]?) {
+    // eventDispatcher doesn't work in New Arch so we need to call it directly :/
+    // we needed eventDispatcher for Reanimated to work on old arch.
+    #if RCT_NEW_ARCH_ENABLED
+      block?(data)
+    #else
+      eventDispatcher?.send(TrueSheetEvent(viewTag: reactTag, name: name, data: data))
+    #endif
   }
 
   func dismiss(promise: Promise) {
@@ -443,7 +452,7 @@ class TrueSheetView: UIView, RCTInvalidating, TrueSheetViewControllerDelegate {
           }
 
           let data = self.sizeInfoData(from: self.viewController.currentSizeInfo)
-          self.dispatchEvent(name: "onPresent", data: data)
+          self.dispatchEvent(name: "onPresent", block: self.onPresent, data: data)
           promise?.resolve(nil)
         }
       }