react-native-morph-card 0.1.15 → 0.2.0

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

@@ -738,7 +738,7 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
         this@MorphCardSourceView.alpha = 1f
 
         transferSnapshotToTarget(decorView, wrapper, targetView,
-          targetWidthPx, targetHeightPx, targetCornerRadiusPx, 200L)
+          targetWidthPx, targetHeightPx, targetCornerRadiusPx)
 
         promise.resolve(true)
       }
@@ -759,8 +759,7 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
     targetView: View?,
     targetWidthPx: Float,
     targetHeightPx: Float,
-    cornerRadius: Float,
-    fadeDuration: Long = 100
+    cornerRadius: Float
   ) {
     val target = targetView as? MorphCardTargetView
     if (target == null) {
@@ -803,19 +802,9 @@ class MorphCardSourceView(context: Context) : ReactViewGroup(context) {
       Log.d(TAG, "transferSnapshot: handed snapshot to MorphCardTargetView")
     }
 
-    val fadeOut = ValueAnimator.ofFloat(1f, 0f)
-    fadeOut.duration = fadeDuration
-    fadeOut.addUpdateListener { anim ->
-      overlay.alpha = anim.animatedValue as Float
-    }
-    fadeOut.addListener(object : android.animation.AnimatorListenerAdapter() {
-      override fun onAnimationEnd(animation: android.animation.Animator) {
-        decorView.removeView(overlay)
-        overlayContainer = null
-        Log.d(TAG, "transferSnapshot: overlay fade-out complete")
-      }
-    })
-    fadeOut.start()
+    decorView.removeView(overlay)
+    overlayContainer = null
+    Log.d(TAG, "transferSnapshot: overlay removed")
   }
 
   // ══════════════════════════════════════════════════════════════

package/ios/Fabric/RNCMorphCardSourceComponentView.mm

@@ -128,25 +128,54 @@ static CGRect imageFrameForScaleMode(UIViewContentMode mode,
 #pragma mark - Snapshot helper
 
 - (UIImage *)captureSnapshot {
-  // Render children directly into a fresh context so the snapshot
-  // captures full rectangular content without the source view's
-  // cornerRadius clipping. No on-screen flash since we never
-  // modify visible properties.
+  // Temporarily disable clipsToBounds + cornerRadius on all descendants so we
+  // capture full rectangular content (like iOS does for the source layer itself).
+  // This mirrors the Android fix that disables Fresco's RoundingParams.
+  NSMutableArray<NSDictionary *> *clippedViews = [NSMutableArray array];
+  __block void (^prepareView)(UIView *);
+  prepareView = ^(UIView *view) {
+    if (view.clipsToBounds && view.layer.cornerRadius > 0) {
+      [clippedViews addObject:@{
+        @"view": view,
+        @"radius": @(view.layer.cornerRadius)
+      }];
+      view.layer.cornerRadius = 0;
+      view.clipsToBounds = NO;
+    }
+    for (UIView *child in view.subviews) {
+      prepareView(child);
+    }
+  };
+  for (UIView *child in self.subviews) {
+    prepareView(child);
+  }
+
   UIGraphicsImageRendererFormat *format =
       [UIGraphicsImageRendererFormat defaultFormat];
   format.opaque = NO;
   CGSize size = self.bounds.size;
   UIGraphicsImageRenderer *renderer =
       [[UIGraphicsImageRenderer alloc] initWithSize:size format:format];
-  return [renderer imageWithActions:^(UIGraphicsImageRendererContext *ctx) {
-    for (UIView *child in self.subviews) {
-      CGContextSaveGState(ctx.CGContext);
-      CGContextTranslateCTM(ctx.CGContext, child.frame.origin.x, child.frame.origin.y);
-      [child drawViewHierarchyInRect:(CGRect){CGPointZero, child.frame.size}
-                  afterScreenUpdates:NO];
-      CGContextRestoreGState(ctx.CGContext);
-    }
-  }];
+  UIImage *image =
+      [renderer imageWithActions:^(UIGraphicsImageRendererContext *ctx) {
+        for (UIView *child in self.subviews) {
+          CGContextSaveGState(ctx.CGContext);
+          CGContextTranslateCTM(ctx.CGContext, child.frame.origin.x,
+                                child.frame.origin.y);
+          [child drawViewHierarchyInRect:(CGRect){CGPointZero, child.frame.size}
+                      afterScreenUpdates:NO];
+          CGContextRestoreGState(ctx.CGContext);
+        }
+      }];
+
+  // Restore clipping
+  for (NSDictionary *entry in clippedViews) {
+    UIView *view = entry[@"view"];
+    view.layer.cornerRadius = [entry[@"radius"] floatValue];
+    view.clipsToBounds = YES;
+  }
+
+  return image;
 }
 
 #pragma mark - Expand
@@ -258,9 +287,7 @@ static CGRect imageFrameForScaleMode(UIViewContentMode mode,
           UIView *ts = self->_targetScreenContainer;
           if (ts) {
             [UIView animateWithDuration:dur * 0.5
-                animations:^{
-                  ts.alpha = 1;
-                }
+                animations:^{ ts.alpha = 1; }
                 completion:nil];
           }
         });
@@ -284,14 +311,8 @@ static CGRect imageFrameForScaleMode(UIViewContentMode mode,
       self.alpha = 1;
       UIView *ts = self->_targetScreenContainer;
       if (ts) { ts.alpha = 1; }
-      [UIView animateWithDuration:0.2
-          animations:^{
-            wrapper.alpha = 0;
-          }
-          completion:^(BOOL finished) {
-            [wrapper removeFromSuperview];
-            self->_wrapperView = nil;
-          }];
+      [wrapper removeFromSuperview];
+      self->_wrapperView = nil;
       resolve(@(YES));
     }];
 
@@ -345,9 +366,7 @@ static CGRect imageFrameForScaleMode(UIViewContentMode mode,
           UIView *ts = self->_targetScreenContainer;
           if (ts) {
             [UIView animateWithDuration:dur * 0.5
-                animations:^{
-                  ts.alpha = 1;
-                }
+                animations:^{ ts.alpha = 1; }
                 completion:nil];
           }
         });
@@ -365,15 +384,9 @@ static CGRect imageFrameForScaleMode(UIViewContentMode mode,
       self.alpha = 1;
       UIView *ts = self->_targetScreenContainer;
       if (ts) { ts.alpha = 1; }
-      [UIView animateWithDuration:0.2
-          animations:^{
-            container.alpha = 0;
-          }
-          completion:^(BOOL finished) {
-            [container removeFromSuperview];
-            self->_wrapperView = nil;
-            self->_snapshot = nil;
-          }];
+      [container removeFromSuperview];
+      self->_wrapperView = nil;
+      self->_snapshot = nil;
       resolve(@(YES));
     }];
 

package/package.json

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