@lodev09/react-native-true-sheet 4.0.0-beta.3 → 4.0.0-beta.30

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

@@ -1,28 +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)
-  val eventDispatcher: EventDispatcher?
+  fun footerViewDidLayout()
 }
 
 /**
@@ -30,40 +20,43 @@ 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
-  private var bottomInset = 0
+  private var stateTranslationY = 0f
+
+  var bottomInset = 0
+    private set
 
   /**
-   * Skips the inset while the keyboard is open — an absolute footer rises
-   * above the keyboard, so the inset would leave a gap.
+   * positionFooter slides the footer off its Yoga position (above the
+   * keyboard, or riding the sheet). Mirror where it rests into the shadow
+   * node so measure() — and Pressability's press region — match where it's
+   * drawn. Called once the footer settles: every push is a commit.
    */
-  var keyboardVisible = false
-    set(value) {
-      if (field == value) return
-      field = value
-      pushBottomInsetState()
-    }
+  fun syncTranslationState() {
+    if (translationY == stateTranslationY) return
+    val sw = stateWrapper ?: return
+    stateTranslationY = translationY
+    TrueSheetStateUpdater.updateFooterTranslation(sw, translationY.pxToDp())
+  }
 
   /**
    * Height the footer occupies above the keyboard — its layout height minus
-   * the safe-area inset it drops while the keyboard is open.
+   * the safe-area inset, which rides below the keyboard's top edge while the
+   * keyboard is open (see positionFooter).
    */
   val keyboardOcclusionHeight: Int
-    get() = maxOf(0, height - if (keyboardVisible) 0 else bottomInset)
+    get() = maxOf(0, height - bottomInset)
 
   /**
    * Tells the shadow node to pad the footer's bottom edge with the sheet's
@@ -73,31 +66,24 @@ class TrueSheetFooterView(private val reactContext: ThemedReactContext) :
   fun setBottomInset(inset: Int) {
     if (bottomInset == inset) return
     bottomInset = inset
-    pushBottomInsetState()
-  }
 
-  private fun pushBottomInsetState() {
     val sw = stateWrapper ?: return
-    val insetDp = (if (keyboardVisible) 0 else bottomInset).toFloat().pxToDp()
+    val insetDp = bottomInset.toFloat().pxToDp()
+    // Carried along — this update replaces a still-queued translation update
+    stateTranslationY = translationY
+    val translateYDp = translationY.pxToDp()
 
     // Synchronous update — the footer must be padded before detents are
     // configured, otherwise the auto detent is set up an inset short
-    if (TrueSheetStateUpdater.updateFooterState(sw, insetDp)) return
+    if (TrueSheetStateUpdater.updateFooterState(sw, insetDp, translateYDp)) return
 
     // Fallback: async state update
     val newState = WritableNativeMap()
     newState.putDouble("bottomInset", insetDp.toDouble())
+    newState.putDouble("translateY", translateYDp.toDouble())
     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)
 
@@ -108,72 +94,15 @@ class TrueSheetFooterView(private val reactContext: ThemedReactContext) :
     }
   }
 
-  // ==================== 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))
+  override fun onLayout(
+    changed: Boolean,
+    left: Int,
+    top: Int,
+    right: Int,
+    bottom: Int
+  ) {
+    super.onLayout(changed, left, top, right, bottom)
+    delegate?.footerViewDidLayout()
   }
 
   companion object {

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

@@ -125,6 +125,9 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
   fun dismissAll(animated: Boolean, promise: Promise) {
     Handler(Looper.getMainLooper()).post {
       try {
+        // Drop presents still waiting on the keyboard
+        viewRegistry.values.forEach { it.cancelPendingPresent() }
+
         val rootSheet = TrueSheetStackManager.getRootSheet()
         if (rootSheet == null) {
           promise.resolve(null)
@@ -221,5 +224,15 @@ class TrueSheetModule(reactContext: ReactApplicationContext) :
      */
     @JvmStatic
     fun getSheetByTag(tag: Int): TrueSheetView? = viewRegistry[tag]
+
+    /**
+     * Drop presents still waiting on the keyboard that would stack on [parent]
+     */
+    @JvmStatic
+    fun cancelPendingPresents(parent: TrueSheetView, restoreFocus: Boolean = true) {
+      viewRegistry.values.forEach {
+        if (it.pendingPresentParent === parent) it.cancelPendingPresent(restoreFocus)
+      }
+    }
   }
 }

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

@@ -0,0 +1,127 @@
+package com.lodev09.truesheet
+
+import android.annotation.SuppressLint
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewTreeObserver
+import android.view.accessibility.AccessibilityEvent
+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.TrueSheetOverlayRootView
+import com.lodev09.truesheet.core.TrueSheetOverlayRootViewDelegate
+import com.lodev09.truesheet.utils.findRootContainerView
+
+/**
+ * Hidden host that renders its children in a root view attached to the
+ * activity's content view, above every presented sheet.
+ */
+@SuppressLint("ViewConstructor")
+class TrueSheetOverlayView(private val reactContext: ThemedReactContext) :
+  ReactViewGroup(reactContext),
+  TrueSheetOverlayRootViewDelegate {
+
+  private val rootView = TrueSheetOverlayRootView(reactContext).apply {
+    delegate = this@TrueSheetOverlayView
+  }
+
+  private var rootContainerView: ViewGroup? = null
+
+  override var eventDispatcher: EventDispatcher? = null
+
+  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
+      pushState()
+    }
+
+  init {
+    // The host stays in the React tree for layout only — children render in the root view
+    visibility = GONE
+  }
+
+  // ==================== View Hierarchy Management ====================
+
+  // When the whole window goes away (e.g. activity destroyed), the container is mid-way through
+  // detaching its children by then, so removing the root view in onDetachedFromWindow crashes.
+  // This fires before that pass begins.
+  private val windowAttachListener = object : ViewTreeObserver.OnWindowAttachListener {
+    override fun onWindowAttached() {}
+    override fun onWindowDetached() = detachRootView()
+  }
+
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    viewTreeObserver.addOnWindowAttachListener(windowAttachListener)
+    attachRootView()
+  }
+
+  override fun onDetachedFromWindow() {
+    viewTreeObserver.removeOnWindowAttachListener(windowAttachListener)
+    rootContainerView?.post { if (!isAttachedToWindow) detachRootView() }
+    super.onDetachedFromWindow()
+  }
+
+  private fun attachRootView() {
+    if (rootView.parent != null) return
+
+    val container = findRootContainerView(reactContext) ?: return
+    container.addView(rootView)
+    rootContainerView = container
+  }
+
+  private fun detachRootView() {
+    rootContainerView?.removeView(rootView)
+    rootContainerView = null
+  }
+
+  fun onDropInstance() {
+    detachRootView()
+    rootView.delegate = null
+  }
+
+  override fun addView(child: View?, index: Int) {
+    rootView.addView(child, index)
+  }
+
+  override fun getChildCount(): Int = rootView.childCount
+
+  override fun getChildAt(index: Int): View? = rootView.getChildAt(index)
+
+  override fun removeViewAt(index: Int) {
+    rootView.removeViewAt(index)
+  }
+
+  // Accessibility: children live in the root view since this view is hidden
+  override fun addChildrenForAccessibility(outChildren: ArrayList<View>) {}
+  override fun dispatchPopulateAccessibilityEvent(event: AccessibilityEvent): Boolean = false
+
+  // ==================== State ====================
+
+  override fun overlayRootViewDidChangeSize(width: Int, height: Int) {
+    if (width == lastWidth && height == lastHeight) return
+
+    lastWidth = width
+    lastHeight = height
+    pushState()
+  }
+
+  private fun pushState() {
+    if (lastWidth == 0 && lastHeight == 0) return
+    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/TrueSheetOverlayViewManager.kt

@@ -0,0 +1,45 @@
+package com.lodev09.truesheet
+
+import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.uimanager.PointerEvents
+import com.facebook.react.uimanager.ReactStylesDiffMap
+import com.facebook.react.uimanager.StateWrapper
+import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.UIManagerHelper
+import com.facebook.react.uimanager.ViewGroupManager
+import com.facebook.react.uimanager.annotations.ReactProp
+
+/**
+ * ViewManager for TrueSheetOverlayView
+ * Renders content above every presented sheet
+ */
+@ReactModule(name = TrueSheetOverlayViewManager.REACT_CLASS)
+class TrueSheetOverlayViewManager : ViewGroupManager<TrueSheetOverlayView>() {
+
+  override fun getName(): String = REACT_CLASS
+
+  override fun createViewInstance(reactContext: ThemedReactContext): TrueSheetOverlayView = TrueSheetOverlayView(reactContext)
+
+  override fun onDropViewInstance(view: TrueSheetOverlayView) {
+    super.onDropViewInstance(view)
+    view.onDropInstance()
+  }
+
+  override fun addEventEmitters(reactContext: ThemedReactContext, view: TrueSheetOverlayView) {
+    view.eventDispatcher = UIManagerHelper.getEventDispatcherForReactTag(reactContext, view.id)
+  }
+
+  override fun updateState(view: TrueSheetOverlayView, props: ReactStylesDiffMap?, stateWrapper: StateWrapper?): Any? {
+    view.stateWrapper = stateWrapper
+    return null
+  }
+
+  @ReactProp(name = "pointerEvents")
+  fun setPointerEvents(view: TrueSheetOverlayView, pointerEventsStr: String?) {
+    view.pointerEvents = PointerEvents.parsePointerEvents(pointerEventsStr)
+  }
+
+  companion object {
+    const val REACT_CLASS = "TrueSheetOverlayView"
+  }
+}

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

@@ -40,6 +40,7 @@ class TrueSheetPackage : BaseReactPackage() {
       TrueSheetContentViewManager(),
       TrueSheetHeaderViewManager(),
       TrueSheetFooterViewManager(),
-      TrueSheetPeekViewManager()
+      TrueSheetPeekViewManager(),
+      TrueSheetOverlayViewManager()
     )
 }

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

@@ -1,5 +1,7 @@
 package com.lodev09.truesheet
 
+import com.facebook.react.bridge.WritableNativeMap
+import com.facebook.react.uimanager.PixelUtil.pxToDp
 import com.facebook.react.uimanager.StateWrapper
 
 /**
@@ -22,9 +24,30 @@ object TrueSheetStateUpdater {
   fun updateState(stateWrapper: StateWrapper, widthDp: Float, heightDp: Float): Boolean =
     isAvailable && nativeUpdateState(stateWrapper, widthDp, heightDp)
 
+  /**
+   * Pushes the container size (px) into the Fabric state — synchronously when
+   * the bridge is available, async otherwise.
+   */
+  fun updateContainerSize(stateWrapper: StateWrapper, widthPx: Int, heightPx: Int) {
+    val widthDp = widthPx.toFloat().pxToDp()
+    val heightDp = heightPx.toFloat().pxToDp()
+
+    if (updateState(stateWrapper, widthDp, heightDp)) return
+
+    val newStateData = WritableNativeMap()
+    newStateData.putDouble("containerWidth", widthDp.toDouble())
+    newStateData.putDouble("containerHeight", heightDp.toDouble())
+    stateWrapper.updateState(newStateData)
+  }
+
   /** Returns false when unavailable — caller should fall back to async updateState. */
-  fun updateFooterState(stateWrapper: StateWrapper, bottomInsetDp: Float): Boolean =
-    isAvailable && nativeUpdateFooterState(stateWrapper, bottomInsetDp)
+  fun updateFooterState(stateWrapper: StateWrapper, bottomInsetDp: Float, translateYDp: Float): Boolean =
+    isAvailable && nativeUpdateFooterState(stateWrapper, bottomInsetDp, translateYDp)
+
+  /** Mirrors the footer's native translation so measure() matches where it's drawn. */
+  fun updateFooterTranslation(stateWrapper: StateWrapper, translateYDp: Float) {
+    if (isAvailable) nativeUpdateFooterTranslation(stateWrapper, translateYDp)
+  }
 
   /**
    * Publishes the precalculated bottom safe-area inset so a late-mounted
@@ -38,7 +61,10 @@ object TrueSheetStateUpdater {
   private external fun nativeUpdateState(stateWrapper: Any, width: Float, height: Float): Boolean
 
   @JvmStatic
-  private external fun nativeUpdateFooterState(stateWrapper: Any, bottomInset: Float): Boolean
+  private external fun nativeUpdateFooterState(stateWrapper: Any, bottomInset: Float, translateY: Float): Boolean
+
+  @JvmStatic
+  private external fun nativeUpdateFooterTranslation(stateWrapper: Any, translateY: Float)
 
   @JvmStatic
   private external fun nativeSetBottomSafeArea(insetDp: Float)