@onekeyfe/react-native-native-overlay 3.0.162-alpha.270 → 6.7.0-11

package/android/build.gradle

@@ -60,6 +60,10 @@ android {
       ]
     }
   }
+
+  testOptions {
+    unitTests.includeAndroidResources = true
+  }
 }
 
 repositories {
@@ -73,6 +77,8 @@ dependencies {
   implementation "com.facebook.react:react-android"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
   implementation "com.google.android.material:material:1.14.0-alpha05"
+  testImplementation "junit:junit:4.13.2"
+  testImplementation "org.robolectric:robolectric:4.17"
 }
 
 react {

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

@@ -0,0 +1,37 @@
+package com.onekey.nativeoverlay
+
+import android.view.View
+import android.view.ViewGroup
+
+/** Restores the caller's flags when a blocking overlay no longer covers it. */
+internal class NativeOverlayAccessibilityIsolation {
+  private val hidden = mutableMapOf<View, Int>()
+
+  fun update(
+    root: ViewGroup,
+    activeContainer: View?,
+    entriesBelow: List<View>,
+    globalHost: View,
+  ) {
+    val below = mutableSetOf<View>()
+    if (activeContainer != null) {
+      var node: View = activeContainer
+      while (node !== root && node.parent is ViewGroup) {
+        val parent = node.parent as ViewGroup
+        for (index in 0 until parent.childCount) {
+          val sibling = parent.getChildAt(index)
+          if (sibling !== node && sibling !== globalHost) below.add(sibling)
+        }
+        node = parent
+      }
+      if (node === root) below.addAll(entriesBelow) else below.clear()
+    }
+    hidden.keys.filter { it !in below }.forEach { view ->
+      view.importantForAccessibility = hidden.remove(view) ?: View.IMPORTANT_FOR_ACCESSIBILITY_AUTO
+    }
+    below.forEach { view ->
+      if (view !in hidden) hidden[view] = view.importantForAccessibility
+      view.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
+    }
+  }
+}

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

@@ -2,13 +2,13 @@ package com.onekey.nativeoverlay
 
 import android.app.Activity
 import android.view.KeyEvent
-import android.view.View
 import android.view.ViewGroup
 import android.view.Window
 import android.widget.FrameLayout
 import androidx.activity.ComponentActivity
 import androidx.activity.OnBackPressedCallback
 import java.util.WeakHashMap
+import java.lang.ref.WeakReference
 
 /** Mirrors `OVERLAY_LEVEL_ORDER`. */
 internal enum class NativeOverlayLevel(val order: Int) {
@@ -49,12 +49,12 @@ internal class NativeOverlayHost private constructor(
   )
   private val backCallback = object : OnBackPressedCallback(false) {
     override fun handleOnBackPressed() {
-      topBlockingEntry()?.let { entry ->
-        if (entry.dismissOnBackPress) entry.onRequestDismiss?.invoke("back")
+      topBackEntry()?.let { entry ->
+        if (!entry.isClosing && entry.dismissOnBackPress) entry.onRequestDismiss?.invoke("back")
       }
     }
   }
-  private val hiddenForAccessibility = mutableMapOf<View, Int>()
+  private val accessibilityIsolation = NativeOverlayAccessibilityIsolation()
 
   init {
     clipChildren = false
@@ -67,8 +67,8 @@ internal class NativeOverlayHost private constructor(
    * predictive back, so the dispatcher alone never runs first.
    */
   fun handleBackKey(event: KeyEvent): Boolean {
-    val entry = topBlockingEntry() ?: return false
-    if (event.action == KeyEvent.ACTION_UP && !event.isCanceled && entry.dismissOnBackPress) {
+    val entry = topBackEntry() ?: return false
+    if (event.action == KeyEvent.ACTION_UP && !event.isCanceled && !entry.isClosing && entry.dismissOnBackPress) {
       entry.onRequestDismiss?.invoke("back")
     }
     return true
@@ -109,14 +109,14 @@ internal class NativeOverlayHost private constructor(
   }
 
   fun onEntriesChanged() {
-    val hasBlocking = topBlockingEntry() != null
-    if (hasBlocking && !backCallback.isEnabled) {
+    val hasBackEntry = topBackEntry() != null
+    if (hasBackEntry && !backCallback.isEnabled) {
       // The most recently added callback wins; re-add so ours runs before
       // ReactActivity's and react-native-screens' callbacks.
       backCallback.remove()
       (activity as? ComponentActivity)?.onBackPressedDispatcher?.addCallback(backCallback)
     }
-    backCallback.isEnabled = hasBlocking
+    backCallback.isEnabled = hasBackEntry
     updateAccessibility()
   }
 
@@ -134,41 +134,40 @@ internal class NativeOverlayHost private constructor(
     }
 
   /** Global overlays win; otherwise the topmost visible page overlay. */
-  private fun topBlockingEntry(): NativeOverlayEntryRootView? =
-    orderedEntries().lastOrNull { it.blocking && it.isShownForInput }
-      ?: NativeOverlayPageHostView.allHosts()
-        .filter { it.isAttachedToWindow && it.isShown }
+  private fun topBackEntry(): NativeOverlayEntryRootView? =
+    orderedEntries().lastOrNull {
+      (it.blocking || it.dismissOnBackPress) && it.isShownForInput && (!it.isClosing || it.blocking)
+    }
+      ?: shownPageHosts()
         .flatMap { it.shownEntries() }
-        .lastOrNull { it.blocking }
+        .lastOrNull { (it.blocking || it.dismissOnBackPress) && (!it.isClosing || it.blocking) }
+
+  private fun shownPageHosts(): List<NativeOverlayPageHostView> =
+    NativeOverlayPageHostView.allHosts().filter {
+      it.isAttachedToWindow && it.isShown && it.rootView === activity.window.decorView
+    }
 
   /** TalkBack only reads the topmost blocking overlay and what is above it. */
   private fun updateAccessibility() {
     val entries = orderedEntries()
     val topIndex = entries.indexOfLast { it.blocking && it.isShownForInput }
-    val content = parent as? ViewGroup
-    val below = mutableListOf<View>()
+    val content = activity.findViewById<ViewGroup>(android.R.id.content) ?: return
     if (topIndex >= 0) {
-      content?.let { group ->
-        (0 until group.childCount).map(group::getChildAt).filter { it !== this }.forEach(below::add)
-      }
-      below.addAll(entries.subList(0, topIndex))
-    }
-    val restore = hiddenForAccessibility.keys.filter { it !in below }
-    restore.forEach { view ->
-      view.importantForAccessibility = hiddenForAccessibility.remove(view) ?: IMPORTANT_FOR_ACCESSIBILITY_AUTO
-    }
-    below.forEach { view ->
-      if (view !in hiddenForAccessibility) {
-        hiddenForAccessibility[view] = view.importantForAccessibility
-        view.importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
-      }
+      accessibilityIsolation.update(content, this, entries.take(topIndex), this)
+      return
     }
+    val pageEntry = shownPageHosts().flatMap { it.shownEntries() }.lastOrNull { it.blocking }
+    val pageHost = pageEntry?.parent as? NativeOverlayPageHostView
+    val below = pageHost?.shownEntries()?.takeWhile { it !== pageEntry }.orEmpty()
+    accessibilityIsolation.update(content, pageHost, below, this)
   }
 
   companion object {
-    private val hosts = WeakHashMap<Activity, NativeOverlayHost>()
+    private val hosts = WeakHashMap<Activity, WeakReference<NativeOverlayHost>>()
 
     fun of(activity: Activity): NativeOverlayHost =
-      hosts.getOrPut(activity) { NativeOverlayHost(activity) }
+      hosts[activity]?.get() ?: NativeOverlayHost(activity).also {
+        hosts[activity] = WeakReference(it)
+      }
   }
 }

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

@@ -3,6 +3,7 @@ package com.onekey.nativeoverlay
 import android.annotation.SuppressLint
 import android.content.Context
 import android.view.ViewGroup
+import com.facebook.react.bridge.ReactContext
 import com.facebook.react.uimanager.PointerEvents
 import com.facebook.react.uimanager.ReactPointerEventsView
 import java.lang.ref.WeakReference
@@ -33,6 +34,7 @@ class NativeOverlayPageHostView(context: Context) : ViewGroup(context), ReactPoi
     if (owners == suspendedOwners) return
     suspendedOwners = owners
     entries().forEach(::applySuspension)
+    onEntriesChanged()
   }
 
   internal fun attach(entry: NativeOverlayEntryRootView) {
@@ -44,10 +46,12 @@ class NativeOverlayPageHostView(context: Context) : ViewGroup(context), ReactPoi
     }
     layoutEntries()
     applySuspension(entry)
+    onEntriesChanged()
   }
 
   internal fun detach(entry: NativeOverlayEntryRootView) {
     removeView(entry)
+    onEntriesChanged()
   }
 
   /** Visible, input-ready entries in bottom-to-top order. */
@@ -56,6 +60,23 @@ class NativeOverlayPageHostView(context: Context) : ViewGroup(context), ReactPoi
 
   fun invalidateHost() {
     if (hostKey.isNotEmpty() && registry[hostKey]?.get() === this) registry.remove(hostKey)
+    onEntriesChanged()
+  }
+
+  override fun onAttachedToWindow() {
+    super.onAttachedToWindow()
+    onEntriesChanged()
+  }
+
+  override fun onDetachedFromWindow() {
+    super.onDetachedFromWindow()
+    onEntriesChanged()
+  }
+
+  private fun onEntriesChanged() {
+    (context as? ReactContext)?.currentActivity?.let {
+      NativeOverlayHost.of(it).onEntriesChanged()
+    }
   }
 
   private var layoutScheduled = false

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

@@ -135,6 +135,7 @@ class NativeOverlayView(
       config = OverlayAnimationConfig.parse(animationConfig)
     }
     entry?.let(::applyEntryConfiguration)
+    notifyHostEntriesChanged()
     if (visible) {
       cycleOpen = true
       if (phase == Phase.HIDDEN || phase == Phase.EXITING) present()
@@ -199,8 +200,9 @@ class NativeOverlayView(
     }
     cancelAnimators()
     phase = Phase.ENTERING
+    target.isClosing = false
     target.isShownForInput = true
-    host?.onEntriesChanged()
+    notifyHostEntriesChanged()
     if (blocking) {
       target.sendAccessibilityEvent(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED)
     }
@@ -225,8 +227,8 @@ class NativeOverlayView(
     val target = entry ?: return finishDismiss("programmatic")
     cancelAnimators()
     phase = Phase.EXITING
-    target.isShownForInput = false
-    host?.onEntriesChanged()
+    target.isClosing = true
+    notifyHostEntriesChanged()
     val transition = config.exit.reduceMotionAdjusted(isReduceMotionEnabled())
     if (transition.kind == "none") return finishDismiss("programmatic")
     animate(target, hiddenState(target, transition), 0f, transition.motion) {
@@ -240,6 +242,7 @@ class NativeOverlayView(
     phase = Phase.HIDDEN
     entry?.let { target ->
       target.isShownForInput = false
+      target.isClosing = false
       stageContent()
       host?.detach(target)
       pageHost?.detach(target)
@@ -389,6 +392,10 @@ class NativeOverlayView(
     }
   }
 
+  private fun notifyHostEntriesChanged() {
+    reactContext.currentActivity?.let { NativeOverlayHost.of(it).onEntriesChanged() }
+  }
+
   /**
    * While hidden, keep the React child inside this invisible view. Fabric only
    * reports onLayout for attached views, and fitted sheets size themselves

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

@@ -0,0 +1,112 @@
+package com.onekey.nativeoverlay
+
+import android.view.View
+import android.widget.FrameLayout
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [34])
+class NativeOverlayAccessibilityIsolationTest {
+  private val context get() = RuntimeEnvironment.getApplication()
+
+  private class Tree(context: android.content.Context) {
+    val root = FrameLayout(context)
+    val reactRoot = FrameLayout(context)
+    val card = FrameLayout(context)
+    val content = View(context).apply { importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES }
+    val chrome = View(context)
+    val pageHost = FrameLayout(context)
+    val lower = View(context)
+    val blocker = View(context)
+    val above = View(context)
+    val globalHost = FrameLayout(context)
+
+    init {
+      root.addView(reactRoot)
+      root.addView(globalHost)
+      reactRoot.addView(card)
+      reactRoot.addView(chrome)
+      card.addView(content)
+      card.addView(pageHost)
+      pageHost.addView(lower)
+      pageHost.addView(blocker)
+      pageHost.addView(above)
+    }
+  }
+
+  @Test
+  fun pageBlockerHidesPageAndNavigationWithoutHidingTheHost() {
+    val tree = Tree(context)
+    val isolation = NativeOverlayAccessibilityIsolation()
+    isolation.update(tree.root, tree.pageHost, listOf(tree.lower), tree.globalHost)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, tree.content.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, tree.chrome.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, tree.pageHost.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, tree.blocker.importantForAccessibility)
+  }
+
+  @Test
+  fun entriesAbovePageBlockerAndGlobalHostStayAccessible() {
+    val tree = Tree(context)
+    NativeOverlayAccessibilityIsolation().update(tree.root, tree.pageHost, listOf(tree.lower), tree.globalHost)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, tree.lower.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, tree.above.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, tree.globalHost.importantForAccessibility)
+  }
+
+  @Test
+  fun dismissalOrSuspensionRestoresOriginalFlags() {
+    val tree = Tree(context)
+    tree.lower.importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
+    val isolation = NativeOverlayAccessibilityIsolation()
+    isolation.update(tree.root, tree.pageHost, listOf(tree.lower), tree.globalHost)
+    isolation.update(tree.root, null, emptyList(), tree.globalHost)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_YES, tree.content.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO, tree.lower.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, tree.chrome.importantForAccessibility)
+  }
+
+  @Test
+  fun globalBlockerHidesReactRootThenPageIsolationReturns() {
+    val tree = Tree(context)
+    val globalLower = View(context)
+    tree.globalHost.addView(globalLower)
+    val isolation = NativeOverlayAccessibilityIsolation()
+    isolation.update(tree.root, tree.pageHost, listOf(tree.lower), tree.globalHost)
+    isolation.update(tree.root, tree.globalHost, listOf(globalLower), tree.globalHost)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, tree.reactRoot.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, globalLower.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_YES, tree.content.importantForAccessibility)
+    isolation.update(tree.root, tree.pageHost, listOf(tree.lower), tree.globalHost)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, tree.reactRoot.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, globalLower.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, tree.content.importantForAccessibility)
+  }
+
+  @Test
+  fun detachedHostRestoresIsolationInsteadOfHidingAnotherTree() {
+    val tree = Tree(context)
+    val isolation = NativeOverlayAccessibilityIsolation()
+    isolation.update(tree.root, tree.pageHost, listOf(tree.lower), tree.globalHost)
+    tree.card.removeView(tree.pageHost)
+    isolation.update(tree.root, tree.pageHost, listOf(tree.lower), tree.globalHost)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_YES, tree.content.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, tree.lower.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, tree.chrome.importantForAccessibility)
+  }
+
+  @Test
+  fun changingTheBlockingEntryRestoresEntriesNoLongerBelowIt() {
+    val tree = Tree(context)
+    val isolation = NativeOverlayAccessibilityIsolation()
+    isolation.update(tree.root, tree.pageHost, listOf(tree.lower, tree.blocker), tree.globalHost)
+    isolation.update(tree.root, tree.pageHost, listOf(tree.lower), tree.globalHost)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, tree.blocker.importantForAccessibility)
+    assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS, tree.lower.importantForAccessibility)
+  }
+}