react-native-reanimated 2.6.0 → 2.7.0

package/ios/REANodesManager.m

@@ -1,29 +1,27 @@
-#import "REANodesManager.h"
-
+#import <RNReanimated/REAAlwaysNode.h>
+#import <RNReanimated/REABezierNode.h>
+#import <RNReanimated/REABlockNode.h>
+#import <RNReanimated/REACallFuncNode.h>
+#import <RNReanimated/REAClockNodes.h>
+#import <RNReanimated/REAConcatNode.h>
+#import <RNReanimated/REACondNode.h>
+#import <RNReanimated/READebugNode.h>
+#import <RNReanimated/REAEventNode.h>
+#import <RNReanimated/REAFunctionNode.h>
+#import <RNReanimated/REAJSCallNode.h>
+#import <RNReanimated/REAModule.h>
+#import <RNReanimated/REANode.h>
+#import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/REAOperatorNode.h>
+#import <RNReanimated/REAParamNode.h>
+#import <RNReanimated/REAPropsNode.h>
+#import <RNReanimated/REASetNode.h>
+#import <RNReanimated/REAStyleNode.h>
+#import <RNReanimated/REATransformNode.h>
+#import <RNReanimated/REAValueNode.h>
 #import <React/RCTConvert.h>
-
 #import <React/RCTShadowView.h>
 #import <stdatomic.h>
-#import "Nodes/REAAlwaysNode.h"
-#import "Nodes/REABezierNode.h"
-#import "Nodes/REABlockNode.h"
-#import "Nodes/REACallFuncNode.h"
-#import "Nodes/REAClockNodes.h"
-#import "Nodes/REAConcatNode.h"
-#import "Nodes/REACondNode.h"
-#import "Nodes/READebugNode.h"
-#import "Nodes/REAEventNode.h"
-#import "Nodes/REAFunctionNode.h"
-#import "Nodes/REAJSCallNode.h"
-#import "Nodes/REANode.h"
-#import "Nodes/REAOperatorNode.h"
-#import "Nodes/REAParamNode.h"
-#import "Nodes/REAPropsNode.h"
-#import "Nodes/REASetNode.h"
-#import "Nodes/REAStyleNode.h"
-#import "Nodes/REATransformNode.h"
-#import "Nodes/REAValueNode.h"
-#import "REAModule.h"
 
 // Interface below has been added in order to use private methods of RCTUIManager,
 // RCTUIManager#UpdateView is a React Method which is exported to JS but in

package/ios/Transitioning/RCTConvert+REATransition.h

@@ -1,7 +1,6 @@
+#import <RNReanimated/REATransition.h>
 #import <React/RCTConvert.h>
 
-#import "REATransition.h"
-
 @interface RCTConvert (REATransition)
 
 + (REATransitionType)REATransitionType:(id)json;

package/ios/Transitioning/RCTConvert+REATransition.m

@@ -1,4 +1,4 @@
-#import "RCTConvert+REATransition.h"
+#import <RNReanimated/RCTConvert+REATransition.h>
 
 @implementation RCTConvert (REATransition)
 

package/ios/Transitioning/REAAllTransitions.h

@@ -1,4 +1,4 @@
-#import "REATransition.h"
+#import <RNReanimated/REATransition.h>
 
 @interface REATransitionGroup : REATransition
 @property (nonatomic) BOOL sequence;

package/ios/Transitioning/REAAllTransitions.m

@@ -1,8 +1,7 @@
+#import <RNReanimated/RCTConvert+REATransition.h>
+#import <RNReanimated/REAAllTransitions.h>
 #import <React/RCTViewManager.h>
 
-#import "RCTConvert+REATransition.h"
-#import "REAAllTransitions.h"
-
 @interface REASnapshotRemover : NSObject <CAAnimationDelegate>
 @end
 

package/ios/Transitioning/REATransition.h

@@ -1,10 +1,9 @@
 #import <QuartzCore/QuartzCore.h>
+#import <RNReanimated/REATransitionAnimation.h>
+#import <RNReanimated/REATransitionValues.h>
 #import <React/RCTView.h>
 #import <UIKit/UIKit.h>
 
-#import "REATransitionAnimation.h"
-#import "REATransitionValues.h"
-
 // TODO: fix below implementation
 #define IS_LAYOUT_ONLY(view) ([view isKindOfClass:[RCTView class]] && view.backgroundColor == nil)
 

package/ios/Transitioning/REATransition.m

@@ -1,12 +1,11 @@
 #import <QuartzCore/QuartzCore.h>
+#import <RNReanimated/RCTConvert+REATransition.h>
+#import <RNReanimated/REATransition.h>
+#import <RNReanimated/REATransitionValues.h>
 #import <React/RCTConvert.h>
 #import <React/RCTViewManager.h>
 #import <UIKit/UIKit.h>
 
-#import "RCTConvert+REATransition.h"
-#import "REATransition.h"
-#import "REATransitionValues.h"
-
 #define DEFAULT_PROPAGATION_SPEED 3
 
 @interface REATransitionGroup : REATransition

package/ios/Transitioning/REATransitionAnimation.m

@@ -1,7 +1,6 @@
+#import <RNReanimated/REATransitionAnimation.h>
 #import <UIKit/UIKit.h>
 
-#import "REATransitionAnimation.h"
-
 #define DEFAULT_DURATION 0.25
 
 #if TARGET_IPHONE_SIMULATOR

package/ios/Transitioning/REATransitionManager.m

@@ -1,10 +1,8 @@
-#import "REATransitionManager.h"
-
+#import <RNReanimated/REATransition.h>
+#import <RNReanimated/REATransitionManager.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTUIManagerObserverCoordinator.h>
 
-#import "REATransition.h"
-
 @interface REATransitionManager () <RCTUIManagerObserver>
 @end
 

package/ios/Transitioning/REATransitionValues.m

@@ -1,9 +1,8 @@
+#import <RNReanimated/REATransition.h>
+#import <RNReanimated/REATransitionValues.h>
 #import <React/RCTView.h>
 #import <React/RCTViewManager.h>
 
-#import "REATransition.h"
-#import "REATransitionValues.h"
-
 @implementation REATransitionValues
 
 - (instancetype)initWithView:(UIView *)view forRoot:(UIView *)root

package/ios/native/NativeMethods.h

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

package/ios/native/NativeMethods.mm

@@ -1,4 +1,4 @@
-#import "NativeMethods.h"
+#import <RNReanimated/NativeMethods.h>
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTScrollView.h>
 

package/ios/native/NativeProxy.h

@@ -1,7 +1,7 @@
-#import <React/RCTEventDispatcher.h>
-
 #if __cplusplus
+
 #import <RNReanimated/NativeReanimatedModule.h>
+#import <React/RCTEventDispatcher.h>
 #include <memory>
 
 namespace reanimated {

package/ios/native/NativeProxy.mm

@@ -1,22 +1,21 @@
-#if TARGET_IPHONE_SIMULATOR
-#import <dlfcn.h>
-#endif
-
+#import <RNReanimated/LayoutAnimationsProxy.h>
+#import <RNReanimated/NativeMethods.h>
+#import <RNReanimated/NativeProxy.h>
+#import <RNReanimated/REAAnimationsManager.h>
+#import <RNReanimated/REAIOSErrorHandler.h>
+#import <RNReanimated/REAIOSScheduler.h>
+#import <RNReanimated/REAModule.h>
+#import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/REAUIManager.h>
+#import <RNReanimated/RNGestureHandlerStateManager.h>
+#import <RNReanimated/ReanimatedSensorContainer.h>
 #import <React/RCTFollyConvert.h>
 #import <React/RCTUIManager.h>
 #import <folly/json.h>
 
-#import <RNGestureHandlerStateManager.h>
-#import "LayoutAnimationsProxy.h"
-#import "NativeMethods.h"
-#import "NativeProxy.h"
-#import "REAAnimationsManager.h"
-#import "REAIOSErrorHandler.h"
-#import "REAIOSScheduler.h"
-#import "REAModule.h"
-#import "REANodesManager.h"
-#import "REAUIManager.h"
-#import "ReanimatedSensorContainer.h"
+#if TARGET_IPHONE_SIMULATOR
+#import <dlfcn.h>
+#endif
 
 #if __has_include(<reacthermes/HermesExecutorFactory.h>)
 #import <reacthermes/HermesExecutorFactory.h>

package/ios/native/REAIOSErrorHandler.h

@@ -1,9 +1,7 @@
-#pragma once
-
+#import <RNReanimated/ErrorHandler.h>
+#import <RNReanimated/Scheduler.h>
 #include <memory>
 #include <string>
-#include "ErrorHandler.h"
-#include "Scheduler.h"
 
 namespace reanimated {
 

package/ios/native/REAIOSErrorHandler.mm

@@ -1,5 +1,5 @@
-#include "REAIOSErrorHandler.h"
 #import <Foundation/Foundation.h>
+#import <RNReanimated/REAIOSErrorHandler.h>
 #import <React/RCTLog.h>
 
 namespace reanimated {

package/ios/native/REAIOSLogger.h

@@ -1,7 +1,5 @@
-#pragma once
-
+#import <RNReanimated/ReanimatedHiddenHeaders.h>
 #include <stdio.h>
-#include "ReanimatedHiddenHeaders.h"
 
 namespace reanimated {
 

package/ios/native/REAIOSLogger.mm

@@ -1,5 +1,5 @@
-#include "REAIOSLogger.h"
 #import <Foundation/Foundation.h>
+#import <RNReanimated/REAIOSLogger.h>
 
 namespace reanimated {
 

package/ios/native/REAIOSScheduler.h

@@ -1,10 +1,8 @@
-#pragma once
-
+#import <RNReanimated/Scheduler.h>
 #import <React/RCTUIManager.h>
 #import <ReactCommon/CallInvoker.h>
 #include <stdio.h>
 #include <memory>
-#include "Scheduler.h"
 
 namespace reanimated {
 

package/ios/native/REAIOSScheduler.mm

@@ -1,5 +1,5 @@
-#include "REAIOSScheduler.h"
-#include "RuntimeManager.h"
+#import <RNReanimated/REAIOSScheduler.h>
+#import <RNReanimated/RuntimeManager.h>
 
 namespace reanimated {
 

package/ios/native/REAInitializer.h

@@ -1,10 +1,3 @@
-//
-//  REAInitializer.h
-//  RNReanimated
-//
-//  Created by Szymon Kapala on 27/07/2021.
-//
-
 #import <Foundation/Foundation.h>
 #import <RNReanimated/NativeProxy.h>
 #import <RNReanimated/REAEventDispatcher.h>

package/ios/native/REAInitializer.mm

@@ -1,5 +1,5 @@
-#import "REAInitializer.h"
-#import "REAUIManager.h"
+#import <RNReanimated/REAInitializer.h>
+#import <RNReanimated/REAUIManager.h>
 
 @interface RCTEventDispatcher (Reanimated)
 

package/ios/native/UIResponder+Reanimated.mm

@@ -1,6 +1,6 @@
-#import "REAInitializer.h"
-#import "REAUIManager.h"
-#import "UIResponder+Reanimated.h"
+#import <RNReanimated/REAInitializer.h>
+#import <RNReanimated/REAUIManager.h>
+#import <RNReanimated/UIResponder+Reanimated.h>
 
 #if __has_include(<reacthermes/HermesExecutorFactory.h>)
 #import <reacthermes/HermesExecutorFactory.h>

package/ios/sensor/ReanimatedSensor.h

@@ -1,7 +1,7 @@
 #if __has_include(<CoreMotion/CoreMotion.h>)
 #import <CoreMotion/CoreMotion.h>
 #endif
-#import "ReanimatedSensorType.h"
+#import <RNReanimated/ReanimatedSensorType.h>
 
 @interface ReanimatedSensor : NSObject {
   ReanimatedSensorType _sensorType;

package/ios/sensor/ReanimatedSensor.m

@@ -1,4 +1,4 @@
-#import "ReanimatedSensor.h"
+#import <RNReanimated/ReanimatedSensor.h>
 
 #if __has_include(<CoreMotion/CoreMotion.h>)
 @implementation ReanimatedSensor

package/ios/sensor/ReanimatedSensorContainer.h

@@ -1,4 +1,4 @@
-#import "ReanimatedSensorType.h"
+#import <RNReanimated/ReanimatedSensorType.h>
 
 @interface ReanimatedSensorContainer : NSObject {
   NSNumber *_nextSensorId;

package/ios/sensor/ReanimatedSensorContainer.m

@@ -1,6 +1,6 @@
-#import "ReanimatedSensorContainer.h"
 #import <Foundation/Foundation.h>
-#import "ReanimatedSensor.h"
+#import <RNReanimated/ReanimatedSensor.h>
+#import <RNReanimated/ReanimatedSensorContainer.h>
 
 static NSNumber *_nextSensorId = nil;
 

package/lib/ConfigHelper.js

@@ -76,7 +76,6 @@ let NATIVE_THREAD_PROPS_WHITELIST = {
     borderTopLeftRadius: true,
     borderTopRightRadius: true,
     borderTopStartRadius: true,
-    opacity: true,
     elevation: true,
     fontSize: true,
     lineHeight: true,

package/lib/reanimated2/Easing.js

@@ -53,7 +53,10 @@ function cubic(t) {
  */
 function poly(n) {
     'worklet';
-    return (t) => Math.pow(t, n);
+    return (t) => {
+        'worklet';
+        return Math.pow(t, n);
+    };
 }
 /**
  * A sinusoidal function.
@@ -110,7 +113,10 @@ function elastic(bounciness = 1) {
  */
 function back(s = 1.70158) {
     'worklet';
-    return (t) => t * t * ((s + 1) * t - s);
+    return (t) => {
+        'worklet';
+        return t * t * ((s + 1) * t - s);
+    };
 }
 /**
  * Provides a simple bouncing effect.
@@ -224,7 +230,7 @@ function createChecker(worklet, workletName, prevArgs) {
         }
         // @ts-ignore this is implicitly any - TODO
         const res = worklet.apply(this, arguments);
-        if (!_WORKLET && res && typeof res === 'function' && res.__worklet) {
+        if (!_WORKLET && res && typeof res === 'function' && res.__workletHash) {
             return createChecker(res, workletName, arguments);
         }
         return res;

package/lib/reanimated2/core.js

@@ -2,9 +2,6 @@
 import NativeReanimatedModule from './NativeReanimated';
 import { Platform } from 'react-native';
 import { nativeShouldBeMock, shouldBeUseWeb, isWeb } from './PlatformChecker';
-global.__reanimatedWorkletInit = function (worklet) {
-    worklet.__worklet = true;
-};
 if (global._setGlobalConsole === undefined) {
     // it can happen when Reanimated plugin wasn't added, but the user uses the only API from version 1
     global._setGlobalConsole = () => {
@@ -31,39 +28,6 @@ export const isConfiguredCheck = () => {
         throw new Error('If you want to use Reanimated 2 then go through our installation steps https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation');
     }
 };
-function _toArrayReanimated(object) {
-    'worklet';
-    if (Array.isArray(object)) {
-        return object;
-    }
-    if (typeof Symbol !== 'undefined' &&
-        (typeof Symbol === 'function' ? Symbol.iterator : '@@iterator') in
-            Object(object)) {
-        return Array.from(object);
-    }
-    throw new Error('Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.');
-}
-function _mergeObjectsReanimated() {
-    'worklet';
-    // we can't use rest parameters in worklets at the moment
-    // eslint-disable-next-line prefer-rest-params
-    const arr = Array.from(arguments);
-    return Object.assign.apply(null, [arr[0], ...arr.slice(1)]);
-}
-global.__reanimatedWorkletInit = function (worklet) {
-    worklet.__worklet = true;
-    if (worklet._closure) {
-        const closure = worklet._closure;
-        Object.keys(closure).forEach((key) => {
-            if (key === '_toConsumableArray') {
-                closure[key] = _toArrayReanimated;
-            }
-            if (key === '_objectSpread') {
-                closure[key] = _mergeObjectsReanimated;
-            }
-        });
-    }
-};
 function pushFrame(frame) {
     NativeReanimatedModule.pushFrame(frame);
 }

package/lib/reanimated2/globals.d.ts

@@ -1,4 +1,4 @@
-import { AnimatedStyle, StyleProps, WorkletFunction } from './commonTypes';
+import { AnimatedStyle, StyleProps } from './commonTypes';
 import { ReanimatedConsole } from './core';
 import { MeasuredDimensions } from './NativeMethods';
 import { NativeReanimated } from './NativeReanimated/NativeReanimated';
@@ -32,7 +32,6 @@ declare global {
   };
   namespace NodeJS {
     interface Global {
-      __reanimatedWorkletInit: (worklet: WorkletFunction) => void;
       _setGlobalConsole: (console?: ReanimatedConsole) => void;
       _log: (s: string) => void;
       _setGestureState: () => void;

package/lib/types/lib/reanimated2/commonTypes.d.ts

@@ -17,7 +17,6 @@ export interface WorkletFunction {
     _closure?: Context;
     __workletHash?: number;
     __optimalization?: number;
-    __worklet?: boolean;
 }
 export interface BasicWorkletFunction<T> extends WorkletFunction {
     (): T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "More powerful alternative to Animated library for React Native.",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
@@ -75,24 +75,22 @@
   "homepage": "https://github.com/software-mansion/react-native-reanimated#readme",
   "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",
-    "react-native-screens": "^3.11.1",
     "setimmediate": "^1.0.5",
     "string-hash-64": "^1.0.3"
   },
   "peerDependencies": {
-    "@babel/preset-typescript": "*",
+    "@babel/core": "^7.0.0-0",
     "react": "*",
-    "react-native": "*",
-    "react-native-gesture-handler": "*"
+    "react-native": "*"
   },
   "devDependencies": {
     "@babel/core": "^7.17.2",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/preset-env": "^7.16.11",
-    "@babel/preset-typescript": "^7.16.7",
     "@react-native-community/bob": "^0.17.1",
     "@react-native-community/eslint-config": "^0.0.5",
     "@testing-library/jest-native": "^4.0.4",

package/plugin.js

@@ -511,18 +511,6 @@ function makeWorklet(t, fun, fileName) {
     );
   }
 
-  statements.push(
-    t.expressionStatement(
-      t.callExpression(
-        t.memberExpression(
-          t.identifier('global'),
-          t.identifier('__reanimatedWorkletInit'),
-          false
-        ),
-        [privateFunctionId]
-      )
-    )
-  );
   statements.push(t.returnStatement(privateFunctionId));
 
   const newFun = t.functionExpression(fun.id, [], t.blockStatement(statements));

package/src/ConfigHelper.ts

@@ -78,7 +78,6 @@ let NATIVE_THREAD_PROPS_WHITELIST: Record<string, boolean> = {
   borderTopLeftRadius: true,
   borderTopRightRadius: true,
   borderTopStartRadius: true,
-  opacity: true,
   elevation: true,
   fontSize: true,
   lineHeight: true,

package/src/reanimated2/Easing.ts

@@ -109,7 +109,10 @@ function cubic(t: number): number {
  */
 function poly(n: number): EasingFn {
   'worklet';
-  return (t) => Math.pow(t, n);
+  return (t) => {
+    'worklet';
+    return Math.pow(t, n);
+  };
 }
 
 /**
@@ -171,7 +174,10 @@ function elastic(bounciness = 1): EasingFn {
  */
 function back(s = 1.70158): (t: number) => number {
   'worklet';
-  return (t) => t * t * ((s + 1) * t - s);
+  return (t) => {
+    'worklet';
+    return t * t * ((s + 1) * t - s);
+  };
 }
 
 /**
@@ -312,7 +318,7 @@ function createChecker(
     }
     // @ts-ignore this is implicitly any - TODO
     const res = worklet.apply(this, arguments);
-    if (!_WORKLET && res && typeof res === 'function' && res.__worklet) {
+    if (!_WORKLET && res && typeof res === 'function' && res.__workletHash) {
       return createChecker(res, workletName, arguments);
     }
     return res;

package/src/reanimated2/commonTypes.ts

@@ -51,7 +51,6 @@ export interface WorkletFunction {
   _closure?: Context;
   __workletHash?: number;
   __optimalization?: number;
-  __worklet?: boolean;
 }
 
 export interface BasicWorkletFunction<T> extends WorkletFunction {

package/src/reanimated2/core.ts

@@ -4,7 +4,6 @@ import { Platform } from 'react-native';
 import { nativeShouldBeMock, shouldBeUseWeb, isWeb } from './PlatformChecker';
 import {
   BasicWorkletFunction,
-  WorkletFunction,
   ComplexWorkletFunction,
   SharedValue,
   AnimationObject,
@@ -14,10 +13,6 @@ import {
 import { Descriptor } from './hook/commonTypes';
 import JSReanimated from './js-reanimated/JSReanimated';
 
-global.__reanimatedWorkletInit = function (worklet: WorkletFunction) {
-  worklet.__worklet = true;
-};
-
 if (global._setGlobalConsole === undefined) {
   // it can happen when Reanimated plugin wasn't added, but the user uses the only API from version 1
   global._setGlobalConsole = () => {
@@ -74,48 +69,6 @@ export const isConfiguredCheck: () => void = () => {
   }
 };
 
-function _toArrayReanimated<T>(object: Iterable<T> | ArrayLike<T> | T[]): T[] {
-  'worklet';
-  if (Array.isArray(object)) {
-    return object;
-  }
-  if (
-    typeof Symbol !== 'undefined' &&
-    (typeof Symbol === 'function' ? Symbol.iterator : '@@iterator') in
-      Object(object)
-  ) {
-    return Array.from(object);
-  }
-  throw new Error(
-    'Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.'
-  );
-}
-
-function _mergeObjectsReanimated(): unknown {
-  'worklet';
-  // we can't use rest parameters in worklets at the moment
-  // eslint-disable-next-line prefer-rest-params
-  const arr = Array.from(arguments);
-  return Object.assign.apply(null, [arr[0], ...arr.slice(1)]);
-}
-
-global.__reanimatedWorkletInit = function (worklet: WorkletFunction) {
-  worklet.__worklet = true;
-
-  if (worklet._closure) {
-    const closure = worklet._closure;
-    Object.keys(closure).forEach((key) => {
-      if (key === '_toConsumableArray') {
-        closure[key] = _toArrayReanimated;
-      }
-
-      if (key === '_objectSpread') {
-        closure[key] = _mergeObjectsReanimated;
-      }
-    });
-  }
-};
-
 function pushFrame(frame: (timestamp: Timestamp) => void): void {
   (NativeReanimatedModule as JSReanimated).pushFrame(frame);
 }

package/src/reanimated2/globals.d.ts

@@ -1,4 +1,4 @@
-import { AnimatedStyle, StyleProps, WorkletFunction } from './commonTypes';
+import { AnimatedStyle, StyleProps } from './commonTypes';
 import { ReanimatedConsole } from './core';
 import { MeasuredDimensions } from './NativeMethods';
 import { NativeReanimated } from './NativeReanimated/NativeReanimated';
@@ -32,7 +32,6 @@ declare global {
   };
   namespace NodeJS {
     interface Global {
-      __reanimatedWorkletInit: (worklet: WorkletFunction) => void;
       _setGlobalConsole: (console?: ReanimatedConsole) => void;
       _log: (s: string) => void;
       _setGestureState: () => void;