react-native-reanimated 2.3.0-alpha.3 → 2.3.0-beta.4

package/ios/native/REAIOSLogger.mm

@@ -5,20 +5,24 @@ namespace reanimated {
 
 std::unique_ptr<LoggerInterface> Logger::instance = std::make_unique<REAIOSLogger>();
 
-void REAIOSLogger::log(const char* str) {
+void REAIOSLogger::log(const char *str)
+{
   NSLog(@"%@", [NSString stringWithCString:str encoding:[NSString defaultCStringEncoding]]);
 }
 
-void REAIOSLogger::log(double d) {
+void REAIOSLogger::log(double d)
+{
   NSLog(@"%lf", d);
 }
 
-void REAIOSLogger::log(int i) {
-   NSLog(@"%i", i);
+void REAIOSLogger::log(int i)
+{
+  NSLog(@"%i", i);
 }
 
-void REAIOSLogger::log(bool b) {
-  const char* str = (b)? "true" : "false";
+void REAIOSLogger::log(bool b)
+{
+  const char *str = (b) ? "true" : "false";
   NSLog(@"%@", [NSString stringWithCString:str encoding:[NSString defaultCStringEncoding]]);
 }
 

package/ios/native/REAIOSScheduler.h

@@ -1,18 +1,18 @@
 #pragma once
 
+#import <React/RCTUIManager.h>
+#import <ReactCommon/CallInvoker.h>
 #include <stdio.h>
+#include <memory>
 #include "Scheduler.h"
-#import <ReactCommon/CallInvoker.h>
-#import <React/RCTUIManager.h>
 
-namespace reanimated
-{
+namespace reanimated {
 
 using namespace facebook;
 using namespace react;
 
 class REAIOSScheduler : public Scheduler {
-  public:
+ public:
   REAIOSScheduler(std::shared_ptr<CallInvoker> jsInvoker);
   void scheduleOnUI(std::function<void()> job) override;
   virtual ~REAIOSScheduler();

package/ios/native/REAIOSScheduler.mm

@@ -6,36 +6,43 @@ namespace reanimated {
 using namespace facebook;
 using namespace react;
 
-REAIOSScheduler::REAIOSScheduler(std::shared_ptr<CallInvoker> jsInvoker) {
+REAIOSScheduler::REAIOSScheduler(std::shared_ptr<CallInvoker> jsInvoker)
+{
   this->jsCallInvoker_ = jsInvoker;
 }
 
-void REAIOSScheduler::scheduleOnUI(std::function<void()> job) {
+void REAIOSScheduler::scheduleOnUI(std::function<void()> job)
+{
   if (runtimeManager.lock() == nullptr) {
     return;
   }
 
-  if([NSThread isMainThread]) {
-    if (runtimeManager.lock()) job();
+  if ([NSThread isMainThread]) {
+    if (runtimeManager.lock()) {
+      job();
+    }
     return;
   }
 
   Scheduler::scheduleOnUI(job);
-  if([NSThread isMainThread]) {
-    if (runtimeManager.lock()) triggerUI();
+  if ([NSThread isMainThread]) {
+    if (runtimeManager.lock()) {
+      triggerUI();
+    }
     return;
   }
-  
+
   if (!this->scheduledOnUI) {
     __block std::weak_ptr<RuntimeManager> blockRuntimeManager = runtimeManager;
 
     dispatch_async(dispatch_get_main_queue(), ^{
-      if (blockRuntimeManager.lock()) triggerUI();
+      if (blockRuntimeManager.lock()) {
+        triggerUI();
+      }
     });
   }
 }
 
-REAIOSScheduler::~REAIOSScheduler(){
-}
+REAIOSScheduler::~REAIOSScheduler() {}
 
 }

package/ios/native/REAInitializer.h

@@ -6,13 +6,12 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <React/RCTCxxBridgeDelegate.h>
 #import <RNReanimated/NativeProxy.h>
+#import <RNReanimated/REAEventDispatcher.h>
 #import <RNReanimated/REAModule.h>
-#import <ReactCommon/RCTTurboModuleManager.h>
 #import <React/RCTBridge+Private.h>
 #import <React/RCTCxxBridgeDelegate.h>
-#import <RNReanimated/REAEventDispatcher.h>
+#import <ReactCommon/RCTTurboModuleManager.h>
 #import <jsireact/JSIExecutor.h>
 
 #if RNVERSION >= 64
@@ -31,9 +30,8 @@ using namespace facebook;
 using namespace react;
 
 JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
-    RCTBridge* bridge,
-    JSIExecutor::RuntimeInstaller runtimeInstallerToWrap
-);
+    RCTBridge *bridge,
+    JSIExecutor::RuntimeInstaller runtimeInstallerToWrap);
 
-}
+} // namespace reanimated
 NS_ASSUME_NONNULL_END

package/ios/native/REAInitializer.mm

@@ -1,9 +1,9 @@
 #import "REAInitializer.h"
 #import "REAUIManager.h"
 
-@interface RCTEventDispatcher(Reanimated)
+@interface RCTEventDispatcher (Reanimated)
 
-- (void)setBridge:(RCTBridge*)bridge;
+- (void)setBridge:(RCTBridge *)bridge;
 
 @end
 
@@ -13,42 +13,54 @@ using namespace facebook;
 using namespace react;
 
 JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
-    RCTBridge* bridge,
+    RCTBridge *bridge,
     JSIExecutor::RuntimeInstaller runtimeInstallerToWrap)
 {
-    [bridge moduleForClass:[RCTUIManager class]];
-    REAUIManager* reaUiManager = [REAUIManager new];
-    [reaUiManager setBridge:bridge];
-    RCTUIManager* uiManager = reaUiManager;
-    [bridge updateModuleWithInstance:uiManager];
-  
-    [bridge moduleForClass:[RCTEventDispatcher class]];
-    RCTEventDispatcher *eventDispatcher = [REAEventDispatcher new];
-    [eventDispatcher setBridge:bridge];
-    [bridge updateModuleWithInstance:eventDispatcher];
-    _bridge_reanimated = bridge;
-    const auto runtimeInstaller = [bridge, runtimeInstallerToWrap](facebook::jsi::Runtime &runtime) {
-      if (!bridge) {
-        return;
-      }
+  [bridge moduleForClass:[RCTUIManager class]];
+  REAUIManager *reaUiManager = [REAUIManager new];
+  [reaUiManager setBridge:bridge];
+  RCTUIManager *uiManager = reaUiManager;
+  [bridge updateModuleWithInstance:uiManager];
+
+  [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];
+  const auto runtimeInstaller = [bridge, runtimeInstallerToWrap](facebook::jsi::Runtime &runtime) {
+    if (!bridge) {
+      return;
+    }
 #if RNVERSION >= 63
-    auto reanimatedModule = reanimated::createReanimatedModule(bridge.jsCallInvoker);
+    auto reanimatedModule = reanimated::createReanimatedModule(bridge, bridge.jsCallInvoker);
 #else
     auto callInvoker = std::make_shared<react::BridgeJSCallInvoker>(bridge.reactInstance);
-    auto reanimatedModule = reanimated::createReanimatedModule(callInvoker);
+    auto reanimatedModule = reanimated::createReanimatedModule(bridge, callInvoker);
 #endif
-    runtime.global().setProperty(runtime,
-                                 jsi::PropNameID::forAscii(runtime, "__reanimatedModuleProxy"),
-                                 jsi::Object::createFromHostObject(runtime, reanimatedModule));
-        
-        if (runtimeInstallerToWrap) {
-            runtimeInstallerToWrap(runtime);
-        }
-    };
-    return runtimeInstaller;
-}
+    runtime.global().setProperty(
+      runtime,
+      "_WORKLET_RUNTIME",
+      static_cast<double>(
+          reinterpret_cast<std::uintptr_t>(reanimatedModule->runtime.get())));
 
+    runtime.global().setProperty(
+        runtime,
+        jsi::PropNameID::forAscii(runtime, "__reanimatedModuleProxy"),
+        jsi::Object::createFromHostObject(runtime, reanimatedModule));
 
+    if (runtimeInstallerToWrap) {
+      runtimeInstallerToWrap(runtime);
+    }
+  };
+  return runtimeInstaller;
 }
 
-
+}

package/ios/native/UIResponder+Reanimated.mm

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

package/lib/Animated.js

@@ -1,4 +1,4 @@
-import { Image, ScrollView, Text, View } from 'react-native';
+import { Image, ScrollView, Text, View, LogBox } from 'react-native';
 import createAnimatedComponent from './createAnimatedComponent';
 import {
   addWhitelistedNativeProps,
@@ -23,3 +23,11 @@ const Animated = {
 export * from './reanimated2';
 export * from './reanimated1';
 export default Animated;
+
+// I think we can ignore this message as long as Gesture Handler doesn't
+// try to load the Reanimated module. I figured it should be here instead of
+// RNGH because this prevents the message from being displayed for all
+// versions of RNGH.
+LogBox.ignoreLogs([
+  'RCTBridge required dispatch_sync to load RNGestureHandlerModule. This may lead to deadlocks',
+]);

package/lib/ConfigHelper.js

@@ -1,163 +1,146 @@
 import ReanimatedModule from './ReanimatedModule';
-
 /**
  * Styles allowed to be direcly updated in UI thread
  */
 let UI_THREAD_PROPS_WHITELIST = {
-  opacity: true,
-  transform: true,
-  /* colors */
-  backgroundColor: true,
-  borderRightColor: true,
-  borderBottomColor: true,
-  borderColor: true,
-  borderEndColor: true,
-  borderLeftColor: true,
-  borderStartColor: true,
-  borderTopColor: true,
-  /* ios styles */
-  shadowOpacity: true,
-  shadowRadius: true,
-  /* legacy android transform properties */
-  scaleX: true,
-  scaleY: true,
-  translateX: true,
-  translateY: true,
+    opacity: true,
+    transform: true,
+    /* colors */
+    backgroundColor: true,
+    borderRightColor: true,
+    borderBottomColor: true,
+    borderColor: true,
+    borderEndColor: true,
+    borderLeftColor: true,
+    borderStartColor: true,
+    borderTopColor: true,
+    /* ios styles */
+    shadowOpacity: true,
+    shadowRadius: true,
+    /* legacy android transform properties */
+    scaleX: true,
+    scaleY: true,
+    translateX: true,
+    translateY: true,
 };
-
 /**
  * Whitelist of view props that can be updated in native thread via UIManagerModule
  */
 let NATIVE_THREAD_PROPS_WHITELIST = {
-  borderBottomWidth: true,
-  borderEndWidth: true,
-  borderLeftWidth: true,
-  borderRightWidth: true,
-  borderStartWidth: true,
-  borderTopWidth: true,
-  borderWidth: true,
-  bottom: true,
-  flex: true,
-  flexGrow: true,
-  flexShrink: true,
-  height: true,
-  left: true,
-  margin: true,
-  marginBottom: true,
-  marginEnd: true,
-  marginHorizontal: true,
-  marginLeft: true,
-  marginRight: true,
-  marginStart: true,
-  marginTop: true,
-  marginVertical: true,
-  maxHeight: true,
-  maxWidth: true,
-  minHeight: true,
-  minWidth: true,
-  padding: true,
-  paddingBottom: true,
-  paddingEnd: true,
-  paddingHorizontal: true,
-  paddingLeft: true,
-  paddingRight: true,
-  paddingStart: true,
-  paddingTop: true,
-  paddingVertical: true,
-  right: true,
-  start: true,
-  top: true,
-  width: true,
-  zIndex: true,
-  borderBottomEndRadius: true,
-  borderBottomLeftRadius: true,
-  borderBottomRightRadius: true,
-  borderBottomStartRadius: true,
-  borderRadius: true,
-  borderTopEndRadius: true,
-  borderTopLeftRadius: true,
-  borderTopRightRadius: true,
-  borderTopStartRadius: true,
-  opacity: true,
-  elevation: true,
-  fontSize: true,
-  lineHeight: true,
-  textShadowRadius: true,
-  letterSpacing: true,
-  /* strings */
-  display: true,
-  backfaceVisibility: true,
-  overflow: true,
-  resizeMode: true,
-  fontStyle: true,
-  fontWeight: true,
-  textAlign: true,
-  textDecorationLine: true,
-  fontFamily: true,
-  textAlignVertical: true,
-  fontVariant: true,
-  textDecorationStyle: true,
-  textTransform: true,
-  writingDirection: true,
-  /* text color */
-  color: true,
-  tintColor: true,
-  shadowColor: true,
-  placeholderTextColor: true,
+    borderBottomWidth: true,
+    borderEndWidth: true,
+    borderLeftWidth: true,
+    borderRightWidth: true,
+    borderStartWidth: true,
+    borderTopWidth: true,
+    borderWidth: true,
+    bottom: true,
+    flex: true,
+    flexGrow: true,
+    flexShrink: true,
+    height: true,
+    left: true,
+    margin: true,
+    marginBottom: true,
+    marginEnd: true,
+    marginHorizontal: true,
+    marginLeft: true,
+    marginRight: true,
+    marginStart: true,
+    marginTop: true,
+    marginVertical: true,
+    maxHeight: true,
+    maxWidth: true,
+    minHeight: true,
+    minWidth: true,
+    padding: true,
+    paddingBottom: true,
+    paddingEnd: true,
+    paddingHorizontal: true,
+    paddingLeft: true,
+    paddingRight: true,
+    paddingStart: true,
+    paddingTop: true,
+    paddingVertical: true,
+    right: true,
+    start: true,
+    top: true,
+    width: true,
+    zIndex: true,
+    borderBottomEndRadius: true,
+    borderBottomLeftRadius: true,
+    borderBottomRightRadius: true,
+    borderBottomStartRadius: true,
+    borderRadius: true,
+    borderTopEndRadius: true,
+    borderTopLeftRadius: true,
+    borderTopRightRadius: true,
+    borderTopStartRadius: true,
+    opacity: true,
+    elevation: true,
+    fontSize: true,
+    lineHeight: true,
+    textShadowRadius: true,
+    letterSpacing: true,
+    /* strings */
+    display: true,
+    backfaceVisibility: true,
+    overflow: true,
+    resizeMode: true,
+    fontStyle: true,
+    fontWeight: true,
+    textAlign: true,
+    textDecorationLine: true,
+    fontFamily: true,
+    textAlignVertical: true,
+    fontVariant: true,
+    textDecorationStyle: true,
+    textTransform: true,
+    writingDirection: true,
+    /* text color */
+    color: true,
+    tintColor: true,
+    shadowColor: true,
+    placeholderTextColor: true,
 };
-
 function configureProps() {
-  ReanimatedModule.configureProps(
-    Object.keys(NATIVE_THREAD_PROPS_WHITELIST),
-    Object.keys(UI_THREAD_PROPS_WHITELIST)
-  );
+    ReanimatedModule.configureProps(Object.keys(NATIVE_THREAD_PROPS_WHITELIST), Object.keys(UI_THREAD_PROPS_WHITELIST));
 }
-
 export function addWhitelistedNativeProps(props) {
-  const oldSize = Object.keys(NATIVE_THREAD_PROPS_WHITELIST).length;
-  NATIVE_THREAD_PROPS_WHITELIST = {
-    ...NATIVE_THREAD_PROPS_WHITELIST,
-    ...props,
-  };
-  if (oldSize !== Object.keys(NATIVE_THREAD_PROPS_WHITELIST).length) {
-    configureProps();
-  }
+    const oldSize = Object.keys(NATIVE_THREAD_PROPS_WHITELIST).length;
+    NATIVE_THREAD_PROPS_WHITELIST = Object.assign(Object.assign({}, NATIVE_THREAD_PROPS_WHITELIST), props);
+    if (oldSize !== Object.keys(NATIVE_THREAD_PROPS_WHITELIST).length) {
+        configureProps();
+    }
 }
-
 export function addWhitelistedUIProps(props) {
-  const oldSize = Object.keys(UI_THREAD_PROPS_WHITELIST).length;
-  UI_THREAD_PROPS_WHITELIST = { ...UI_THREAD_PROPS_WHITELIST, ...props };
-  if (oldSize !== Object.keys(UI_THREAD_PROPS_WHITELIST).length) {
-    configureProps();
-  }
+    const oldSize = Object.keys(UI_THREAD_PROPS_WHITELIST).length;
+    UI_THREAD_PROPS_WHITELIST = Object.assign(Object.assign({}, UI_THREAD_PROPS_WHITELIST), props);
+    if (oldSize !== Object.keys(UI_THREAD_PROPS_WHITELIST).length) {
+        configureProps();
+    }
 }
-
 const PROCESSED_VIEW_NAMES = new Set();
 /**
  * updates UI props whitelist for given view host instance
  * this will work just once for every view name
  */
 export function adaptViewConfig(viewConfig) {
-  const viewName = viewConfig.uiViewClassName;
-  const props = viewConfig.validAttributes;
-
-  // update whitelist of UI props for this view name only once
-  if (!PROCESSED_VIEW_NAMES.has(viewName)) {
-    const propsToAdd = {};
-    Object.keys(props).forEach((key) => {
-      // we don't want to add native props as they affect layout
-      // we also skip props which repeat here
-      if (
-        !(key in NATIVE_THREAD_PROPS_WHITELIST) &&
-        !(key in UI_THREAD_PROPS_WHITELIST)
-      ) {
-        propsToAdd[key] = true;
-      }
-    });
-    addWhitelistedUIProps(propsToAdd);
-
-    PROCESSED_VIEW_NAMES.add(viewName);
-  }
+    const viewName = viewConfig.uiViewClassName;
+    const props = viewConfig.validAttributes;
+    // update whitelist of UI props for this view name only once
+    if (!PROCESSED_VIEW_NAMES.has(viewName)) {
+        const propsToAdd = {};
+        Object.keys(props).forEach((key) => {
+            // we don't want to add native props as they affect layout
+            // we also skip props which repeat here
+            if (!(key in NATIVE_THREAD_PROPS_WHITELIST) &&
+                !(key in UI_THREAD_PROPS_WHITELIST)) {
+                propsToAdd[key] = true;
+            }
+        });
+        addWhitelistedUIProps(propsToAdd);
+        PROCESSED_VIEW_NAMES.add(viewName);
+    }
 }
-
 configureProps();

package/lib/ReanimatedEventEmitter.js

@@ -1,4 +1,3 @@
 import ReanimatedModule from './ReanimatedModule';
 import { NativeEventEmitter } from 'react-native';
-
 export default new NativeEventEmitter(ReanimatedModule);

package/lib/ReanimatedModule.js

@@ -1,3 +1,2 @@
 import ReanimatedModuleCompat from './ReanimatedModuleCompat';
-
 export default ReanimatedModuleCompat;

package/lib/ReanimatedModule.macos.js

@@ -1,3 +1,2 @@
 import ReanimatedModuleCompat from './ReanimatedModuleCompat';
-
 export default ReanimatedModuleCompat;

package/lib/ReanimatedModule.native.js

@@ -1,13 +1,12 @@
 import { NativeModules } from 'react-native';
 import ReanimatedModuleCompat from './ReanimatedModuleCompat';
 import { nativeShouldBeMock } from './reanimated2/PlatformChecker';
-
 let exportedModule;
 if (nativeShouldBeMock()) {
-  exportedModule = ReanimatedModuleCompat;
-} else {
-  const { ReanimatedModule } = NativeModules;
-  exportedModule = ReanimatedModule;
+    exportedModule = ReanimatedModuleCompat;
+}
+else {
+    const { ReanimatedModule } = NativeModules;
+    exportedModule = ReanimatedModule;
 }
-
 export default exportedModule;

package/lib/ReanimatedModule.windows.js

@@ -1,3 +1,2 @@
 import ReanimatedModuleCompat from './ReanimatedModuleCompat';
-
 export default ReanimatedModuleCompat;