@lodev09/react-native-true-sheet 3.9.6 → 3.9.7

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

@@ -11,6 +11,7 @@ interface TrueSheetContainerViewDelegate {
   val eventDispatcher: EventDispatcher?
   fun containerViewContentDidChangeSize(width: Int, height: Int)
   fun containerViewContentDidScroll()
+  fun containerViewScrollViewDidChange()
   fun containerViewHeaderDidChangeSize(width: Int, height: Int)
   fun containerViewFooterDidChangeSize(width: Int, height: Int)
 }
@@ -124,6 +125,10 @@ class TrueSheetContainerView(reactContext: ThemedReactContext) :
     delegate?.containerViewContentDidScroll()
   }
 
+  override fun contentViewScrollViewDidChange() {
+    delegate?.containerViewScrollViewDidChange()
+  }
+
   override fun headerViewDidChangeSize(width: Int, height: Int) {
     headerHeight = height
     delegate?.containerViewHeaderDidChangeSize(width, height)

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

@@ -18,6 +18,7 @@ import com.lodev09.truesheet.utils.isDescendantOf
 interface TrueSheetContentViewDelegate {
   fun contentViewDidChangeSize(width: Int, height: Int)
   fun contentViewDidScroll()
+  fun contentViewScrollViewDidChange()
 }
 
 /**
@@ -32,7 +33,6 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
   private var lastHeight = 0
 
   private var pinnedScrollView: ScrollView? = null
-  private var cachedScrollView: ScrollView? = null
   private var originalScrollViewPaddingBottom: Int = 0
   private var bottomInset: Int = 0
 
@@ -45,6 +45,22 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
       keyboardScrollOffset = value?.getDouble("keyboardScrollOffset")?.toFloat()?.dpToPx() ?: 0f
     }
 
+  override fun addView(child: View?, index: Int) {
+    super.addView(child, index)
+    checkScrollViewChanged()
+  }
+
+  override fun removeViewAt(index: Int) {
+    super.removeViewAt(index)
+    checkScrollViewChanged()
+  }
+
+  private fun checkScrollViewChanged() {
+    if (pinnedScrollView == null || pinnedScrollView?.isDescendantOf(this) == false) {
+      delegate?.contentViewScrollViewDidChange()
+    }
+  }
+
   override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
     super.onSizeChanged(w, h, oldw, oldh)
 
@@ -61,65 +77,63 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
       return
     }
 
-    this.bottomInset = bottomInset
-    applyScrollViewBottomInset()
-  }
+    // Check if pinned scroll view is still valid (still in view hierarchy)
+    if (pinnedScrollView != null && pinnedScrollView?.isDescendantOf(this) == false) {
+      clearScrollable()
+    }
 
-  private fun applyScrollViewBottomInset() {
-    val scrollView = findScrollView(this)
+    // Already set up with same inset and valid scroll view
+    if (pinnedScrollView != null && this.bottomInset == bottomInset) {
+      return
+    }
 
-    if (scrollView != pinnedScrollView) {
-      // Clean up previous scroll view
-      pinnedScrollView?.setOnScrollChangeListener(null as View.OnScrollChangeListener?)
-      pinnedScrollView?.setPadding(
-        pinnedScrollView!!.paddingLeft,
-        pinnedScrollView!!.paddingTop,
-        pinnedScrollView!!.paddingRight,
-        originalScrollViewPaddingBottom
-      )
+    val scrollView = findScrollView(this) ?: return
 
+    // Only capture originals on first pin
+    if (pinnedScrollView == null) {
+      originalScrollViewPaddingBottom = scrollView.paddingBottom
       pinnedScrollView = scrollView
-      originalScrollViewPaddingBottom = scrollView?.paddingBottom ?: 0
 
-      scrollView?.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
+      scrollView.setOnScrollChangeListener { _, _, scrollY, _, oldScrollY ->
         if (scrollY != oldScrollY) {
           delegate?.contentViewDidScroll()
         }
       }
     }
 
-    scrollView?.let {
-      it.clipToPadding = false
-      it.setPadding(
-        it.paddingLeft,
-        it.paddingTop,
-        it.paddingRight,
-        originalScrollViewPaddingBottom + bottomInset
-      )
+    this.bottomInset = bottomInset
+
+    setScrollViewPaddingBottom(originalScrollViewPaddingBottom + bottomInset)
+
+    // If keyboard is currently showing, re-apply the keyboard inset to the new ScrollView
+    val keyboardHeight = keyboardObserver?.currentHeight ?: 0
+    if (keyboardHeight > 0) {
+      setScrollViewPaddingBottom(originalScrollViewPaddingBottom + keyboardHeight)
     }
   }
 
+  private fun setScrollViewPaddingBottom(paddingBottom: Int) {
+    val scrollView = pinnedScrollView ?: return
+    scrollView.clipToPadding = false
+    scrollView.setPadding(
+      scrollView.paddingLeft,
+      scrollView.paddingTop,
+      scrollView.paddingRight,
+      paddingBottom
+    )
+  }
+
   fun clearScrollable() {
     pinnedScrollView?.setOnScrollChangeListener(null as View.OnScrollChangeListener?)
-    pinnedScrollView?.setPadding(
-      pinnedScrollView!!.paddingLeft,
-      pinnedScrollView!!.paddingTop,
-      pinnedScrollView!!.paddingRight,
-      originalScrollViewPaddingBottom
-    )
+    setScrollViewPaddingBottom(originalScrollViewPaddingBottom)
     pinnedScrollView = null
-    cachedScrollView = null
     originalScrollViewPaddingBottom = 0
     bottomInset = 0
   }
 
   fun findScrollView(): ScrollView? {
-    // Return cached if still valid (attached and descendant of this view)
-    cachedScrollView?.let {
-      if (it.isAttachedToWindow && it.isDescendantOf(this)) return it
-      cachedScrollView = null
-    }
-    return findScrollView(this as View).also { cachedScrollView = it }
+    if (pinnedScrollView != null) return pinnedScrollView
+    return findScrollView(this as View)
   }
 
   private fun findScrollView(view: View): ScrollView? {
@@ -175,15 +189,7 @@ class TrueSheetContentView(private val reactContext: ThemedReactContext) : React
     val scrollView = pinnedScrollView ?: return
 
     val totalBottomInset = if (keyboardHeight > 0) keyboardHeight else bottomInset
-    val newPaddingBottom = originalScrollViewPaddingBottom + totalBottomInset
-
-    scrollView.clipToPadding = false
-    scrollView.setPadding(
-      scrollView.paddingLeft,
-      scrollView.paddingTop,
-      scrollView.paddingRight,
-      newPaddingBottom
-    )
+    setScrollViewPaddingBottom(originalScrollViewPaddingBottom + totalBottomInset)
 
     // Trigger a scroll to force update
     scrollView.post {

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

@@ -592,6 +592,13 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
     viewController.commitKeyboardDetent()
   }
 
+  // When the ScrollView changes (e.g. conditional remount), re-pin the new ScrollView
+  // and request layout so BottomSheetBehavior re-discovers the nested scrolling child.
+  override fun containerViewScrollViewDidChange() {
+    setupScrollable()
+    viewController.sheetView?.requestLayout()
+  }
+
   override fun containerViewHeaderDidChangeSize(width: Int, height: Int) {
     updateSheetIfNeeded()
   }

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

@@ -65,15 +65,10 @@ class TrueSheetCoordinatorLayout(context: Context) :
     get() = PointerEvents.BOX_NONE
 
   /**
-   * Clears stale `nestedScrollingChildRef` from BottomSheetBehavior and forces re-discovery.
+   * Clears stale `nestedScrollingChildRef` from BottomSheetBehavior.
    *
-   * `BottomSheetBehavior.onLayoutChild` calls `findScrollingChild()` which traverses the
-   * entire sheet subtree. The cached `nestedScrollingChildRef` can become stale when:
-   * 1. A child sheet with a ScrollView is dismissed and its ScrollView returns to this hierarchy
-   * 2. A ScrollView is conditionally removed and re-added (e.g. React conditional rendering)
-   *
-   * When stale (GC'd target or view no longer in sheet), we clear the ref and request layout
-   * so `onLayoutChild` re-runs `findScrollingChild()` to discover the current ScrollView.
+   * The cached `nestedScrollingChildRef` can become stale when a child sheet
+   * with a ScrollView is dismissed and its ScrollView returns to this hierarchy.
    */
   private fun clearStaleNestedScrollingChildRef() {
     val sheet = delegate?.findSheetView() ?: return
@@ -86,7 +81,6 @@ class TrueSheetCoordinatorLayout(context: Context) :
       val view = ref.get()
       if (view == null || !view.isDescendantOf(sheet)) {
         ref.clear()
-        sheet.requestLayout()
       }
     } catch (_: Exception) {}
   }

package/ios/TrueSheetContainerView.h

@@ -15,18 +15,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol TrueSheetContainerViewDelegate <NSObject>
 
-/**
- * Called when the container's content size changes
- * @param newSize The new size of the content
- */
 - (void)containerViewContentDidChangeSize:(CGSize)newSize;
+- (void)containerViewScrollViewDidChange;
 
 @optional
 
-/**
- * Called when the header size changes
- * @param newSize The new size of the header
- */
 - (void)containerViewHeaderDidChangeSize:(CGSize)newSize;
 
 @end

package/ios/TrueSheetContainerView.mm

@@ -175,8 +175,8 @@ using namespace facebook::react;
   [self.delegate containerViewContentDidChangeSize:newSize];
 }
 
-- (void)contentViewDidChangeChildren {
-  [self setupScrollable];
+- (void)contentViewScrollViewDidChange {
+  [self.delegate containerViewScrollViewDidChange];
 }
 
 #pragma mark - TrueSheetHeaderViewDelegate

package/ios/TrueSheetContentView.h

@@ -22,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 @protocol TrueSheetContentViewDelegate <NSObject>
 
 - (void)contentViewDidChangeSize:(CGSize)newSize;
-- (void)contentViewDidChangeChildren;
+- (void)contentViewScrollViewDidChange;
 
 @end
 

package/ios/TrueSheetContentView.mm

@@ -57,29 +57,42 @@ using namespace facebook::react;
 
 - (void)mountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
   [super mountChildComponentView:childComponentView index:index];
-  [self.delegate contentViewDidChangeChildren];
+  [self checkScrollViewChanged];
 }
 
 - (void)unmountChildComponentView:(UIView<RCTComponentViewProtocol> *)childComponentView index:(NSInteger)index {
   [super unmountChildComponentView:childComponentView index:index];
-  [self.delegate contentViewDidChangeChildren];
+  [self checkScrollViewChanged];
+}
+
+- (void)checkScrollViewChanged {
+  if (!_pinnedScrollView || ![_pinnedScrollView isDescendantOfView:self]) {
+    [self.delegate contentViewScrollViewDidChange];
+  }
 }
 
 #pragma mark - Scrollable
 
+- (void)setScrollViewContentInset:(CGFloat)contentBottom indicatorInset:(CGFloat)indicatorBottom {
+  if (!_pinnedScrollView)
+    return;
+
+  UIEdgeInsets contentInset = _pinnedScrollView.scrollView.contentInset;
+  contentInset.bottom = contentBottom;
+  _pinnedScrollView.scrollView.contentInset = contentInset;
+
+  UIEdgeInsets indicatorInsets = _pinnedScrollView.scrollView.verticalScrollIndicatorInsets;
+  indicatorInsets.bottom = indicatorBottom;
+  _pinnedScrollView.scrollView.verticalScrollIndicatorInsets = indicatorInsets;
+}
+
 - (void)clearScrollable {
   if (_pinnedScrollView) {
     CGRect frame = _pinnedScrollView.frame;
     frame.size.height = _originalScrollViewHeight;
     _pinnedScrollView.frame = frame;
 
-    UIEdgeInsets contentInset = _pinnedScrollView.scrollView.contentInset;
-    contentInset.bottom = 0;
-    _pinnedScrollView.scrollView.contentInset = contentInset;
-
-    UIEdgeInsets indicatorInsets = _pinnedScrollView.scrollView.verticalScrollIndicatorInsets;
-    indicatorInsets.bottom = _originalIndicatorBottomInset;
-    _pinnedScrollView.scrollView.verticalScrollIndicatorInsets = indicatorInsets;
+    [self setScrollViewContentInset:0 indicatorInset:_originalIndicatorBottomInset];
   }
   _pinnedScrollView = nil;
   _bottomInset = 0;
@@ -94,7 +107,6 @@ using namespace facebook::react;
   }
 
   // Check if pinned scroll view is still valid (still in view hierarchy)
-  // This handles the case where content changes and the old scroll view is unmounted
   if (_pinnedScrollView && ![_pinnedScrollView isDescendantOfView:self]) {
     [self clearScrollable];
   }
@@ -120,13 +132,13 @@ using namespace facebook::react;
 
   [self updateScrollViewHeight];
 
-  UIEdgeInsets contentInset = scrollView.scrollView.contentInset;
-  contentInset.bottom = bottomInset;
-  scrollView.scrollView.contentInset = contentInset;
+  [self setScrollViewContentInset:_bottomInset indicatorInset:_originalIndicatorBottomInset];
 
-  UIEdgeInsets indicatorInsets = scrollView.scrollView.verticalScrollIndicatorInsets;
-  indicatorInsets.bottom = _originalIndicatorBottomInset;
-  scrollView.scrollView.verticalScrollIndicatorInsets = indicatorInsets;
+  // If keyboard is currently showing, re-apply the keyboard inset to the new ScrollView
+  CGFloat keyboardHeight = _keyboardObserver ? _keyboardObserver.currentHeight : 0;
+  if (keyboardHeight > 0) {
+    [self setScrollViewContentInset:keyboardHeight indicatorInset:_originalIndicatorBottomInset + keyboardHeight];
+  }
 }
 
 - (void)updateScrollViewHeight {
@@ -202,13 +214,8 @@ using namespace facebook::react;
                         delay:0
                       options:curve | UIViewAnimationOptionBeginFromCurrentState
                    animations:^{
-                     UIEdgeInsets contentInset = self->_pinnedScrollView.scrollView.contentInset;
-                     contentInset.bottom = height;
-                     self->_pinnedScrollView.scrollView.contentInset = contentInset;
-
-                     UIEdgeInsets indicatorInsets = self->_pinnedScrollView.scrollView.verticalScrollIndicatorInsets;
-                     indicatorInsets.bottom = self->_originalIndicatorBottomInset + height;
-                     self->_pinnedScrollView.scrollView.verticalScrollIndicatorInsets = indicatorInsets;
+                     [self setScrollViewContentInset:height
+                                      indicatorInset:self->_originalIndicatorBottomInset + height];
 
                      if (firstResponder) {
                        CGRect responderFrame = [firstResponder convertRect:firstResponder.bounds
@@ -229,13 +236,8 @@ using namespace facebook::react;
                         delay:0
                       options:curve | UIViewAnimationOptionBeginFromCurrentState
                    animations:^{
-                     UIEdgeInsets contentInset = self->_pinnedScrollView.scrollView.contentInset;
-                     contentInset.bottom = self->_bottomInset;
-                     self->_pinnedScrollView.scrollView.contentInset = contentInset;
-
-                     UIEdgeInsets indicatorInsets = self->_pinnedScrollView.scrollView.verticalScrollIndicatorInsets;
-                     indicatorInsets.bottom = self->_originalIndicatorBottomInset;
-                     self->_pinnedScrollView.scrollView.verticalScrollIndicatorInsets = indicatorInsets;
+                     [self setScrollViewContentInset:self->_bottomInset
+                                      indicatorInset:self->_originalIndicatorBottomInset];
                    }
                    completion:nil];
 }

package/ios/TrueSheetView.mm

@@ -574,6 +574,11 @@ using namespace facebook::react;
   [self setupSheetDetentsForSizeChange];
 }
 
+// When the ScrollView changes (e.g. conditional remount), re-pin the new ScrollView.
+- (void)containerViewScrollViewDidChange {
+  [_containerView setupScrollable];
+}
+
 #pragma mark - TrueSheetViewControllerDelegate
 
 - (void)viewControllerWillPresentAtIndex:(NSInteger)index position:(CGFloat)position detent:(CGFloat)detent {

package/ios/core/TrueSheetKeyboardObserver.h

@@ -24,6 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface TrueSheetKeyboardObserver : NSObject
 
 @property (nonatomic, weak, nullable) TrueSheetViewController *viewController;
+@property (nonatomic, readonly) CGFloat currentHeight;
 
 - (void)addDelegate:(id<TrueSheetKeyboardObserverDelegate>)delegate;
 - (void)removeDelegate:(id<TrueSheetKeyboardObserverDelegate>)delegate;

package/ios/core/TrueSheetKeyboardObserver.mm

@@ -14,6 +14,11 @@
 
 @implementation TrueSheetKeyboardObserver {
   NSHashTable<id<TrueSheetKeyboardObserverDelegate>> *_delegates;
+  CGFloat _currentHeight;
+}
+
+- (CGFloat)currentHeight {
+  return _currentHeight;
 }
 
 - (instancetype)init {
@@ -76,6 +81,8 @@
   CGRect keyboardFrameInWindow = [window convertRect:keyboardFrame fromWindow:nil];
   CGFloat keyboardHeight = MAX(0, window.bounds.size.height - keyboardFrameInWindow.origin.y);
 
+  _currentHeight = keyboardHeight;
+
   for (id<TrueSheetKeyboardObserverDelegate> delegate in _delegates) {
     if (keyboardHeight > 0) {
       [delegate keyboardWillShow:keyboardHeight duration:duration curve:curve];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lodev09/react-native-true-sheet",
-  "version": "3.9.6",
+  "version": "3.9.7",
   "description": "The true native bottom sheet experience for your React Native Apps.",
   "source": "./src/index.ts",
   "main": "./lib/module/index.js",
@@ -188,7 +188,8 @@
       "before:init": [
         "yarn tidy",
         "yarn test"
-      ]
+      ],
+      "after:bump": "sed -i '' 's/## Unreleased/## Unreleased\\n\\n## ${version}/' CHANGELOG.md && git add CHANGELOG.md"
     },
     "github": {
       "release": true,