@onekeyfe/react-native-native-overlay 6.7.0-alpha.359 → 6.7.0-alpha.363

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

@@ -125,7 +125,11 @@ class NativeOverlayView(
 
   fun removeReactChild(child: View) {
     if (contentChild !== child) return
-    (child.parent as? ViewGroup)?.removeView(child)
+    (child.parent as? ViewGroup)?.let { previous ->
+      previous.removeOnLayoutChangeListener(contentLayoutListener)
+      previous.removeView(child)
+      previous.endViewTransition(child)
+    }
     contentChild = null
   }
 
@@ -417,6 +421,8 @@ class NativeOverlayView(
     (child.parent as? ViewGroup)?.let { previous ->
       previous.removeOnLayoutChangeListener(contentLayoutListener)
       previous.removeView(child)
+      // Android retains a transitioning child's parent until the transition ends.
+      previous.endViewTransition(child)
     }
     container.addView(child)
     container.addOnLayoutChangeListener(contentLayoutListener)

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

@@ -1,8 +1,10 @@
 package com.onekey.nativeoverlay
 
+import android.animation.ValueAnimator
 import android.graphics.Color
 import android.os.Looper
 import android.view.View
+import android.view.ViewGroup
 import androidx.activity.ComponentActivity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import com.facebook.react.bridge.BridgeReactContext
@@ -11,6 +13,7 @@ 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.assertNull
 import org.junit.Assert.assertSame
 import org.junit.Assert.assertTrue
 import org.junit.Test
@@ -67,10 +70,11 @@ class NativeOverlayMotionTest {
     val reactContext = BridgeReactContext(activity)
     reactContext.onHostResume(activity)
     val context = ThemedReactContext(reactContext, activity, "OverlayMotionTest", 1)
+    val child = View(context)
     val overlay = NativeOverlayView(context).apply {
       presentation = "sheet"
       sheetHeight = 200.0
-      addReactChild(View(context))
+      addReactChild(child)
     }
     activity.setContentView(overlay)
     var dismissals = 0
@@ -80,13 +84,24 @@ class NativeOverlayMotionTest {
 
     val entryField = NativeOverlayView::class.java.getDeclaredField("entry").apply { isAccessible = true }
     val original = entryField.get(overlay) as NativeOverlayEntryRootView
+    Shadows.shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(350))
     overlay.visible = false
     overlay.commitConfiguration()
     assertTrue(original.isClosing)
+    val animatorField = NativeOverlayView::class.java.getDeclaredField("contentAnimator").apply { isAccessible = true }
+    val exitAnimator = animatorField.get(overlay) as ValueAnimator
+    assertTrue(exitAnimator.isStarted)
+    assertEquals(292L, exitAnimator.duration)
+    exitAnimator.currentPlayTime = exitAnimator.duration / 3
+    val alphaBeforeReopen = original.animatedView.alpha
+    assertTrue(alphaBeforeReopen > 0f && alphaBeforeReopen < 1f)
+    assertTrue(original.isClosing)
 
     overlay.visible = true
     overlay.commitConfiguration()
     assertSame(original, entryField.get(overlay))
+    assertSame(child, original.contentView.getChildAt(0))
+    assertEquals(alphaBeforeReopen, original.animatedView.alpha, 0.01f)
     assertTrue(original.isShownForInput)
     assertFalse(original.isClosing)
     assertEquals(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO, original.contentView.importantForAccessibility)
@@ -98,4 +113,125 @@ class NativeOverlayMotionTest {
     Shadows.shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(350))
     assertEquals(1, dismissals)
   }
+
+  @Test
+  fun finishingExitMovesTransitioningContentBackToStagingView() {
+    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 child = View(context)
+    val overlay = NativeOverlayView(context).apply {
+      addReactChild(child)
+    }
+    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 entry = entryField.get(overlay) as NativeOverlayEntryRootView
+    Shadows.shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(350))
+
+    entry.contentView.startViewTransition(child)
+    overlay.visible = false
+    overlay.commitConfiguration()
+    Shadows.shadowOf(Looper.getMainLooper()).idleFor(Duration.ofMillis(350))
+    assertSame(overlay, child.parent)
+    assertEquals(0, entry.contentView.childCount)
+    assertEquals(1, overlay.childCount)
+    assertSame(child, overlay.getChildAt(0))
+    entry.contentView.endViewTransition(child)
+    assertSame(overlay, child.parent)
+    assertEquals(1, dismissals)
+  }
+
+  @Test
+  fun presentingMovesTransitioningContentIntoEntry() {
+    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 child = View(context)
+    val overlay = NativeOverlayView(context).apply {
+      addReactChild(child)
+    }
+    activity.setContentView(overlay)
+
+    overlay.startViewTransition(child)
+    overlay.visible = true
+    overlay.commitConfiguration()
+
+    val entryField = NativeOverlayView::class.java.getDeclaredField("entry").apply { isAccessible = true }
+    val entry = entryField.get(overlay) as NativeOverlayEntryRootView
+    assertSame(entry.contentView, child.parent)
+    assertEquals(0, overlay.childCount)
+    assertEquals(1, entry.contentView.childCount)
+    assertSame(child, entry.contentView.getChildAt(0))
+    overlay.endViewTransition(child)
+    assertSame(entry.contentView, child.parent)
+  }
+
+  @Test
+  fun removingTransitioningStagedContentReleasesItsParentAndLayoutListener() {
+    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 child = View(context)
+    val overlay = NativeOverlayView(context).apply { addReactChild(child) }
+    activity.setContentView(overlay)
+
+    overlay.startViewTransition(child)
+    overlay.removeReactChild(child)
+
+    assertNull(child.parent)
+    assertEquals(0, overlay.childCount)
+    assertEquals(0, overlay.getReactChildCount())
+    assertNoContentLayoutListener(overlay, overlay)
+    overlay.endViewTransition(child)
+    assertNull(child.parent)
+  }
+
+  @Test
+  fun replacingTransitioningPresentedContentReleasesTheRemovedChild() {
+    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 child = View(context)
+    val overlay = NativeOverlayView(context).apply { addReactChild(child) }
+    activity.setContentView(overlay)
+    overlay.visible = true
+    overlay.commitConfiguration()
+    val container = child.parent as ViewGroup
+    container.startViewTransition(child)
+
+    val replacement = View(context)
+    overlay.addReactChild(replacement)
+
+    assertNull(child.parent)
+    assertSame(replacement, overlay.getReactChildAt(0))
+    assertSame(container, replacement.parent)
+    assertEquals(1, container.childCount)
+    container.endViewTransition(child)
+    assertSame(container, replacement.parent)
+
+    overlay.removeReactChild(replacement)
+    assertNoContentLayoutListener(container, overlay)
+  }
+
+  private fun assertNoContentLayoutListener(container: View, overlay: NativeOverlayView) {
+    val listener = NativeOverlayView::class.java.getDeclaredField("contentLayoutListener").apply {
+      isAccessible = true
+    }.get(overlay)
+    val listenerInfo = View::class.java.getDeclaredField("mListenerInfo").apply {
+      isAccessible = true
+    }.get(container) ?: return
+    val layoutListeners = listenerInfo.javaClass.getDeclaredField("mOnLayoutChangeListeners").apply {
+      isAccessible = true
+    }.get(listenerInfo) as? Collection<*>
+    assertFalse(layoutListeners?.contains(listener) == true)
+  }
 }

package/docs/SPEC.md

@@ -232,6 +232,15 @@ request ─► queued ─► active ─► (enter anim) presented
 - Content stays mounted until `finalize`. This replaces today's hardcoded
   timers: the Dialog 300 ms portal destroy, the ColorPicker 300 ms, the
   ActionList and Select 150 ms waits, and the DialogLoading 50 ms delays.
+- On Android, moving the same React child between its hidden staging view and
+  the entry host must release an in-progress transition held by the previous
+  parent before the new parent adds it. Completing that previous transition
+  later must not detach the child from its new parent. Animated closing moves
+  the child back after exit completion; reopening during exit keeps the same
+  child and entry without reporting a completed dismissal. Fabric removal or
+  replacement of the React child must also release the old container's layout
+  listener and in-progress transition, leaving the removed child without a
+  parent; a later transition completion must not affect replacement content.
 - A queued entry is promoted only after the previous entry in its lane is
   finalized, so exit and enter never overlap. `replace` is the exception: the
   new entry enters while the replaced one exits.
@@ -407,6 +416,11 @@ Automated (P0):
   blockers, input readiness, canceled key-up, global/page precedence,
   suspension and blocking-only accessibility isolation. It also checks live
   host reuse, Activity isolation and rebuilding after a cleared weak value.
+- `NativeOverlayMotionTest` exercises the production Android view's transition
+  reparenting in both directions, including the exit-completion staging path,
+  old-parent transition completion after the move, and reopen during exit.
+  It also covers Fabric removal of staged content and replacement of presented
+  content during a transition, including layout-listener cleanup.
 - `src/__tests__/pageIsolation.web.test.ts` mounts a real React portal in a
   DOM host and verifies late suspension, level ordering and restoration after
   the blocking entry is removed.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-native-overlay",
-  "version": "6.7.0-alpha.359",
+  "version": "6.7.0-alpha.363",
   "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",