react-native-morph-card 0.1.1 → 0.1.2

package/android/src/main/java/com/melivalesca/morphcard/MorphCardSourceView.kt

@@ -225,23 +225,18 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
   }
 
   /**
-   * Walk the view tree and hide any screen container that isn't the source screen.
-   * This catches modal screens added to separate ScreenStacks.
+   * Walk the view tree and hide any screen container that isn't already known.
+   * This catches modal screens added to separate ScreenStacks (e.g. transparentModal).
    */
-  private fun hideNewScreenContainers(root: ViewGroup, sourceScreen: View?) {
+  private fun hideNewScreenContainers(root: ViewGroup, knownScreens: Set<View>) {
     fun walk(group: ViewGroup) {
       val name = group.javaClass.name
       if (name.contains("ScreenStack") || name.contains("ScreenContainer")) {
         for (i in 0 until group.childCount) {
           val child = group.getChildAt(i)
-          if (child !== sourceScreen && child.visibility == View.VISIBLE) {
-            // Check if this is a screen container we haven't seen before
-            val childScreen = child
-            val isSourceAncestor = isAncestorOf(childScreen, sourceScreen)
-            if (!isSourceAncestor) {
-              childScreen.visibility = View.INVISIBLE
-              Log.d(TAG, "preDraw: hid screen container ${childScreen.javaClass.simpleName}")
-            }
+          if (!knownScreens.contains(child) && child.visibility == View.VISIBLE) {
+            child.visibility = View.INVISIBLE
+            Log.d(TAG, "preDraw: hid new screen ${child.javaClass.simpleName} in ${group.javaClass.simpleName}")
           }
         }
       }
@@ -253,14 +248,25 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
     walk(root)
   }
 
-  private fun isAncestorOf(potentialAncestor: View, target: View?): Boolean {
-    if (target == null) return false
-    var current: View? = target
-    while (current != null) {
-      if (current === potentialAncestor) return true
-      current = if (current.parent is View) current.parent as View else null
+  /**
+   * Collect all current children of ScreenStack/ScreenContainer views.
+   */
+  private fun collectExistingScreens(root: ViewGroup): Set<View> {
+    val screens = mutableSetOf<View>()
+    fun walk(group: ViewGroup) {
+      val name = group.javaClass.name
+      if (name.contains("ScreenStack") || name.contains("ScreenContainer")) {
+        for (i in 0 until group.childCount) {
+          screens.add(group.getChildAt(i))
+        }
+      }
+      for (i in 0 until group.childCount) {
+        val child = group.getChildAt(i)
+        if (child is ViewGroup) walk(child)
+      }
     }
-    return false
+    walk(root)
+    return screens
   }
 
   private fun removeHierarchyListener() {
@@ -344,9 +350,10 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
     // Also install a pre-draw listener on the DecorView to catch modal screens
     // that are added to a different ScreenStack (e.g. transparentModal).
     // This fires before every frame draw, so we can hide screens before they render.
-    val savedSourceScreen = sourceScreen
+    val knownScreens = collectExistingScreens(decorView)
+    Log.d(TAG, "prepareExpand: tracking ${knownScreens.size} existing screens")
     val pdListener = ViewTreeObserver.OnPreDrawListener {
-      hideNewScreenContainers(decorView, savedSourceScreen)
+      hideNewScreenContainers(decorView, knownScreens)
       true
     }
     decorView.viewTreeObserver.addOnPreDrawListener(pdListener)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-morph-card",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Native card-to-modal morph transition for React Native. iOS App Store-style expand animation.",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",