react-native-reanimated 3.0.0-rc.5 → 3.0.0-rc.7

package/lib/module/reanimated2/core.js

@@ -138,7 +138,8 @@ function workletValueSetter(value) {
       animation.onStart(animation, this.value, timestamp, previousAnimation);
     };
 
-    initializeAnimation(getTimestamp());
+    const currentTimestamp = getTimestamp();
+    initializeAnimation(currentTimestamp);
 
     const step = timestamp => {
       if (animation.cancelled) {
@@ -163,13 +164,7 @@ function workletValueSetter(value) {
     };
 
     this._animation = animation;
-
-    if (_frameTimestamp) {
-      // frame
-      step(_frameTimestamp);
-    } else {
-      requestAnimationFrame(step);
-    }
+    step(currentTimestamp);
   } else {
     // prevent setting again to the same value
     // and triggering the mappers that treat this value as an input
@@ -226,7 +221,7 @@ function workletValueSetterJS(value) {
     };
 
     this._animation = animation;
-    requestFrame(step);
+    step(getTimestamp());
   } else {
     this._setValue && this._setValue(value);
   }
@@ -303,6 +298,9 @@ export function enableLayoutAnimations(flag) {
     NativeReanimatedModule.enableLayoutAnimations(flag);
   }
 }
+export function configureLayoutAnimations(viewTag, type, config, viewSharedValue) {
+  NativeReanimatedModule.configureLayoutAnimation(viewTag, type, config, viewSharedValue);
+}
 export function configureProps(uiProps, nativeProps) {
   if (!nativeShouldBeMock()) {
     NativeReanimatedModule.configureProps(uiProps, nativeProps);

package/lib/module/reanimated2/core.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeReanimatedModule","Platform","nativeShouldBeMock","shouldBeUseWeb","isWeb","global","_setGlobalConsole","undefined","testWorklet","throwUninitializedReanimatedException","Error","checkPluginState","throwError","__workletHash","isConfigured","isConfiguredCheck","pushFrame","frame","requestFrame","native","requestAnimationFrame","_WORKLET","_log","s","console","log","runOnUI","worklet","makeShareable","value","getViewProp","viewTag","propName","_IS_FABRIC","Promise","resolve","reject","result","substr","_getTimestamp","getTimestamp","_frameTimestamp","_eventTimestamp","_getCurrentTime","OS","workletValueSetter","previousAnimation","_animation","cancelled","onFrame","animation","_value","current","isHigherOrder","callback","initializeAnimation","timestamp","onStart","step","finished","workletValueSetterJS","_setValue","makeMutable","makeRemote","object","startMapper","mapper","inputs","outputs","updater","viewDescriptors","stopMapper","mapperId","runOnJS","fun","__callAsync","installCoreFunctions","capturableConsole","debug","warn","error","info","featuresConfig","enableLayoutAnimations","setByUser","flag","isCallByUser","configureProps","uiProps","nativeProps","jestResetJsReanimatedModule","jestResetModule"],"sources":["core.ts"],"sourcesContent":["/* global _WORKLET _getCurrentTime _frameTimestamp _eventTimestamp _setGlobalConsole */\nimport NativeReanimatedModule from './NativeReanimated';\nimport { Platform } from 'react-native';\nimport { nativeShouldBeMock, shouldBeUseWeb, isWeb } from './PlatformChecker';\nimport {\n  BasicWorkletFunction,\n  ComplexWorkletFunction,\n  SharedValue,\n  AnimationObject,\n  AnimatableValue,\n  Timestamp,\n} from './commonTypes';\nimport { Descriptor } from './hook/commonTypes';\nimport JSReanimated from './js-reanimated/JSReanimated';\n\nif (global._setGlobalConsole === undefined) {\n  // it can happen when Reanimated plugin wasn't added, but the user uses the only API from version 1\n  global._setGlobalConsole = () => {\n    // noop\n  };\n}\n\nexport type ReanimatedConsole = Pick<\n  Console,\n  'debug' | 'log' | 'warn' | 'info' | 'error'\n>;\n\nexport type WorkletValue =\n  | (() => AnimationObject)\n  | AnimationObject\n  | AnimatableValue\n  | Descriptor;\ninterface WorkletValueSetterContext {\n  _animation?: AnimationObject | null;\n  _value?: AnimatableValue | Descriptor;\n  value?: AnimatableValue;\n  _setValue?: (val: AnimatableValue | Descriptor) => void;\n}\n\nconst testWorklet: BasicWorkletFunction<void> = () => {\n  'worklet';\n};\n\nconst throwUninitializedReanimatedException = () => {\n  throw new Error(\n    \"Failed to initialize react-native-reanimated library, make sure you followed installation steps here: https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation/ \\n1) Make sure reanimated's babel plugin is installed in your babel.config.js (you should have 'react-native-reanimated/plugin' listed there - also see the above link for details) \\n2) Make sure you reset build cache after updating the config, run: yarn start --reset-cache\"\n  );\n};\n\nexport const checkPluginState: (throwError: boolean) => boolean = (\n  throwError = true\n) => {\n  if (!testWorklet.__workletHash && !shouldBeUseWeb()) {\n    if (throwError) {\n      throwUninitializedReanimatedException();\n    }\n    return false;\n  }\n  return true;\n};\n\nexport const isConfigured: (throwError?: boolean) => boolean = (\n  throwError = false\n) => {\n  return checkPluginState(throwError);\n};\n\nexport const isConfiguredCheck: () => void = () => {\n  checkPluginState(true);\n};\n\nfunction pushFrame(frame: (timestamp: Timestamp) => void): void {\n  (NativeReanimatedModule as JSReanimated).pushFrame(frame);\n}\n\nexport function requestFrame(frame: (timestamp: Timestamp) => void): void {\n  'worklet';\n  if (NativeReanimatedModule.native) {\n    requestAnimationFrame(frame);\n  } else {\n    pushFrame(frame);\n  }\n}\n\nglobal._WORKLET = false;\nglobal._log = function (s: string) {\n  console.log(s);\n};\n\nexport function runOnUI<A extends any[], R>(\n  worklet: ComplexWorkletFunction<A, R>\n): (...args: A) => void {\n  return makeShareable(worklet);\n}\n\nexport function makeShareable<T>(value: T): T {\n  isConfiguredCheck();\n  return NativeReanimatedModule.makeShareable(value);\n}\n\nexport function getViewProp<T>(viewTag: string, propName: string): Promise<T> {\n  if (global._IS_FABRIC) {\n    throw new Error(\n      '[react-native-reanimated] `getViewProp` is not supported on Fabric yet'\n    );\n  }\n\n  return new Promise((resolve, reject) => {\n    return NativeReanimatedModule.getViewProp(\n      viewTag,\n      propName,\n      (result: T) => {\n        if (typeof result === 'string' && result.substr(0, 6) === 'error:') {\n          reject(result);\n        } else {\n          resolve(result);\n        }\n      }\n    );\n  });\n}\n\nlet _getTimestamp: () => number;\nif (nativeShouldBeMock()) {\n  _getTimestamp = () => {\n    return (NativeReanimatedModule as JSReanimated).getTimestamp();\n  };\n} else {\n  _getTimestamp = () => {\n    'worklet';\n    if (_frameTimestamp) {\n      return _frameTimestamp;\n    }\n    if (_eventTimestamp) {\n      return _eventTimestamp;\n    }\n    return _getCurrentTime();\n  };\n}\n\nexport function getTimestamp(): number {\n  'worklet';\n  if (Platform.OS === 'web') {\n    return (NativeReanimatedModule as JSReanimated).getTimestamp();\n  }\n  return _getTimestamp();\n}\n\nfunction workletValueSetter<T extends WorkletValue>(\n  this: WorkletValueSetterContext,\n  value: T\n): void {\n  'worklet';\n  const previousAnimation = this._animation;\n  if (previousAnimation) {\n    previousAnimation.cancelled = true;\n    this._animation = null;\n  }\n  if (\n    typeof value === 'function' ||\n    (value !== null &&\n      typeof value === 'object' &&\n      (value as AnimationObject).onFrame !== undefined)\n  ) {\n    const animation: AnimationObject =\n      typeof value === 'function'\n        ? (value as () => AnimationObject)()\n        : (value as AnimationObject);\n    // prevent setting again to the same value\n    // and triggering the mappers that treat this value as an input\n    // this happens when the animation's target value(stored in animation.current until animation.onStart is called) is set to the same value as a current one(this._value)\n    // built in animations that are not higher order(withTiming, withSpring) hold target value in .current\n    if (this._value === animation.current && !animation.isHigherOrder) {\n      animation.callback && animation.callback(true);\n      return;\n    }\n    // animated set\n    const initializeAnimation = (timestamp: number) => {\n      animation.onStart(animation, this.value, timestamp, previousAnimation);\n    };\n    initializeAnimation(getTimestamp());\n    const step = (timestamp: number) => {\n      if (animation.cancelled) {\n        animation.callback && animation.callback(false /* finished */);\n        return;\n      }\n      const finished = animation.onFrame(animation, timestamp);\n      animation.finished = true;\n      animation.timestamp = timestamp;\n      this._value = animation.current;\n      if (finished) {\n        animation.callback && animation.callback(true /* finished */);\n      } else {\n        requestAnimationFrame(step);\n      }\n    };\n\n    this._animation = animation;\n\n    if (_frameTimestamp) {\n      // frame\n      step(_frameTimestamp);\n    } else {\n      requestAnimationFrame(step);\n    }\n  } else {\n    // prevent setting again to the same value\n    // and triggering the mappers that treat this value as an input\n    if (this._value === value) {\n      return;\n    }\n    this._value = value as Descriptor | AnimatableValue;\n  }\n}\n\n// We cannot use pushFrame\n// so we use own implementation for js\nfunction workletValueSetterJS<T extends WorkletValue>(\n  this: WorkletValueSetterContext,\n  value: T\n): void {\n  const previousAnimation = this._animation;\n  if (previousAnimation) {\n    previousAnimation.cancelled = true;\n    this._animation = null;\n  }\n  if (\n    typeof value === 'function' ||\n    (value !== null &&\n      typeof value === 'object' &&\n      (value as AnimationObject).onFrame)\n  ) {\n    // animated set\n    const animation: AnimationObject =\n      typeof value === 'function'\n        ? (value as () => AnimationObject)()\n        : (value as AnimationObject);\n    let initializeAnimation: ((timestamp: number) => void) | null = (\n      timestamp: number\n    ) => {\n      animation.onStart(animation, this.value, timestamp, previousAnimation);\n    };\n    const step = (timestamp: number) => {\n      if (animation.cancelled) {\n        animation.callback && animation.callback(false /* finished */);\n        return;\n      }\n      if (initializeAnimation) {\n        initializeAnimation(timestamp);\n        initializeAnimation = null; // prevent closure from keeping ref to previous animation\n      }\n      const finished = animation.onFrame(animation, timestamp);\n      animation.timestamp = timestamp;\n      this._setValue && this._setValue(animation.current as AnimatableValue);\n      if (finished) {\n        animation.callback && animation.callback(true /* finished */);\n      } else {\n        requestFrame(step);\n      }\n    };\n\n    this._animation = animation;\n\n    requestFrame(step);\n  } else {\n    this._setValue && this._setValue(value as AnimatableValue | Descriptor);\n  }\n}\n\nexport function makeMutable<T>(value: T): SharedValue<T> {\n  isConfiguredCheck();\n  return NativeReanimatedModule.makeMutable(value);\n}\n\nexport function makeRemote<T>(object = {}): T {\n  isConfiguredCheck();\n  return NativeReanimatedModule.makeRemote(object);\n}\n\nexport function startMapper(\n  mapper: () => void,\n  inputs: any[] = [],\n  outputs: any[] = [],\n  updater: () => void = () => {\n    // noop\n  },\n  viewDescriptors: Descriptor[] | SharedValue<Descriptor[]> = []\n): number {\n  isConfiguredCheck();\n  return NativeReanimatedModule.startMapper(\n    mapper,\n    inputs,\n    outputs,\n    updater,\n    viewDescriptors\n  );\n}\n\nexport function stopMapper(mapperId: number): void {\n  NativeReanimatedModule.stopMapper(mapperId);\n}\n\nexport interface RunOnJSFunction<A extends any[], R> {\n  __callAsync?: (...args: A) => void;\n  (...args: A): R;\n}\n\nexport function runOnJS<A extends any[], R>(\n  fun: RunOnJSFunction<A, R>\n): () => void {\n  'worklet';\n  if (!_WORKLET) {\n    return fun;\n  }\n  if (!fun.__callAsync) {\n    throw new Error(\n      \"Attempting to call runOnJS with an object that is not a host function. Using runOnJS is only possible with methods that are defined on the main React-Native Javascript thread and that aren't marked as worklets\"\n    );\n  } else {\n    return fun.__callAsync;\n  }\n}\n\nNativeReanimatedModule.installCoreFunctions(\n  NativeReanimatedModule.native\n    ? (workletValueSetter as <T>(value: T) => void)\n    : (workletValueSetterJS as <T>(value: T) => void)\n);\n\nif (!isWeb() && isConfigured()) {\n  const capturableConsole = console;\n  runOnUI(() => {\n    'worklet';\n    const console = {\n      debug: runOnJS(capturableConsole.debug),\n      log: runOnJS(capturableConsole.log),\n      warn: runOnJS(capturableConsole.warn),\n      error: runOnJS(capturableConsole.error),\n      info: runOnJS(capturableConsole.info),\n    };\n    _setGlobalConsole(console);\n  })();\n}\n\ntype FeaturesConfig = {\n  enableLayoutAnimations: boolean;\n  setByUser: boolean;\n};\n\nlet featuresConfig: FeaturesConfig = {\n  enableLayoutAnimations: false,\n  setByUser: false,\n};\n\nexport function enableLayoutAnimations(\n  flag: boolean,\n  isCallByUser = true\n): void {\n  if (isCallByUser) {\n    featuresConfig = {\n      enableLayoutAnimations: flag,\n      setByUser: true,\n    };\n    NativeReanimatedModule.enableLayoutAnimations(flag);\n  } else if (\n    !featuresConfig.setByUser &&\n    featuresConfig.enableLayoutAnimations !== flag\n  ) {\n    featuresConfig.enableLayoutAnimations = flag;\n    NativeReanimatedModule.enableLayoutAnimations(flag);\n  }\n}\n\nexport function configureProps(uiProps: string[], nativeProps: string[]): void {\n  if (!nativeShouldBeMock()) {\n    NativeReanimatedModule.configureProps(uiProps, nativeProps);\n  }\n}\n\nexport function jestResetJsReanimatedModule() {\n  (NativeReanimatedModule as JSReanimated).jestResetModule();\n}\n"],"mappings":"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"}
+{"version":3,"names":["NativeReanimatedModule","Platform","nativeShouldBeMock","shouldBeUseWeb","isWeb","global","_setGlobalConsole","undefined","testWorklet","throwUninitializedReanimatedException","Error","checkPluginState","throwError","__workletHash","isConfigured","isConfiguredCheck","pushFrame","frame","requestFrame","native","requestAnimationFrame","_WORKLET","_log","s","console","log","runOnUI","worklet","makeShareable","value","getViewProp","viewTag","propName","_IS_FABRIC","Promise","resolve","reject","result","substr","_getTimestamp","getTimestamp","_frameTimestamp","_eventTimestamp","_getCurrentTime","OS","workletValueSetter","previousAnimation","_animation","cancelled","onFrame","animation","_value","current","isHigherOrder","callback","initializeAnimation","timestamp","onStart","currentTimestamp","step","finished","workletValueSetterJS","_setValue","makeMutable","makeRemote","object","startMapper","mapper","inputs","outputs","updater","viewDescriptors","stopMapper","mapperId","runOnJS","fun","__callAsync","installCoreFunctions","capturableConsole","debug","warn","error","info","featuresConfig","enableLayoutAnimations","setByUser","flag","isCallByUser","configureLayoutAnimations","type","config","viewSharedValue","configureLayoutAnimation","configureProps","uiProps","nativeProps","jestResetJsReanimatedModule","jestResetModule"],"sources":["core.ts"],"sourcesContent":["/* global _WORKLET _getCurrentTime _frameTimestamp _eventTimestamp _setGlobalConsole */\nimport NativeReanimatedModule from './NativeReanimated';\nimport { Platform } from 'react-native';\nimport { nativeShouldBeMock, shouldBeUseWeb, isWeb } from './PlatformChecker';\nimport {\n  BasicWorkletFunction,\n  ComplexWorkletFunction,\n  SharedValue,\n  AnimationObject,\n  AnimatableValue,\n  Timestamp,\n} from './commonTypes';\nimport { Descriptor } from './hook/commonTypes';\nimport JSReanimated from './js-reanimated/JSReanimated';\nimport { LayoutAnimationFunction } from './layoutReanimation';\n\nif (global._setGlobalConsole === undefined) {\n  // it can happen when Reanimated plugin wasn't added, but the user uses the only API from version 1\n  global._setGlobalConsole = () => {\n    // noop\n  };\n}\n\nexport type ReanimatedConsole = Pick<\n  Console,\n  'debug' | 'log' | 'warn' | 'info' | 'error'\n>;\n\nexport type WorkletValue =\n  | (() => AnimationObject)\n  | AnimationObject\n  | AnimatableValue\n  | Descriptor;\ninterface WorkletValueSetterContext {\n  _animation?: AnimationObject | null;\n  _value?: AnimatableValue | Descriptor;\n  value?: AnimatableValue;\n  _setValue?: (val: AnimatableValue | Descriptor) => void;\n}\n\nconst testWorklet: BasicWorkletFunction<void> = () => {\n  'worklet';\n};\n\nconst throwUninitializedReanimatedException = () => {\n  throw new Error(\n    \"Failed to initialize react-native-reanimated library, make sure you followed installation steps here: https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation/ \\n1) Make sure reanimated's babel plugin is installed in your babel.config.js (you should have 'react-native-reanimated/plugin' listed there - also see the above link for details) \\n2) Make sure you reset build cache after updating the config, run: yarn start --reset-cache\"\n  );\n};\n\nexport const checkPluginState: (throwError: boolean) => boolean = (\n  throwError = true\n) => {\n  if (!testWorklet.__workletHash && !shouldBeUseWeb()) {\n    if (throwError) {\n      throwUninitializedReanimatedException();\n    }\n    return false;\n  }\n  return true;\n};\n\nexport const isConfigured: (throwError?: boolean) => boolean = (\n  throwError = false\n) => {\n  return checkPluginState(throwError);\n};\n\nexport const isConfiguredCheck: () => void = () => {\n  checkPluginState(true);\n};\n\nfunction pushFrame(frame: (timestamp: Timestamp) => void): void {\n  (NativeReanimatedModule as JSReanimated).pushFrame(frame);\n}\n\nexport function requestFrame(frame: (timestamp: Timestamp) => void): void {\n  'worklet';\n  if (NativeReanimatedModule.native) {\n    requestAnimationFrame(frame);\n  } else {\n    pushFrame(frame);\n  }\n}\n\nglobal._WORKLET = false;\nglobal._log = function (s: string) {\n  console.log(s);\n};\n\nexport function runOnUI<A extends any[], R>(\n  worklet: ComplexWorkletFunction<A, R>\n): (...args: A) => void {\n  return makeShareable(worklet);\n}\n\nexport function makeShareable<T>(value: T): T {\n  isConfiguredCheck();\n  return NativeReanimatedModule.makeShareable(value);\n}\n\nexport function getViewProp<T>(viewTag: string, propName: string): Promise<T> {\n  if (global._IS_FABRIC) {\n    throw new Error(\n      '[react-native-reanimated] `getViewProp` is not supported on Fabric yet'\n    );\n  }\n\n  return new Promise((resolve, reject) => {\n    return NativeReanimatedModule.getViewProp(\n      viewTag,\n      propName,\n      (result: T) => {\n        if (typeof result === 'string' && result.substr(0, 6) === 'error:') {\n          reject(result);\n        } else {\n          resolve(result);\n        }\n      }\n    );\n  });\n}\n\nlet _getTimestamp: () => number;\nif (nativeShouldBeMock()) {\n  _getTimestamp = () => {\n    return (NativeReanimatedModule as JSReanimated).getTimestamp();\n  };\n} else {\n  _getTimestamp = () => {\n    'worklet';\n    if (_frameTimestamp) {\n      return _frameTimestamp;\n    }\n    if (_eventTimestamp) {\n      return _eventTimestamp;\n    }\n    return _getCurrentTime();\n  };\n}\n\nexport function getTimestamp(): number {\n  'worklet';\n  if (Platform.OS === 'web') {\n    return (NativeReanimatedModule as JSReanimated).getTimestamp();\n  }\n  return _getTimestamp();\n}\n\nfunction workletValueSetter<T extends WorkletValue>(\n  this: WorkletValueSetterContext,\n  value: T\n): void {\n  'worklet';\n  const previousAnimation = this._animation;\n  if (previousAnimation) {\n    previousAnimation.cancelled = true;\n    this._animation = null;\n  }\n  if (\n    typeof value === 'function' ||\n    (value !== null &&\n      typeof value === 'object' &&\n      (value as AnimationObject).onFrame !== undefined)\n  ) {\n    const animation: AnimationObject =\n      typeof value === 'function'\n        ? (value as () => AnimationObject)()\n        : (value as AnimationObject);\n    // prevent setting again to the same value\n    // and triggering the mappers that treat this value as an input\n    // this happens when the animation's target value(stored in animation.current until animation.onStart is called) is set to the same value as a current one(this._value)\n    // built in animations that are not higher order(withTiming, withSpring) hold target value in .current\n    if (this._value === animation.current && !animation.isHigherOrder) {\n      animation.callback && animation.callback(true);\n      return;\n    }\n    // animated set\n    const initializeAnimation = (timestamp: number) => {\n      animation.onStart(animation, this.value, timestamp, previousAnimation);\n    };\n    const currentTimestamp = getTimestamp();\n    initializeAnimation(currentTimestamp);\n    const step = (timestamp: number) => {\n      if (animation.cancelled) {\n        animation.callback && animation.callback(false /* finished */);\n        return;\n      }\n      const finished = animation.onFrame(animation, timestamp);\n      animation.finished = true;\n      animation.timestamp = timestamp;\n      this._value = animation.current;\n      if (finished) {\n        animation.callback && animation.callback(true /* finished */);\n      } else {\n        requestAnimationFrame(step);\n      }\n    };\n\n    this._animation = animation;\n    step(currentTimestamp);\n  } else {\n    // prevent setting again to the same value\n    // and triggering the mappers that treat this value as an input\n    if (this._value === value) {\n      return;\n    }\n    this._value = value as Descriptor | AnimatableValue;\n  }\n}\n\n// We cannot use pushFrame\n// so we use own implementation for js\nfunction workletValueSetterJS<T extends WorkletValue>(\n  this: WorkletValueSetterContext,\n  value: T\n): void {\n  const previousAnimation = this._animation;\n  if (previousAnimation) {\n    previousAnimation.cancelled = true;\n    this._animation = null;\n  }\n  if (\n    typeof value === 'function' ||\n    (value !== null &&\n      typeof value === 'object' &&\n      (value as AnimationObject).onFrame)\n  ) {\n    // animated set\n    const animation: AnimationObject =\n      typeof value === 'function'\n        ? (value as () => AnimationObject)()\n        : (value as AnimationObject);\n    let initializeAnimation: ((timestamp: number) => void) | null = (\n      timestamp: number\n    ) => {\n      animation.onStart(animation, this.value, timestamp, previousAnimation);\n    };\n    const step = (timestamp: number) => {\n      if (animation.cancelled) {\n        animation.callback && animation.callback(false /* finished */);\n        return;\n      }\n      if (initializeAnimation) {\n        initializeAnimation(timestamp);\n        initializeAnimation = null; // prevent closure from keeping ref to previous animation\n      }\n      const finished = animation.onFrame(animation, timestamp);\n      animation.timestamp = timestamp;\n      this._setValue && this._setValue(animation.current as AnimatableValue);\n      if (finished) {\n        animation.callback && animation.callback(true /* finished */);\n      } else {\n        requestFrame(step);\n      }\n    };\n\n    this._animation = animation;\n    step(getTimestamp());\n  } else {\n    this._setValue && this._setValue(value as AnimatableValue | Descriptor);\n  }\n}\n\nexport function makeMutable<T>(value: T): SharedValue<T> {\n  isConfiguredCheck();\n  return NativeReanimatedModule.makeMutable(value);\n}\n\nexport function makeRemote<T>(object = {}): T {\n  isConfiguredCheck();\n  return NativeReanimatedModule.makeRemote(object);\n}\n\nexport function startMapper(\n  mapper: () => void,\n  inputs: any[] = [],\n  outputs: any[] = [],\n  updater: () => void = () => {\n    // noop\n  },\n  viewDescriptors: Descriptor[] | SharedValue<Descriptor[]> = []\n): number {\n  isConfiguredCheck();\n  return NativeReanimatedModule.startMapper(\n    mapper,\n    inputs,\n    outputs,\n    updater,\n    viewDescriptors\n  );\n}\n\nexport function stopMapper(mapperId: number): void {\n  NativeReanimatedModule.stopMapper(mapperId);\n}\n\nexport interface RunOnJSFunction<A extends any[], R> {\n  __callAsync?: (...args: A) => void;\n  (...args: A): R;\n}\n\nexport function runOnJS<A extends any[], R>(\n  fun: RunOnJSFunction<A, R>\n): () => void {\n  'worklet';\n  if (!_WORKLET) {\n    return fun;\n  }\n  if (!fun.__callAsync) {\n    throw new Error(\n      \"Attempting to call runOnJS with an object that is not a host function. Using runOnJS is only possible with methods that are defined on the main React-Native Javascript thread and that aren't marked as worklets\"\n    );\n  } else {\n    return fun.__callAsync;\n  }\n}\n\nNativeReanimatedModule.installCoreFunctions(\n  NativeReanimatedModule.native\n    ? (workletValueSetter as <T>(value: T) => void)\n    : (workletValueSetterJS as <T>(value: T) => void)\n);\n\nif (!isWeb() && isConfigured()) {\n  const capturableConsole = console;\n  runOnUI(() => {\n    'worklet';\n    const console = {\n      debug: runOnJS(capturableConsole.debug),\n      log: runOnJS(capturableConsole.log),\n      warn: runOnJS(capturableConsole.warn),\n      error: runOnJS(capturableConsole.error),\n      info: runOnJS(capturableConsole.info),\n    };\n    _setGlobalConsole(console);\n  })();\n}\n\ntype FeaturesConfig = {\n  enableLayoutAnimations: boolean;\n  setByUser: boolean;\n};\n\nlet featuresConfig: FeaturesConfig = {\n  enableLayoutAnimations: false,\n  setByUser: false,\n};\n\nexport function enableLayoutAnimations(\n  flag: boolean,\n  isCallByUser = true\n): void {\n  if (isCallByUser) {\n    featuresConfig = {\n      enableLayoutAnimations: flag,\n      setByUser: true,\n    };\n    NativeReanimatedModule.enableLayoutAnimations(flag);\n  } else if (\n    !featuresConfig.setByUser &&\n    featuresConfig.enableLayoutAnimations !== flag\n  ) {\n    featuresConfig.enableLayoutAnimations = flag;\n    NativeReanimatedModule.enableLayoutAnimations(flag);\n  }\n}\n\nexport function configureLayoutAnimations(\n  viewTag: number,\n  type: string,\n  config: LayoutAnimationFunction | Keyframe,\n  viewSharedValue: SharedValue<null | Record<string, unknown>> | null\n): void {\n  NativeReanimatedModule.configureLayoutAnimation(\n    viewTag,\n    type,\n    config,\n    viewSharedValue\n  );\n}\n\nexport function configureProps(uiProps: string[], nativeProps: string[]): void {\n  if (!nativeShouldBeMock()) {\n    NativeReanimatedModule.configureProps(uiProps, nativeProps);\n  }\n}\n\nexport function jestResetJsReanimatedModule() {\n  (NativeReanimatedModule as JSReanimated).jestResetModule();\n}\n"],"mappings":"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"}

package/lib/module/reanimated2/globals.d.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["globals.d.ts"],"sourcesContent":["import type {\n  AnimatedStyle,\n  StyleProps,\n  MeasuredDimensions,\n} from './commonTypes';\nimport type { ReanimatedConsole } from './core';\nimport type { FrameCallbackRegistryUI } from './frameCallback/FrameCallbackRegistryUI';\nimport type { ShadowNodeWrapper } from './hook/commonTypes';\nimport type { NativeReanimated } from './NativeReanimated/NativeReanimated';\n\ndeclare global {\n  const _WORKLET: boolean;\n  const _IS_FABRIC: boolean;\n  const _frameTimestamp: number | null;\n  const _eventTimestamp: number;\n  const __reanimatedModuleProxy: NativeReanimated;\n  const _setGlobalConsole: (console?: ReanimatedConsole) => void;\n  const _log: (s: string) => void;\n  const _getCurrentTime: () => number;\n  const _stopObservingProgress: (tag: number, flag: boolean) => void;\n  const _startObservingProgress: (\n    tag: number,\n    flag: { value: boolean; _value: boolean }\n  ) => void;\n  const _setGestureState: (handlerTag: number, newState: number) => void;\n  const _updatePropsPaper: (\n    tag: number,\n    name: string,\n    updates: StyleProps | AnimatedStyle\n  ) => void;\n  const _updatePropsFabric: (\n    shadowNodeWrapper: ShadowNodeWrapper,\n    props: StyleProps | AnimatedStyle\n  ) => void;\n  const _removeShadowNodeFromRegistry: (\n    shadowNodeWrapper: ShadowNodeWrapper\n  ) => void;\n  const _measure: (viewTag: number) => MeasuredDimensions;\n  const _scrollTo: (\n    viewTag: number,\n    x: number,\n    y: number,\n    animated: boolean\n  ) => void;\n  const _dispatchCommand: (\n    shadowNodeWrapper: ShadowNodeWrapper,\n    commandName: string,\n    args: Array<unknown>\n  ) => void;\n  const _chronoNow: () => number;\n  const performance: { now: () => number };\n  const LayoutAnimationRepository: {\n    configs: Record<string, unknown>;\n    registerConfig(tag: number, config: Record<string, unknown>): void;\n    removeConfig(tag: number): void;\n    startAnimationForTag(tag: number, type: string, yogaValues: unknown): void;\n  };\n  const ReanimatedDataMock: {\n    now: () => number;\n  };\n  const _frameCallbackRegistry: FrameCallbackRegistryUI;\n\n  namespace NodeJS {\n    interface Global {\n      _WORKLET: boolean;\n      _IS_FABRIC: boolean;\n      _frameTimestamp: number | null;\n      _eventTimestamp: number;\n      __reanimatedModuleProxy: NativeReanimated;\n      _setGlobalConsole: (console?: ReanimatedConsole) => void;\n      _log: (s: string) => void;\n      _getCurrentTime: () => number;\n      _stopObservingProgress: (tag: number, flag: boolean) => void;\n      _startObservingProgress: (\n        tag: number,\n        flag: { value: boolean; _value: boolean }\n      ) => void;\n      _setGestureState: (handlerTag: number, newState: number) => void;\n      _updatePropsPaper: (\n        tag: number,\n        name: string,\n        updates: StyleProps | AnimatedStyle\n      ) => void;\n      _updatePropsFabric: (\n        shadowNodeWrapper: ShadowNodeWrapper,\n        props: StyleProps | AnimatedStyle\n      ) => void;\n      _removeShadowNodeFromRegistry: (\n        shadowNodeWrapper: ShadowNodeWrapper\n      ) => void;\n      _measure: (viewTag: number) => MeasuredDimensions;\n      _scrollTo: (\n        viewTag: number,\n        x: number,\n        y: number,\n        animated: boolean\n      ) => void;\n      _dispatchCommand: (\n        shadowNodeWrapper: ShadowNodeWrapper,\n        commandName: string,\n        args: Array<unknown>\n      ) => void;\n      _chronoNow: () => number;\n      performance: { now: () => number };\n      LayoutAnimationRepository: {\n        configs: Record<string, unknown>;\n        registerConfig(tag: number, config: Record<string, unknown>): void;\n        removeConfig(tag: number): void;\n        startAnimationForTag(\n          tag: number,\n          type: string,\n          yogaValues: unknown\n        ): void;\n      };\n      ReanimatedDataMock: {\n        now: () => number;\n      };\n      _frameCallbackRegistry: FrameCallbackRegistryUI;\n    }\n  }\n}\n"],"mappings":""}
+{"version":3,"names":[],"sources":["globals.d.ts"],"sourcesContent":["import type {\n  AnimatedStyle,\n  StyleProps,\n  MeasuredDimensions,\n} from './commonTypes';\nimport type { ReanimatedConsole } from './core';\nimport type { FrameCallbackRegistryUI } from './frameCallback/FrameCallbackRegistryUI';\nimport type { ShadowNodeWrapper } from './hook/commonTypes';\nimport type { NativeReanimated } from './NativeReanimated/NativeReanimated';\n\ndeclare global {\n  const _WORKLET: boolean;\n  const _IS_FABRIC: boolean;\n  const _REANIMATED_VERSION_CPP: string;\n  const _frameTimestamp: number | null;\n  const _eventTimestamp: number;\n  const __reanimatedModuleProxy: NativeReanimated;\n  const _setGlobalConsole: (console?: ReanimatedConsole) => void;\n  const _log: (s: string) => void;\n  const _getCurrentTime: () => number;\n  const _stopObservingProgress: (\n    tag: number,\n    cancelled: boolean,\n    removeView: boolean\n  ) => void;\n  const _startObservingProgress: (\n    tag: number,\n    viewSharedValue: { value: unknown; _value: unknown },\n    type: string\n  ) => void;\n  const _setGestureState: (handlerTag: number, newState: number) => void;\n  const _updatePropsPaper: (\n    tag: number,\n    name: string,\n    updates: StyleProps | AnimatedStyle\n  ) => void;\n  const _updatePropsFabric: (\n    shadowNodeWrapper: ShadowNodeWrapper,\n    props: StyleProps | AnimatedStyle\n  ) => void;\n  const _removeShadowNodeFromRegistry: (\n    shadowNodeWrapper: ShadowNodeWrapper\n  ) => void;\n  const _measure: (viewTag: number) => MeasuredDimensions;\n  const _scrollTo: (\n    viewTag: number,\n    x: number,\n    y: number,\n    animated: boolean\n  ) => void;\n  const _dispatchCommand: (\n    shadowNodeWrapper: ShadowNodeWrapper,\n    commandName: string,\n    args: Array<unknown>\n  ) => void;\n  const _chronoNow: () => number;\n  const performance: { now: () => number };\n  const LayoutAnimationRepository: {\n    configs: Record<string, unknown>;\n    registerConfig(tag: number, config: Record<string, unknown>): void;\n    removeConfig(tag: number): void;\n    startAnimationForTag(tag: number, type: string, yogaValues: unknown): void;\n  };\n  const ReanimatedDataMock: {\n    now: () => number;\n  };\n  const _frameCallbackRegistry: FrameCallbackRegistryUI;\n\n  namespace NodeJS {\n    interface Global {\n      _WORKLET: boolean;\n      _IS_FABRIC: boolean;\n      _REANIMATED_VERSION_CPP: string;\n      _frameTimestamp: number | null;\n      _eventTimestamp: number;\n      __reanimatedModuleProxy: NativeReanimated;\n      _setGlobalConsole: (console?: ReanimatedConsole) => void;\n      _log: (s: string) => void;\n      _getCurrentTime: () => number;\n      _stopObservingProgress: (tag: number, flag: boolean) => void;\n      _startObservingProgress: (\n        tag: number,\n        flag: { value: boolean; _value: boolean }\n      ) => void;\n      _setGestureState: (handlerTag: number, newState: number) => void;\n      _updatePropsPaper: (\n        tag: number,\n        name: string,\n        updates: StyleProps | AnimatedStyle\n      ) => void;\n      _updatePropsFabric: (\n        shadowNodeWrapper: ShadowNodeWrapper,\n        props: StyleProps | AnimatedStyle\n      ) => void;\n      _removeShadowNodeFromRegistry: (\n        shadowNodeWrapper: ShadowNodeWrapper\n      ) => void;\n      _measure: (viewTag: number) => MeasuredDimensions;\n      _scrollTo: (\n        viewTag: number,\n        x: number,\n        y: number,\n        animated: boolean\n      ) => void;\n      _dispatchCommand: (\n        shadowNodeWrapper: ShadowNodeWrapper,\n        commandName: string,\n        args: Array<unknown>\n      ) => void;\n      _chronoNow: () => number;\n      performance: { now: () => number };\n      LayoutAnimationRepository: {\n        startAnimationForTag(\n          tag: number,\n          type: string,\n          yogaValues: Record<string, number>,\n          config: LayoutAnimationFunction | Keyframe,\n          viewSharedValue: { value: unknown; _value: unknown }\n        ): void;\n      };\n      ReanimatedDataMock: {\n        now: () => number;\n      };\n      _frameCallbackRegistry: FrameCallbackRegistryUI;\n    }\n  }\n}\n"],"mappings":""}

package/lib/module/reanimated2/layoutReanimation/LayoutAnimationRepository.js

@@ -1,89 +1,50 @@
 /* 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 = Object.create(null);
   const enteringAnimationForTag = {};
   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];
+        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
+          };
         }
       }
 
-      const sv = configs[tag].sv;
-
-      _stopObservingProgress(tag, false);
-
-      _startObservingProgress(tag, sv);
-
-      const backupColor = {};
-
-      for (const key in style.initialValues) {
-        if (ColorProperties.includes(key)) {
-          const value = style.initialValues[key];
-          backupColor[key] = value;
-          style.initialValues[key] = processColor(value);
-        }
-      }
-
-      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 => {
         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;
+      viewSharedValue.value = animation;
 
-      _startObservingProgress(tag, sv);
+      _startObservingProgress(tag, viewSharedValue, type);
     }
 
   };

package/lib/module/reanimated2/layoutReanimation/LayoutAnimationRepository.js.map

@@ -1 +1 @@
-{"version":3,"names":["runOnUI","withStyleAnimation","ColorProperties","processColor","configs","Object","create","enteringAnimationForTag","global","LayoutAnimationRepository","registerConfig","tag","config","removeConfig","startAnimationForTag","type","yogaValues","style","currentAnimation","animations","entryAniamtion","layoutAnimation","key","sv","_stopObservingProgress","_startObservingProgress","backupColor","initialValues","includes","value","assign","_value","animation","callback","finished"],"sources":["LayoutAnimationRepository.ts"],"sourcesContent":["/* global _stopObservingProgress, _startObservingProgress */\nimport { runOnUI } from '../core';\nimport { withStyleAnimation } from '../animation/styleAnimation';\nimport { ColorProperties } from '../UpdateProps';\nimport { processColor } from '../Colors';\n\nrunOnUI(() => {\n  'worklet';\n\n  const configs: Record<string, any> = Object.create(null);\n  const enteringAnimationForTag: Record<string, any> = {};\n\n  global.LayoutAnimationRepository = {\n    configs,\n    registerConfig(tag, config) {\n      configs[tag] = config;\n      enteringAnimationForTag[tag] = null;\n    },\n    removeConfig(tag) {\n      delete configs[tag];\n      delete enteringAnimationForTag[tag];\n    },\n    startAnimationForTag(tag, type, yogaValues) {\n      if (configs[tag] == null) {\n        return; // :(\n      }\n      const style = configs[tag][type](yogaValues);\n      let currentAnimation = style.animations;\n      if (type === 'entering') {\n        enteringAnimationForTag[tag] = style;\n      } else if (type === 'layout' && enteringAnimationForTag[tag] !== null) {\n        const entryAniamtion = enteringAnimationForTag[tag].animations;\n        const layoutAnimation = style.animations;\n        currentAnimation = {};\n        for (const key in entryAniamtion) {\n          currentAnimation[key] = entryAniamtion[key];\n        }\n        for (const key in layoutAnimation) {\n          currentAnimation[key] = layoutAnimation[key];\n        }\n      }\n\n      const sv: { value: boolean; _value: boolean } = configs[tag].sv;\n      _stopObservingProgress(tag, false);\n      _startObservingProgress(tag, sv);\n\n      const backupColor: Record<string, string> = {};\n      for (const key in style.initialValues) {\n        if (ColorProperties.includes(key)) {\n          const value = style.initialValues[key];\n          backupColor[key] = value;\n          style.initialValues[key] = processColor(value);\n        }\n      }\n\n      sv.value = Object.assign({}, sv._value, style.initialValues);\n      _stopObservingProgress(tag, false);\n      const animation = withStyleAnimation(currentAnimation);\n\n      animation.callback = (finished?: boolean) => {\n        if (finished) {\n          _stopObservingProgress(tag, finished);\n        }\n        style.callback && style.callback(finished);\n      };\n\n      if (backupColor) {\n        configs[tag].sv._value = { ...configs[tag].sv.value, ...backupColor };\n      }\n\n      configs[tag].sv.value = animation;\n      _startObservingProgress(tag, sv);\n    },\n  };\n})();\n"],"mappings":"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"}
+{"version":3,"names":["runOnUI","withStyleAnimation","LogBox","ignoreLogs","enteringAnimationForTag","global","LayoutAnimationRepository","startAnimationForTag","tag","type","yogaValues","config","viewSharedValue","style","currentAnimation","animations","enteringAnimation","_stopObservingProgress","_value","Object","assign","initialValues","animation","callback","finished","shouldRemoveView","value","_startObservingProgress"],"sources":["LayoutAnimationRepository.ts"],"sourcesContent":["/* global _stopObservingProgress, _startObservingProgress */\nimport { runOnUI } from '../core';\nimport { withStyleAnimation } from '../animation/styleAnimation';\nimport { LogBox } from 'react-native';\n\nLogBox.ignoreLogs(['Overriding previous layout animation with']);\n\nrunOnUI(() => {\n  'worklet';\n\n  const enteringAnimationForTag: Record<string, any> = {};\n\n  global.LayoutAnimationRepository = {\n    startAnimationForTag(tag, type, yogaValues, config, viewSharedValue) {\n      const style = config(yogaValues);\n      let currentAnimation = style.animations;\n\n      if (type === 'entering') {\n        enteringAnimationForTag[tag] = currentAnimation;\n      } else if (type === 'layout') {\n        // When layout animation is requested, but entering is still running, we merge\n        // new layout animation targets into the ongoing animation\n        const enteringAnimation = enteringAnimationForTag[tag];\n        if (enteringAnimation) {\n          currentAnimation = { ...enteringAnimation, ...style.animations };\n        }\n      }\n      _stopObservingProgress(tag, false, false);\n      viewSharedValue._value = Object.assign(\n        {},\n        viewSharedValue._value,\n        style.initialValues\n      );\n      const animation = withStyleAnimation(currentAnimation);\n\n      animation.callback = (finished?: boolean) => {\n        if (finished) {\n          delete enteringAnimationForTag[tag];\n          const shouldRemoveView = type === 'exiting';\n          _stopObservingProgress(tag, finished, shouldRemoveView);\n        }\n        style.callback && style.callback(finished);\n      };\n\n      viewSharedValue.value = animation;\n      _startObservingProgress(tag, viewSharedValue, type);\n    },\n  };\n})();\n"],"mappings":"AAAA;AACA,SAASA,OAAT,QAAwB,SAAxB;AACA,SAASC,kBAAT,QAAmC,6BAAnC;AACA,SAASC,MAAT,QAAuB,cAAvB;AAEAA,MAAM,CAACC,UAAP,CAAkB,CAAC,2CAAD,CAAlB;AAEAH,OAAO,CAAC,MAAM;EACZ;;EAEA,MAAMI,uBAA4C,GAAG,EAArD;EAEAC,MAAM,CAACC,yBAAP,GAAmC;IACjCC,oBAAoB,CAACC,GAAD,EAAMC,IAAN,EAAYC,UAAZ,EAAwBC,MAAxB,EAAgCC,eAAhC,EAAiD;MACnE,MAAMC,KAAK,GAAGF,MAAM,CAACD,UAAD,CAApB;MACA,IAAII,gBAAgB,GAAGD,KAAK,CAACE,UAA7B;;MAEA,IAAIN,IAAI,KAAK,UAAb,EAAyB;QACvBL,uBAAuB,CAACI,GAAD,CAAvB,GAA+BM,gBAA/B;MACD,CAFD,MAEO,IAAIL,IAAI,KAAK,QAAb,EAAuB;QAC5B;QACA;QACA,MAAMO,iBAAiB,GAAGZ,uBAAuB,CAACI,GAAD,CAAjD;;QACA,IAAIQ,iBAAJ,EAAuB;UACrBF,gBAAgB,GAAG,EAAE,GAAGE,iBAAL;YAAwB,GAAGH,KAAK,CAACE;UAAjC,CAAnB;QACD;MACF;;MACDE,sBAAsB,CAACT,GAAD,EAAM,KAAN,EAAa,KAAb,CAAtB;;MACAI,eAAe,CAACM,MAAhB,GAAyBC,MAAM,CAACC,MAAP,CACvB,EADuB,EAEvBR,eAAe,CAACM,MAFO,EAGvBL,KAAK,CAACQ,aAHiB,CAAzB;MAKA,MAAMC,SAAS,GAAGrB,kBAAkB,CAACa,gBAAD,CAApC;;MAEAQ,SAAS,CAACC,QAAV,GAAsBC,QAAD,IAAwB;QAC3C,IAAIA,QAAJ,EAAc;UACZ,OAAOpB,uBAAuB,CAACI,GAAD,CAA9B;UACA,MAAMiB,gBAAgB,GAAGhB,IAAI,KAAK,SAAlC;;UACAQ,sBAAsB,CAACT,GAAD,EAAMgB,QAAN,EAAgBC,gBAAhB,CAAtB;QACD;;QACDZ,KAAK,CAACU,QAAN,IAAkBV,KAAK,CAACU,QAAN,CAAeC,QAAf,CAAlB;MACD,CAPD;;MASAZ,eAAe,CAACc,KAAhB,GAAwBJ,SAAxB;;MACAK,uBAAuB,CAACnB,GAAD,EAAMI,eAAN,EAAuBH,IAAvB,CAAvB;IACD;;EAlCgC,CAAnC;AAoCD,CAzCM,CAAP"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "3.0.0-rc.5",
+  "version": "3.0.0-rc.7",
   "description": "More powerful alternative to Animated library for React Native.",
   "scripts": {
     "test": "yarn run format:js && yarn run lint:js && yarn run test:unit",
@@ -76,7 +76,6 @@
   "dependencies": {
     "@babel/plugin-transform-object-assign": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
-    "@types/invariant": "^2.2.35",
     "invariant": "^2.2.4",
     "lodash.isequal": "^4.5.0",
     "setimmediate": "^1.0.5",
@@ -101,6 +100,7 @@
     "@types/babel__core": "^7.1.18",
     "@types/babel__generator": "^7.6.4",
     "@types/babel__traverse": "^7.14.2",
+    "@types/invariant": "^2.2.35",
     "@types/jest": "^27.4.0",
     "@types/react-native": "^0.66.0",
     "@typescript-eslint/eslint-plugin": "^5.11.0",

package/scripts/reanimated_utils.rb

@@ -17,7 +17,7 @@ def find_config()
     :react_native_common_dir => nil,
   }
 
-  react_native_node_modules_dir = File.join(File.dirname(`cd #{Pod::Config.instance.installation_root.to_s} && node --print "require.resolve('react-native/package.json')"`), '..')
+  react_native_node_modules_dir = File.join(File.dirname(`cd "#{Pod::Config.instance.installation_root.to_s}" && node --print "require.resolve('react-native/package.json')"`), '..')
   react_native_json = try_to_parse_react_native_package_json(react_native_node_modules_dir)
 
   if react_native_json == nil
@@ -52,6 +52,7 @@ def assert_no_multiple_instances(react_native_info)
 
   lib_instances_in_react_native_node_modules = %x[find #{react_native_info[:react_native_node_modules_dir]} -name "package.json" | grep "/react-native-reanimated/package.json"]
   lib_instances_in_react_native_node_modules_array = lib_instances_in_react_native_node_modules.split("\n")
+  lib_instances_in_reanimated_node_modules_array = Array.new
   reanimated_instances = lib_instances_in_react_native_node_modules_array.length()
   if react_native_info[:react_native_node_modules_dir] != react_native_info[:reanimated_node_modules_dir]
     lib_instances_in_reanimated_node_modules = %x[find #{react_native_info[:reanimated_node_modules_dir]} -name "package.json" | grep "/react-native-reanimated/package.json"]
@@ -64,7 +65,7 @@ def assert_no_multiple_instances(react_native_info)
       location['/package.json'] = ''
       parsed_location += "- " + location + "\n"
     end
-    raise "[react-native-reanimated] Multiple versions of Reanimated were detected. Only one instance of react-native-reanimated can be installed in a project. You need to resolve the conflict manually. Check out the documentation: https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/troubleshooting#multiple-versions-of-reanimated-were-detected \n\nConflict between: \n" + parsed_location
+    raise "[react-native-reanimated] Multiple versions of Reanimated were detected. Only one instance of react-native-reanimated can be installed in a project. You need to resolve the conflict manually. Check out the documentation: https://docs.swmansion.com/react-native-reanimated/docs/next/fundamentals/troubleshooting#multiple-versions-of-reanimated-were-detected \n\nConflict between: \n" + parsed_location
   end
 end
 

package/src/createAnimatedComponent.tsx

@@ -8,14 +8,10 @@ import { adaptViewConfig } from './ConfigHelper';
 import { RNRenderer } from './reanimated2/platform-specific/RNRenderer';
 import {
   makeMutable,
-  runOnUI,
+  configureLayoutAnimations,
   enableLayoutAnimations,
+  runOnUI,
 } from './reanimated2/core';
-import {
-  DefaultEntering,
-  DefaultExiting,
-  DefaultLayout,
-} from './reanimated2/layoutReanimation/defaultAnimations/Default';
 import {
   isJest,
   isChromeDebugger,
@@ -26,6 +22,7 @@ import {
   BaseAnimationBuilder,
   EntryExitAnimationFunction,
   ILayoutAnimationBuilder,
+  LayoutAnimationFunction,
 } from './reanimated2/layoutReanimation';
 import {
   SharedValue,
@@ -43,6 +40,25 @@ function dummyListener() {
   // event is used.
 }
 
+function maybeBuild(
+  layoutAnimationOrBuilder:
+    | ILayoutAnimationBuilder
+    | LayoutAnimationFunction
+    | Keyframe
+): LayoutAnimationFunction | Keyframe {
+  const isAnimationBuilder = (
+    value: ILayoutAnimationBuilder | LayoutAnimationFunction | Keyframe
+  ): value is ILayoutAnimationBuilder =>
+    'build' in layoutAnimationOrBuilder &&
+    typeof layoutAnimationOrBuilder.build === 'function';
+
+  if (isAnimationBuilder(layoutAnimationOrBuilder)) {
+    return layoutAnimationOrBuilder.build();
+  } else {
+    return layoutAnimationOrBuilder;
+  }
+}
+
 type NestedArray<T> = T | NestedArray<T>[];
 function flattenArray<T>(array: NestedArray<T>): T[] {
   if (!Array.isArray(array)) {
@@ -399,42 +415,35 @@ export default function createAnimatedComponent(
       setLocalRef: (ref) => {
         // TODO update config
         const tag = findNodeHandle(ref);
-        if (
-          !shouldBeUseWeb() &&
-          (this.props.layout || this.props.entering || this.props.exiting) &&
-          tag != null
-        ) {
-          enableLayoutAnimations(true, false);
-          let layout = this.props.layout ? this.props.layout : DefaultLayout;
-          let entering = this.props.entering
-            ? this.props.entering
-            : DefaultEntering;
-          let exiting = this.props.exiting
-            ? this.props.exiting
-            : DefaultExiting;
-
-          if (has('build', layout)) {
-            layout = layout.build();
+        const { layout, entering, exiting } = this.props;
+        if ((layout || entering || exiting) && tag != null) {
+          if (!shouldBeUseWeb()) {
+            enableLayoutAnimations(true, false);
           }
-
-          if (has('build', entering)) {
-            entering = entering.build() as EntryExitAnimationFunction;
+          if (layout) {
+            configureLayoutAnimations(
+              tag,
+              'layout',
+              maybeBuild(layout),
+              this.sv
+            );
           }
-
-          if (has('build', exiting)) {
-            exiting = exiting.build() as EntryExitAnimationFunction;
+          if (entering) {
+            configureLayoutAnimations(
+              tag,
+              'entering',
+              maybeBuild(entering),
+              this.sv
+            );
+          }
+          if (exiting) {
+            configureLayoutAnimations(
+              tag,
+              'exiting',
+              maybeBuild(exiting),
+              this.sv
+            );
           }
-
-          const config = {
-            layout,
-            entering,
-            exiting,
-            sv: this.sv,
-          };
-          runOnUI(() => {
-            'worklet';
-            global.LayoutAnimationRepository.registerConfig(tag, config);
-          })();
         }
 
         if (ref !== this._component) {

package/src/reanimated2/NativeReanimated/NativeReanimated.ts

@@ -6,6 +6,8 @@ import {
   AnimatedKeyboardInfo,
 } from '../commonTypes';
 import { Descriptor } from '../hook/commonTypes';
+import { LayoutAnimationFunction } from '../layoutReanimation';
+import { version as jsVersion } from '../../../package.json';
 
 export class NativeReanimated {
   native: boolean;
@@ -18,6 +20,33 @@ export class NativeReanimated {
     }
     this.InnerNativeModule = global.__reanimatedModuleProxy;
     this.native = native;
+    if (native) {
+      this.checkVersion();
+    }
+  }
+
+  checkVersion(): void {
+    const cppVersion = global._REANIMATED_VERSION_CPP;
+    const ok = (() => {
+      if (
+        jsVersion.match(/^\d+\.\d+\.\d+$/) &&
+        cppVersion.match(/^\d+\.\d+\.\d+$/)
+      ) {
+        // x.y.z, compare only major and minor, skip patch
+        const [jsMajor, jsMinor] = jsVersion.split('.');
+        const [cppMajor, cppMinor] = cppVersion.split('.');
+        return jsMajor === cppMajor && jsMinor === cppMinor;
+      } else {
+        // alpha, beta or rc, compare everything
+        return jsVersion === cppVersion;
+      }
+    })();
+    if (!ok) {
+      console.error(
+        `[Reanimated] Mismatch between JavaScript part and native part of Reanimated (${jsVersion} vs. ${cppVersion}). Did you forget to re-build the app after upgrading react-native-reanimated? If you use Expo Go, you must downgrade to ${cppVersion} which is bundled into Expo SDK.`
+      );
+      // TODO: detect Expo managed workflow
+    }
   }
 
   installCoreFunctions(valueSetter: <T>(value: T) => void): void {
@@ -91,6 +120,20 @@ export class NativeReanimated {
     return this.InnerNativeModule.getViewProp(viewTag, propName, callback);
   }
 
+  configureLayoutAnimation(
+    viewTag: number,
+    type: string,
+    config: Keyframe | LayoutAnimationFunction,
+    viewSharedValue: SharedValue<null | Record<string, unknown>> | null
+  ) {
+    this.InnerNativeModule.configureLayoutAnimation(
+      viewTag,
+      type,
+      config,
+      viewSharedValue
+    );
+  }
+
   enableLayoutAnimations(flag: boolean): void {
     this.InnerNativeModule.enableLayoutAnimations(flag);
   }

package/src/reanimated2/core.ts

@@ -12,6 +12,7 @@ import {
 } from './commonTypes';
 import { Descriptor } from './hook/commonTypes';
 import JSReanimated from './js-reanimated/JSReanimated';
+import { LayoutAnimationFunction } from './layoutReanimation';
 
 if (global._setGlobalConsole === undefined) {
   // it can happen when Reanimated plugin wasn't added, but the user uses the only API from version 1
@@ -178,7 +179,8 @@ function workletValueSetter<T extends WorkletValue>(
     const initializeAnimation = (timestamp: number) => {
       animation.onStart(animation, this.value, timestamp, previousAnimation);
     };
-    initializeAnimation(getTimestamp());
+    const currentTimestamp = getTimestamp();
+    initializeAnimation(currentTimestamp);
     const step = (timestamp: number) => {
       if (animation.cancelled) {
         animation.callback && animation.callback(false /* finished */);
@@ -196,13 +198,7 @@ function workletValueSetter<T extends WorkletValue>(
     };
 
     this._animation = animation;
-
-    if (_frameTimestamp) {
-      // frame
-      step(_frameTimestamp);
-    } else {
-      requestAnimationFrame(step);
-    }
+    step(currentTimestamp);
   } else {
     // prevent setting again to the same value
     // and triggering the mappers that treat this value as an input
@@ -260,8 +256,7 @@ function workletValueSetterJS<T extends WorkletValue>(
     };
 
     this._animation = animation;
-
-    requestFrame(step);
+    step(getTimestamp());
   } else {
     this._setValue && this._setValue(value as AnimatableValue | Descriptor);
   }
@@ -371,6 +366,20 @@ export function enableLayoutAnimations(
   }
 }
 
+export function configureLayoutAnimations(
+  viewTag: number,
+  type: string,
+  config: LayoutAnimationFunction | Keyframe,
+  viewSharedValue: SharedValue<null | Record<string, unknown>> | null
+): void {
+  NativeReanimatedModule.configureLayoutAnimation(
+    viewTag,
+    type,
+    config,
+    viewSharedValue
+  );
+}
+
 export function configureProps(uiProps: string[], nativeProps: string[]): void {
   if (!nativeShouldBeMock()) {
     NativeReanimatedModule.configureProps(uiProps, nativeProps);