react-native-reanimated 2.3.3 → 2.5.0

package/src/reanimated2/layoutReanimation/defaultAnimations/Zoom.ts

@@ -14,7 +14,8 @@ const { width, height } = Dimensions.get('window');
 
 export class ZoomIn
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomIn {
     return new ZoomIn();
   }
@@ -24,6 +25,7 @@ export class ZoomIn
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -33,6 +35,7 @@ export class ZoomIn
         },
         initialValues: {
           transform: [{ scale: 0 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -42,7 +45,8 @@ export class ZoomIn
 
 export class ZoomInRotate
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomInRotate {
     return new ZoomInRotate();
   }
@@ -53,6 +57,7 @@ export class ZoomInRotate
     const delay = this.getDelay();
     const rotate = this.rotateV ? this.rotateV : '0.3';
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -65,6 +70,7 @@ export class ZoomInRotate
         },
         initialValues: {
           transform: [{ scale: 0 }, { rotate: rotate }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -74,7 +80,8 @@ export class ZoomInRotate
 
 export class ZoomInLeft
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomInLeft {
     return new ZoomInLeft();
   }
@@ -84,6 +91,7 @@ export class ZoomInLeft
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -96,6 +104,7 @@ export class ZoomInLeft
         },
         initialValues: {
           transform: [{ translateX: -width }, { scale: 0 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -105,7 +114,8 @@ export class ZoomInLeft
 
 export class ZoomInRight
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomInRight {
     return new ZoomInRight();
   }
@@ -115,6 +125,7 @@ export class ZoomInRight
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -127,6 +138,7 @@ export class ZoomInRight
         },
         initialValues: {
           transform: [{ translateX: width }, { scale: 0 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -136,7 +148,8 @@ export class ZoomInRight
 
 export class ZoomInUp
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomInUp {
     return new ZoomInUp();
   }
@@ -146,6 +159,7 @@ export class ZoomInUp
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -158,6 +172,7 @@ export class ZoomInUp
         },
         initialValues: {
           transform: [{ translateY: -height }, { scale: 0 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -167,7 +182,8 @@ export class ZoomInUp
 
 export class ZoomInDown
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomInDown {
     return new ZoomInDown();
   }
@@ -177,6 +193,7 @@ export class ZoomInDown
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -189,6 +206,7 @@ export class ZoomInDown
         },
         initialValues: {
           transform: [{ translateY: height }, { scale: 0 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -198,7 +216,8 @@ export class ZoomInDown
 
 export class ZoomInEasyUp
   extends ComplexAnimationBuilder
-  implements IEntryAnimationBuilder {
+  implements IEntryAnimationBuilder
+{
   static createInstance(): ZoomInEasyUp {
     return new ZoomInEasyUp();
   }
@@ -208,6 +227,7 @@ export class ZoomInEasyUp
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return (values) => {
       'worklet';
@@ -220,6 +240,7 @@ export class ZoomInEasyUp
         },
         initialValues: {
           transform: [{ translateY: -values.targetHeight }, { scale: 0 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -229,7 +250,8 @@ export class ZoomInEasyUp
 
 export class ZoomInEasyDown
   extends ComplexAnimationBuilder
-  implements IEntryAnimationBuilder {
+  implements IEntryAnimationBuilder
+{
   static createInstance(): ZoomInEasyDown {
     return new ZoomInEasyDown();
   }
@@ -239,6 +261,7 @@ export class ZoomInEasyDown
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return (values) => {
       'worklet';
@@ -251,6 +274,7 @@ export class ZoomInEasyDown
         },
         initialValues: {
           transform: [{ translateY: values.targetHeight }, { scale: 0 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -260,7 +284,8 @@ export class ZoomInEasyDown
 
 export class ZoomOut
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomOut {
     return new ZoomOut();
   }
@@ -270,6 +295,7 @@ export class ZoomOut
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -279,6 +305,7 @@ export class ZoomOut
         },
         initialValues: {
           transform: [{ scale: 1 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -288,7 +315,8 @@ export class ZoomOut
 
 export class ZoomOutRotate
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomOutRotate {
     return new ZoomOutRotate();
   }
@@ -299,6 +327,7 @@ export class ZoomOutRotate
     const delay = this.getDelay();
     const rotate = this.rotateV ? this.rotateV : '0.3';
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -311,6 +340,7 @@ export class ZoomOutRotate
         },
         initialValues: {
           transform: [{ scale: 1 }, { rotate: '0' }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -320,7 +350,8 @@ export class ZoomOutRotate
 
 export class ZoomOutLeft
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomOutLeft {
     return new ZoomOutLeft();
   }
@@ -330,6 +361,7 @@ export class ZoomOutLeft
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -342,6 +374,7 @@ export class ZoomOutLeft
         },
         initialValues: {
           transform: [{ translateX: 0 }, { scale: 1 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -351,7 +384,8 @@ export class ZoomOutLeft
 
 export class ZoomOutRight
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomOutRight {
     return new ZoomOutRight();
   }
@@ -361,6 +395,7 @@ export class ZoomOutRight
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -373,6 +408,7 @@ export class ZoomOutRight
         },
         initialValues: {
           transform: [{ translateX: 0 }, { scale: 1 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -382,7 +418,8 @@ export class ZoomOutRight
 
 export class ZoomOutUp
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomOutUp {
     return new ZoomOutUp();
   }
@@ -392,6 +429,7 @@ export class ZoomOutUp
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -404,6 +442,7 @@ export class ZoomOutUp
         },
         initialValues: {
           transform: [{ translateY: 0 }, { scale: 1 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -413,7 +452,8 @@ export class ZoomOutUp
 
 export class ZoomOutDown
   extends ComplexAnimationBuilder
-  implements IEntryExitAnimationBuilder {
+  implements IEntryExitAnimationBuilder
+{
   static createInstance(): ZoomOutDown {
     return new ZoomOutDown();
   }
@@ -423,6 +463,7 @@ export class ZoomOutDown
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return () => {
       'worklet';
@@ -435,6 +476,7 @@ export class ZoomOutDown
         },
         initialValues: {
           transform: [{ translateY: 0 }, { scale: 1 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -444,7 +486,8 @@ export class ZoomOutDown
 
 export class ZoomOutEasyUp
   extends ComplexAnimationBuilder
-  implements IExitAnimationBuilder {
+  implements IExitAnimationBuilder
+{
   static createInstance(): ZoomOutEasyUp {
     return new ZoomOutEasyUp();
   }
@@ -454,6 +497,7 @@ export class ZoomOutEasyUp
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return (values) => {
       'worklet';
@@ -471,6 +515,7 @@ export class ZoomOutEasyUp
         },
         initialValues: {
           transform: [{ translateY: 0 }, { scale: 1 }],
+          ...initialValues,
         },
         callback: callback,
       };
@@ -480,7 +525,8 @@ export class ZoomOutEasyUp
 
 export class ZoomOutEasyDown
   extends ComplexAnimationBuilder
-  implements IExitAnimationBuilder {
+  implements IExitAnimationBuilder
+{
   static createInstance(): ZoomOutEasyDown {
     return new ZoomOutEasyDown();
   }
@@ -490,6 +536,7 @@ export class ZoomOutEasyDown
     const [animation, config] = this.getAnimationAndConfig();
     const delay = this.getDelay();
     const callback = this.callbackV;
+    const initialValues = this.initialValues;
 
     return (values) => {
       'worklet';
@@ -507,6 +554,7 @@ export class ZoomOutEasyDown
         },
         initialValues: {
           transform: [{ translateY: 0 }, { scale: 1 }],
+          ...initialValues,
         },
         callback: callback,
       };

package/src/reanimated2/layoutReanimation/defaultTransitions/CurvedTransition.ts

@@ -8,7 +8,8 @@ import { withTiming } from '../../animation';
 
 export class CurvedTransition
   extends BaseAnimationBuilder
-  implements ILayoutAnimationBuilder {
+  implements ILayoutAnimationBuilder
+{
   easingXV: EasingFn = Easing.in(Easing.ease);
   easingYV: EasingFn = Easing.out(Easing.ease);
   easingWidthV: EasingFn = Easing.in(Easing.exp);

package/src/reanimated2/layoutReanimation/defaultTransitions/EntryExitTransition.ts

@@ -4,13 +4,18 @@ import {
   LayoutAnimationFunction,
 } from '../animationBuilder/commonTypes';
 import { BaseAnimationBuilder } from '../animationBuilder';
-import { AnimationObject, withSequence, withTiming } from '../../animation';
+import { withSequence, withTiming } from '../../animation';
 import { FadeIn, FadeOut } from '../defaultAnimations/Fade';
-import { StyleProps, TransformProperty } from '../../commonTypes';
+import {
+  StyleProps,
+  TransformProperty,
+  AnimationObject,
+} from '../../commonTypes';
 
 export class EntryExitTransition
   extends BaseAnimationBuilder
-  implements ILayoutAnimationBuilder {
+  implements ILayoutAnimationBuilder
+{
   enteringV: BaseAnimationBuilder | typeof BaseAnimationBuilder = FadeIn;
 
   exitingV: BaseAnimationBuilder | typeof BaseAnimationBuilder = FadeOut;
@@ -148,24 +153,30 @@ export class EntryExitTransition
         exitingValues.initialValues.transform ?? []
       ).concat(
         (enteringValues.animations.transform ?? []).map((value) => {
-          for (const transformProp of Object.keys(value)) {
-            const current = (value[
-              transformProp as keyof TransformProperty
-            ] as AnimationObject).current;
-            if (typeof current === 'string') {
-              if (current.includes('deg'))
-                return ({
-                  [transformProp]: '0deg',
-                } as unknown) as TransformProperty;
-              else
-                return ({
-                  [transformProp]: '0',
-                } as unknown) as TransformProperty;
-            } else if (transformProp.includes('translate')) {
-              return ({ [transformProp]: 0 } as unknown) as TransformProperty;
-            } else {
-              return ({ [transformProp]: 1 } as unknown) as TransformProperty;
-            }
+          const objectKeys = Object.keys(value);
+          if (objectKeys?.length < 1) {
+            console.error(
+              `[Reanimated]: \${value} is not a valid Transform object`
+            );
+            return value;
+          }
+          const transformProp = objectKeys[0];
+          const current = (
+            value[transformProp as keyof TransformProperty] as AnimationObject
+          ).current;
+          if (typeof current === 'string') {
+            if (current.includes('deg'))
+              return {
+                [transformProp]: '0deg',
+              } as unknown as TransformProperty;
+            else
+              return {
+                [transformProp]: '0',
+              } as unknown as TransformProperty;
+          } else if (transformProp.includes('translate')) {
+            return { [transformProp]: 0 } as unknown as TransformProperty;
+          } else {
+            return { [transformProp]: 1 } as unknown as TransformProperty;
           }
           return value;
         })

package/src/reanimated2/layoutReanimation/defaultTransitions/FadingTransition.ts

@@ -7,7 +7,8 @@ import { BaseAnimationBuilder } from '../animationBuilder';
 
 export class FadingTransition
   extends BaseAnimationBuilder
-  implements ILayoutAnimationBuilder {
+  implements ILayoutAnimationBuilder
+{
   static createInstance(): FadingTransition {
     return new FadingTransition();
   }

package/src/reanimated2/layoutReanimation/defaultTransitions/JumpingTransition.ts

@@ -7,7 +7,8 @@ import { Easing } from '../../Easing';
 import { BaseAnimationBuilder } from '../animationBuilder';
 export class JumpingTransition
   extends BaseAnimationBuilder
-  implements ILayoutAnimationBuilder {
+  implements ILayoutAnimationBuilder
+{
   static createInstance(): JumpingTransition {
     return new JumpingTransition();
   }

package/src/reanimated2/layoutReanimation/defaultTransitions/LinearTransition.ts

@@ -6,7 +6,8 @@ import {
 
 export class LinearTransition
   extends ComplexAnimationBuilder
-  implements ILayoutAnimationBuilder {
+  implements ILayoutAnimationBuilder
+{
   static createInstance(): LinearTransition {
     return new LinearTransition();
   }

package/src/reanimated2/layoutReanimation/defaultTransitions/SequencedTransition.ts

@@ -7,7 +7,8 @@ import { BaseAnimationBuilder } from '../animationBuilder';
 
 export class SequencedTransition
   extends BaseAnimationBuilder
-  implements ILayoutAnimationBuilder {
+  implements ILayoutAnimationBuilder
+{
   reversed = false;
 
   static createInstance(): SequencedTransition {

package/src/reanimated2/mock.ts

@@ -1,4 +1,4 @@
-/* eslint-disable standard/no-callback-literal */
+/* eslint-disable node/no-callback-literal */
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-nocheck
 const NOOP = () => {
@@ -59,7 +59,8 @@ const ReanimatedV2 = {
     elastic: ID,
     back: ID,
     bounce: ID,
-    bezier: ID,
+    bezier: () => ({ factory: ID }),
+    bezierFn: ID,
     in: ID,
     out: ID,
     inOut: ID,

package/src/reanimated2/utils.ts

@@ -1,6 +1,6 @@
 import { Component } from 'react';
 import { measure } from './NativeMethods';
-import { RefObjectFunction } from './hook/useAnimatedRef';
+import { RefObjectFunction } from './hook/commonTypes';
 
 export interface ComponentCoords {
   x: number;

package/android/src/main/java/com/swmansion/reanimated/ReanimatedProxyPackage.java

@@ -1,15 +0,0 @@
-package com.swmansion.reanimated;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-
-import java.util.Arrays;
-import java.util.List;
-
-import com.swmansion.reanimated.ReanimatedPackage;
-
-public class ReanimatedPackage implements ReactPackage {
-  // dummy package
-}