@lodev09/react-native-true-sheet 4.0.0-beta.25 → 4.0.0-beta.26

package/README.md

@@ -35,6 +35,7 @@ The true native bottom sheet experience for your React Native Apps. 💩
 * 🍞 **`TrueSheetOverlay`** - Render toasts, dialogs, and other [overlays above your sheets](https://sheet.lodev09.com/guides/overlays) — no more `FullWindowOverlay`/`Modal` workarounds
 * 🔍 **Element inspector** - React Native's dev menu inspector now works inside a presented sheet
 * 🎨 **Dim color and opacity** - [Customize the dim](https://sheet.lodev09.com/guides/dimming#dim-color-and-opacity) behind the sheet with `dimColor` and `dimOpacity`
+* 📱 **Foldables** - [Rest the sheet on the hinge](https://sheet.lodev09.com/guides/foldables) of a half-folded iPhone with `foldOptions` (iOS 27.1+)
 
 ```sh
 npx expo install @lodev09/react-native-true-sheet@beta

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

@@ -67,7 +67,7 @@ class TrueSheetOverlayView(private val reactContext: ThemedReactContext) :
 
   override fun onDetachedFromWindow() {
     viewTreeObserver.removeOnWindowAttachListener(windowAttachListener)
-    detachRootView()
+    rootContainerView?.post { if (!isAttachedToWindow) detachRootView() }
     super.onDetachedFromWindow()
   }
 

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

@@ -72,6 +72,9 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   // Debounce flag to coalesce rapid layout changes into a single sheet update
   private var isSheetUpdatePending: Boolean = false
 
+  // didFocus waiting for the slide-back after a child dismissed
+  private var isDidFocusPending: Boolean = false
+
   // Root container for the coordinator layout (activity or Modal dialog content view)
   internal var rootContainerView: ViewGroup? = null
 
@@ -610,7 +613,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
     // Propagate any additional translation up the stack
     if (additionalTranslation > 0) {
-      TrueSheetStackManager.getParentSheet(this)?.addTranslation(additionalTranslation)
+      viewController.parentSheetView?.addTranslation(additionalTranslation)
     }
   }
 
@@ -642,7 +645,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
     val additionalTranslation = newTranslation - currentTranslation
     if (additionalTranslation > 0) {
-      TrueSheetStackManager.getParentSheet(this)?.addTranslation(additionalTranslation, animated = false)
+      viewController.parentSheetView?.addTranslation(additionalTranslation, animated = false)
     }
   }
 
@@ -653,7 +656,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     if (viewController.isExpanded) return
 
     viewController.translateSheet(viewController.currentTranslationY + amount, animated)
-    TrueSheetStackManager.getParentSheet(this)?.addTranslation(amount, animated)
+    viewController.parentSheetView?.addTranslation(amount, animated)
   }
 
   /**
@@ -666,7 +669,25 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
 
     // Parent should recalculate its translation based on this sheet's position
     val mySheetTop = viewController.detentCalculator.getSheetTopForDetentIndex(viewController.currentDetentIndex)
-    TrueSheetStackManager.getParentSheet(this)?.updateTranslationForChild(mySheetTop)
+    viewController.parentSheetView?.updateTranslationForChild(mySheetTop)
+  }
+
+  /**
+   * Resets translation after a child dismissed and emits didFocus once the sheet settles.
+   * A sheet presented on top before then cancels the slide-back, so the next blur flushes it.
+   */
+  private fun focusAfterResetTranslation() {
+    isDidFocusPending = true
+    resetTranslation { emitPendingDidFocus() }
+  }
+
+  private fun emitPendingDidFocus() {
+    if (!isDidFocusPending) return
+    isDidFocusPending = false
+
+    if (viewController.isPresented && !viewController.isBeingDismissed) {
+      viewControllerDidFocus()
+    }
   }
 
   // ==================== TrueSheetViewControllerDelegate ====================
@@ -701,6 +722,9 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   }
 
   override fun viewControllerDidDismiss(parent: TrueSheetView?) {
+    // A slide-back cut short by this sheet's own dismissal never emits; don't carry it over
+    isDidFocusPending = false
+
     // Detach coordinator from the root container view
     viewController.coordinatorLayout?.let { rootContainerView?.removeView(it) }
     rootContainerView = null
@@ -715,12 +739,7 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     // The sheets below stop blending this sheet's dim
     parent?.viewController?.takeIf { it.isPresented }?.updateDimAmount()
 
-    parent?.resetTranslation {
-      val parentController = parent.viewController
-      if (parentController.isPresented && !parentController.isBeingDismissed) {
-        parent.viewControllerDidFocus()
-      }
-    }
+    parent?.focusAfterResetTranslation()
   }
 
   override fun viewControllerDidChangeDetent(index: Int, position: Float, detent: Float) {
@@ -763,6 +782,8 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   }
 
   override fun viewControllerWillBlur() {
+    emitPendingDidFocus()
+
     val surfaceId = UIManagerHelper.getSurfaceId(this)
     eventDispatcher?.dispatchEvent(WillBlurEvent(surfaceId, id))
   }

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

@@ -886,6 +886,8 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     setupSheetDetents()
     setupDimmedBackground()
     setupKeyboardObserver()
+    // Before the slide, so an input focused in onWillPresent insets the scrollable
+    containerView?.setupKeyboardHandler()
 
     displayedBackgroundIndex = detentIndex
     setupBackground(animated = false)
@@ -1008,11 +1010,9 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     // Restore isHideable to actual value after present animation
     behavior?.isHideable = dismissible
 
-    containerView?.setupKeyboardHandler()
-
     val (index, position, detent) = getDetentInfoWithValue(currentDetentIndex)
-    delegate?.viewControllerDidPresent(index, position, detent)
     parentSheetView?.viewControllerDidBlur()
+    delegate?.viewControllerDidPresent(index, position, detent)
     delegate?.viewControllerDidFocus()
     sheetView?.updateGrabberAccessibilityValue(index, detents.size)
 

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

@@ -253,6 +253,11 @@ class TrueSheetViewManager :
     // iOS-specific prop - no-op on Android
   }
 
+  @ReactProp(name = "foldOptions")
+  override fun setFoldOptions(view: TrueSheetView, options: ReadableMap?) {
+    // iOS-specific prop - no-op on Android
+  }
+
   @ReactProp(name = "insetAdjustment")
   override fun setInsetAdjustment(view: TrueSheetView, insetAdjustment: String?) {
     view.setInsetAdjustment(insetAdjustment ?: "automatic")

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

@@ -44,22 +44,9 @@ class RNScreensEventObserver : EventDispatcherListener {
   }
 
   fun capturePresenterScreenFromView(view: View?) {
-    presenterScreenTag = 0
-    val ancestors = mutableSetOf<Int>()
-
-    var current: View? = view
-    while (current != null) {
-      if (isScreenView(current)) {
-        if (presenterScreenTag == 0) {
-          presenterScreenTag = current.id
-        } else {
-          ancestors.add(current.id)
-        }
-      }
-      current = (current.parent as? View)
-    }
-
-    ancestorScreenTags = ancestors
+    val tags = screenTags(view).toList()
+    presenterScreenTag = tags.firstOrNull() ?: 0
+    ancestorScreenTags = tags.drop(1).toSet()
   }
 
   override fun onEventDispatch(event: Event<*>) {
@@ -84,5 +71,10 @@ class RNScreensEventObserver : EventDispatcherListener {
 
   companion object {
     private fun isScreenView(view: View): Boolean = view.javaClass.name == RN_SCREENS_VIEW_CLASS
+
+    // Tags of the screens enclosing the view, innermost first
+    private fun screenTags(view: View?): Sequence<Int> = generateSequence(view) { it.parent as? View }.filter(::isScreenView).map { it.id }
+
+    fun findPresenterScreenTag(view: View?): Int = screenTags(view).firstOrNull() ?: 0
   }
 }

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

@@ -40,6 +40,15 @@ class TrueSheetBottomSheetBehavior<V : View> : BottomSheetBehavior<V>() {
     hideFriction = HIDE_FRICTION
   }
 
+  // Material's first layout registers an IME callback that rides the sheet's translationY
+  // with the keyboard. TrueSheet positions sheets for the keyboard itself, and the callback
+  // overwrites a parent's stack translation when the keyboard rises mid-translation.
+  override fun onLayoutChild(parent: CoordinatorLayout, child: V, layoutDirection: Int): Boolean {
+    val handled = super.onLayoutChild(parent, child, layoutDirection)
+    ViewCompat.setWindowInsetsAnimationCallback(child, null)
+    return handled
+  }
+
   // With the short threshold, settle at or below the lowest detent like
   // Compose Material3's sheet instead of Material's half-height rule.
   private fun releaseState(child: V, dragged: Boolean, velocityY: Float): Int? {

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

@@ -81,14 +81,6 @@ class TrueSheetBottomSheetView(private val reactContext: ThemedReactContext) : F
     clipToPadding = false
   }
 
-  override fun setTranslationY(translationY: Float) {
-    // This prevents keyboard inset animations from resetting parent sheet translation
-    if (translationY == 0f && this.translationY != 0f) {
-      return
-    }
-    super.setTranslationY(translationY)
-  }
-
   // =============================================================================
   // MARK: - Layout
   // =============================================================================

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

@@ -12,16 +12,6 @@ object TrueSheetStackManager {
 
   private val presentedSheetStack = mutableListOf<TrueSheetView>()
 
-  /**
-   * Gets the parent sheet at the given index, if any.
-   * Only returns a parent if it's in the same container.
-   * Must be called within synchronized block.
-   */
-  private fun getParentSheetAt(index: Int, rootContainer: ViewGroup?): TrueSheetView? {
-    if (index <= 0) return null
-    return presentedSheetStack[index - 1].takeIf { it.rootContainerView == rootContainer }
-  }
-
   /**
    * Returns the topmost presented and visible sheet, skipping sheets that are dismissing.
    * A dismissing sheet can't parent a new one: its dim would suppress the child's own dim
@@ -33,6 +23,22 @@ object TrueSheetStackManager {
       it.viewController.run { isPresented && isSheetVisible && !isBeingDismissed }
     }
 
+  /**
+   * Returns the topmost sheet hidden by screen navigation that was presented from the same
+   * screen as the given sheet. Sheets presented on the covering screen must not parent to it,
+   * or the hidden sheet would receive focus and blur events while it can't be seen.
+   * Must be called within synchronized block.
+   */
+  private fun findScreenHiddenSheet(sheetView: TrueSheetView): TrueSheetView? {
+    val screenTag = RNScreensEventObserver.findPresenterScreenTag(sheetView)
+    if (screenTag == 0) return null
+
+    return presentedSheetStack.lastOrNull {
+      it.viewController.run { isPresented && wasHiddenByScreen && !isBeingDismissed } &&
+        it.screensEventObserver?.presenterScreenTag == screenTag
+    }
+  }
+
   /**
    * Registers a sheet in the stack and returns its parent sheet if any.
    * Only returns a parent if it's in the same container (e.g., same Screen).
@@ -40,7 +46,8 @@ object TrueSheetStackManager {
   @JvmStatic
   fun registerSheet(sheetView: TrueSheetView): TrueSheetView? {
     synchronized(presentedSheetStack) {
-      val parentSheet = findTopmostSheet()?.takeIf { it.rootContainerView == sheetView.rootContainerView }
+      val parentSheet = (findTopmostSheet() ?: findScreenHiddenSheet(sheetView))
+        ?.takeIf { it.rootContainerView == sheetView.rootContainerView }
 
       if (!presentedSheetStack.contains(sheetView)) {
         presentedSheetStack.add(sheetView)
@@ -62,24 +69,20 @@ object TrueSheetStackManager {
 
   /**
    * Updates parent sheet translation based on the child sheet's position.
-   * Only affects parent sheets in the same container.
    */
   @JvmStatic
   fun updateParentTranslation(sheetView: TrueSheetView) {
-    synchronized(presentedSheetStack) {
-      val index = presentedSheetStack.indexOf(sheetView)
-      val parentSheet = getParentSheetAt(index, sheetView.rootContainerView) ?: return
-
-      // Post to ensure layout is complete before reading position
-      sheetView.viewController.post {
-        val childMinSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(0)
-        val childCurrentSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(
-          sheetView.viewController.currentDetentIndex
-        )
-        // Cap to minimum detent position
-        val childSheetTop = maxOf(childMinSheetTop, childCurrentSheetTop)
-        parentSheet.updateTranslationForChild(childSheetTop)
-      }
+    val parentSheet = sheetView.viewController.parentSheetView ?: return
+
+    // Post to ensure layout is complete before reading position
+    sheetView.viewController.post {
+      val childMinSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(0)
+      val childCurrentSheetTop = sheetView.viewController.detentCalculator.getSheetTopForDetentIndex(
+        sheetView.viewController.currentDetentIndex
+      )
+      // Cap to minimum detent position
+      val childSheetTop = maxOf(childMinSheetTop, childCurrentSheetTop)
+      parentSheet.updateTranslationForChild(childSheetTop)
     }
   }
 
@@ -113,18 +116,6 @@ object TrueSheetStackManager {
     }
   }
 
-  /**
-   * Gets the parent sheet of the given sheet, if any.
-   * Only returns a parent if it's in the same container.
-   */
-  @JvmStatic
-  fun getParentSheet(sheetView: TrueSheetView): TrueSheetView? {
-    synchronized(presentedSheetStack) {
-      val index = presentedSheetStack.indexOf(sheetView)
-      return getParentSheetAt(index, sheetView.rootContainerView)
-    }
-  }
-
   /**
    * Returns true if the given sheet is the topmost presented sheet in its container.
    */

package/common/cpp/react/renderer/components/TrueSheetSpec/TrueSheetContentViewShadowNode.cpp

@@ -1,6 +1,5 @@
 #include "TrueSheetContentViewShadowNode.h"
 
-#include <folly/ScopeGuard.h>
 #include <react/renderer/components/view/conversions.h>
 #include <react/renderer/core/ComponentDescriptor.h>
 #include <react/renderer/core/LayoutConstraints.h>
@@ -95,7 +94,12 @@ void TrueSheetContentViewShadowNode::updateNaturalHeightIfNeeded(const LayoutCon
     if (contentChanged_ || !measurement_ || !(measurement_->constraints == constraints) ||
         !(measurement_->context == measurementContext) || measurement_->errata != errata) {
       gIsMeasuringNaturalHeight = true;
-      auto restoreMeasurement = folly::makeGuard([] { gIsMeasuringNaturalHeight = false; });
+      // Not folly::makeGuard: its terminate() isn't linked into RN < 0.86 on Android.
+      struct RestoreMeasurement {
+        ~RestoreMeasurement() {
+          gIsMeasuringNaturalHeight = false;
+        }
+      } restoreMeasurement;
       auto measurementNode =
         measurement_ ? cloneForMeasurement(*this, *measurementSourceChildren_, measurement_->root->getChildren())
                      : cloneForMeasurement(*this, {}, {});

package/ios/TrueSheetContainerView.h

@@ -37,6 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)containerViewContentDidChangeSize:(CGSize)newSize;
 - (void)containerViewScrollViewDidChange;
+- (void)containerViewDidMountTransaction;
 
 @optional
 

package/ios/TrueSheetContainerView.mm

@@ -287,6 +287,12 @@ using namespace facebook::react;
   [self.delegate containerViewScrollViewDidChange];
 }
 
+// Footer controls can mount, unmount, or hide deep in its subtree without
+// passing through its own mount hooks or changing its size.
+- (void)contentViewDidMountTransaction {
+  [self.delegate containerViewDidMountTransaction];
+}
+
 #pragma mark - TrueSheetHeaderViewDelegate
 
 - (void)headerViewDidChangeSize:(CGSize)newSize {

package/ios/TrueSheetContentView.h

@@ -26,6 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)contentViewDidChangeSize:(CGSize)newSize;
 - (void)contentViewScrollViewDidChange;
+- (void)contentViewDidMountTransaction;
 
 @end
 

package/ios/TrueSheetContentView.mm

@@ -181,6 +181,8 @@ using namespace facebook::react;
   // Layout has settled for the whole tree — the footer overlap (sheet height,
   // scroll view frame) and the keyboard inset are current here
   [self updateBottomInset];
+
+  [self.delegate contentViewDidMountTransaction];
 }
 
 #pragma mark - Scrollable

package/ios/TrueSheetFooterView.mm

@@ -123,6 +123,11 @@ using namespace facebook::react;
 
 - (void)collectAccessibilityElementsFromView:(UIView *)view into:(NSMutableArray *)elements {
   for (UIView *subview in view.subviews) {
+    // Fabric hides `display: none` views instead of unmounting them
+    if (subview.hidden) {
+      continue;
+    }
+
     if (subview.isAccessibilityElement || subview.accessibilityLabel || subview.accessibilityIdentifier) {
       [elements addObject:subview];
     } else if (subview.accessibilityElements.count > 0) {

package/ios/TrueSheetView.mm

@@ -284,6 +284,8 @@ using namespace facebook::react;
 
   _controller.placement = newProps.placement;
 
+  _controller.foldOptions = newProps.foldOptions;
+
   _controller.grabber = newProps.grabber;
 
   // Grabber options - check if any non-default values are set
@@ -866,7 +868,11 @@ using namespace facebook::react;
 - (void)containerViewFooterDidChangeSize:(CGSize)newSize {
   [self syncFooterMetrics];
   [self setupSheetDetentsForSizeChange];
-  [_controller setupAccessibilityContainer];
+  [_controller refreshAccessibilityContainer];
+}
+
+- (void)containerViewDidMountTransaction {
+  [_controller refreshAccessibilityContainerIfFooterChanged];
 }
 
 - (void)containerViewPeekDidChangeSize:(CGSize)newSize {
@@ -882,11 +888,12 @@ using namespace facebook::react;
 
 - (void)viewControllerWillPresentAtIndex:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent {
   _controller.activeDetentIndex = index;
+  // Before emitting, so an input focused in onWillPresent raises a tracked keyboard
+  [_containerView setupKeyboardObserverWithViewController:_controller];
   [TrueSheetLifecycleEvents emitWillPresent:_eventEmitter index:index position:position detent:detent];
 }
 
 - (void)viewControllerDidPresentAtIndex:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent {
-  [_containerView setupKeyboardObserverWithViewController:_controller];
   [TrueSheetLifecycleEvents emitDidPresent:_eventEmitter index:index position:position detent:detent];
 
   if (_pendingPropsUpdate) {

package/ios/TrueSheetViewController.h

@@ -84,6 +84,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) facebook::react::TrueSheetViewBackgroundBlur backgroundBlur;
 @property (nonatomic, assign) facebook::react::TrueSheetViewPresentation presentation;
 @property (nonatomic, assign) facebook::react::TrueSheetViewPlacement placement;
+@property (nonatomic, assign) facebook::react::TrueSheetViewFoldOptionsStruct foldOptions;
 @property (nonatomic, assign) facebook::react::TrueSheetViewInsetAdjustment insetAdjustment;
 @property (nonatomic, assign) BOOL scrollingExpandsSheet;
 @property (nonatomic, assign) CGFloat footerKeyboardOffset;
@@ -109,6 +110,13 @@ NS_ASSUME_NONNULL_BEGIN
  * announced — ahead of the grow/shrink animation, unlike keyboardSheetGrown.
  */
 @property (nonatomic, assign) CGFloat keyboardHeight;
+
+/**
+ * How far UIKit grows the sheet for the iPadOS minimized keyboard, which it
+ * treats as docked. Taken off every detent so the sheet stays put.
+ */
+@property (nonatomic, assign) CGFloat minimizedKeyboardOverlap;
+
 @property (nonatomic, readonly) BOOL isTopmostPresentedController;
 @property (nonatomic, readonly) BOOL isStackedBehindChild;
 @property (nonatomic, weak, nullable) UIView *accessibilityContentView;
@@ -130,6 +138,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) CGFloat appliedFooterBottomInset;
 
 - (void)setupAccessibilityContainer;
+- (void)refreshAccessibilityContainer;
+- (void)refreshAccessibilityContainerIfFooterChanged;
+
 - (void)applyActiveDetent;
 - (void)setupActiveDetentWithIndex:(NSInteger)index;
 - (void)resizeToDetentIndex:(NSInteger)index;
@@ -138,6 +149,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setupSheetDetents;
 - (void)setupSheetDetentsForSizeChange;
 - (void)setupSheetDetentsForDetentsChange;
+- (void)invalidateDetents;
 - (void)setupDraggable;
 - (void)setupAnchorViewInView:(UIView *)parentView;