react-native-reanimated 3.0.0-rc.4 → 3.0.0-rc.6

package/src/reanimated2/jestUtils.ts

@@ -188,13 +188,21 @@ export const advanceAnimationByFrame = (count) => {
 };
 
 export const setUpTests = (userConfig = {}) => {
-  let expect;
-  try {
-    expect = require('expect');
-  } catch (_) {
-    // for Jest in version 28+
-    const { expect: expectModule } = require('@jest/globals');
+  let expect = global.expect;
+  if (expect === undefined) {
+    const expectModule = require('expect');
     expect = expectModule;
+    // Starting from Jest 28, "expect" package uses named exports instead of default export.
+    // So, requiring "expect" package doesn't give direct access to "expect" function anymore.
+    // It gives access to the module object instead.
+    // We use this info to detect if the project uses Jest 28 or higher.
+    if (typeof expect === 'object') {
+      const jestGlobals = require('@jest/globals');
+      expect = jestGlobals.expect;
+    }
+    if (expect === undefined || expect.extend === undefined) {
+      expect = expectModule.default;
+    }
   }
 
   require('setimmediate');

package/src/reanimated2/layoutReanimation/LayoutAnimationRepository.ts

@@ -1,75 +1,49 @@
 /* global _stopObservingProgress, _startObservingProgress */
 import { runOnUI } from '../core';
 import { withStyleAnimation } from '../animation/styleAnimation';
-import { ColorProperties } from '../UpdateProps';
-import { processColor } from '../Colors';
+import { LogBox } from 'react-native';
+
+LogBox.ignoreLogs(['Overriding previous layout animation with']);
 
 runOnUI(() => {
   'worklet';
 
-  const configs: Record<string, any> = Object.create(null);
   const enteringAnimationForTag: Record<string, any> = {};
 
   global.LayoutAnimationRepository = {
-    configs,
-    registerConfig(tag, config) {
-      configs[tag] = config;
-      enteringAnimationForTag[tag] = null;
-    },
-    removeConfig(tag) {
-      delete configs[tag];
-      delete enteringAnimationForTag[tag];
-    },
-    startAnimationForTag(tag, type, yogaValues) {
-      if (configs[tag] == null) {
-        return; // :(
-      }
-      const style = configs[tag][type](yogaValues);
+    startAnimationForTag(tag, type, yogaValues, config, viewSharedValue) {
+      const style = config(yogaValues);
       let currentAnimation = style.animations;
-      if (type === 'entering') {
-        enteringAnimationForTag[tag] = style;
-      } else if (type === 'layout' && enteringAnimationForTag[tag] !== null) {
-        const entryAniamtion = enteringAnimationForTag[tag].animations;
-        const layoutAnimation = style.animations;
-        currentAnimation = {};
-        for (const key in entryAniamtion) {
-          currentAnimation[key] = entryAniamtion[key];
-        }
-        for (const key in layoutAnimation) {
-          currentAnimation[key] = layoutAnimation[key];
-        }
-      }
-
-      const sv: { value: boolean; _value: boolean } = configs[tag].sv;
-      _stopObservingProgress(tag, false);
-      _startObservingProgress(tag, sv);
 
-      const backupColor: Record<string, string> = {};
-      for (const key in style.initialValues) {
-        if (ColorProperties.includes(key)) {
-          const value = style.initialValues[key];
-          backupColor[key] = value;
-          style.initialValues[key] = processColor(value);
+      if (type === 'entering') {
+        enteringAnimationForTag[tag] = currentAnimation;
+      } else if (type === 'layout') {
+        // When layout animation is requested, but entering is still running, we merge
+        // new layout animation targets into the ongoing animation
+        const enteringAnimation = enteringAnimationForTag[tag];
+        if (enteringAnimation) {
+          currentAnimation = { ...enteringAnimation, ...style.animations };
         }
       }
-
-      sv.value = Object.assign({}, sv._value, style.initialValues);
-      _stopObservingProgress(tag, false);
+      _stopObservingProgress(tag, false, false);
+      viewSharedValue._value = Object.assign(
+        {},
+        viewSharedValue._value,
+        style.initialValues
+      );
       const animation = withStyleAnimation(currentAnimation);
 
       animation.callback = (finished?: boolean) => {
         if (finished) {
-          _stopObservingProgress(tag, finished);
+          delete enteringAnimationForTag[tag];
+          const shouldRemoveView = type === 'exiting';
+          _stopObservingProgress(tag, finished, shouldRemoveView);
         }
         style.callback && style.callback(finished);
       };
 
-      if (backupColor) {
-        configs[tag].sv._value = { ...configs[tag].sv.value, ...backupColor };
-      }
-
-      configs[tag].sv.value = animation;
-      _startObservingProgress(tag, sv);
+      viewSharedValue.value = animation;
+      _startObservingProgress(tag, viewSharedValue, type);
     },
   };
 })();

package/lib/commonjs/reanimated2/layoutReanimation/defaultAnimations/Default.js

@@ -1,55 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.DefaultLayout = exports.DefaultExiting = exports.DefaultEntering = void 0;
-
-const DefaultLayout = values => {
-  'worklet';
-
-  return {
-    initialValues: {
-      originX: values.targetOriginX,
-      originY: values.targetOriginY,
-      width: values.targetWidth,
-      height: values.targetHeight
-    },
-    animations: {}
-  };
-};
-
-exports.DefaultLayout = DefaultLayout;
-
-const DefaultEntering = values => {
-  'worklet';
-
-  return {
-    initialValues: {
-      originX: values.targetOriginX,
-      originY: values.targetOriginY,
-      width: values.targetWidth,
-      height: values.targetHeight
-    },
-    animations: {}
-  };
-};
-
-exports.DefaultEntering = DefaultEntering;
-
-const DefaultExiting = values => {
-  'worklet';
-
-  return {
-    initialValues: {
-      originX: values.currentOriginX,
-      originY: values.currentOriginY,
-      width: values.currentWidth,
-      height: values.currentHeight
-    },
-    animations: {}
-  };
-};
-
-exports.DefaultExiting = DefaultExiting;
-//# sourceMappingURL=Default.js.map

package/lib/commonjs/reanimated2/layoutReanimation/defaultAnimations/Default.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["DefaultLayout","values","initialValues","originX","targetOriginX","originY","targetOriginY","width","targetWidth","height","targetHeight","animations","DefaultEntering","DefaultExiting","currentOriginX","currentOriginY","currentWidth","currentHeight"],"sources":["Default.ts"],"sourcesContent":["import {\n  LayoutAnimationFunction,\n  EntryAnimationsValues,\n  ExitAnimationsValues,\n  AnimationConfigFunction,\n} from '../animationBuilder/commonTypes';\n\nexport const DefaultLayout: LayoutAnimationFunction = (values) => {\n  'worklet';\n  return {\n    initialValues: {\n      originX: values.targetOriginX,\n      originY: values.targetOriginY,\n      width: values.targetWidth,\n      height: values.targetHeight,\n    },\n    animations: {},\n  };\n};\n\nexport const DefaultEntering: AnimationConfigFunction<EntryAnimationsValues> = (\n  values\n) => {\n  'worklet';\n  return {\n    initialValues: {\n      originX: values.targetOriginX,\n      originY: values.targetOriginY,\n      width: values.targetWidth,\n      height: values.targetHeight,\n    },\n    animations: {},\n  };\n};\n\nexport const DefaultExiting: AnimationConfigFunction<ExitAnimationsValues> = (\n  values\n) => {\n  'worklet';\n  return {\n    initialValues: {\n      originX: values.currentOriginX,\n      originY: values.currentOriginY,\n      width: values.currentWidth,\n      height: values.currentHeight,\n    },\n    animations: {},\n  };\n};\n"],"mappings":";;;;;;;AAOO,MAAMA,aAAsC,GAAIC,MAAD,IAAY;EAChE;;EACA,OAAO;IACLC,aAAa,EAAE;MACbC,OAAO,EAAEF,MAAM,CAACG,aADH;MAEbC,OAAO,EAAEJ,MAAM,CAACK,aAFH;MAGbC,KAAK,EAAEN,MAAM,CAACO,WAHD;MAIbC,MAAM,EAAER,MAAM,CAACS;IAJF,CADV;IAOLC,UAAU,EAAE;EAPP,CAAP;AASD,CAXM;;;;AAaA,MAAMC,eAA+D,GAC1EX,MAD6E,IAE1E;EACH;;EACA,OAAO;IACLC,aAAa,EAAE;MACbC,OAAO,EAAEF,MAAM,CAACG,aADH;MAEbC,OAAO,EAAEJ,MAAM,CAACK,aAFH;MAGbC,KAAK,EAAEN,MAAM,CAACO,WAHD;MAIbC,MAAM,EAAER,MAAM,CAACS;IAJF,CADV;IAOLC,UAAU,EAAE;EAPP,CAAP;AASD,CAbM;;;;AAeA,MAAME,cAA6D,GACxEZ,MAD2E,IAExE;EACH;;EACA,OAAO;IACLC,aAAa,EAAE;MACbC,OAAO,EAAEF,MAAM,CAACa,cADH;MAEbT,OAAO,EAAEJ,MAAM,CAACc,cAFH;MAGbR,KAAK,EAAEN,MAAM,CAACe,YAHD;MAIbP,MAAM,EAAER,MAAM,CAACgB;IAJF,CADV;IAOLN,UAAU,EAAE;EAPP,CAAP;AASD,CAbM"}

package/lib/module/reanimated2/layoutReanimation/defaultAnimations/Default.js

@@ -1,40 +0,0 @@
-export const DefaultLayout = values => {
-  'worklet';
-
-  return {
-    initialValues: {
-      originX: values.targetOriginX,
-      originY: values.targetOriginY,
-      width: values.targetWidth,
-      height: values.targetHeight
-    },
-    animations: {}
-  };
-};
-export const DefaultEntering = values => {
-  'worklet';
-
-  return {
-    initialValues: {
-      originX: values.targetOriginX,
-      originY: values.targetOriginY,
-      width: values.targetWidth,
-      height: values.targetHeight
-    },
-    animations: {}
-  };
-};
-export const DefaultExiting = values => {
-  'worklet';
-
-  return {
-    initialValues: {
-      originX: values.currentOriginX,
-      originY: values.currentOriginY,
-      width: values.currentWidth,
-      height: values.currentHeight
-    },
-    animations: {}
-  };
-};
-//# sourceMappingURL=Default.js.map

package/lib/module/reanimated2/layoutReanimation/defaultAnimations/Default.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["DefaultLayout","values","initialValues","originX","targetOriginX","originY","targetOriginY","width","targetWidth","height","targetHeight","animations","DefaultEntering","DefaultExiting","currentOriginX","currentOriginY","currentWidth","currentHeight"],"sources":["Default.ts"],"sourcesContent":["import {\n  LayoutAnimationFunction,\n  EntryAnimationsValues,\n  ExitAnimationsValues,\n  AnimationConfigFunction,\n} from '../animationBuilder/commonTypes';\n\nexport const DefaultLayout: LayoutAnimationFunction = (values) => {\n  'worklet';\n  return {\n    initialValues: {\n      originX: values.targetOriginX,\n      originY: values.targetOriginY,\n      width: values.targetWidth,\n      height: values.targetHeight,\n    },\n    animations: {},\n  };\n};\n\nexport const DefaultEntering: AnimationConfigFunction<EntryAnimationsValues> = (\n  values\n) => {\n  'worklet';\n  return {\n    initialValues: {\n      originX: values.targetOriginX,\n      originY: values.targetOriginY,\n      width: values.targetWidth,\n      height: values.targetHeight,\n    },\n    animations: {},\n  };\n};\n\nexport const DefaultExiting: AnimationConfigFunction<ExitAnimationsValues> = (\n  values\n) => {\n  'worklet';\n  return {\n    initialValues: {\n      originX: values.currentOriginX,\n      originY: values.currentOriginY,\n      width: values.currentWidth,\n      height: values.currentHeight,\n    },\n    animations: {},\n  };\n};\n"],"mappings":"AAOA,OAAO,MAAMA,aAAsC,GAAIC,MAAD,IAAY;EAChE;;EACA,OAAO;IACLC,aAAa,EAAE;MACbC,OAAO,EAAEF,MAAM,CAACG,aADH;MAEbC,OAAO,EAAEJ,MAAM,CAACK,aAFH;MAGbC,KAAK,EAAEN,MAAM,CAACO,WAHD;MAIbC,MAAM,EAAER,MAAM,CAACS;IAJF,CADV;IAOLC,UAAU,EAAE;EAPP,CAAP;AASD,CAXM;AAaP,OAAO,MAAMC,eAA+D,GAC1EX,MAD6E,IAE1E;EACH;;EACA,OAAO;IACLC,aAAa,EAAE;MACbC,OAAO,EAAEF,MAAM,CAACG,aADH;MAEbC,OAAO,EAAEJ,MAAM,CAACK,aAFH;MAGbC,KAAK,EAAEN,MAAM,CAACO,WAHD;MAIbC,MAAM,EAAER,MAAM,CAACS;IAJF,CADV;IAOLC,UAAU,EAAE;EAPP,CAAP;AASD,CAbM;AAeP,OAAO,MAAME,cAA6D,GACxEZ,MAD2E,IAExE;EACH;;EACA,OAAO;IACLC,aAAa,EAAE;MACbC,OAAO,EAAEF,MAAM,CAACa,cADH;MAEbT,OAAO,EAAEJ,MAAM,CAACc,cAFH;MAGbR,KAAK,EAAEN,MAAM,CAACe,YAHD;MAIbP,MAAM,EAAER,MAAM,CAACgB;IAJF,CADV;IAOLN,UAAU,EAAE;EAPP,CAAP;AASD,CAbM"}

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

@@ -1,49 +0,0 @@
-import {
-  LayoutAnimationFunction,
-  EntryAnimationsValues,
-  ExitAnimationsValues,
-  AnimationConfigFunction,
-} from '../animationBuilder/commonTypes';
-
-export const DefaultLayout: LayoutAnimationFunction = (values) => {
-  'worklet';
-  return {
-    initialValues: {
-      originX: values.targetOriginX,
-      originY: values.targetOriginY,
-      width: values.targetWidth,
-      height: values.targetHeight,
-    },
-    animations: {},
-  };
-};
-
-export const DefaultEntering: AnimationConfigFunction<EntryAnimationsValues> = (
-  values
-) => {
-  'worklet';
-  return {
-    initialValues: {
-      originX: values.targetOriginX,
-      originY: values.targetOriginY,
-      width: values.targetWidth,
-      height: values.targetHeight,
-    },
-    animations: {},
-  };
-};
-
-export const DefaultExiting: AnimationConfigFunction<ExitAnimationsValues> = (
-  values
-) => {
-  'worklet';
-  return {
-    initialValues: {
-      originX: values.currentOriginX,
-      originY: values.currentOriginY,
-      width: values.currentWidth,
-      height: values.currentHeight,
-    },
-    animations: {},
-  };
-};