@lodev09/react-native-true-sheet 2.0.2 → 2.0.4

package/android/src/main/java/com/lodev09/truesheet/TrueSheetView.kt

@@ -19,7 +19,6 @@ import com.lodev09.truesheet.core.Utils
 class TrueSheetView(context: Context) :
   ViewGroup(context),
   LifecycleEventListener {
-  private var eventDispatcher: EventDispatcher? = null
 
   private val reactContext: ThemedReactContext
     get() = context as ThemedReactContext
@@ -27,6 +26,12 @@ class TrueSheetView(context: Context) :
   private val surfaceId: Int
     get() = UIManagerHelper.getSurfaceId(this)
 
+  var eventDispatcher: EventDispatcher?
+    get() = rootSheetView.eventDispatcher
+    set(eventDispatcher) {
+      rootSheetView.eventDispatcher = eventDispatcher
+    }
+
   var initialIndex: Int = -1
   var initialIndexAnimated: Boolean = true
 
@@ -62,11 +67,8 @@ class TrueSheetView(context: Context) :
 
   init {
     reactContext.addLifecycleEventListener(this)
-    eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, id)
 
     rootSheetView = RootSheetView(context)
-    rootSheetView.eventDispatcher = eventDispatcher
-
     sheetDialog = TrueSheetDialog(reactContext, rootSheetView)
 
     // Configure Sheet Dialog
@@ -173,6 +175,13 @@ class TrueSheetView(context: Context) :
     // Do nothing as we are laid out by UIManager
   }
 
+  override fun setId(id: Int) {
+    super.setId(id)
+
+    // Forward the ID to our content view, so event dispatching behaves correctly
+    rootSheetView.id = id
+  }
+
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
 
@@ -193,7 +202,7 @@ class TrueSheetView(context: Context) :
 
   override fun onDetachedFromWindow() {
     super.onDetachedFromWindow()
-    sheetDialog.dismiss()
+    onDropInstance()
   }
 
   override fun addView(child: View, index: Int) {
@@ -219,7 +228,6 @@ class TrueSheetView(context: Context) :
 
   override fun removeViewAt(index: Int) {
     UiThreadUtil.assertOnUiThread()
-
     val child = getChildAt(index)
     rootSheetView.removeView(child)
   }
@@ -229,14 +237,12 @@ class TrueSheetView(context: Context) :
     // Those will be handled by the rootView which lives in the dialog
   }
 
-  override fun dispatchPopulateAccessibilityEvent(event: AccessibilityEvent): Boolean {
-    // Explicitly override this to prevent accessibility events being passed down to children
-    // Those will be handled by the rootView which lives in the dialog
-    return false
-  }
+  // Explicitly override this to prevent accessibility events being passed down to children
+  // Those will be handled by the mHostView which lives in the dialog
+  public override fun dispatchPopulateAccessibilityEvent(event: AccessibilityEvent): Boolean = false
 
   override fun onHostResume() {
-    // do nothing
+    configureIfShowing()
   }
 
   override fun onHostPause() {
@@ -245,6 +251,10 @@ class TrueSheetView(context: Context) :
 
   override fun onHostDestroy() {
     // Drop the instance if the host is destroyed which will dismiss the dialog
+    onDropInstance()
+  }
+
+  fun onDropInstance() {
     reactContext.removeLifecycleEventListener(this)
     sheetDialog.dismiss()
   }
@@ -311,7 +321,7 @@ class TrueSheetView(context: Context) :
     eventDispatcher?.dispatchEvent(TrueSheetEvent(surfaceId, id, name, data))
   }
 
-  private fun configureIfShowing() {
+  fun configureIfShowing() {
     if (sheetDialog.isShowing) {
       sheetDialog.configure()
       sheetDialog.positionFooter()

package/android/src/main/java/com/lodev09/truesheet/TrueSheetViewManager.kt

@@ -8,6 +8,7 @@ import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.MapBuilder
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.ViewGroupManager
 import com.facebook.react.uimanager.annotations.ReactProp
 import com.lodev09.truesheet.core.Utils
@@ -19,7 +20,19 @@ class TrueSheetViewManager : ViewGroupManager<TrueSheetView>() {
 
   override fun onDropViewInstance(view: TrueSheetView) {
     super.onDropViewInstance(view)
-    view.onHostDestroy()
+    view.onDropInstance()
+  }
+
+  override fun addEventEmitters(reactContext: ThemedReactContext, view: TrueSheetView) {
+    val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id)
+    dispatcher?.let {
+      view.eventDispatcher = it
+    }
+  }
+
+  override fun onAfterUpdateTransaction(view: TrueSheetView) {
+    super.onAfterUpdateTransaction(view)
+    view.configureIfShowing()
   }
 
   override fun getExportedCustomDirectEventTypeConstants(): MutableMap<String, Any> =

package/android/src/main/java/com/lodev09/truesheet/core/RootSheetView.kt

@@ -32,8 +32,8 @@ class RootSheetView(private val context: Context?) :
 
   private val jSTouchDispatcher = JSTouchDispatcher(this)
   private var jSPointerDispatcher: JSPointerDispatcher? = null
-  var sizeChangeListener: ((w: Int, h: Int) -> Unit)? = null
 
+  var sizeChangeListener: ((w: Int, h: Int) -> Unit)? = null
   var eventDispatcher: EventDispatcher? = null
 
   private val reactContext: ThemedReactContext
@@ -59,53 +59,44 @@ class RootSheetView(private val context: Context?) :
   }
 
   override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jSTouchDispatcher.handleTouchEvent(event, it) }
-    jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, true)
+    eventDispatcher?.let { eventDispatcher ->
+      jSTouchDispatcher.handleTouchEvent(event, eventDispatcher, reactContext)
+      jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, true)
+    }
     return super.onInterceptTouchEvent(event)
   }
 
   @SuppressLint("ClickableViewAccessibility")
   override fun onTouchEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jSTouchDispatcher.handleTouchEvent(event, it) }
-    jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, false)
+    eventDispatcher?.let { eventDispatcher ->
+      jSTouchDispatcher.handleTouchEvent(event, eventDispatcher, reactContext)
+      jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, false)
+    }
     super.onTouchEvent(event)
-
     // In case when there is no children interested in handling touch event, we return true from
     // the root view in order to receive subsequent events related to that gesture
     return true
   }
 
   override fun onInterceptHoverEvent(event: MotionEvent): Boolean {
-    jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, true)
+    eventDispatcher?.let { jSPointerDispatcher?.handleMotionEvent(event, it, true) }
     return super.onHoverEvent(event)
   }
 
   override fun onHoverEvent(event: MotionEvent): Boolean {
-    jSPointerDispatcher?.handleMotionEvent(event, eventDispatcher, false)
+    eventDispatcher?.let { jSPointerDispatcher?.handleMotionEvent(event, it, false) }
     return super.onHoverEvent(event)
   }
 
-  @Deprecated("Deprecated in Java")
-  override fun onChildStartedNativeGesture(ev: MotionEvent) {
-    eventDispatcher?.let {
-      if (ev != null) {
-        jSTouchDispatcher.onChildStartedNativeGesture(ev, it)
-      }
+  override fun onChildStartedNativeGesture(childView: View, ev: MotionEvent) {
+    eventDispatcher?.let { eventDispatcher ->
+      jSTouchDispatcher.onChildStartedNativeGesture(ev, eventDispatcher)
+      jSPointerDispatcher?.onChildStartedNativeGesture(childView, ev, eventDispatcher)
     }
   }
 
-  override fun onChildStartedNativeGesture(childView: View?, ev: MotionEvent) {
-    eventDispatcher?.let { jSTouchDispatcher.onChildStartedNativeGesture(ev, it) }
-    jSPointerDispatcher?.onChildStartedNativeGesture(childView, ev, eventDispatcher)
-  }
-
   override fun onChildEndedNativeGesture(childView: View, ev: MotionEvent) {
     eventDispatcher?.let { jSTouchDispatcher.onChildEndedNativeGesture(ev, it) }
     jSPointerDispatcher?.onChildEndedNativeGesture()
   }
-
-  override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
-    // No-op - override in order to still receive events to onInterceptTouchEvent
-    // even when some other view disallow that
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/commonjs/index.js",
@@ -41,8 +41,8 @@
     "docs": "yarn workspace docs",
     "test": "jest",
     "typecheck": "tsc",
-    "lint": "eslint --fix \"**/*.{js,ts,tsx}\"",
-    "format": "prettier --write \"**/*.{js,ts,tsx}\"",
+    "lint": "eslint --fix \"**/*.{ts,tsx}\"",
+    "format": "prettier --write \"**/*.{ts,tsx}\"",
     "tidy": "yarn typecheck && yarn lint && yarn format && scripts/swiftlint.sh && scripts/ktlint.sh",
     "clean": "scripts/clean.sh",
     "prepare": "bob build",

package/react-native-true-sheet.podspec

@@ -16,6 +16,13 @@ Pod::Spec.new do |s|
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
 
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.pod_target_xcconfig = {
+      # Detect if new arch is enabled in Swift code
+      "OTHER_SWIFT_FLAGS" => "-DRCT_NEW_ARCH_ENABLED"
+    }
+  end
+
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
   if respond_to?(:install_modules_dependencies, true)
@@ -26,10 +33,10 @@ Pod::Spec.new do |s|
     # Don't install the dependencies when we run `pod install` in the old architecture.
     if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
       s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-      s.pod_target_xcconfig    = {
-          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-          "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+      s.pod_target_xcconfig = s.pod_target_xcconfig | {
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
       }
       s.dependency "React-RCTFabric"
       s.dependency "React-Codegen"