@lodev09/react-native-true-sheet 3.7.2 → 3.7.3

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

@@ -26,6 +26,7 @@ class RNScreensFragmentObserver(
   private val activeModalFragments: MutableSet<Fragment> = mutableSetOf()
   private var isActivityInForeground = true
   private var pendingDismissRunnable: Runnable? = null
+  private var isInitialized = false
 
   /**
    * Start observing fragment lifecycle events.
@@ -53,6 +54,9 @@ class RNScreensFragmentObserver(
         // Ignore if app is resuming from background
         if (!isActivityInForeground) return
 
+        // Ignore initial fragment attachments during app startup (cold start deep links)
+        if (!isInitialized) return
+
         if (isModalFragment(f) && !activeModalFragments.contains(f)) {
           // Cancel any pending dismiss since a modal is being presented
           cancelPendingDismiss()
@@ -95,6 +99,11 @@ class RNScreensFragmentObserver(
     }
 
     fragmentManager.registerFragmentLifecycleCallbacks(fragmentLifecycleCallback!!, true)
+
+    // Mark as initialized after a frame to ignore initial fragment attachments during cold start
+    activity.window?.decorView?.post {
+      isInitialized = true
+    }
   }
 
   /**

package/ios/TrueSheetView.mm

@@ -19,7 +19,6 @@
 #import "events/TrueSheetLifecycleEvents.h"
 #import "events/TrueSheetStateEvents.h"
 #import "utils/LayoutUtil.h"
-#import "utils/WindowUtil.h"
 
 #import <react/renderer/components/TrueSheetSpec/EventEmitters.h>
 #import <react/renderer/components/TrueSheetSpec/Props.h>
@@ -91,8 +90,16 @@ using namespace facebook::react;
   }
 
   if (_initialDetentIndex >= 0 && !_didInitiallyPresent) {
-    _didInitiallyPresent = YES;
-    [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
+    UIViewController *vc = [self findPresentingViewController];
+
+    // Only present if the view controller is in the same window and not being dismissed
+    if (vc && vc.view.window == self.window && !vc.isBeingDismissed) {
+      _didInitiallyPresent = YES;
+      [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
+    } else {
+      // Animate next time when sheet finally moves to the correct window
+      _initialDetentAnimated = YES;
+    }
   }
 }
 
@@ -106,6 +113,8 @@ using namespace facebook::react;
     [root dismissViewControllerAnimated:YES completion:nil];
   }
 
+  _didInitiallyPresent = NO;
+
   _controller.delegate = nil;
   _controller = nil;
 
@@ -551,11 +560,10 @@ using namespace facebook::react;
 #pragma mark - Private Helpers
 
 - (UIViewController *)findPresentingViewController {
-  UIWindow *keyWindow = [WindowUtil keyWindow];
-  if (!keyWindow)
+  if (!self.window)
     return nil;
 
-  UIViewController *rootViewController = keyWindow.rootViewController;
+  UIViewController *rootViewController = self.window.rootViewController;
   if (!rootViewController)
     return nil;
 

package/package.json

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