react-native-morph-card 0.1.14 → 0.1.15

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

@@ -114,55 +114,86 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
     val bitmap = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
     val canvas = Canvas(bitmap)
 
-    // Track state to restore: (view, hadClipToOutline, savedRoundingParams)
-    data class ViewState(val view: View, val hadClip: Boolean, val roundingParams: Any?)
-    val savedStates = mutableListOf<ViewState>()
+    // Track Fresco views to restore rounding after capture
+    data class FrescoState(val view: View, val hierarchy: Any, val roundingParams: Any)
+    val frescoStates = mutableListOf<FrescoState>()
+    // Track views whose clipToOutline was disabled
+    val clippedViews = mutableListOf<View>()
 
-    fun disableClipping(view: View) {
-      val hadClip = view.clipToOutline
-      var savedRounding: Any? = null
-
-      Log.d(TAG, "captureSnapshot: visiting ${view.javaClass.name} clipToOutline=$hadClip size=${view.width}x${view.height}")
+    // Map of Fresco views to their hierarchy (for drawing drawable directly)
+    val frescoViews = mutableMapOf<View, Any>()
 
+    fun prepareView(view: View) {
       // Disable outline clipping
-      if (hadClip) {
+      if (view.clipToOutline) {
+        clippedViews.add(view)
         view.clipToOutline = false
       }
 
-      // Disable Fresco RoundingParams on DraweeView (React Native Image components).
-      // Uses reflection to avoid a compile-time dependency on Fresco.
+      // Detect Fresco DraweeView and disable rounding
       try {
         val getHierarchy = view.javaClass.getMethod("getHierarchy")
         val hierarchy = getHierarchy.invoke(view)
         if (hierarchy != null) {
-          Log.d(TAG, "captureSnapshot: found hierarchy ${hierarchy.javaClass.name}")
           val getRounding = hierarchy.javaClass.getMethod("getRoundingParams")
-          savedRounding = getRounding.invoke(hierarchy)
-          Log.d(TAG, "captureSnapshot: roundingParams=$savedRounding")
-          if (savedRounding != null) {
+          val rounding = getRounding.invoke(hierarchy)
+          if (rounding != null) {
             val roundingClass = Class.forName("com.facebook.drawee.generic.RoundingParams")
             val setRounding = hierarchy.javaClass.getMethod("setRoundingParams", roundingClass)
             setRounding.invoke(hierarchy, null)
-            Log.d(TAG, "captureSnapshot: disabled Fresco rounding")
+            frescoStates.add(FrescoState(view, hierarchy, rounding))
+            frescoViews[view] = hierarchy
+            Log.d(TAG, "captureSnapshot: disabled Fresco rounding on ${view.width}x${view.height}")
           }
         }
-      } catch (e: Exception) {
-        Log.d(TAG, "captureSnapshot: reflection skip for ${view.javaClass.simpleName}: ${e.javaClass.simpleName}")
-      }
-
-      if (hadClip || savedRounding != null) {
-        savedStates.add(ViewState(view, hadClip, savedRounding))
-      }
+      } catch (_: Exception) {}
 
       if (view is ViewGroup) {
         for (i in 0 until view.childCount) {
-          disableClipping(view.getChildAt(i))
+          prepareView(view.getChildAt(i))
         }
       }
     }
 
     for (i in 0 until childCount) {
-      disableClipping(getChildAt(i))
+      prepareView(getChildAt(i))
+    }
+
+    // Draw children. For Fresco views, draw the top-level drawable directly
+    // (since the internal drawable is rebuilt when roundingParams changes).
+    fun drawView(view: View, c: Canvas) {
+      val hierarchy = frescoViews[view]
+      if (hierarchy != null) {
+        try {
+          val getTopDrawable = hierarchy.javaClass.getMethod("getTopLevelDrawable")
+          val drawable = getTopDrawable.invoke(hierarchy) as? android.graphics.drawable.Drawable
+          if (drawable != null) {
+            drawable.setBounds(0, 0, view.width, view.height)
+            drawable.invalidateSelf()
+            drawable.draw(c)
+            Log.d(TAG, "captureSnapshot: drew Fresco drawable directly ${view.width}x${view.height}")
+            return
+          }
+        } catch (_: Exception) {}
+      }
+
+      if (view is ViewGroup) {
+        // Draw background
+        view.background?.let { bg ->
+          bg.setBounds(0, 0, view.width, view.height)
+          bg.draw(c)
+        }
+        for (i in 0 until view.childCount) {
+          val child = view.getChildAt(i)
+          if (child.visibility != VISIBLE) continue
+          c.save()
+          c.translate(child.left.toFloat(), child.top.toFloat())
+          drawView(child, c)
+          c.restore()
+        }
+      } else {
+        view.draw(c)
+      }
     }
 
     for (i in 0 until childCount) {
@@ -170,26 +201,21 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
       if (child.visibility != VISIBLE) continue
       canvas.save()
       canvas.translate(child.left.toFloat(), child.top.toFloat())
-      child.draw(canvas)
+      drawView(child, canvas)
       canvas.restore()
     }
 
-    // Restore all view states
-    for (state in savedStates) {
-      if (state.hadClip) {
-        state.view.clipToOutline = true
-      }
-      if (state.roundingParams != null) {
-        try {
-          val getHierarchy = state.view.javaClass.getMethod("getHierarchy")
-          val hierarchy = getHierarchy.invoke(state.view)
-          if (hierarchy != null) {
-            val roundingClass = Class.forName("com.facebook.drawee.generic.RoundingParams")
-            val setRounding = hierarchy.javaClass.getMethod("setRoundingParams", roundingClass)
-            setRounding.invoke(hierarchy, state.roundingParams)
-          }
-        } catch (_: Exception) {}
-      }
+    // Restore clipToOutline
+    for (view in clippedViews) {
+      view.clipToOutline = true
+    }
+    // Restore Fresco rounding params
+    for (state in frescoStates) {
+      try {
+        val roundingClass = Class.forName("com.facebook.drawee.generic.RoundingParams")
+        val setRounding = state.hierarchy.javaClass.getMethod("setRoundingParams", roundingClass)
+        setRounding.invoke(state.hierarchy, state.roundingParams)
+      } catch (_: Exception) {}
     }
 
     return bitmap

package/package.json

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