react-native-reanimated 2.14.2 → 2.14.3

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

@@ -1,2 +1,2 @@
-#Tue Jan 17 15:21:03 UTC 2023
+#Thu Jan 19 15:25:25 UTC 2023
 gradle.version=7.5.1

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "2.14.2",
+  "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/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;
 }