@lodev09/react-native-true-sheet 3.6.5 → 3.6.7

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

@@ -46,7 +46,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   // Initial present configuration (set by ViewManager before mount)
   var initialDetentIndex: Int = -1
   var initialDetentAnimated: Boolean = true
-  private var pendingInitialPresentation: Boolean = false
+  private var didInitiallyPresent: Boolean = false
 
   var stateWrapper: StateWrapper? = null
     set(value) {
@@ -100,7 +100,15 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   override fun onAttachedToWindow() {
     super.onAttachedToWindow()
-    presentInitialDetentIfNeeded()
+
+    if (initialDetentIndex >= 0 && !didInitiallyPresent) {
+      didInitiallyPresent = true
+      if (initialDetentAnimated) {
+        present(initialDetentIndex, true) { }
+      } else {
+        post { present(initialDetentIndex, false) { } }
+      }
+    }
   }
 
   override fun addView(child: View?, index: Int) {
@@ -110,29 +118,11 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
       child.delegate = this
       viewController.createSheet()
 
-      if (initialDetentIndex >= 0 && !viewController.isPresented) {
-        pendingInitialPresentation = true
-        presentInitialDetentIfNeeded()
-      }
-
       val surfaceId = UIManagerHelper.getSurfaceId(this)
       eventDispatcher?.dispatchEvent(MountEvent(surfaceId, id))
     }
   }
 
-  private fun presentInitialDetentIfNeeded() {
-    if (!pendingInitialPresentation || initialDetentIndex < 0 || viewController.isPresented || !isAttachedToWindow) {
-      return
-    }
-
-    pendingInitialPresentation = false
-    if (initialDetentAnimated) {
-      present(initialDetentIndex, true) { }
-    } else {
-      post { present(initialDetentIndex, false) { } }
-    }
-  }
-
   override fun getChildCount(): Int = viewController.childCount
 
   override fun getChildAt(index: Int): View? = viewController.getChildAt(index)
@@ -164,13 +154,16 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
   fun onDropInstance() {
     reactContext.removeLifecycleEventListener(this)
-    TrueSheetModule.unregisterView(id)
-    TrueSheetStackManager.removeSheet(this)
 
     if (viewController.isPresented) {
       viewController.dismiss(animated = false)
     }
+
+    TrueSheetModule.unregisterView(id)
+    TrueSheetStackManager.removeSheet(this)
+
     viewController.delegate = null
+    didInitiallyPresent = false
   }
 
   /**

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

@@ -295,8 +295,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     sheetView = TrueSheetBottomSheetView(reactContext).apply {
       delegate = this@TrueSheetViewController
     }
-
-    setupModalObserver()
   }
 
   private fun cleanupSheet() {
@@ -594,11 +592,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       return
     }
 
-    val activity = reactContext.currentActivity ?: run {
-      RNLog.w(reactContext, "TrueSheet: No activity available for presentation.")
-      return
-    }
-
     if (isPresented) {
       setupDimmedBackground(detentIndex)
       setStateForDetentIndex(detentIndex)
@@ -611,14 +604,38 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       setupSheetInCoordinator(coordinator, sheet)
 
       // Add coordinator to activity
+      val activity = reactContext.currentActivity ?: run {
+        RNLog.w(reactContext, "TrueSheet: No activity available for presentation.")
+        return
+      }
+
       val contentView = activity.findViewById<ViewGroup>(android.R.id.content)
       contentView?.addView(coordinator)
 
-      // Setup back button handling
+      emitWillPresentEvents()
+
+      setupSheetDetents()
+      setupDimmedBackground(currentDetentIndex)
+      setupKeyboardObserver()
+      setupModalObserver()
       setupBackCallback()
 
-      // Start presentation
-      onSheetShow()
+      sheet.setupBackground()
+      sheet.setupElevation()
+      sheet.setupGrabber()
+
+      if (shouldAnimatePresent) {
+        isPresentAnimating = true
+        post { setStateForDetentIndex(currentDetentIndex) }
+      } else {
+        setStateForDetentIndex(currentDetentIndex)
+        emitChangePositionDelegate(detentCalculator.getSheetTopForDetentIndex(currentDetentIndex))
+        updateDimAmount()
+        finishPresent()
+      }
+
+      isPresented = true
+      isSheetVisible = true
     }
   }
 
@@ -641,35 +658,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     coordinator.addView(sheet, params)
   }
 
-  private fun onSheetShow() {
-    val sheet = sheetView ?: run {
-      RNLog.e(reactContext, "TrueSheet: sheetView is null in onSheetShow")
-      return
-    }
-
-    emitWillPresentEvents()
-
-    setupSheetDetents()
-    setupDimmedBackground(currentDetentIndex)
-    setupKeyboardObserver()
-    sheet.setupBackground()
-    sheet.setupElevation()
-    sheet.setupGrabber()
-
-    if (shouldAnimatePresent) {
-      isPresentAnimating = true
-      post { setStateForDetentIndex(currentDetentIndex) }
-    } else {
-      setStateForDetentIndex(currentDetentIndex)
-      emitChangePositionDelegate(detentCalculator.getSheetTopForDetentIndex(currentDetentIndex))
-      updateDimAmount()
-      finishPresent()
-    }
-
-    isPresented = true
-    isSheetVisible = true
-  }
-
   fun dismiss(animated: Boolean = true) {
     if (isDismissing) return
 

package/ios/TrueSheetView.mm

@@ -51,7 +51,7 @@ using namespace facebook::react;
   BOOL _initialDetentAnimated;
   BOOL _isSheetUpdatePending;
   BOOL _pendingLayoutUpdate;
-  BOOL _pendingInitialPresentation;
+  BOOL _didInitiallyPresent;
 }
 
 #pragma mark - Initialization
@@ -74,7 +74,6 @@ using namespace facebook::react;
     _initialDetentAnimated = YES;
     _scrollable = NO;
     _isSheetUpdatePending = NO;
-    _pendingInitialPresentation = NO;
   }
   return self;
 }
@@ -85,13 +84,14 @@ using namespace facebook::react;
   if (!self.window)
     return;
 
-  // Register with TurboModule when tag is set
   if (self.tag > 0) {
     [TrueSheetModule registerView:self withTag:@(self.tag)];
   }
 
-  // Handle pending initial presentation after view is in window hierarchy
-  [self presentInitialDetentIfNeeded];
+  if (_initialDetentIndex >= 0 && !_didInitiallyPresent) {
+    _didInitiallyPresent = YES;
+    [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
+  }
 }
 
 - (void)dealloc {
@@ -252,21 +252,20 @@ using namespace facebook::react;
     [_controller setupDraggable];
   } else if (_initialDetentIndex >= 0) {
     _pendingLayoutUpdate = NO;
-    _pendingInitialPresentation = YES;
-    [self presentInitialDetentIfNeeded];
   }
 }
 
 - (void)prepareForRecycle {
   [super prepareForRecycle];
 
-  _lastStateSize = CGSizeZero;
-
   if (_controller && _controller.presentingViewController) {
     [_controller dismissViewControllerAnimated:YES completion:nil];
   }
 
   [TrueSheetModule unregisterViewWithTag:@(self.tag)];
+
+  _lastStateSize = CGSizeZero;
+  _didInitiallyPresent = NO;
 }
 
 #pragma mark - Child Component Mounting
@@ -501,14 +500,6 @@ using namespace facebook::react;
 
 #pragma mark - Private Helpers
 
-- (void)presentInitialDetentIfNeeded {
-  if (!_pendingInitialPresentation || _initialDetentIndex < 0 || _controller.isPresented || !self.window)
-    return;
-
-  _pendingInitialPresentation = NO;
-  [self presentAtIndex:_initialDetentIndex animated:_initialDetentAnimated completion:nil];
-}
-
 - (UIViewController *)findPresentingViewController {
   UIWindow *keyWindow = [WindowUtil keyWindow];
   if (!keyWindow)

package/package.json

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