@lodev09/react-native-true-sheet 4.0.0-beta.15 → 4.0.0-beta.17

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

@@ -4,11 +4,9 @@ import android.annotation.SuppressLint
 import android.view.View
 import android.view.ViewGroup
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
 
 interface TrueSheetContainerViewDelegate {
-  val eventDispatcher: EventDispatcher?
   fun containerViewContentDidChangeSize(width: Int, height: Int)
   fun containerViewContentDidScroll()
   fun containerViewScrollViewDidChange()
@@ -107,9 +105,6 @@ class TrueSheetContainerView(reactContext: ThemedReactContext) :
       contentView?.bottomInset = value
     }
 
-  override val eventDispatcher: EventDispatcher?
-    get() = delegate?.eventDispatcher
-
   init {
     // Allow footer to position outside container bounds
     clipChildren = false

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

@@ -1,29 +1,18 @@
 package com.lodev09.truesheet
 
 import android.annotation.SuppressLint
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewParent
 import com.facebook.react.bridge.WritableNativeMap
-import com.facebook.react.uimanager.JSPointerDispatcher
-import com.facebook.react.uimanager.JSTouchDispatcher
 import com.facebook.react.uimanager.PixelUtil.pxToDp
-import com.facebook.react.uimanager.PointerEvents
-import com.facebook.react.uimanager.RootView
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.ThemedReactContext
-import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.views.view.ReactViewGroup
-import com.lodev09.truesheet.core.TrueSheetCoordinatorLayout
-import com.lodev09.truesheet.utils.TouchEventDeduper
 
 /**
- * Delegate interface for footer view size changes and event dispatching
+ * Delegate interface for footer view size changes
  */
 interface TrueSheetFooterViewDelegate {
   fun footerViewDidChangeSize(width: Int, height: Int)
   fun footerViewDidLayout()
-  val eventDispatcher: EventDispatcher?
 }
 
 /**
@@ -31,19 +20,16 @@ interface TrueSheetFooterViewDelegate {
  * This is the second child of TrueSheetContainerView
  * Positioned absolutely at the bottom of the sheet
  *
- * Implements RootView to handle touch events when positioned outside parent bounds.
+ * Touches reach it through the controller's RootView like any other sheet
+ * content — the container tracks the sheet's visible height, so the footer
+ * always lays out inside the container's bounds.
  */
 @SuppressLint("ViewConstructor")
-class TrueSheetFooterView(private val reactContext: ThemedReactContext) :
-  ReactViewGroup(reactContext),
-  RootView {
+class TrueSheetFooterView(reactContext: ThemedReactContext) : ReactViewGroup(reactContext) {
 
   var delegate: TrueSheetFooterViewDelegate? = null
   var stateWrapper: StateWrapper? = null
 
-  private val eventDispatcher: EventDispatcher?
-    get() = delegate?.eventDispatcher
-
   private var lastWidth = 0
   private var lastHeight = 0
 
@@ -80,14 +66,6 @@ class TrueSheetFooterView(private val reactContext: ThemedReactContext) :
     sw.updateState(newState)
   }
 
-  private val jsTouchDispatcher = JSTouchDispatcher(this)
-  private var jsPointerDispatcher: JSPointerDispatcher? = null
-  private val touchDeduper = TouchEventDeduper()
-
-  init {
-    jsPointerDispatcher = JSPointerDispatcher(this)
-  }
-
   override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
     super.onSizeChanged(w, h, oldw, oldh)
 
@@ -109,74 +87,6 @@ class TrueSheetFooterView(private val reactContext: ThemedReactContext) :
     delegate?.footerViewDidLayout()
   }
 
-  // ==================== RootView Implementation ====================
-
-  override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { dispatcher ->
-      if (touchDeduper.shouldDispatch(event)) {
-        jsTouchDispatcher.handleTouchEvent(event, dispatcher, reactContext)
-      }
-      jsPointerDispatcher?.handleMotionEvent(event, dispatcher, true)
-    }
-    return super.onInterceptTouchEvent(event)
-  }
-
-  override fun requestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
-    // Mirrors ReactSurfaceView: keep receiving onInterceptTouchEvent so
-    // jsTouchDispatcher sees the gesture end, but forward the request up the tree.
-    parent?.requestDisallowInterceptTouchEvent(disallowIntercept)
-  }
-
-  override fun onTouchEvent(event: MotionEvent): Boolean {
-    if (pointerEvents == PointerEvents.NONE || pointerEvents == PointerEvents.BOX_NONE) {
-      return false
-    }
-
-    eventDispatcher?.let { dispatcher ->
-      if (touchDeduper.shouldDispatch(event)) {
-        jsTouchDispatcher.handleTouchEvent(event, dispatcher, reactContext)
-      }
-      jsPointerDispatcher?.handleMotionEvent(event, dispatcher, false)
-    }
-    super.onTouchEvent(event)
-    return true
-  }
-
-  override fun onInterceptHoverEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jsPointerDispatcher?.handleMotionEvent(event, it, true) }
-    return super.onHoverEvent(event)
-  }
-
-  override fun onHoverEvent(event: MotionEvent): Boolean {
-    eventDispatcher?.let { jsPointerDispatcher?.handleMotionEvent(event, it, false) }
-    return super.onHoverEvent(event)
-  }
-
-  override fun onChildStartedNativeGesture(childView: View?, ev: MotionEvent) {
-    findCoordinatorLayout()?.childDidClaimNativeGesture()
-    eventDispatcher?.let { dispatcher ->
-      jsTouchDispatcher.onChildStartedNativeGesture(ev, dispatcher)
-      jsPointerDispatcher?.onChildStartedNativeGesture(childView, ev, dispatcher)
-    }
-  }
-
-  private fun findCoordinatorLayout(): TrueSheetCoordinatorLayout? {
-    var current: ViewParent? = parent
-    while (current != null && current !is TrueSheetCoordinatorLayout) {
-      current = current.parent
-    }
-    return current as? TrueSheetCoordinatorLayout
-  }
-
-  override fun onChildEndedNativeGesture(childView: View, ev: MotionEvent) {
-    eventDispatcher?.let { jsTouchDispatcher.onChildEndedNativeGesture(ev, it) }
-    jsPointerDispatcher?.onChildEndedNativeGesture()
-  }
-
-  override fun handleException(t: Throwable) {
-    reactContext.reactApplicationContext.handleException(RuntimeException(t))
-  }
-
   companion object {
     const val TAG_NAME = "TrueSheet"
   }

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

@@ -32,6 +32,11 @@ class TrueSheetOverlayView(private val reactContext: ThemedReactContext) :
   private var lastWidth = 0
   private var lastHeight = 0
 
+  // Fabric hands back a new StateWrapper on every state commit — including our
+  // own pushes — so pushState dedupes against the last pushed size to break the loop
+  private var lastStateWidth = 0
+  private var lastStateHeight = 0
+
   var stateWrapper: StateWrapper? = null
     set(value) {
       field = value
@@ -101,6 +106,11 @@ class TrueSheetOverlayView(private val reactContext: ThemedReactContext) :
 
   private fun pushState() {
     if (lastWidth == 0 && lastHeight == 0) return
-    stateWrapper?.let { TrueSheetStateUpdater.updateContainerSize(it, lastWidth, lastHeight) }
+    if (lastWidth == lastStateWidth && lastHeight == lastStateHeight) return
+    val sw = stateWrapper ?: return
+
+    lastStateWidth = lastWidth
+    lastStateHeight = lastHeight
+    TrueSheetStateUpdater.updateContainerSize(sw, lastWidth, lastHeight)
   }
 }

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

@@ -209,12 +209,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // Touch Dispatchers
   private val jsTouchDispatcher = JSTouchDispatcher(this)
   private val jsPointerDispatcher = JSPointerDispatcher(this)
-
-  // True when the active touch stream began inside the footer. Latched on
-  // ACTION_DOWN so subsequent MOVE events keep routing to the footer even if
-  // the finger drifts outside the footer's rect mid-gesture.
-  private var footerOwnsTouchStream = false
-
   private val touchDeduper = TouchEventDeduper()
 
   private val eventDispatcher
@@ -1042,13 +1036,25 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
       animate = isPresented
     )
 
-    updateStateDimensions()
-
     if (isPresented && applyState) {
       // Prefer the pending target while a resize animation is in flight so a
       // layout-driven reconfigure doesn't revert to the stale currentDetentIndex.
       val targetIndex = if (pendingDetentIndex >= 0) pendingDetentIndex else currentDetentIndex
+
+      // Track the settle like resize() — the container (and the footer pinned
+      // to its bottom) follows the sheet's visible height instead of jumping
+      // to the target and riding the animation
+      pendingDetentIndex = targetIndex
+      sheetView?.let { updateStateDimensionsForPosition(it.top) }
       setStateForDetentIndex(targetIndex)
+
+      // Already at the target — no slide frames will follow
+      if (!isSettling) {
+        pendingDetentIndex = -1
+        updateStateDimensions()
+      }
+    } else {
+      updateStateDimensions()
     }
 
     interactionState = InteractionState.Idle
@@ -1190,9 +1196,10 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
     val sheetHeight = sheet.height
 
     // Pinned to the screen bottom (above the keyboard) while the sheet sits at
-    // or above its lowest stop; past it the footer rides down with the sheet
-    // instead, like iOS
-    val anchorTop = minOf(sheet.top, detentCalculator.getLowestSheetTop())
+    // or above its lowest stop; dragged past it the footer rides down with the
+    // sheet instead, like iOS. A resize settle always pins — the sheet may be
+    // animating up from below a stop that just grew
+    val anchorTop = if (pendingDetentIndex >= 0) sheet.top else minOf(sheet.top, detentCalculator.getLowestSheetTop())
     val footerY = (sheetHeight - anchorTop - footerHeight - keyboardShift).toFloat()
 
     // Clamp to prevent footer going above safe area
@@ -1566,41 +1573,6 @@ class TrueSheetViewController(private val reactContext: ThemedReactContext) :
   // MARK: - RootView Touch Handling
   // =============================================================================
 
-  override fun dispatchTouchEvent(event: MotionEvent): Boolean {
-    val footer = containerView?.footerView
-    val action = event.actionMasked
-
-    if (footer != null && footer.isShown) {
-      if (action == MotionEvent.ACTION_DOWN) {
-        val loc = ScreenUtils.getScreenLocation(footer)
-        val x = event.rawX.toInt()
-        val y = event.rawY.toInt()
-        footerOwnsTouchStream = x >= loc[0] &&
-          x <= loc[0] + footer.width &&
-          y >= loc[1] &&
-          y <= loc[1] + footer.height
-      }
-
-      if (footerOwnsTouchStream) {
-        val loc = ScreenUtils.getScreenLocation(footer)
-        val localEvent = MotionEvent.obtain(event)
-        localEvent.setLocation(event.rawX - loc[0], event.rawY - loc[1])
-        val handled = footer.dispatchTouchEvent(localEvent)
-        localEvent.recycle()
-
-        if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
-          footerOwnsTouchStream = false
-        }
-        if (handled) return true
-      }
-    }
-
-    if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
-      footerOwnsTouchStream = false
-    }
-    return super.dispatchTouchEvent(event)
-  }
-
   override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
     eventDispatcher?.let {
       if (touchDeduper.shouldDispatch(event)) {

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

@@ -250,7 +250,7 @@ class TrueSheetCoordinatorLayout(context: Context) :
   }
 
   /**
-   * Called by descendant RootView implementations (controller, footer) when a child
+   * Called by the descendant RootView (controller) when a child
    * starts a native gesture — e.g. an RNGH handler activated or a scrollable began
    * scrolling. Yields sheet interception for the rest of the touch stream.
    */

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

@@ -139,6 +139,9 @@ class TrueSheetDimView(private val reactContext: ThemedReactContext) :
 
   override fun onTouchEvent(event: MotionEvent): Boolean {
     if (blockGestures) {
+      if (event.actionMasked == MotionEvent.ACTION_DOWN) {
+        parent?.requestDisallowInterceptTouchEvent(true)
+      }
       // When dimmed, consume touch and trigger click on ACTION_UP
       if (event.action == MotionEvent.ACTION_UP) {
         performClick()

package/android/src/main/java/com/lodev09/truesheet/utils/ScreenUtils.kt

@@ -104,18 +104,6 @@ object ScreenUtils {
    */
   fun getScreenHeight(reactContext: ReactContext): Int = reactContext.resources.displayMetrics.heightPixels
 
-  /**
-   * Get the location of a view in screen coordinates
-   *
-   * @param view The view to get screen location for
-   * @return IntArray with [x, y] coordinates in screen space
-   */
-  fun getScreenLocation(view: View): IntArray {
-    val location = IntArray(2)
-    view.getLocationOnScreen(location)
-    return location
-  }
-
   /**
    * Returns true if the device is a phone in portrait orientation.
    */

package/ios/TrueSheetFooterView.mm

@@ -155,6 +155,8 @@ using namespace facebook::react;
     _lastHeight = height;
     [self.delegate footerViewDidChangeSize:CGSizeMake(layoutMetrics.frame.size.width, height)];
   }
+
+  [self applyKeyboardOffset];
 }
 
 - (void)prepareForRecycle {
@@ -184,6 +186,20 @@ using namespace facebook::react;
   return controller.absoluteFooter && controller.footerAvoidsKeyboard;
 }
 
+- (CGFloat)keyboardSlideForHeight:(CGFloat)height {
+  UIWindow *window = self.window;
+  if (!window) {
+    return 0;
+  }
+
+  // Measure in the transform's coordinate space, excluding the footer's current slide.
+  CGFloat footerBottom = self.center.y + self.bounds.size.height / 2;
+  CGPoint keyboardTopInWindow = CGPointMake(CGRectGetMidX(window.bounds), CGRectGetMaxY(window.bounds) - height);
+  CGFloat keyboardTop = [self.superview convertPoint:keyboardTopInWindow fromView:window].y;
+  CGFloat keyboardOffset = self.keyboardObserver.viewController.footerKeyboardOffset;
+  return MAX(0, footerBottom - keyboardTop + keyboardOffset);
+}
+
 // Yoga owns the footer's frame (pinned to the container's bottom edge), so the
 // keyboard slide is carried by a transform instead of layout.
 - (void)keyboardWillShow:(CGFloat)height duration:(NSTimeInterval)duration curve:(UIViewAnimationOptions)curve {
@@ -193,18 +209,19 @@ using namespace facebook::react;
 
   [self setKeyboardVisible:YES];
 
-  CGFloat keyboardOffset = self.keyboardObserver.viewController.footerKeyboardOffset;
-  CGFloat slide = MAX(0, height + keyboardOffset);
+  CGFloat slide = [self keyboardSlideForHeight:height];
   _currentKeyboardOffset = slide;
 
   [UIView animateWithDuration:duration
-                        delay:0
-                      options:curve | UIViewAnimationOptionBeginFromCurrentState
-                   animations:^{
-                     self.transform = CGAffineTransformMakeTranslation(0, -slide);
-                     [self syncEdgeEffect];
-                   }
-                   completion:nil];
+    delay:0
+    options:curve | UIViewAnimationOptionBeginFromCurrentState
+    animations:^{
+      self.transform = CGAffineTransformMakeTranslation(0, -slide);
+      [self syncEdgeEffect];
+    }
+    completion:^(BOOL finished) {
+      [self applyKeyboardOffset];
+    }];
 }
 
 - (void)keyboardWillHide:(NSTimeInterval)duration curve:(UIViewAnimationOptions)curve {
@@ -252,8 +269,7 @@ using namespace facebook::react;
 
   [self setKeyboardVisible:YES];
 
-  CGFloat keyboardOffset = self.keyboardObserver.viewController.footerKeyboardOffset;
-  CGFloat slide = MAX(0, height + keyboardOffset);
+  CGFloat slide = [self keyboardSlideForHeight:height];
   _currentKeyboardOffset = slide;
   self.transform = CGAffineTransformMakeTranslation(0, -slide);
 }

package/ios/TrueSheetView.mm

@@ -831,6 +831,7 @@ using namespace facebook::react;
 
 - (void)viewControllerSafeAreaInsetsDidChange {
   [self refreshFooterBottomInset];
+  [_containerView updateFooterKeyboardOffset];
 }
 
 - (void)viewControllerWillFocus {