@lodev09/react-native-true-sheet 3.5.1 → 3.5.3

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

@@ -24,6 +24,7 @@ class RNScreensFragmentObserver(
   private var activityLifecycleObserver: DefaultLifecycleObserver? = null
   private val activeModalFragments: MutableSet<Fragment> = mutableSetOf()
   private var isActivityInForeground = true
+  private var pendingDismissRunnable: Runnable? = null
 
   /**
    * Start observing fragment lifecycle events.
@@ -52,6 +53,9 @@ class RNScreensFragmentObserver(
         if (!isActivityInForeground) return
 
         if (isModalFragment(f) && !activeModalFragments.contains(f)) {
+          // Cancel any pending dismiss since a modal is being presented
+          cancelPendingDismiss()
+
           activeModalFragments.add(f)
 
           if (activeModalFragments.size == 1) {
@@ -71,7 +75,8 @@ class RNScreensFragmentObserver(
           activeModalFragments.remove(f)
 
           if (activeModalFragments.isEmpty()) {
-            onModalWillDismiss()
+            // Post dismiss to allow fragment attach to cancel if navigation is happening
+            schedulePendingDismiss()
           }
         }
       }
@@ -79,7 +84,7 @@ class RNScreensFragmentObserver(
       override fun onFragmentDestroyed(fm: FragmentManager, f: Fragment) {
         super.onFragmentDestroyed(fm, f)
 
-        if (activeModalFragments.isEmpty()) {
+        if (activeModalFragments.isEmpty() && pendingDismissRunnable == null) {
           onModalDidDismiss()
         }
       }
@@ -94,6 +99,8 @@ class RNScreensFragmentObserver(
   fun stop() {
     val activity = reactContext.currentActivity as? AppCompatActivity
 
+    cancelPendingDismiss()
+
     fragmentLifecycleCallback?.let { callback ->
       activity?.supportFragmentManager?.unregisterFragmentLifecycleCallbacks(callback)
     }
@@ -107,6 +114,31 @@ class RNScreensFragmentObserver(
     activeModalFragments.clear()
   }
 
+  private fun schedulePendingDismiss() {
+    val activity = reactContext.currentActivity ?: return
+    val decorView = activity.window?.decorView ?: return
+
+    cancelPendingDismiss()
+
+    pendingDismissRunnable = Runnable {
+      pendingDismissRunnable = null
+      if (activeModalFragments.isEmpty()) {
+        onModalWillDismiss()
+      }
+    }
+    decorView.post(pendingDismissRunnable)
+  }
+
+  private fun cancelPendingDismiss() {
+    val activity = reactContext.currentActivity ?: return
+    val decorView = activity.window?.decorView ?: return
+
+    pendingDismissRunnable?.let {
+      decorView.removeCallbacks(it)
+      pendingDismissRunnable = null
+    }
+  }
+
   companion object {
     /**
      * Check if fragment is from react-native-screens.

package/ios/TrueSheetContentView.mm

@@ -14,6 +14,7 @@
 #import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
 #import <react/renderer/components/TrueSheetSpec/Props.h>
 #import <react/renderer/components/TrueSheetSpec/RCTComponentViewHelpers.h>
+#import "TrueSheetView.h"
 #import "TrueSheetViewController.h"
 #import "utils/LayoutUtil.h"
 
@@ -128,6 +129,9 @@ using namespace facebook::react;
 
 - (RCTScrollViewComponentView *)findScrollViewInSubviews:(NSArray<UIView *> *)subviews {
   for (UIView *subview in subviews) {
+    if ([subview isKindOfClass:TrueSheetView.class]) {
+      continue;
+    }
     if ([subview isKindOfClass:RCTScrollViewComponentView.class]) {
       return (RCTScrollViewComponentView *)subview;
     }
@@ -161,7 +165,7 @@ using namespace facebook::react;
     CGFloat closestDistance = CGFLOAT_MAX;
 
     for (UIView *sibling in self.subviews) {
-      if (sibling == scrollView) {
+      if (sibling == scrollView || [sibling isKindOfClass:TrueSheetView.class]) {
         continue;
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "3.5.1",
+  "version": "3.5.3",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",