react-native-morph-card 0.2.1 → 0.2.2

package/ios/Fabric/RNCMorphCardSourceComponentView.mm

@@ -442,22 +442,25 @@ static CGRect imageFrameForScaleMode(UIViewContentMode mode,
 
     UIView *content = wrapper.subviews.firstObject;
 
+    UICubicTimingParameters *timing = [[UICubicTimingParameters alloc]
+        initWithControlPoint1:CGPointMake(0.25, 1.0)
+                controlPoint2:CGPointMake(0.5, 1.0)];
     UIViewPropertyAnimator *animator = [[UIViewPropertyAnimator alloc]
         initWithDuration:dur
-            dampingRatio:0.85
-              animations:^{
-                wrapper.frame = self->_cardFrame;
-                wrapper.layer.cornerRadius = self->_cardCornerRadius;
-                if (content) {
-                  content.frame = (CGRect){CGPointZero, content.frame.size};
-                }
-              }];
+        timingParameters:timing];
+    [animator addAnimations:^{
+      wrapper.frame = self->_cardFrame;
+      wrapper.layer.cornerRadius = self->_cardCornerRadius;
+      if (content) {
+        content.frame = (CGRect){CGPointZero, content.frame.size};
+      }
+    }];
 
-    // Fade out target screen concurrently at 15% (mirrors expand's fade-in)
+    // Fade out target screen concurrently at 15%, over 65% of duration
     dispatch_after(
         dispatch_time(DISPATCH_TIME_NOW, (int64_t)(dur * 0.15 * NSEC_PER_SEC)),
         dispatch_get_main_queue(), ^{
-          [UIView animateWithDuration:dur * 0.5
+          [UIView animateWithDuration:dur * 0.65
               animations:^{
                 if (targetScreen) { targetScreen.alpha = 0; }
               }
@@ -521,20 +524,23 @@ static CGRect imageFrameForScaleMode(UIViewContentMode mode,
       sourceScreen.alpha = 1;
     }
 
+    UICubicTimingParameters *timing2 = [[UICubicTimingParameters alloc]
+        initWithControlPoint1:CGPointMake(0.25, 1.0)
+                controlPoint2:CGPointMake(0.5, 1.0)];
     UIViewPropertyAnimator *animator = [[UIViewPropertyAnimator alloc]
         initWithDuration:dur
-            dampingRatio:0.85
-              animations:^{
-                container.frame = self->_cardFrame;
-                container.layer.cornerRadius = self->_cardCornerRadius;
-                snapshot.frame = (CGRect){CGPointZero, self->_cardFrame.size};
-              }];
+        timingParameters:timing2];
+    [animator addAnimations:^{
+      container.frame = self->_cardFrame;
+      container.layer.cornerRadius = self->_cardCornerRadius;
+      snapshot.frame = (CGRect){CGPointZero, self->_cardFrame.size};
+    }];
 
-    // Fade out target screen concurrently at 15% (mirrors expand's fade-in)
+    // Fade out target screen concurrently at 15%, over 65% of duration
     dispatch_after(
         dispatch_time(DISPATCH_TIME_NOW, (int64_t)(dur * 0.15 * NSEC_PER_SEC)),
         dispatch_get_main_queue(), ^{
-          [UIView animateWithDuration:dur * 0.5
+          [UIView animateWithDuration:dur * 0.65
               animations:^{
                 if (targetScreen) { targetScreen.alpha = 0; }
               }

package/package.json

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