react-native-reanimated 2.3.0-beta.1 → 2.3.0-beta.2

package/RNReanimated.podspec

@@ -7,7 +7,7 @@ reactVersion = '0.0.0'
 begin
   reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "react-native", "package.json")))["version"]
 rescue
-  reactVersion = '0.64.0'
+  reactVersion = '0.66.0'
 end
 
 rnVersion = reactVersion.split('.')[1]
@@ -20,7 +20,7 @@ end
 
 folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DRNVERSION=' + rnVersion
 folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2020.01.13.00'
+folly_version = '2021.04.26.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -49,12 +49,12 @@ Pod::Spec.new do |s|
 
   s.pod_target_xcconfig    = {
     "USE_HEADERMAP" => "YES",
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" "
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" "
   }
   s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
   s.xcconfig               = {
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\"",
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\"",
                                "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags  }
 
   s.requires_arc = true

package/ios/LayoutReanimation/REAUIManager.mm

@@ -8,7 +8,10 @@
 #import "RCTLayoutAnimationGroup.h"
 #import "REAIOSScheduler.h"
 #include "Scheduler.h"
+
+#if __has_include(<RNScreens/RNSScreen.h>)
 #import <RNScreens/RNSScreen.h>
+#endif
 
 @interface RCTUIManager(REA)
 - (void)_manageChildren:(NSNumber *)containerTag
@@ -40,7 +43,7 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
 {
   if(!_blockSetter) {
     _blockSetter = true;
-    
+
     self.bridge = bridge;
     [super setValue:bridge forKey:@"_bridge"];
     [self setValue:[bridge.uiManager valueForKey:@"_shadowViewRegistry"] forKey:@"_shadowViewRegistry"];
@@ -52,7 +55,7 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
     [self setValue:[bridge.uiManager valueForKey:@"_rootViewTags"] forKey:@"_rootViewTags"];
     [self setValue:[bridge.uiManager valueForKey:@"_observerCoordinator"] forKey:@"_observerCoordinator"];
     [self setValue:[bridge.uiManager valueForKey:@"_componentDataByName"] forKey:@"_componentDataByName"];
-    
+
     _blockSetter = false;
   }
 }
@@ -68,12 +71,12 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
   BOOL isUIViewRegistry = ((id)registry == (id)[self valueForKey:@"_viewRegistry"]);
   id<RCTComponent> container;
   NSArray<id<RCTComponent>> *permanentlyRemovedChildren;
-  if(isUIViewRegistry) {    
-    container = registry[containerTag];    
+  if(isUIViewRegistry) {
+    container = registry[containerTag];
     for(id<RCTComponent> toRemoveChild in _toBeRemovedRegister[containerTag]) {
       [container removeReactSubview:toRemoveChild];
     }
-    
+
     permanentlyRemovedChildren = [super _childrenToRemoveFromContainer:container atIndices:removeAtIndices];
     if(permanentlyRemovedChildren != nil) {
       for(id<RCTComponent> permanentlyRemovedChild in permanentlyRemovedChildren) {
@@ -84,7 +87,7 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
       }
     }
   }
-  
+
   [super _manageChildren:containerTag
          moveFromIndices:moveFromIndices
            moveToIndices:moveToIndices
@@ -92,7 +95,7 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
             addAtIndices:addAtIndices
          removeAtIndices:removeAtIndices
                 registry:registry];
-  
+
   if(isUIViewRegistry) {
     NSMutableDictionary<NSNumber *, id<RCTComponent>> *viewRegistry = [self valueForKey:@"_viewRegistry"];
     for(id<RCTComponent> toRemoveChild in _toBeRemovedRegister[containerTag]) {
@@ -103,7 +106,7 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
       [container insertReactSubview:toRemoveChild atIndex:lastIndex];
       viewRegistry[toRemoveChild.reactTag] = toRemoveChild;
     }
-    
+
     for (UIView *removedChild in permanentlyRemovedChildren) {
       [self callAnimationForTree: removedChild parentTag:containerTag];
     }
@@ -115,7 +118,7 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
   REASnapshot* snapshot = [[REASnapshot alloc] init:view];
   _parentMapper[view.reactTag] = parentTag;
   [_animationsManager onViewRemoval:view before:snapshot];
-  
+
   for(UIView* subView in view.reactSubviews) {
     [self callAnimationForTree:subView parentTag:view.reactTag];
   }
@@ -123,7 +126,7 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
 
 // Overrided https://github.com/facebook/react-native/blob/v0.65.0/React/Modules/RCTUIManager.m#L530
 - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *)rootShadowView
-{  
+{
   NSHashTable<RCTShadowView *> *affectedShadowViews = [NSHashTable weakObjectsHashTable];
   [rootShadowView layoutWithAffectedShadowViews:affectedShadowViews];
 
@@ -232,7 +235,7 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
       if (view.isHidden != isHidden) {
         view.hidden = isHidden;
       }
-      
+
       REASnapshot* snapshotBefore = [[REASnapshot alloc] init:view];
       if (creatingLayoutAnimation) {
         // Animate view creation
@@ -278,7 +281,7 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
         [view reactSetFrame:frame];
         completion(YES);
       }
-      
+
       if(isNew) {
         REASnapshot* snapshot = [[REASnapshot alloc] init:view];
         [_animationsManager onViewCreate:view after:snapshot];
@@ -287,7 +290,7 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
         REASnapshot* snapshotAfter = [[REASnapshot alloc] init:view];
         [_animationsManager onViewUpdate:view before:snapshotBefore after:snapshotAfter];
       }
-      
+
     }
 
     [_animationsManager removeLeftovers];
@@ -319,7 +322,7 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
   if(tag == nil) {
     return;
   }
-  
+
   [_toBeRemovedRegister[tag] removeObject:view];
   if(_toBeRemovedRegister[tag].count == 0) {
     [_toBeRemovedRegister removeObjectForKey:tag];
@@ -328,9 +331,11 @@ std::weak_ptr<reanimated::Scheduler> _scheduler;
   [view.reactSuperview removeReactSubview:view];
   id<RCTComponent> parentView = viewRegistry[tag];
   [parentView removeReactSubview:view];
+#if __has_include(<RNScreens/RNSScreen.h>)
   if ([view isKindOfClass:[RNSScreenView class]]) {
     [parentView didUpdateReactSubviews];
   }
+#endif
   [viewRegistry removeObjectForKey:view.reactTag];
 }
 

package/ios/native/REAInitializer.mm

@@ -24,7 +24,16 @@ JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
   
     [bridge moduleForClass:[RCTEventDispatcher class]];
     RCTEventDispatcher *eventDispatcher = [REAEventDispatcher new];
+#if RNVERSION >= 66
+    RCTCallableJSModules *callableJSModules = [RCTCallableJSModules new];
+    [bridge setValue:callableJSModules forKey:@"_callableJSModules"];
+    [callableJSModules setBridge:bridge];
+    [eventDispatcher setValue:callableJSModules forKey:@"_callableJSModules"];
+    [eventDispatcher setValue:bridge forKey:@"_bridge"];
+    [eventDispatcher initialize];
+#else
     [eventDispatcher setBridge:bridge];
+#endif
     [bridge updateModuleWithInstance:eventDispatcher];
     _bridge_reanimated = bridge;
     const auto runtimeInstaller = [bridge, runtimeInstallerToWrap](facebook::jsi::Runtime &runtime) {

package/lib/reanimated2/index.js

@@ -7,3 +7,4 @@ export * from './NativeMethods';
 export * from './Colors';
 export * from './PropAdapters';
 export * from './layoutReanimation';
+export * from './utils';

package/lib/reanimated2/layoutReanimation/defaultAnimations/Lightspeed.js

@@ -17,7 +17,9 @@ export class LightSpeedInRight extends ComplexAnimationBuilder {
                     animations: {
                         opacity: delayFunction(delay, withTiming(1, { duration: duration })),
                         transform: [
-                            { translateX: delayFunction(delay, animation(0, config)) },
+                            {
+                                translateX: delayFunction(delay, animation(0, Object.assign(Object.assign({}, config), { duration: duration * 0.7 }))),
+                            },
                             {
                                 skewX: delayFunction(delay, withSequence(withTiming('10deg', { duration: duration * 0.7 }), withTiming('-5deg', { duration: duration * 0.15 }), withTiming('0deg', { duration: duration * 0.15 }))),
                             },
@@ -52,7 +54,7 @@ export class LightSpeedInLeft extends ComplexAnimationBuilder {
                         opacity: delayFunction(delay, withTiming(1, { duration: duration })),
                         transform: [
                             {
-                                translateX: delayFunction(delay, animation(0, config)),
+                                translateX: delayFunction(delay, animation(0, Object.assign(Object.assign({}, config), { duration: duration * 0.7 }))),
                             },
                             {
                                 skewX: delayFunction(delay, withSequence(withTiming('-10deg', { duration: duration * 0.7 }), withTiming('5deg', { duration: duration * 0.15 }), withTiming('0deg', { duration: duration * 0.15 }))),

package/lib/reanimated2/utils.js

@@ -0,0 +1,9 @@
+import { measure } from './NativeMethods';
+export function getRelativeCoords(parentRef, x, y) {
+    'worklet';
+    const parentCoords = measure(parentRef);
+    return {
+        x: x - parentCoords.x,
+        y: y - parentCoords.y,
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-reanimated",
-  "version": "2.3.0-beta.1",
+  "version": "2.3.0-beta.2",
   "description": "More powerful alternative to Animated library for React Native.",
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
@@ -92,7 +92,7 @@
     "@types/babel__generator": "^7.6.2",
     "@types/babel__traverse": "^7.0.15",
     "@types/jest": "^26.0.15",
-    "@types/react-native": "^0.64.2",
+    "@types/react-native": "^0.65.1",
     "@typescript-eslint/eslint-plugin": "^4.15.1",
     "@typescript-eslint/parser": "^4.15.1",
     "babel-eslint": "^10.0.3",
@@ -112,7 +112,7 @@
     "lint-staged": "^10.2.11",
     "prettier": "^2.2.1",
     "react": "17.0.2",
-    "react-native": "0.65.1",
+    "react-native": "0.66.0-rc.4",
     "react-native-codegen": "^0.0.7",
     "react-native-gesture-handler": "^1.6.1",
     "react-test-renderer": "17.0.2",

package/react-native-reanimated.d.ts

@@ -649,6 +649,15 @@ declare module 'react-native-reanimated' {
     pageY: number;
   };
 
+  export function getRelativeCoords(
+    ref: RefObject<Component>,
+    x: number,
+    y: number
+  ): {
+    x: number;
+    y: number;
+  };
+
   export function scrollTo(
     ref: RefObject<ReactNativeScrollView | ScrollView>,
     x: number,

package/src/reanimated2/index.ts

@@ -7,3 +7,4 @@ export * from './NativeMethods';
 export * from './Colors';
 export * from './PropAdapters';
 export * from './layoutReanimation';
+export * from './utils';

package/src/reanimated2/layoutReanimation/defaultAnimations/Lightspeed.ts

@@ -28,7 +28,12 @@ export class LightSpeedInRight
         animations: {
           opacity: delayFunction(delay, withTiming(1, { duration: duration })),
           transform: [
-            { translateX: delayFunction(delay, animation(0, config)) },
+            {
+              translateX: delayFunction(
+                delay,
+                animation(0, { ...config, duration: duration * 0.7 })
+              ),
+            },
             {
               skewX: delayFunction(
                 delay,
@@ -72,7 +77,10 @@ export class LightSpeedInLeft
           opacity: delayFunction(delay, withTiming(1, { duration: duration })),
           transform: [
             {
-              translateX: delayFunction(delay, animation(0, config)),
+              translateX: delayFunction(
+                delay,
+                animation(0, { ...config, duration: duration * 0.7 })
+              ),
             },
             {
               skewX: delayFunction(

package/src/reanimated2/utils.ts

@@ -0,0 +1,21 @@
+import { Component } from 'react';
+import { measure } from './NativeMethods';
+import { RefObjectFunction } from './hook/useAnimatedRef';
+
+export interface ComponentCoords {
+  x: number;
+  y: number;
+}
+
+export function getRelativeCoords(
+  parentRef: RefObjectFunction<Component>,
+  x: number,
+  y: number
+): ComponentCoords {
+  'worklet';
+  const parentCoords = measure(parentRef);
+  return {
+    x: x - parentCoords.x,
+    y: y - parentCoords.y,
+  };
+}