react-native-morph-card 0.1.0 → 0.1.1

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

@@ -14,6 +14,7 @@ import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewOutlineProvider
+import android.view.ViewTreeObserver
 import android.view.animation.PathInterpolator
 import android.widget.FrameLayout
 import android.widget.ImageView
@@ -54,6 +55,7 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
   private var targetScreenContainerRef: WeakReference<View>? = null
   private var screenStackRef: WeakReference<ViewGroup>? = null
   private var hierarchyListener: ViewGroup.OnHierarchyChangeListener? = null
+  private var preDrawListener: ViewTreeObserver.OnPreDrawListener? = null
 
   // Spring-like interpolator (approximates iOS dampingRatio:0.85)
   private val springInterpolator = PathInterpolator(0.25f, 1.0f, 0.5f, 1.0f)
@@ -222,10 +224,53 @@ 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.
+   */
+  private fun hideNewScreenContainers(root: ViewGroup, sourceScreen: 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}")
+            }
+          }
+        }
+      }
+      for (i in 0 until group.childCount) {
+        val child = group.getChildAt(i)
+        if (child is ViewGroup) walk(child)
+      }
+    }
+    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
+    }
+    return false
+  }
+
   private fun removeHierarchyListener() {
     screenStackRef?.get()?.setOnHierarchyChangeListener(null)
     screenStackRef = null
     hierarchyListener = null
+    preDrawListener?.let { listener ->
+      getDecorView()?.viewTreeObserver?.removeOnPreDrawListener(listener)
+      preDrawListener = null
+    }
   }
 
   // ══════════════════════════════════════════════════════════════
@@ -286,7 +331,7 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
         override fun onChildViewAdded(parent: View?, child: View?) {
           if (child != null && child !== sourceScreen) {
             child.visibility = View.INVISIBLE
-            Log.d(TAG, "prepareExpand: intercepted new screen, set INVISIBLE")
+            Log.d(TAG, "prepareExpand: hierarchy intercepted new screen, set INVISIBLE")
           }
         }
         override fun onChildViewRemoved(parent: View?, child: View?) {}
@@ -296,6 +341,17 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
       hierarchyListener = listener
     }
 
+    // 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 pdListener = ViewTreeObserver.OnPreDrawListener {
+      hideNewScreenContainers(decorView, savedSourceScreen)
+      true
+    }
+    decorView.viewTreeObserver.addOnPreDrawListener(pdListener)
+    preDrawListener = pdListener
+
     // Capture snapshot
     val cardImage = captureSnapshot()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-morph-card",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "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",