@onekeyfe/react-native-native-overlay 6.7.0-alpha.344 → 6.7.0-alpha.354

package/android/src/main/java/com/onekey/nativeoverlay/NativeOverlayAnimation.kt

@@ -69,8 +69,9 @@ internal sealed class OverlayMotion {
 }
 
 /**
- * Analytic step response of `m·x'' + c·x' + k·x = 0`, identical to
- * Reanimated and `springProgressAt` in JS. Driving one ValueAnimator with it
+ * Analytic step response of `m·x'' + c·x' + k·x = 0`, with overdamped
+ * responses capped at critical damping to match UIKit's sheet response.
+ * Driving one ValueAnimator with it
  * keeps alpha, translation, scale and backdrop on the same clock; androidx
  * SpringAnimation would need one animation per property.
  */
@@ -89,19 +90,13 @@ internal class SpringInterpolator(private val spring: OverlayMotion.Spring) : Ti
 
     fun progressAt(spring: OverlayMotion.Spring, t: Double): Double {
       val w0 = sqrt(spring.stiffness / spring.mass)
-      val zeta = spring.damping / (2 * sqrt(spring.stiffness * spring.mass))
+      val zeta = minOf(1.0, spring.damping / (2 * sqrt(spring.stiffness * spring.mass)))
       return when {
         zeta < 1 -> {
           val wd = w0 * sqrt(1 - zeta * zeta)
           1 - exp(-zeta * w0 * t) * (cos(wd * t) + (zeta * w0 / wd) * sin(wd * t))
         }
-        zeta == 1.0 -> 1 - exp(-w0 * t) * (1 + w0 * t)
-        else -> {
-          val root = sqrt(zeta * zeta - 1)
-          val r1 = -w0 * (zeta - root)
-          val r2 = -w0 * (zeta + root)
-          1 - (r2 * exp(r1 * t) - r1 * exp(r2 * t)) / (r2 - r1)
-        }
+        else -> 1 - exp(-w0 * t) * (1 + w0 * t)
       }
     }
 

package/android/src/main/java/com/onekey/nativeoverlay/NativeOverlayEntryRootView.kt

@@ -60,7 +60,12 @@ internal class NativeOverlayEntryRootView(
    * below), non-blocking ones let it continue past the empty area.
    */
   override val pointerEvents: PointerEvents
-    get() = if (blocking && isShownForInput) PointerEvents.AUTO else PointerEvents.BOX_NONE
+    get() = when {
+      blocking && isClosing -> PointerEvents.BOX_ONLY
+      isClosing -> PointerEvents.NONE
+      blocking && isShownForInput -> PointerEvents.AUTO
+      else -> PointerEvents.BOX_NONE
+    }
   var stackOrder = 0
   var levelOrder = 0
   /** Page scope: the owning page, used by the page host to hide the entry. */
@@ -74,6 +79,19 @@ internal class NativeOverlayEntryRootView(
   var dismissOnBackPress = true
   var dismissOnBackdropPress = false
   var isShownForInput = false
+  private var contentAccessibilityBeforeClose: Int? = null
+  var isClosing = false
+    set(value) {
+      if (field == value) return
+      field = value
+      if (value) {
+        contentAccessibilityBeforeClose = contentView.importantForAccessibility
+        contentView.importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
+      } else {
+        contentAccessibilityBeforeClose?.let { contentView.importantForAccessibility = it }
+        contentAccessibilityBeforeClose = null
+      }
+    }
   var onRequestDismiss: ((String) -> Unit)? = null
 
   val backdropView = View(reactContext).apply { alpha = 0f }
@@ -90,12 +108,13 @@ internal class NativeOverlayEntryRootView(
   /** `sheet` presentation: the draggable surface; otherwise null. */
   var sheetView: FrameLayout? = null
     private set
+  private var sheetAnimationView: CoordinatorLayout? = null
   private var sheetBehavior: BottomSheetBehavior<FrameLayout>? = null
   private var handleView: View? = null
   var onSheetHiddenByPan: (() -> Unit)? = null
 
   /** The view that enter / exit animations move. */
-  val animatedView: View get() = sheetView ?: contentView
+  val animatedView: View get() = sheetAnimationView ?: contentView
 
   private val touchDispatcher = JSTouchDispatcher(this)
   private val pointerDispatcher = if (ReactFeatureFlags.dispatchPointerEvents) {
@@ -220,6 +239,7 @@ internal class NativeOverlayEntryRootView(
       },
     )
     sheetView = sheet
+    sheetAnimationView = coordinator
     sheetBehavior = behavior
     handleView = handle
     return sheet
@@ -350,6 +370,7 @@ internal class NativeOverlayEntryRootView(
   }
 
   override fun dispatchTouchEvent(event: MotionEvent): Boolean {
+    if (isClosing) return blocking
     if (!isShownForInput) return false
     if (event.actionMasked == MotionEvent.ACTION_DOWN) {
       // Non-blocking overlays (toasts) only take touches that land on content.

package/android/src/main/java/com/onekey/nativeoverlay/NativeOverlayHost.kt

@@ -50,7 +50,7 @@ internal class NativeOverlayHost private constructor(
   private val backCallback = object : OnBackPressedCallback(false) {
     override fun handleOnBackPressed() {
       topBackEntry()?.let { entry ->
-        if (entry.dismissOnBackPress) entry.onRequestDismiss?.invoke("back")
+        if (!entry.isClosing && entry.dismissOnBackPress) entry.onRequestDismiss?.invoke("back")
       }
     }
   }
@@ -68,7 +68,7 @@ internal class NativeOverlayHost private constructor(
    */
   fun handleBackKey(event: KeyEvent): Boolean {
     val entry = topBackEntry() ?: return false
-    if (event.action == KeyEvent.ACTION_UP && !event.isCanceled && entry.dismissOnBackPress) {
+    if (event.action == KeyEvent.ACTION_UP && !event.isCanceled && !entry.isClosing && entry.dismissOnBackPress) {
       entry.onRequestDismiss?.invoke("back")
     }
     return true
@@ -135,10 +135,12 @@ internal class NativeOverlayHost private constructor(
 
   /** Global overlays win; otherwise the topmost visible page overlay. */
   private fun topBackEntry(): NativeOverlayEntryRootView? =
-    orderedEntries().lastOrNull { (it.blocking || it.dismissOnBackPress) && it.isShownForInput }
+    orderedEntries().lastOrNull {
+      (it.blocking || it.dismissOnBackPress) && it.isShownForInput && (!it.isClosing || it.blocking)
+    }
       ?: shownPageHosts()
         .flatMap { it.shownEntries() }
-        .lastOrNull { it.blocking || it.dismissOnBackPress }
+        .lastOrNull { (it.blocking || it.dismissOnBackPress) && (!it.isClosing || it.blocking) }
 
   private fun shownPageHosts(): List<NativeOverlayPageHostView> =
     NativeOverlayPageHostView.allHosts().filter {

package/android/src/main/java/com/onekey/nativeoverlay/NativeOverlayView.kt

@@ -200,6 +200,7 @@ class NativeOverlayView(
     }
     cancelAnimators()
     phase = Phase.ENTERING
+    target.isClosing = false
     target.isShownForInput = true
     notifyHostEntriesChanged()
     if (blocking) {
@@ -226,7 +227,7 @@ class NativeOverlayView(
     val target = entry ?: return finishDismiss("programmatic")
     cancelAnimators()
     phase = Phase.EXITING
-    target.isShownForInput = false
+    target.isClosing = true
     notifyHostEntriesChanged()
     val transition = config.exit.reduceMotionAdjusted(isReduceMotionEnabled())
     if (transition.kind == "none") return finishDismiss("programmatic")
@@ -241,6 +242,7 @@ class NativeOverlayView(
     phase = Phase.HIDDEN
     entry?.let { target ->
       target.isShownForInput = false
+      target.isClosing = false
       stageContent()
       host?.detach(target)
       pageHost?.detach(target)

package/android/src/test/java/com/onekey/nativeoverlay/NativeOverlayBackTest.kt

@@ -1,11 +1,15 @@
 package com.onekey.nativeoverlay
 
 import android.view.KeyEvent
+import android.view.MotionEvent
 import android.view.View
 import android.widget.FrameLayout
 import androidx.activity.ComponentActivity
 import com.facebook.react.bridge.BridgeReactContext
+import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ThemedReactContext
+import com.facebook.react.uimanager.TouchTargetHelper
+import com.facebook.react.views.view.ReactViewGroup
 import java.lang.ref.WeakReference
 import java.util.WeakHashMap
 import org.junit.Assert.assertEquals
@@ -124,6 +128,140 @@ class NativeOverlayBackTest {
     pageHost.invalidateHost()
   }
 
+  @Test
+  fun closingGlobalBlockerKeepsTouchBackAndAccessibilityOwnership() {
+    var pageTouches = 0
+    val page = View(activity).apply {
+      setOnTouchListener { _, _ ->
+        pageTouches += 1
+        true
+      }
+    }
+    activity.setContentView(page)
+    val lower = entry("lower", true, true)
+    val top = entry("top", true, true, 1)
+    host.attach(lower, NativeOverlayLevel.MODAL)
+    host.attach(top, NativeOverlayLevel.MODAL)
+    top.isClosing = true
+    host.onEntriesChanged()
+
+    assertEquals(PointerEvents.BOX_ONLY, top.pointerEvents)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, top.contentView.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, page.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, lower.importantForAccessibility)
+    assertTrue(back())
+    assertEquals(emptyList<String>(), dismissals)
+
+    val content = activity.findViewById<FrameLayout>(android.R.id.content)
+    val size = View.MeasureSpec.makeMeasureSpec(300, View.MeasureSpec.EXACTLY)
+    content.measure(size, size)
+    content.layout(0, 0, 300, 300)
+    val down = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN, 150f, 150f, 0)
+    try {
+      assertTrue(content.dispatchTouchEvent(down))
+      assertEquals(0, pageTouches)
+    } finally {
+      down.recycle()
+    }
+
+    top.isClosing = false
+    host.onEntriesChanged()
+    assertEquals(PointerEvents.AUTO, top.pointerEvents)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, top.contentView.importantForAccessibility)
+    assertTrue(back())
+    assertEquals(listOf("top:back"), dismissals)
+  }
+
+  @Test
+  fun closingPageBlockerStillTakesBack() {
+    val pageHost = NativeOverlayPageHostView(context).apply { hostKey = "closing-page" }
+    activity.setContentView(pageHost)
+    val top = entry("page", true, true)
+    pageHost.attach(top)
+    top.isClosing = true
+    host.onEntriesChanged()
+
+    assertEquals(PointerEvents.BOX_ONLY, top.pointerEvents)
+    assertTrue(back())
+    assertEquals(emptyList<String>(), dismissals)
+    top.isClosing = false
+    host.onEntriesChanged()
+    assertEquals(PointerEvents.AUTO, top.pointerEvents)
+    assertTrue(back())
+    assertEquals(listOf("page:back"), dismissals)
+    pageHost.invalidateHost()
+  }
+
+  @Test
+  fun pageEntryHitTestingKeepsClosingContentAndLowerPageSeparate() {
+    val root = ReactViewGroup(context).apply { id = 101 }
+    val below = ReactViewGroup(context).apply { id = 102 }
+    val child = ReactViewGroup(context).apply { id = 103 }
+    val pageHost = NativeOverlayPageHostView(context).apply { hostKey = "page-hit-test" }
+    root.addView(below)
+    root.addView(pageHost)
+    activity.setContentView(root)
+    val overlay = entry("page", true, true)
+    overlay.contentView.addView(child)
+    pageHost.attach(overlay)
+
+    val size = View.MeasureSpec.makeMeasureSpec(300, View.MeasureSpec.EXACTLY)
+    root.measure(size, size)
+    root.layout(0, 0, 300, 300)
+    below.layout(0, 0, 300, 300)
+    pageHost.layout(0, 0, 300, 300)
+    child.layout(0, 0, 300, 300)
+
+    fun target() = TouchTargetHelper.findTargetTagForTouch(150f, 150f, root)
+    assertEquals(child.id, target())
+    overlay.isClosing = true
+    assertEquals(root.id, target())
+    overlay.updateBlocking(false)
+    assertEquals(below.id, target())
+    overlay.updateBlocking(true)
+    overlay.isClosing = false
+    assertEquals(child.id, target())
+    pageHost.invalidateHost()
+  }
+
+  @Test
+  fun reopeningCoveredClosingEntryRestoresItsContentAccessibility() {
+    activity.setContentView(View(activity))
+    val first = entry("first", true, true)
+    val second = entry("second", true, true)
+    host.attach(first, NativeOverlayLevel.MODAL)
+    first.isClosing = true
+    host.onEntriesChanged()
+    host.attach(second, NativeOverlayLevel.SECURE)
+
+    first.isClosing = false
+    host.onEntriesChanged()
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, first.importantForAccessibility)
+    host.detach(second)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, first.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, first.contentView.importantForAccessibility)
+  }
+
+  @Test
+  fun closingNonBlockingEntryPassesTouchAndBackToLowerBlocker() {
+    val lower = entry("lower", true, true)
+    val toast = entry("toast", false, true)
+    host.attach(lower, NativeOverlayLevel.MODAL)
+    host.attach(toast, NativeOverlayLevel.TOAST)
+    toast.isClosing = true
+    host.onEntriesChanged()
+
+    assertEquals(PointerEvents.NONE, toast.pointerEvents)
+    val down = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN, 150f, 150f, 0)
+    try {
+      assertFalse(toast.dispatchTouchEvent(down))
+    } finally {
+      down.recycle()
+    }
+    assertTrue(back())
+    assertEquals(listOf("lower:back"), dismissals)
+  }
+
   @Test
   fun hostCacheReusesLiveHostAndSeparatesActivities() {
     assertSame(host, NativeOverlayHost.of(activity))

package/android/src/test/java/com/onekey/nativeoverlay/NativeOverlayMotionTest.kt

@@ -0,0 +1,101 @@
+package com.onekey.nativeoverlay
+
+import android.graphics.Color
+import android.os.Looper
+import android.view.View
+import androidx.activity.ComponentActivity
+import androidx.coordinatorlayout.widget.CoordinatorLayout
+import com.facebook.react.bridge.BridgeReactContext
+import com.facebook.react.uimanager.ThemedReactContext
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotSame
+import org.junit.Assert.assertSame
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows
+import org.robolectric.annotation.Config
+import java.time.Duration
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [34])
+class NativeOverlayMotionTest {
+  @Test
+  fun sheetAnimationMovesCoordinatorWithoutTakingMaterialsSheetTranslation() {
+    val activity = Robolectric.buildActivity(ComponentActivity::class.java).setup().get()
+    val reactContext = BridgeReactContext(activity)
+    reactContext.onHostResume(activity)
+    val context = ThemedReactContext(reactContext, activity, "OverlayMotionTest", 1)
+    val entry = NativeOverlayEntryRootView(context)
+    assertSame(entry.contentView, entry.animatedView)
+
+    entry.configureSheet(500, 16f, Color.WHITE, showHandle = true, draggable = true)
+    val sheet = entry.sheetView!!
+    val animated = entry.animatedView
+    assertTrue(animated is CoordinatorLayout)
+    assertSame(animated, sheet.parent)
+    assertNotSame(sheet, animated)
+    assertTrue((sheet.layoutParams as CoordinatorLayout.LayoutParams).behavior is BottomSheetBehavior<*>)
+
+    animated.translationY = 42f
+    assertEquals(0f, sheet.translationY)
+    sheet.translationY = 7f
+    assertEquals(42f, animated.translationY)
+    assertEquals(7f, sheet.translationY)
+  }
+
+  @Test
+  fun quickMatchesMeasuredCriticalResponseWithoutChangingUnderdampedResponse() {
+    val quick = OverlayMotion.QUICK
+    assertEquals(292L, quick.durationMs())
+    assertEquals(0.8238140348, SpringInterpolator.progressAt(quick, 0.1), 0.000001)
+    assertEquals(0.9990003945, SpringInterpolator.progressAt(quick, 0.292), 0.000001)
+
+    val underdamped = OverlayMotion.Spring(1.0, 100.0, 5.0)
+    assertEquals(0.3929451508, SpringInterpolator.progressAt(underdamped, 0.1), 0.000001)
+    val timing = OverlayMotion.Timing(250L, 0.25f, 0.1f, 0.25f, 1f)
+    assertEquals(250L, timing.durationMs())
+  }
+
+  @Test
+  fun reopeningTheSameEntryDuringExitRetargetsItsAnimation() {
+    val activity = Robolectric.buildActivity(ComponentActivity::class.java).setup().visible().get()
+    val reactContext = BridgeReactContext(activity)
+    reactContext.onHostResume(activity)
+    val context = ThemedReactContext(reactContext, activity, "OverlayMotionTest", 1)
+    val overlay = NativeOverlayView(context).apply {
+      presentation = "sheet"
+      sheetHeight = 200.0
+      addReactChild(View(context))
+    }
+    activity.setContentView(overlay)
+    var dismissals = 0
+    overlay.onDismissed = { dismissals++ }
+    overlay.visible = true
+    overlay.commitConfiguration()
+
+    val entryField = NativeOverlayView::class.java.getDeclaredField("entry").apply { isAccessible = true }
+    val original = entryField.get(overlay) as NativeOverlayEntryRootView
+    overlay.visible = false
+    overlay.commitConfiguration()
+    assertTrue(original.isClosing)
+
+    overlay.visible = true
+    overlay.commitConfiguration()
+    assertSame(original, entryField.get(overlay))
+    assertTrue(original.isShownForInput)
+    assertFalse(original.isClosing)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, original.contentView.importantForAccessibility)
+    Shadows.shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(350))
+    assertEquals(0, dismissals)
+
+    overlay.visible = false
+    overlay.commitConfiguration()
+    Shadows.shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(350))
+    assertEquals(1, dismissals)
+  }
+}

package/docs/SPEC.md

@@ -1,8 +1,10 @@
 # react-native-native-overlay SPEC
 
 Status: Implemented through the P5 caller migration in app-monorepo. Android
-and Web runtime checks passed there; iOS runtime, physical-device and iPad
-acceptance remain unverified. Packaging in app-modules is validated separately.
+and Web runtime checks passed there; focused iOS 26.5 simulator and Android 16
+emulator checks are recorded below. Broader iOS runtime, physical-device and
+iPad acceptance remain unverified. Packaging in app-modules is validated
+separately.
 
 The implementation is migrated from app-monorepo commit
 `376633bd9f1c410dbccb01fb6a0492be9a5c3f38`, package
@@ -39,13 +41,15 @@ attribution in source comments.
 
 ### Release boundary
 
-The earlier `3.0.162-alpha.272` release remains immutable. This branch now
-includes the current main SDK baseline, with all publishable workspaces aligned
-before release. Use `package-publish` with `npm_dist_tag=next` and an empty
-`only_workspace` to generate a fresh `6.7.0-alpha.N` preview, publish every
-workspace, and verify every registry version. Preserve `latest` and keep both
-repository PRs open. App consumers pin the verified exact preview version and
-refresh dependency and native locks before installed-version acceptance.
+The earlier `3.0.162-alpha.272` release remains immutable. This branch is
+prepared at `6.7.0-9`: the repository's release validator requires all 43
+publishable workspace manifests and exact internal pins to use the same
+version. Publish only `@onekeyfe/react-native-native-overlay` through the
+manual `package-publish` workflow with `npm_dist_tag=latest` and
+`only_workspace=@onekeyfe/react-native-native-overlay`; verify that exact
+registry tarball before the App pins it and refreshes its dependency and native
+locks. The other workspace version changes are release metadata, not a request
+to publish their packages in this run. Leave the source PR open for review.
 
 ## 5.1 Purpose, scope, and non-goals
 
@@ -168,8 +172,20 @@ visible)`, `removePage(ownerKey)`.
 - `motion` is a preset name or a concrete `{ type: 'spring', spring: { mass, stiffness, damping, overshootClamping } }`
   or `{ type: 'timing', timing: { durationMs, easing: cubicBezier } }`.
 - Presets are resolved per platform:
-  - Native mirrors the Reanimated driver: `quick` is a spring with m 0.1,
-    k 100, c 20 (damping ratio ≈ 3.16).
+  - Native `quick` supplies spring m 0.1, k 100, c 20. The iOS sheet's
+    measured position and dimming response use the critically damped curve
+    at angular frequency `sqrt(k/m)`; UIKit reports an animator duration near
+    292 ms. Android caps an overdamped spring's effective damping ratio at 1
+    while preserving m and k; underdamped and timing motions retain their
+    existing response. This rule
+    also applies to custom overdamped springs as a platform compatibility
+    inference; only the default `quick` sheet path has been measured on iOS.
+    Android's implementation is covered by native tests. In the consumer
+    shells, the default `quick` Dialog and ActionList sheet enter/exit motion
+    and dimming were compared over three cycles per direction on Android 16
+    and iOS 26.5; their normalized visible curves met the recorded parity
+    tolerance. This does not verify custom springs, exact cross-device
+    rectangles, or callback timing.
   - Web mirrors the CSS driver: `quick` is 150 ms `cubic-bezier(.25,.1,.25,1)`.
   - Converting native springs for web is opt-in (`springToCssLinear`), because
     it would slow web overlays down 4–9×.
@@ -183,6 +199,13 @@ visible)`, `removePage(ownerKey)`.
 | fullscreen   | fade, `quick`                                                                    | none          |
 | anchored     | scale 0.95 + fade from the resolved anchor placement, `popoverQuick`             | fade          |
 
+- **Android sheet transform ownership (Implemented; Android 16 consumer-shell runtime verified):**
+  the overlay's enter/exit transform belongs to the sheet's CoordinatorLayout
+  parent. Material's IME insets callback owns the child sheet's `translationY`,
+  and the keyboard layer owns the IME avoidance lift. These transforms compose
+  while the child sheet remains the BottomSheetBehavior drag target. The
+  overlay must not animate the child sheet's `translationY` during IME motion.
+
 - Special cases the callers set explicitly:
   - App lock: `enter: none`, `exit: fade lockFade`. The web tamper check reloads
     the page if the lock fades in from opacity 0.
@@ -216,6 +239,22 @@ request ─► queued ─► active ─► (enter anim) presented
   its current value. It does not restart.
 - `onRemoved` fires exactly once per entry, even when a finalize and the
   timeout race.
+- **Android exit ownership (Implemented; blocking page/global touch and global
+  Back runtime verified on Android 16; accessibility native-test verified,
+  TalkBack device verification pending):** A
+  blocking entry keeps ownership of touch, Back, and accessibility isolation
+  until its exit animation completes and the native host detaches it. During
+  exit, the entry consumes touches and Back without forwarding them to its
+  closing React content or requesting a
+  second dismissal. Its content is hidden from TalkBack while lower content
+  remains isolated. A reopen during exit restores content input and
+  accessibility without briefly exposing the page below. Closing non-blocking
+  entries pass through touch and Back to the entry below.
+  Consumer-shell recordings verify that page and global blocking entries keep
+  lower touch targets inert during their visible exit, then release them, and
+  that Back does not navigate beneath a closing global entry. Native tests
+  cover closing non-blocking entries and same-entry reopen; those paths and
+  TalkBack reading during exit have not been verified on device.
 - Page entries:
   - They are suspended (hidden but kept) while the owner page is covered or
     detached.
@@ -460,6 +499,8 @@ P2 sheet notes:
   flick dismisses, never from scrolled content). Reopening kept content after
   a pan dismissal clears the sheet transform, transition and backdrop opacity;
   the next dismissal follows the normal exit path and restores focus.
+  Cancelling a tracked pointer resets its drag offset, transition and backdrop
+  without dismissing the sheet or swallowing a later click.
 - A fitted sheet measures its content with `onLayout` before presenting.
   Hidden content stays mounted inside the zero-width host (clipped on iOS,
   INVISIBLE on Android), and the host height stays auto: a fixed 0 height

package/lib/module/web/useSheetDrag.js

@@ -111,10 +111,27 @@ export function useSheetDrag({
         once: true
       });
     };
+    const onPointerCancel = event => {
+      if (!tracking || event.pointerId !== pointerId) {
+        return;
+      }
+      tracking = false;
+      dragging = false;
+      velocity = 0;
+      if (sheet.hasPointerCapture?.(pointerId)) {
+        sheet.releasePointerCapture(pointerId);
+      }
+      pointerId = -1;
+      sheet.style.transform = '';
+      sheet.style.transition = '';
+      if (backdropRef.current) {
+        backdropRef.current.style.opacity = '1';
+      }
+    };
     sheet.addEventListener('pointerdown', onPointerDown);
     sheet.addEventListener('pointermove', onPointerMove);
     sheet.addEventListener('pointerup', onPointerUp);
-    sheet.addEventListener('pointercancel', onPointerUp);
+    sheet.addEventListener('pointercancel', onPointerCancel);
     return () => {
       if (sheet.hasPointerCapture?.(pointerId)) {
         sheet.releasePointerCapture(pointerId);
@@ -122,7 +139,7 @@ export function useSheetDrag({
       sheet.removeEventListener('pointerdown', onPointerDown);
       sheet.removeEventListener('pointermove', onPointerMove);
       sheet.removeEventListener('pointerup', onPointerUp);
-      sheet.removeEventListener('pointercancel', onPointerUp);
+      sheet.removeEventListener('pointercancel', onPointerCancel);
     };
   }, [sheetRef, backdropRef, enabled]);
 }

package/lib/module/web/useSheetDrag.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","DRAG_START_THRESHOLD","DISMISS_DISTANCE_RATIO","DISMISS_VELOCITY","UPWARD_RESISTANCE","SETTLE_TRANSITION","scrolledAncestorWithin","target","sheet","node","HTMLElement","scrollTop","scrollHeight","clientHeight","parentElement","undefined","useSheetDrag","sheetRef","backdropRef","enabled","onDismissByPan","onDismissRef","current","startY","lastY","lastTime","velocity","tracking","dragging","pointerId","setOffset","offset","style","transform","backdrop","opacity","String","Math","max","offsetHeight","onPointerDown","event","button","clientY","timeStamp","onPointerMove","dy","setPointerCapture","transition","dt","onPointerUp","height","addEventListener","clickEvent","stopPropagation","preventDefault","capture","once","hasPointerCapture","releasePointerCapture","removeEventListener"],"sourceRoot":"../../../src","sources":["web/useSheetDrag.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAGzC,MAAMC,oBAAoB,GAAG,CAAC;AAC9B,MAAMC,sBAAsB,GAAG,GAAG;AAClC,MAAMC,gBAAgB,GAAG,GAAG,CAAC,CAAC;AAC9B,MAAMC,iBAAiB,GAAG,GAAG;AAC7B,MAAMC,iBAAiB,GAAG,gDAAgD;AAE1E,SAASC,sBAAsBA,CAC7BC,MAA0B,EAC1BC,KAAkB,EAClB;EACA,IAAIC,IAAI,GAAGF,MAAM,YAAYG,WAAW,GAAGH,MAAM,GAAG,IAAI;EACxD,OAAOE,IAAI,IAAIA,IAAI,KAAKD,KAAK,EAAE;IAC7B,IAAIC,IAAI,CAACE,SAAS,GAAG,CAAC,IAAIF,IAAI,CAACG,YAAY,GAAGH,IAAI,CAACI,YAAY,EAAE;MAC/D,OAAOJ,IAAI;IACb;IACAA,IAAI,GAAGA,IAAI,CAACK,aAAa;EAC3B;EACA,OAAOC,SAAS;AAClB;;AAEA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAAC;EAC3BC,QAAQ;EACRC,WAAW;EACXC,OAAO;EACPC;AAMF,CAAC,EAAE;EACD,MAAMC,YAAY,GAAGrB,MAAM,CAACoB,cAAc,CAAC;EAC3CC,YAAY,CAACC,OAAO,GAAGF,cAAc;EAErCrB,SAAS,CAAC,MAAM;IACd,MAAMS,KAAK,GAAGS,QAAQ,CAACK,OAAO;IAC9B,IAAI,CAACd,KAAK,IAAI,CAACW,OAAO,EAAE;MACtB;IACF;IACA,IAAII,MAAM,GAAG,CAAC;IACd,IAAIC,KAAK,GAAG,CAAC;IACb,IAAIC,QAAQ,GAAG,CAAC;IAChB,IAAIC,QAAQ,GAAG,CAAC;IAChB,IAAIC,QAAQ,GAAG,KAAK;IACpB,IAAIC,QAAQ,GAAG,KAAK;IACpB,IAAIC,SAAS,GAAG,CAAC,CAAC;IAElB,MAAMC,SAAS,GAAIC,MAAc,IAAK;MACpCvB,KAAK,CAACwB,KAAK,CAACC,SAAS,GAAG,kBAAkBF,MAAM,QAAQ;MACxD,MAAMG,QAAQ,GAAGhB,WAAW,CAACI,OAAO;MACpC,IAAIY,QAAQ,IAAIH,MAAM,GAAG,CAAC,EAAE;QAC1BG,QAAQ,CAACF,KAAK,CAACG,OAAO,GAAGC,MAAM,CAC7BC,IAAI,CAACC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAGP,MAAM,GAAGvB,KAAK,CAAC+B,YAAY,CAC7C,CAAC;MACH;IACF,CAAC;IAED,MAAMC,aAAa,GAAIC,KAAmB,IAAK;MAC7C,IAAIA,KAAK,CAACC,MAAM,KAAK,CAAC,IAAIpC,sBAAsB,CAACmC,KAAK,CAAClC,MAAM,EAAEC,KAAK,CAAC,EAAE;QACrE;MACF;MACAmB,QAAQ,GAAG,IAAI;MACfC,QAAQ,GAAG,KAAK;MAChBC,SAAS,GAAGY,KAAK,CAACZ,SAAS;MAC3BN,MAAM,GAAGkB,KAAK,CAACE,OAAO;MACtBnB,KAAK,GAAGiB,KAAK,CAACE,OAAO;MACrBlB,QAAQ,GAAGgB,KAAK,CAACG,SAAS;MAC1BlB,QAAQ,GAAG,CAAC;IACd,CAAC;IAED,MAAMmB,aAAa,GAAIJ,KAAmB,IAAK;MAC7C,IAAI,CAACd,QAAQ,IAAIc,KAAK,CAACZ,SAAS,KAAKA,SAAS,EAAE;QAC9C;MACF;MACA,MAAMiB,EAAE,GAAGL,KAAK,CAACE,OAAO,GAAGpB,MAAM;MACjC,IAAI,CAACK,QAAQ,EAAE;QACb,IAAIkB,EAAE,GAAG7C,oBAAoB,EAAE;UAC7B;QACF;QACA2B,QAAQ,GAAG,IAAI;QACfpB,KAAK,CAACuC,iBAAiB,CAAClB,SAAS,CAAC;QAClCrB,KAAK,CAACwB,KAAK,CAACgB,UAAU,GAAG,MAAM;MACjC;MACA,MAAMC,EAAE,GAAGZ,IAAI,CAACC,GAAG,CAAC,CAAC,EAAEG,KAAK,CAACG,SAAS,GAAGnB,QAAQ,CAAC;MAClDC,QAAQ,GAAG,CAACe,KAAK,CAACE,OAAO,GAAGnB,KAAK,IAAIyB,EAAE;MACvCzB,KAAK,GAAGiB,KAAK,CAACE,OAAO;MACrBlB,QAAQ,GAAGgB,KAAK,CAACG,SAAS;MAC1Bd,SAAS,CAACgB,EAAE,GAAG,CAAC,GAAGA,EAAE,GAAGA,EAAE,GAAG1C,iBAAiB,CAAC;IACjD,CAAC;IAED,MAAM8C,WAAW,GAAIT,KAAmB,IAAK;MAC3C,IAAI,CAACd,QAAQ,IAAIc,KAAK,CAACZ,SAAS,KAAKA,SAAS,EAAE;QAC9C;MACF;MACAF,QAAQ,GAAG,KAAK;MAChB,IAAI,CAACC,QAAQ,EAAE;QACb;MACF;MACAA,QAAQ,GAAG,KAAK;MAChB,MAAMkB,EAAE,GAAGL,KAAK,CAACE,OAAO,GAAGpB,MAAM;MACjC,MAAM4B,MAAM,GAAG3C,KAAK,CAAC+B,YAAY;MACjC/B,KAAK,CAACwB,KAAK,CAACgB,UAAU,GAAG3C,iBAAiB;MAC1C,IAAIyC,EAAE,GAAGK,MAAM,GAAGjD,sBAAsB,IAAIwB,QAAQ,GAAGvB,gBAAgB,EAAE;QACvE2B,SAAS,CAACqB,MAAM,CAAC;QACjB9B,YAAY,CAACC,OAAO,CAAC,CAAC;MACxB,CAAC,MAAM;QACLQ,SAAS,CAAC,CAAC,CAAC;QACZ,IAAIZ,WAAW,CAACI,OAAO,EAAE;UACvBJ,WAAW,CAACI,OAAO,CAACU,KAAK,CAACG,OAAO,GAAG,GAAG;QACzC;MACF;MACA;MACA;MACA3B,KAAK,CAAC4C,gBAAgB,CACpB,OAAO,EACNC,UAAU,IAAK;QACdA,UAAU,CAACC,eAAe,CAAC,CAAC;QAC5BD,UAAU,CAACE,cAAc,CAAC,CAAC;MAC7B,CAAC,EACD;QAAEC,OAAO,EAAE,IAAI;QAAEC,IAAI,EAAE;MAAK,CAC9B,CAAC;IACH,CAAC;IAEDjD,KAAK,CAAC4C,gBAAgB,CAAC,aAAa,EAAEZ,aAAa,CAAC;IACpDhC,KAAK,CAAC4C,gBAAgB,CAAC,aAAa,EAAEP,aAAa,CAAC;IACpDrC,KAAK,CAAC4C,gBAAgB,CAAC,WAAW,EAAEF,WAAW,CAAC;IAChD1C,KAAK,CAAC4C,gBAAgB,CAAC,eAAe,EAAEF,WAAW,CAAC;IACpD,OAAO,MAAM;MACX,IAAI1C,KAAK,CAACkD,iBAAiB,GAAG7B,SAAS,CAAC,EAAE;QACxCrB,KAAK,CAACmD,qBAAqB,CAAC9B,SAAS,CAAC;MACxC;MACArB,KAAK,CAACoD,mBAAmB,CAAC,aAAa,EAAEpB,aAAa,CAAC;MACvDhC,KAAK,CAACoD,mBAAmB,CAAC,aAAa,EAAEf,aAAa,CAAC;MACvDrC,KAAK,CAACoD,mBAAmB,CAAC,WAAW,EAAEV,WAAW,CAAC;MACnD1C,KAAK,CAACoD,mBAAmB,CAAC,eAAe,EAAEV,WAAW,CAAC;IACzD,CAAC;EACH,CAAC,EAAE,CAACjC,QAAQ,EAAEC,WAAW,EAAEC,OAAO,CAAC,CAAC;AACtC","ignoreList":[]}
+{"version":3,"names":["useEffect","useRef","DRAG_START_THRESHOLD","DISMISS_DISTANCE_RATIO","DISMISS_VELOCITY","UPWARD_RESISTANCE","SETTLE_TRANSITION","scrolledAncestorWithin","target","sheet","node","HTMLElement","scrollTop","scrollHeight","clientHeight","parentElement","undefined","useSheetDrag","sheetRef","backdropRef","enabled","onDismissByPan","onDismissRef","current","startY","lastY","lastTime","velocity","tracking","dragging","pointerId","setOffset","offset","style","transform","backdrop","opacity","String","Math","max","offsetHeight","onPointerDown","event","button","clientY","timeStamp","onPointerMove","dy","setPointerCapture","transition","dt","onPointerUp","height","addEventListener","clickEvent","stopPropagation","preventDefault","capture","once","onPointerCancel","hasPointerCapture","releasePointerCapture","removeEventListener"],"sourceRoot":"../../../src","sources":["web/useSheetDrag.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/web/useSheetDrag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useSheetDrag.d.ts","sourceRoot":"","sources":["../../../../src/web/useSheetDrag.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAsBvC;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,EAC3B,QAAQ,EACR,WAAW,EACX,OAAO,EACP,cAAc,GACf,EAAE;IACD,QAAQ,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC3C,WAAW,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC9C,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,IAAI,CAAC;CAC5B,QA2GA"}
+{"version":3,"file":"useSheetDrag.d.ts","sourceRoot":"","sources":["../../../../src/web/useSheetDrag.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAsBvC;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,EAC3B,QAAQ,EACR,WAAW,EACX,OAAO,EACP,cAAc,GACf,EAAE;IACD,QAAQ,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC3C,WAAW,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAC9C,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,MAAM,IAAI,CAAC;CAC5B,QA6HA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-native-overlay",
-  "version": "6.7.0-alpha.344",
+  "version": "6.7.0-alpha.354",
   "description": "Native and Web overlay hosts with ordered levels, page scope and Fabric measurement",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/web/useSheetDrag.ts

@@ -129,10 +129,28 @@ export function useSheetDrag({
       );
     };
 
+    const onPointerCancel = (event: PointerEvent) => {
+      if (!tracking || event.pointerId !== pointerId) {
+        return;
+      }
+      tracking = false;
+      dragging = false;
+      velocity = 0;
+      if (sheet.hasPointerCapture?.(pointerId)) {
+        sheet.releasePointerCapture(pointerId);
+      }
+      pointerId = -1;
+      sheet.style.transform = '';
+      sheet.style.transition = '';
+      if (backdropRef.current) {
+        backdropRef.current.style.opacity = '1';
+      }
+    };
+
     sheet.addEventListener('pointerdown', onPointerDown);
     sheet.addEventListener('pointermove', onPointerMove);
     sheet.addEventListener('pointerup', onPointerUp);
-    sheet.addEventListener('pointercancel', onPointerUp);
+    sheet.addEventListener('pointercancel', onPointerCancel);
     return () => {
       if (sheet.hasPointerCapture?.(pointerId)) {
         sheet.releasePointerCapture(pointerId);
@@ -140,7 +158,7 @@ export function useSheetDrag({
       sheet.removeEventListener('pointerdown', onPointerDown);
       sheet.removeEventListener('pointermove', onPointerMove);
       sheet.removeEventListener('pointerup', onPointerUp);
-      sheet.removeEventListener('pointercancel', onPointerUp);
+      sheet.removeEventListener('pointercancel', onPointerCancel);
     };
   }, [sheetRef, backdropRef, enabled]);
 }