react-native-reanimated 2.14.1 → 2.14.3

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Jan 12 09:56:32 UTC 2023
+#Thu Jan 19 15:25:25 UTC 2023
 gradle.version=7.5.1

package/android/CMakeLists.txt

@@ -160,48 +160,54 @@ else()
         set (JSI_LIB "")
     else()
         find_library(
-                JSI_LIB
-                jsi
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
+            JSI_LIB
+            jsi
+            PATHS ${LIBRN_DIR}
+            NO_DEFAULT_PATH
+            NO_CMAKE_FIND_ROOT_PATH
         )
     endif()
 
     find_library(
-            GLOG_LIB
-            glog
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
+        GLOG_LIB
+        glog
+        PATHS ${LIBRN_DIR}
+        NO_DEFAULT_PATH
+        NO_CMAKE_FIND_ROOT_PATH
     )
 
     find_library(
-            FBJNI_LIB
-            fbjni
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
+        FBJNI_LIB
+        fbjni
+        PATHS ${LIBRN_DIR}
+        NO_DEFAULT_PATH
+        NO_CMAKE_FIND_ROOT_PATH
     )
 
     if(${REACT_NATIVE_MINOR_VERSION} LESS 69)
         find_library(
-                FOLLY_LIB
-                folly_json
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
+            FOLLY_LIB
+            folly_json
+            PATHS ${LIBRN_DIR}
+            NO_DEFAULT_PATH
+            NO_CMAKE_FIND_ROOT_PATH
         )
     else()
         find_library(
-                FOLLY_LIB
-                folly_runtime
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
+            FOLLY_LIB
+            folly_runtime
+            PATHS ${LIBRN_DIR}
+            NO_DEFAULT_PATH
+            NO_CMAKE_FIND_ROOT_PATH
         )
     endif()
 
     find_library(
-            REACTNATIVEJNI_LIB
-            reactnativejni
-            PATHS ${LIBRN_DIR}
-            NO_CMAKE_FIND_ROOT_PATH
+        REACTNATIVEJNI_LIB
+        reactnativejni
+        PATHS ${LIBRN_DIR}
+        NO_DEFAULT_PATH
+        NO_CMAKE_FIND_ROOT_PATH
     )
 
     target_link_libraries(
@@ -246,10 +252,11 @@ if(${JS_RUNTIME} STREQUAL "hermes")
             set(HERMES_EXECUTOR_LIB ReactAndroid::hermes_executor)
         else()
             find_library(
-                    HERMES_EXECUTOR_LIB
-                    hermes-executor-debug
-                    PATHS ${LIBRN_DIR}
-                    NO_CMAKE_FIND_ROOT_PATH
+                HERMES_EXECUTOR_LIB
+                hermes-executor-debug
+                PATHS ${LIBRN_DIR}
+                NO_DEFAULT_PATH
+                NO_CMAKE_FIND_ROOT_PATH
             )
         endif()
         target_link_libraries(
@@ -269,6 +276,7 @@ elseif(${JS_RUNTIME} STREQUAL "v8")
             V8EXECUTOR_LIB
             v8executor
             PATHS ${V8_SO_DIR}
+            NO_DEFAULT_PATH
             NO_CMAKE_FIND_ROOT_PATH
     )
     target_link_libraries(
@@ -281,10 +289,11 @@ elseif(${JS_RUNTIME} STREQUAL "jsc")
         set(JSEXECUTOR_LIB ReactAndroid::jscexecutor)
     else()
         find_library(
-                JSEXECUTOR_LIB
-                jscexecutor
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
+            JSEXECUTOR_LIB
+            jscexecutor
+            PATHS ${LIBRN_DIR}
+            NO_DEFAULT_PATH
+            NO_CMAKE_FIND_ROOT_PATH
         )
     endif()
     target_link_libraries(${PACKAGE_NAME} ${JSEXECUTOR_LIB})

package/android/build.gradle

@@ -481,7 +481,7 @@ android {
         debug {
             externalNativeBuild {
                 cmake {
-                    if (JS_RUNTIME == "hermes") {
+                    if (JS_RUNTIME == "hermes" && !REANIMATED_PACKAGE_BUILD) {
                         arguments "-DHERMES_ENABLE_DEBUGGER=1"
                     } else {
                         arguments "-DHERMES_ENABLE_DEBUGGER=0"

package/ios/native/NativeProxy.mm

@@ -23,7 +23,11 @@
 #elif __has_include(<hermes/hermes.h>)
 #import <hermes/hermes.h>
 #else
-#import <jsi/JSCRuntime.h>
+#if REACT_NATIVE_MINOR_VERSION >= 71
+#include <jsc/JSCRuntime.h>
+#else
+#include <jsi/JSCRuntime.h>
+#endif // REACT_NATIVE_MINOR_VERSION
 #endif
 
 namespace reanimated {

package/lib/createAnimatedComponent.js

@@ -192,8 +192,8 @@ export default function createAnimatedComponent(Component, options) {
             let viewTag = findNodeHandle((options === null || options === void 0 ? void 0 : options.setNativeProps) ? this : node);
             const componentName = Component.displayName || Component.name;
             if ((componentName === null || componentName === void 0 ? void 0 : componentName.endsWith('FlashList')) && this._component) {
-                // @ts-ignore it's FlashList specific: https://github.com/Shopify/flash-list/blob/218f314e63806b4fe926741ef73f8b9cd6ebc7eb/src/FlashList.tsx#L824
-                viewTag = findNodeHandle(this._component.recyclerlistview_unsafe);
+                // @ts-ignore it's FlashList specific: https://github.com/Shopify/flash-list/blob/218f314e63806b4fe926741ef73f8b9cd6ebc7eb/src/FlashList.tsx#L815
+                viewTag = findNodeHandle(this._component.getScrollableNode());
             }
             for (const key in this.props) {
                 const prop = this.props[key];

package/lib/reanimated2/animation/styleAnimation.js

@@ -24,7 +24,7 @@ export function setPath(obj, path, value) {
     for (let i = 0; i < keys.length - 1; i++) {
         // creates entry if there isn't one
         currObj = currObj;
-        if (!currObj[keys[i]]) {
+        if (!(keys[i] in currObj)) {
             // if next key is a number create an array
             if (typeof keys[i + 1] === 'number') {
                 currObj[keys[i]] = [];
@@ -117,6 +117,9 @@ export function withStyleAnimation(styleAnimations) {
                     if (prevAnimation && !prevVal) {
                         prevVal = prevAnimation.current;
                     }
+                    if (prevVal === undefined) {
+                        console.warn(`Initial values for animation are missing for property ${currentEntry.path.join('.')}`);
+                    }
                     setPath(animation.current, currentEntry.path, prevVal);
                     let currentAnimation;
                     if (typeof currentEntry.value !== 'object' ||

package/lib/reanimated2/hook/useAnimatedStyle.js

@@ -155,7 +155,7 @@ function styleUpdater(viewDescriptors, updater, state, maybeViewRef, animationsA
                 requestFrame(frame);
             }
         }
-        state.last = Object.assign({}, oldValues, newValues);
+        state.last = Object.assign(oldValues, newValues);
         const style = getStyleWithoutAnimations(state.last);
         if (style) {
             updateProps(viewDescriptors, style, maybeViewRef);
@@ -165,7 +165,7 @@ function styleUpdater(viewDescriptors, updater, state, maybeViewRef, animationsA
         state.isAnimationCancelled = true;
         state.animations = [];
         const diff = styleDiff(oldValues, newValues);
-        state.last = Object.assign({}, oldValues, newValues);
+        state.last = Object.assign(oldValues, diff);
         if (diff) {
             updateProps(viewDescriptors, newValues, maybeViewRef);
         }
@@ -240,7 +240,7 @@ function jestStyleUpdater(viewDescriptors, updater, state, maybeViewRef, animati
     }
     // calculate diff
     const diff = styleDiff(oldValues, newValues);
-    state.last = Object.assign({}, oldValues, newValues);
+    state.last = Object.assign(oldValues, diff);
     if (Object.keys(diff).length !== 0) {
         updatePropsJestWrapper(viewDescriptors, diff, maybeViewRef, animatedStyle, adapters);
     }

package/lib/reanimated2/hook/utils.js

@@ -108,25 +108,17 @@ export function canApplyOptimalisation(upadterFn) {
 }
 export function isAnimated(prop) {
     'worklet';
-    const propsToCheck = [prop];
-    while (propsToCheck.length > 0) {
-        const currentProp = propsToCheck.pop();
-        if (Array.isArray(currentProp)) {
-            for (const item of currentProp) {
-                propsToCheck.push(item);
-            }
-        }
-        else if ((currentProp === null || currentProp === void 0 ? void 0 : currentProp.onFrame) !== undefined) {
+    if (Array.isArray(prop)) {
+        return prop.some(isAnimated);
+    }
+    else if (typeof prop === 'object') {
+        if (prop.onFrame !== undefined) {
             return true;
         }
-        else if (typeof currentProp === 'object') {
-            for (const item of Object.values(currentProp)) {
-                propsToCheck.push(item);
-            }
+        else {
+            return Object.values(prop).some(isAnimated);
         }
-        // if none of the above, it's not the animated prop, check next one
     }
-    // when none of the props were animated return false
     return false;
 }
 export function styleDiff(oldStyle, newStyle) {

package/lib/reanimated2/platform-specific/checkVersion.js

@@ -4,6 +4,10 @@ import { version as jsVersion } from '../../../package.json';
  */
 export function checkVersion() {
     const cppVersion = global._REANIMATED_VERSION_CPP;
+    if (cppVersion === undefined) {
+        console.error(`[Reanimated] Couldn't determine the version of the native part of Reanimated. Did you forget to re-build the app after upgrading react-native-reanimated? If you use Expo Go, you must use the exact version which is bundled into Expo SDK.`);
+        return;
+    }
     const ok = (() => {
         if (jsVersion.match(/^\d+\.\d+\.\d+$/) &&
             cppVersion.match(/^\d+\.\d+\.\d+$/)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "2.14.1",
+  "version": "2.14.3",
   "description": "More powerful alternative to Animated library for React Native.",
   "scripts": {
     "test": "yarn run format:js && yarn run lint:js && yarn run test:unit",

package/src/createAnimatedComponent.tsx

@@ -245,8 +245,8 @@ export default function createAnimatedComponent(
       const componentName = Component.displayName || Component.name;
 
       if (componentName?.endsWith('FlashList') && this._component) {
-        // @ts-ignore it's FlashList specific: https://github.com/Shopify/flash-list/blob/218f314e63806b4fe926741ef73f8b9cd6ebc7eb/src/FlashList.tsx#L824
-        viewTag = findNodeHandle(this._component.recyclerlistview_unsafe);
+        // @ts-ignore it's FlashList specific: https://github.com/Shopify/flash-list/blob/218f314e63806b4fe926741ef73f8b9cd6ebc7eb/src/FlashList.tsx#L815
+        viewTag = findNodeHandle(this._component.getScrollableNode());
       }
 
       for (const key in this.props) {

package/src/reanimated2/animation/styleAnimation.ts

@@ -46,7 +46,7 @@ export function setPath<T>(
   for (let i = 0; i < keys.length - 1; i++) {
     // creates entry if there isn't one
     currObj = currObj as { [key: string]: NestedObjectValues<T> };
-    if (!currObj[keys[i]]) {
+    if (!(keys[i] in currObj)) {
       // if next key is a number create an array
       if (typeof keys[i + 1] === 'number') {
         currObj[keys[i]] = [];
@@ -178,6 +178,13 @@ export function withStyleAnimation(
           if (prevAnimation && !prevVal) {
             prevVal = prevAnimation.current;
           }
+          if (prevVal === undefined) {
+            console.warn(
+              `Initial values for animation are missing for property ${currentEntry.path.join(
+                '.'
+              )}`
+            );
+          }
           setPath(animation.current, currentEntry.path, prevVal);
           let currentAnimation: AnimationObject;
           if (

package/src/reanimated2/hook/useAnimatedStyle.ts

@@ -253,7 +253,7 @@ function styleUpdater(
         requestFrame(frame);
       }
     }
-    state.last = Object.assign({}, oldValues, newValues);
+    state.last = Object.assign(oldValues, newValues);
     const style = getStyleWithoutAnimations(state.last);
     if (style) {
       updateProps(viewDescriptors, style, maybeViewRef);
@@ -263,7 +263,7 @@ function styleUpdater(
     state.animations = [];
 
     const diff = styleDiff(oldValues, newValues);
-    state.last = Object.assign({}, oldValues, newValues);
+    state.last = Object.assign(oldValues, diff);
     if (diff) {
       updateProps(viewDescriptors, newValues, maybeViewRef);
     }
@@ -361,7 +361,7 @@ function jestStyleUpdater(
 
   // calculate diff
   const diff = styleDiff(oldValues, newValues);
-  state.last = Object.assign({}, oldValues, newValues);
+  state.last = Object.assign(oldValues, diff);
 
   if (Object.keys(diff).length !== 0) {
     updatePropsJestWrapper(

package/src/reanimated2/hook/utils.ts

@@ -179,25 +179,15 @@ export function canApplyOptimalisation(upadterFn: WorkletFunction): number {
 
 export function isAnimated(prop: NestedObjectValues<AnimationObject>): boolean {
   'worklet';
-  const propsToCheck: NestedObjectValues<AnimationObject>[] = [prop];
-  while (propsToCheck.length > 0) {
-    const currentProp: NestedObjectValues<AnimationObject> =
-      propsToCheck.pop() as NestedObjectValues<AnimationObject>;
-    if (Array.isArray(currentProp)) {
-      for (const item of currentProp) {
-        propsToCheck.push(item);
-      }
-    } else if (currentProp?.onFrame !== undefined) {
+  if (Array.isArray(prop)) {
+    return prop.some(isAnimated);
+  } else if (typeof prop === 'object') {
+    if (prop.onFrame !== undefined) {
       return true;
-    } else if (typeof currentProp === 'object') {
-      for (const item of Object.values(currentProp)) {
-        propsToCheck.push(item);
-      }
+    } else {
+      return Object.values(prop).some(isAnimated);
     }
-    // if none of the above, it's not the animated prop, check next one
   }
-
-  // when none of the props were animated return false
   return false;
 }
 

package/src/reanimated2/platform-specific/checkVersion.ts

@@ -5,6 +5,12 @@ import { version as jsVersion } from '../../../package.json';
  */
 export function checkVersion(): void {
   const cppVersion = global._REANIMATED_VERSION_CPP;
+  if (cppVersion === undefined) {
+    console.error(
+      `[Reanimated] Couldn't determine the version of the native part of Reanimated. Did you forget to re-build the app after upgrading react-native-reanimated? If you use Expo Go, you must use the exact version which is bundled into Expo SDK.`
+    );
+    return;
+  }
   const ok = (() => {
     if (
       jsVersion.match(/^\d+\.\d+\.\d+$/) &&