@lodev09/react-native-true-sheet 3.4.0-beta.0 → 3.4.0-beta.1

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

@@ -368,8 +368,8 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     isSheetUpdatePending = true
     viewController.post {
       isSheetUpdatePending = false
-      viewController.setupSheetDetents()
-      viewController.positionFooter()
+      viewController.setupSheetDetentsForSizeChange()
+      TrueSheetDialogObserver.onSheetSizeChanged(this)
     }
   }
 
@@ -384,9 +384,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   }
 
   override fun containerViewFooterDidChangeSize(width: Int, height: Int) {
-    if (viewController.isPresented) {
-      viewController.positionFooter()
-    }
+    viewController.positionFooter()
   }
 
   companion object {

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

@@ -76,6 +76,7 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     // Animation durations from res/anim/true_sheet_slide_in.xml and true_sheet_slide_out.xml
     private const val PRESENT_ANIMATION_DURATION = 250L
     private const val DISMISS_ANIMATION_DURATION = 150L
+    private const val TRANSLATE_ANIMATION_DURATION = 100L
   }
 
   // ====================================================================
@@ -408,6 +409,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
           isDialogVisible = false
           dialog?.window?.setWindowAnimations(com.lodev09.truesheet.R.style.TrueSheetFadeOutAnimation)
           dialog?.window?.decorView?.visibility = INVISIBLE
+          dimView?.visibility = INVISIBLE
+          parentDimView?.visibility = INVISIBLE
           wasHiddenByModal = true
         }
       },
@@ -416,6 +419,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
         if (isPresented && wasHiddenByModal) {
           isDialogVisible = true
           dialog?.window?.decorView?.visibility = VISIBLE
+          dimView?.visibility = VISIBLE
+          parentDimView?.visibility = VISIBLE
           // Restore animation after visibility change to avoid slide animation
           sheetContainer?.post {
             dialog?.window?.setWindowAnimations(windowAnimation)
@@ -478,11 +483,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   /** Translates the sheet when stacking. Pass 0 to reset. */
   fun translateDialog(translationY: Int) {
     val bottomSheet = bottomSheetView ?: return
-    val duration = if (translationY > 0) PRESENT_ANIMATION_DURATION else DISMISS_ANIMATION_DURATION
 
     bottomSheet.animate()
       .translationY(translationY.toFloat())
-      .setDuration(duration)
+      .setDuration(TRANSLATE_ANIMATION_DURATION)
       .setUpdateListener {
         val effectiveTop = bottomSheet.top + bottomSheet.translationY.toInt()
         emitChangePositionDelegate(effectiveTop)
@@ -589,6 +593,11 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     }
   }
 
+  fun setupSheetDetentsForSizeChange() {
+    setupSheetDetents()
+    positionFooter()
+  }
+
   fun setupGrabber() {
     val bottomSheet = bottomSheetView ?: return
 

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

@@ -20,18 +20,8 @@ object TrueSheetDialogObserver {
       val parentSheet = presentedSheetStack.lastOrNull()
         ?.takeIf { it.viewController.isPresented && it.viewController.isDialogVisible }
 
-      // Translate parent sheets down to match the new sheet's position
-      val newSheetTop = sheetView.viewController.getExpectedSheetTop(detentIndex)
-      for (sheet in presentedSheetStack) {
-        if (!sheet.viewController.isDialogVisible) continue
-        if (sheet.viewController.isExpanded) continue
-
-        val sheetTop = sheet.viewController.currentSheetTop
-        if (sheetTop < newSheetTop) {
-          val translationY = newSheetTop - sheetTop
-          sheet.viewController.translateDialog(translationY)
-        }
-      }
+      val childSheetTop = sheetView.viewController.getExpectedSheetTop(detentIndex)
+      updateParentTranslations(childSheetTop)
 
       if (!presentedSheetStack.contains(sheetView)) {
         presentedSheetStack.add(sheetView)
@@ -43,7 +33,7 @@ object TrueSheetDialogObserver {
 
   /**
    * Called when a sheet has been dismissed.
-   * Shows the parent sheet if this sheet was stacked on it.
+   * Resets parent sheet translation if this sheet was stacked on it.
    */
   @JvmStatic
   fun onSheetDidDismiss(sheetView: TrueSheetView, hadParent: Boolean) {
@@ -55,6 +45,27 @@ object TrueSheetDialogObserver {
     }
   }
 
+  /**
+   * Called when a presented sheet's size changes (e.g., after setupSheetDetents).
+   * Updates parent sheet translations to match the new sheet position.
+   */
+  @JvmStatic
+  fun onSheetSizeChanged(sheetView: TrueSheetView) {
+    synchronized(presentedSheetStack) {
+      val index = presentedSheetStack.indexOf(sheetView)
+      if (index <= 0) return
+
+      // Post to ensure layout is complete before reading position
+      sheetView.viewController.post {
+        val childMinSheetTop = sheetView.viewController.getExpectedSheetTop(0)
+        val childCurrentSheetTop = sheetView.viewController.getExpectedSheetTop(sheetView.viewController.currentDetentIndex)
+        // Cap to minimum detent position
+        val childSheetTop = maxOf(childMinSheetTop, childCurrentSheetTop)
+        updateParentTranslations(childSheetTop, untilIndex = index)
+      }
+    }
+  }
+
   /**
    * Returns all sheets presented on top of the given sheet (children/descendants).
    * Returns them in reverse order (top-most first) for proper dismissal.
@@ -81,4 +92,25 @@ object TrueSheetDialogObserver {
       presentedSheetStack.clear()
     }
   }
+
+  /**
+   * Translates parent sheets down to match the child sheet's position.
+   * @param childSheetTop The top position of the child sheet
+   * @param untilIndex If specified, only update sheets up to this index (exclusive)
+   */
+  private fun updateParentTranslations(childSheetTop: Int, untilIndex: Int = presentedSheetStack.size) {
+    for (i in 0 until untilIndex) {
+      val parentSheet = presentedSheetStack[i]
+      if (!parentSheet.viewController.isDialogVisible) continue
+      if (parentSheet.viewController.isExpanded) continue
+
+      val parentSheetTop = parentSheet.viewController.getExpectedSheetTop(parentSheet.viewController.currentDetentIndex)
+      if (parentSheetTop < childSheetTop) {
+        val translationY = childSheetTop - parentSheetTop
+        parentSheet.viewController.translateDialog(translationY)
+      } else {
+        parentSheet.viewController.translateDialog(0)
+      }
+    }
+  }
 }

package/ios/TrueSheetView.mm

@@ -403,10 +403,7 @@ using namespace facebook::react;
 
   dispatch_async(dispatch_get_main_queue(), ^{
     self->_isSheetUpdatePending = NO;
-
-    [self->_controller.sheetPresentationController animateChanges:^{
-      [self->_controller setupSheetDetentsForSizeChange];
-    }];
+    [self->_controller setupSheetDetentsForSizeChange];
   });
 }
 

package/ios/TrueSheetViewController.mm

@@ -594,8 +594,10 @@
 #pragma mark - Sheet Configuration
 
 - (void)setupSheetDetentsForSizeChange {
-  _pendingContentSizeChange = YES;
-  [self setupSheetDetents];
+  [self.sheetPresentationController animateChanges:^{
+    _pendingContentSizeChange = YES;
+    [self setupSheetDetents];
+  }];
 }
 
 - (void)setupSheetDetentsForDetentsChange {

package/package.json

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