react-native-reanimated 2.3.1 → 2.4.0

package/android/build.gradle

@@ -96,10 +96,10 @@ while (!aar.exists()) {
       println "\n\n\n"
       println "****************************************************************************************"
       println "\n\n\n"
-      println "WARNING reanimated - no version-specific reanimated AAR for react-native version " . minor . " found."
-      println "Falling back to AAR for react-native version " . minorCopy
+      println "WARNING reanimated - no version-specific reanimated AAR for react-native version " + minor + " found."
+      println "Falling back to AAR for react-native version " + minorCopy
       println "The react-native JSI interface is not ABI-safe yet, this may result in crashes."
-      println "Please post a pull request to implement support for react-native version " . minor . " to the reanimated repo."
+      println "Please post a pull request to implement support for react-native version " + minor + " to the reanimated repo."
       println "Thanks!"
       println "\n\n\n"
       println "****************************************************************************************"

package/ios/LayoutReanimation/REAAnimationsManager.h

@@ -5,10 +5,10 @@
 NS_ASSUME_NONNULL_BEGIN
 
 typedef NS_ENUM(NSInteger, ViewState) {
+  Inactive,
   Appearing,
   Disappearing,
   Layout,
-  Inactive,
   ToRemove,
 };
 

package/ios/LayoutReanimation/REAAnimationsManager.m

@@ -150,6 +150,10 @@ typedef NS_ENUM(NSInteger, FrameConfigType) { EnteringFrame, ExitingFrame };
   NSMutableSet<NSNumber *> *roots = [NSMutableSet new];
   for (NSNumber *viewTag in _toRemove) {
     UIView *view = _viewForTag[viewTag];
+    if (view == nil) {
+      view = [_reaUiManager viewForReactTag:viewTag];
+      _viewForTag[viewTag] = view;
+    }
     [self findRoot:view roots:roots];
   }
   for (NSNumber *viewTag in roots) {

package/ios/native/NativeMethods.h

@@ -1,11 +1,11 @@
 #import <Foundation/Foundation.h>
+#import <RNGestureHandlerStateManager.h>
 #import <React/RCTUIManager.h>
 #include <string>
 #import <string>
 #include <utility>
 #include <vector>
 #import <vector>
-#import "RNGestureHandlerStateManager.h"
 
 namespace reanimated {
 

package/ios/native/NativeProxy.mm

@@ -3,6 +3,7 @@
 #import <React/RCTUIManager.h>
 #import <folly/json.h>
 
+#import <RNGestureHandlerStateManager.h>
 #import "LayoutAnimationsProxy.h"
 #import "NativeMethods.h"
 #import "NativeProxy.h"
@@ -12,7 +13,6 @@
 #import "REAModule.h"
 #import "REANodesManager.h"
 #import "REAUIManager.h"
-#import "RNGestureHandlerStateManager.h"
 
 #if __has_include(<reacthermes/HermesExecutorFactory.h>)
 #import <reacthermes/HermesExecutorFactory.h>
@@ -246,7 +246,15 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
 
   [reanimatedModule.nodesManager registerEventHandler:^(NSString *eventName, id<RCTEvent> event) {
     std::string eventNameString([eventName UTF8String]);
-    std::string eventAsString = folly::toJson(convertIdToFollyDynamic([event arguments][2]));
+
+    std::string eventAsString;
+    try {
+      eventAsString = folly::toJson(convertIdToFollyDynamic([event arguments][2]));
+    } catch (folly::json::parse_error &) {
+      // Events from other libraries may contain NaN or INF values which cannot be represented in JSON.
+      // See https://github.com/software-mansion/react-native-reanimated/issues/1776 for details.
+      return;
+    }
 
     eventAsString = "{ NativeMap:" + eventAsString + "}";
     jsi::Object global = module->runtime->global();

package/lib/{reanimated2 → src/reanimated2}/Colors.js

@@ -8,9 +8,6 @@
 /* eslint no-bitwise: 0 */
 import { Platform } from 'react-native';
 import { makeRemote, makeShareable, isConfigured } from './core';
-import { interpolate } from './interpolation';
-// @ts-ignore JS file
-import { Extrapolate } from '../reanimated1/derived';
 // var INTEGER = '[-+]?\\d+';
 const NUMBER = '[-+]?\\d*\\.?\\d+';
 const PERCENTAGE = NUMBER + '%';
@@ -381,7 +378,7 @@ export const rgbaColor = (r, g, b, alpha = 1) => {
     }
     return c;
 };
-function RGBtoHSV(r, g, b) {
+export function RGBtoHSV(r, g, b) {
     'worklet';
     /* eslint-disable */
     if (arguments.length === 1) {
@@ -522,96 +519,3 @@ export function toRGBA(HSVA) {
     const { r, g, b } = HSVtoRGB(HSVA[0], HSVA[1], HSVA[2]);
     return `rgba(${r}, ${g}, ${b}, ${HSVA[3]})`;
 }
-const interpolateColorsHSV = (value, inputRange, colors) => {
-    'worklet';
-    const h = interpolate(value, inputRange, colors.h, Extrapolate.CLAMP);
-    const s = interpolate(value, inputRange, colors.s, Extrapolate.CLAMP);
-    const v = interpolate(value, inputRange, colors.v, Extrapolate.CLAMP);
-    return hsvToColor(h, s, v);
-};
-const interpolateColorsRGB = (value, inputRange, colors) => {
-    'worklet';
-    const r = interpolate(value, inputRange, colors.r, Extrapolate.CLAMP);
-    const g = interpolate(value, inputRange, colors.g, Extrapolate.CLAMP);
-    const b = interpolate(value, inputRange, colors.b, Extrapolate.CLAMP);
-    const a = interpolate(value, inputRange, colors.a, Extrapolate.CLAMP);
-    return rgbaColor(r, g, b, a);
-};
-const BUFFER_SIZE = 200;
-const hashOrderRGBA = new ArrayBuffer(BUFFER_SIZE);
-let curentHashIndexRGBA = 0;
-const interpolateCacheRGBA = {};
-const getInterpolateCacheRGBA = (colors) => {
-    'worklet';
-    const hash = colors.join('');
-    const cache = interpolateCacheRGBA[hash];
-    if (cache !== undefined) {
-        return cache;
-    }
-    const r = [];
-    const g = [];
-    const b = [];
-    const a = [];
-    for (let i = 0; i < colors.length; ++i) {
-        const color = colors[i];
-        const proocessedColor = processColor(color);
-        // explicit check in case if processedColor is 0
-        if (proocessedColor !== null && proocessedColor !== undefined) {
-            r.push(red(proocessedColor));
-            g.push(green(proocessedColor));
-            b.push(blue(proocessedColor));
-            a.push(opacity(proocessedColor));
-        }
-    }
-    const newCache = { r, g, b, a };
-    const overrideHash = hashOrderRGBA[curentHashIndexRGBA];
-    if (overrideHash) {
-        delete interpolateCacheRGBA[overrideHash];
-    }
-    interpolateCacheRGBA[hash] = newCache;
-    hashOrderRGBA[curentHashIndexRGBA] = hash;
-    curentHashIndexRGBA = (curentHashIndexRGBA + 1) % BUFFER_SIZE;
-    return newCache;
-};
-const hashOrderHSV = new ArrayBuffer(BUFFER_SIZE);
-let curentHashIndexHSV = 0;
-const interpolateCacheHSV = {};
-const getInterpolateCacheHSV = (colors) => {
-    'worklet';
-    const hash = colors.join('');
-    const cache = interpolateCacheHSV[hash];
-    if (cache !== undefined) {
-        return cache;
-    }
-    const h = [];
-    const s = [];
-    const v = [];
-    for (let i = 0; i < colors.length; ++i) {
-        const color = colors[i];
-        const proocessedColor = RGBtoHSV(processColor(color));
-        if (proocessedColor) {
-            h.push(proocessedColor.h);
-            s.push(proocessedColor.s);
-            v.push(proocessedColor.v);
-        }
-    }
-    const newCache = { h, s, v };
-    const overrideHash = hashOrderHSV[curentHashIndexHSV];
-    if (overrideHash) {
-        delete interpolateCacheHSV[overrideHash];
-    }
-    interpolateCacheHSV[hash] = newCache;
-    hashOrderHSV[curentHashIndexHSV] = hash;
-    curentHashIndexHSV = (curentHashIndexHSV + 1) % BUFFER_SIZE;
-    return newCache;
-};
-export const interpolateColor = (value, inputRange, outputRange, colorSpace = 'RGB') => {
-    'worklet';
-    if (colorSpace === 'HSV') {
-        return interpolateColorsHSV(value, inputRange, getInterpolateCacheHSV(outputRange));
-    }
-    else if (colorSpace === 'RGB') {
-        return interpolateColorsRGB(value, inputRange, getInterpolateCacheRGBA(outputRange));
-    }
-    throw new Error(`invalid color space provided: ${colorSpace}. Supported values are: ['RGB', 'HSV']`);
-};

package/lib/{reanimated2 → src/reanimated2}/Easing.js

@@ -149,6 +149,10 @@ function bezier(x1, y1, x2, y2) {
         },
     };
 }
+function bezierFn(x1, y1, x2, y2) {
+    'worklet';
+    return Bezier(x1, y1, x2, y2);
+}
 /**
  * Runs an easing function forwards.
  */
@@ -194,6 +198,7 @@ const EasingObject = {
     back,
     bounce,
     bezier,
+    bezierFn,
     in: in_,
     out,
     inOut,

package/lib/{reanimated2 → src/reanimated2}/NativeMethods.js

@@ -1,12 +1,21 @@
 import { findNodeHandle } from 'react-native';
-import { isChromeDebugger } from './PlatformChecker';
+import { shouldBeUseWeb } from './PlatformChecker';
 export function getTag(view) {
     return findNodeHandle(view);
 }
+const isNativeIndefined = shouldBeUseWeb();
 export function measure(animatedRef) {
     'worklet';
-    if (!_WORKLET && !isChromeDebugger()) {
-        throw new Error('(measure) method cannot be used on RN side!');
+    if (!_WORKLET || isNativeIndefined) {
+        console.warn('[reanimated.measure] method cannot be used for web or Chrome Debugger');
+        return {
+            x: NaN,
+            y: NaN,
+            width: NaN,
+            height: NaN,
+            pageX: NaN,
+            pageY: NaN,
+        };
     }
     const viewTag = animatedRef();
     const result = _measure(viewTag);
@@ -17,7 +26,7 @@ export function measure(animatedRef) {
 }
 export function scrollTo(animatedRef, x, y, animated) {
     'worklet';
-    if (!_WORKLET && !isChromeDebugger()) {
+    if (!_WORKLET || isNativeIndefined) {
         return;
     }
     const viewTag = animatedRef();
@@ -25,8 +34,9 @@ export function scrollTo(animatedRef, x, y, animated) {
 }
 export function setGestureState(handlerTag, newState) {
     'worklet';
-    if (!_WORKLET && !isChromeDebugger()) {
+    if (!_WORKLET || isNativeIndefined) {
         console.warn('[Reanimated] You can not use setGestureState in non-worklet function.');
+        return;
     }
     _setGestureState(handlerTag, newState);
 }

package/lib/{reanimated2 → src/reanimated2}/NativeReanimated/index.js

@@ -1,9 +1,9 @@
 import reanimatedJS from '../js-reanimated';
-import { nativeShouldBeMock } from '../PlatformChecker';
+import { shouldBeUseWeb } from '../PlatformChecker';
 import { Platform } from 'react-native';
 import { NativeReanimated } from './NativeReanimated';
 let exportedModule;
-if (nativeShouldBeMock()) {
+if (shouldBeUseWeb()) {
     exportedModule = reanimatedJS;
 }
 else {

package/lib/{reanimated2 → src/reanimated2}/core.js

@@ -275,9 +275,11 @@ if (!NativeReanimatedModule.useOnlyV1) {
                 info: runOnJS(capturableConsole.info),
             };
             _setGlobalConsole(console);
-            global.performance = {
-                now: global._chronoNow,
-            };
+            if (global.performance == null) {
+                global.performance = {
+                    now: global._chronoNow,
+                };
+            }
         })();
     }
 }

package/lib/{reanimated2 → src/reanimated2}/hook/useAnimatedGestureHandler.js

@@ -1,4 +1,3 @@
-import { isWeb } from '../PlatformChecker';
 import { useEvent, useHandler } from './Hooks';
 export var EventType;
 (function (EventType) {
@@ -43,7 +42,7 @@ export function useAnimatedGestureHandler(handlers, dependencies) {
             handlers.onFinish(event, context, event.state === EventType.CANCELLED || event.state === EventType.FAILED);
         }
     };
-    if (isWeb()) {
+    if (useWeb) {
         return handler;
     }
     return useEvent(handler, ['onGestureHandlerStateChange', 'onGestureHandlerEvent'], doDependenciesDiffer);