react-native-morph-card 0.1.6 → 0.1.8

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

@@ -384,7 +384,10 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
 
     // PixelCopy captures from the surface (hardware-rendered, preserves outlines).
     // We use a background HandlerThread for the callback to avoid deadlocking main.
-    val window = (context as? android.app.Activity)?.window
+    // Note: context may be ThemedReactContext, not Activity directly.
+    val activity = (context as? android.app.Activity)
+      ?: (context as? com.facebook.react.bridge.ReactContext)?.currentActivity
+    val window = activity?.window
     if (window != null) {
       val blockerBitmap = Bitmap.createBitmap(decorView.width, decorView.height, Bitmap.Config.ARGB_8888)
       val copyThread = android.os.HandlerThread("PixelCopyThread")
@@ -494,6 +497,18 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
     // Stop intercepting new screens — animation is taking over
     removeHierarchyListener()
 
+    // Remove the PixelCopy blocker bitmap — it was only needed to prevent the
+    // modal screen from flashing before it was hidden. Now that the target screen
+    // is INVISIBLE, the blocker would show a stale copy of the source card
+    // at the original position while the card wrapper animates away.
+    val blockerView = wrapper.findViewWithTag<FrameLayout>("morphCardWrapper")?.let { cardW ->
+      // The blocker is any child of the overlay that isn't the card wrapper
+      (0 until wrapper.childCount).map { wrapper.getChildAt(it) }.firstOrNull { it !== cardW }
+    }
+    if (blockerView != null) {
+      wrapper.removeView(blockerView)
+    }
+
     // Read target position (now settled after delay)
     val d = density
     val targetLoc = if (targetView != null) getLocationInWindow(targetView) else intArrayOf(cardLeft.toInt(), cardTop.toInt())
@@ -562,17 +577,11 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
     }
 
     // Crossfade: at 15% of animation, make target screen VISIBLE with alpha=0
-    // then fade alpha to 1 over 50% of duration. Also remove the blocker image.
+    // then fade alpha to 1 over 50% of duration.
     val targetScreen = targetScreenContainerRef?.get()
     val sourceScreen2 = sourceScreenContainerRef?.get()
-    // Find the blocker image (first child of the full-screen overlay, before the card wrapper)
-    val blockerView = if (wrapper.childCount > 1) wrapper.getChildAt(0) else null
     if (targetScreen != null && targetScreen !== sourceScreen2) {
       mainHandler.postDelayed({
-        // Remove blocker — source screen is visible underneath
-        if (blockerView != null && blockerView.tag != "morphCardWrapper") {
-          (blockerView.parent as? ViewGroup)?.removeView(blockerView)
-        }
         // Switch from INVISIBLE to VISIBLE but with alpha=0
         targetScreen.alpha = 0f
         targetScreen.visibility = View.VISIBLE

package/package.json

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