@lodev09/react-native-true-sheet 3.9.0-beta.5 → 3.9.0-beta.7

package/README.md

@@ -2,6 +2,7 @@
 
 [![CI](https://github.com/lodev09/react-native-true-sheet/actions/workflows/checks.yml/badge.svg)](https://github.com/lodev09/react-native-true-sheet/actions/workflows/checks.yml)
 [![NPM Downloads](https://img.shields.io/npm/d18m/%40lodev09%2Freact-native-true-sheet)](https://www.npmjs.com/package/@lodev09/react-native-true-sheet)
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/lodev09/react-native-true-sheet)
 
 The true native bottom sheet experience for your React Native Apps. 💩
 
@@ -37,7 +38,7 @@ The true native bottom sheet experience for your React Native Apps. 💩
 | TrueSheet | React Native | Expo SDK |
 |-----------|--------------|----------|
 | 3.7+      | 0.81+        | 54+      |
-| 3.6       | 0.79         | 52-53    |
+| 3.6       | 0.80         | 52-53    |
 
 ### Expo
 

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

@@ -551,7 +551,10 @@ class TrueSheetView(private val reactContext: ThemedReactContext) :
   }
 
   override fun viewControllerDidChangeSize(width: Int, height: Int) {
-    updateState(width, height)
+    // On android scrollable, we need the actual sheet height to get proper ScrollView height.
+    // Unlike IOS where ScrollView is pinned to the container.
+    val effectiveHeight = if (viewController.scrollable) height else viewController.screenHeight
+    updateState(width, effectiveHeight)
   }
 
   override fun viewControllerWillFocus() {

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

@@ -454,7 +454,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     sheetView?.let { emitChangePositionDelegate(it.top, realtime = false) }
   }
 
-  override val isScrollable: Boolean get() = scrollable
   override fun findScrollView(): ScrollView? = containerView?.contentView?.findScrollView()
   override fun findSheetView(): TrueSheetBottomSheetView? = sheetView
 

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

@@ -12,7 +12,6 @@ import com.facebook.react.uimanager.ReactPointerEventsView
 import com.lodev09.truesheet.utils.isDescendantOf
 
 interface TrueSheetCoordinatorLayoutDelegate {
-  val isScrollable: Boolean
   fun coordinatorLayoutDidLayout(changed: Boolean)
   fun coordinatorLayoutDidChangeConfiguration()
   fun findScrollView(): ScrollView?
@@ -96,11 +95,8 @@ class TrueSheetCoordinatorLayout(context: Context) :
    * See: https://github.com/facebook/react-native/pull/44099
    */
   override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
-    if (delegate?.isScrollable != true) {
-      if (ev.actionMasked == MotionEvent.ACTION_DOWN) {
-        clearStaleNestedScrollingChildRef()
-      }
-      return super.onInterceptTouchEvent(ev)
+    if (ev.actionMasked == MotionEvent.ACTION_DOWN) {
+      clearStaleNestedScrollingChildRef()
     }
 
     val scrollView = delegate?.findScrollView()

package/ios/TrueSheetView.mm

@@ -268,9 +268,9 @@ using namespace facebook::react;
 - (void)updateState:(const State::Shared &)state oldState:(const State::Shared &)oldState {
   _state = std::static_pointer_cast<TrueSheetViewShadowNode::ConcreteState const>(state);
 
-  // Initialize with _controller size to set initial width
   if (_controller) {
-    [self updateStateWithSize:_controller.view.frame.size];
+    // Initialize with _controller size to set initial width
+    [self viewControllerDidChangeSize:_controller.view.frame.size];
   }
 }
 
@@ -640,7 +640,10 @@ using namespace facebook::react;
 }
 
 - (void)viewControllerDidChangeSize:(CGSize)size {
-  [self updateStateWithSize:size];
+  // TODO: Explicit screen height for now until synchronous layout is supported.
+  CGSize effectiveSize = CGSizeMake(size.width, _controller.screenHeight);
+
+  [self updateStateWithSize:effectiveSize];
 }
 
 - (void)viewControllerWillFocus {

package/ios/TrueSheetViewController.mm

@@ -219,7 +219,6 @@ using namespace facebook::react;
     dispatch_async(dispatch_get_main_queue(), ^{
       NSInteger index = [self currentDetentIndex];
       CGFloat detent = [self detentValueForIndex:index];
-      [self.delegate viewControllerDidChangeSize:self.view.frame.size];
       [self.delegate viewControllerDidPresentAtIndex:index position:self.currentPosition detent:detent];
       [self.delegate viewControllerDidFocus];
 
@@ -314,7 +313,6 @@ using namespace facebook::react;
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
       [self storeResolvedPositionForIndex:pendingIndex];
       CGFloat detent = [self detentValueForIndex:pendingIndex];
-      [self.delegate viewControllerDidChangeSize:self.view.frame.size];
       [self.delegate viewControllerDidChangeDetent:pendingIndex position:self.currentPosition detent:detent];
       [self emitChangePositionDelegateWithPosition:self.currentPosition realtime:NO debug:@"pending detent change"];
     });
@@ -809,7 +807,6 @@ using namespace facebook::react;
     NSInteger index = self.currentDetentIndex;
     if (index >= 0) {
       CGFloat detent = [self detentValueForIndex:index];
-      [self.delegate viewControllerDidChangeSize:self.view.frame.size];
       [self.delegate viewControllerDidChangeDetent:index position:self.currentPosition detent:detent];
     }
   });

package/package.json

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