react-native-reanimated 3.8.0 → 3.9.0-layout-animation-experimental

package/apple/REAModule.h

@@ -1,4 +1,13 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTInitializing.h>
+#if REACT_NATIVE_MINOR_VERSION >= 74
+#import <React/RCTRuntimeExecutorModule.h>
+#import <ReactCommon/RCTRuntimeExecutor.h>
+#endif // REACT_NATIVE_MINOR_VERSION >= 74
+#import <rnreanimated/rnreanimated.h>
+#else // RCT_NEW_ARCH_ENABLED
 #import <React/RCTBridgeModule.h>
+#endif // RCT_NEW_ARCH_ENABLED
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTEventEmitter.h>
 #import <React/RCTUIManager.h>
@@ -8,13 +17,24 @@
 #import <RNReanimated/REAAnimationsManager.h>
 #import <RNReanimated/REANodesManager.h>
 
-@interface REAModule : RCTEventEmitter <RCTBridgeModule, RCTEventDispatcherObserver, RCTUIManagerObserver>
+@interface REAModule : RCTEventEmitter
+#ifdef RCT_NEW_ARCH_ENABLED
+                       <NativeReanimatedModuleSpec,
+                        RCTInitializing,
+#if REACT_NATIVE_MINOR_VERSION >= 74
+                        RCTRuntimeExecutorModule,
+#endif // REACT_NATIVE_MINOR_VERSION >= 74
+#else
+                       <RCTBridgeModule,
+#endif // RCT_NEW_ARCH_ENABLED
+                        RCTEventDispatcherObserver,
+                        RCTUIManagerObserver>
 
 @property (nonatomic, readonly) REANodesManager *nodesManager;
 @property REAAnimationsManager *animationsManager;
 
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)installReanimatedAfterReload;
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 @end

package/apple/REAModule.mm

@@ -9,12 +9,12 @@
 #import <React/RCTSurfaceView.h>
 #if REACT_NATIVE_MINOR_VERSION < 73
 #import <React/RCTRuntimeExecutorFromBridge.h>
-#endif
-#endif
+#endif // REACT_NATIVE_MINOR_VERSION < 73
+#endif // RCT_NEW_ARCH_ENABLED
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <RNReanimated/REAInitializerRCTFabricSurface.h>
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 #import <RNReanimated/NativeProxy.h>
 #import <RNReanimated/REAModule.h>
@@ -28,7 +28,7 @@
 
 #if __has_include(<UIKit/UIAccessibility.h>)
 #import <UIKit/UIAccessibility.h>
-#endif
+#endif // __has_include(<UIKit/UIAccessibility.h>)
 
 using namespace facebook::react;
 using namespace reanimated;
@@ -46,7 +46,7 @@ using namespace reanimated;
 static __strong REAInitializerRCTFabricSurface *reaSurface;
 #else
 typedef void (^AnimatedOperation)(REANodesManager *nodesManager);
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 @implementation REAModule {
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -54,13 +54,19 @@ typedef void (^AnimatedOperation)(REANodesManager *nodesManager);
   std::weak_ptr<NativeReanimatedModule> weakNativeReanimatedModule_;
 #else
   NSMutableArray<AnimatedOperation> *_operations;
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 #ifndef NDEBUG
   SingleInstanceChecker<REAModule> singleInstanceChecker_;
-#endif
+#endif // NDEBUG
   bool hasListeners;
+  bool _isBridgeless;
 }
 
+@synthesize moduleRegistry = _moduleRegistry;
+#if REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED)
+@synthesize runtimeExecutor = _runtimeExecutor;
+#endif // REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED)
+
 RCT_EXPORT_MODULE(ReanimatedModule);
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -74,7 +80,7 @@ RCT_EXPORT_MODULE(ReanimatedModule);
 {
 #ifdef RCT_NEW_ARCH_ENABLED
   [[NSNotificationCenter defaultCenter] removeObserver:self];
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
   [_nodesManager invalidate];
   [super invalidate];
 }
@@ -125,7 +131,11 @@ RCT_EXPORT_MODULE(ReanimatedModule);
 
 - (void)handleJavaScriptDidLoadNotification:(NSNotification *)notification
 {
-  _surfacePresenter = self.bridge.surfacePresenter;
+  [self attachReactEventListener];
+}
+
+- (void)attachReactEventListener
+{
   RCTScheduler *scheduler = [_surfacePresenter scheduler];
   __weak __typeof__(self) weakSelf = self;
   _surfacePresenter.runtimeExecutor(^(jsi::Runtime &runtime) {
@@ -149,9 +159,30 @@ RCT_EXPORT_MODULE(ReanimatedModule);
   });
 }
 
+#pragma mark-- Bridgeless methods
+
+/*
+ * Taken from RCTNativeAnimatedTurboModule:
+ * This selector is invoked via BridgelessTurboModuleSetup.
+ */
+- (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
+{
+  _surfacePresenter = surfacePresenter;
+  _isBridgeless = true;
+}
+
 - (void)setBridge:(RCTBridge *)bridge
 {
   [super setBridge:bridge];
+  // only within the first loading `self.bridge.surfacePresenter` exists
+  // during the reload `self.bridge.surfacePresenter` is null
+  if (self.bridge.surfacePresenter) {
+    _surfacePresenter = self.bridge.surfacePresenter;
+  }
+
+  [self setReaSurfacePresenter];
+
+  _nodesManager = [[REANodesManager alloc] initWithModule:self bridge:bridge surfacePresenter:_surfacePresenter];
 
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(handleJavaScriptDidLoadNotification:)
@@ -159,30 +190,19 @@ RCT_EXPORT_MODULE(ReanimatedModule);
                                              object:nil];
 
   [[self.moduleRegistry moduleForName:"EventDispatcher"] addDispatchObserver:self];
-  [bridge.uiManager.observerCoordinator addObserver:self];
+}
 
-  // only within the first loading `self.bridge.surfacePresenter` exists
-  // during the reload `self.bridge.surfacePresenter` is null
-  _surfacePresenter = self.bridge.surfacePresenter;
-#ifndef NDEBUG
+- (void)setReaSurfacePresenter
+{
   if (reaSurface == nil) {
     // we need only one instance because SurfacePresenter is the same during the application lifetime
     reaSurface = [[REAInitializerRCTFabricSurface alloc] init];
     [_surfacePresenter registerSurface:reaSurface];
   }
   reaSurface.reaModule = self;
-#endif
-
-  if (_surfacePresenter == nil) {
-    // _surfacePresenter will be set in installReanimatedAfterReload
-    _nodesManager = [[REANodesManager alloc] initWithModule:self bridge:self.bridge surfacePresenter:nil];
-    return;
-  }
-
-  _nodesManager = [[REANodesManager alloc] initWithModule:self bridge:self.bridge surfacePresenter:_surfacePresenter];
 }
 
-#else
+#else // RCT_NEW_ARCH_ENABLED
 
 - (void)setBridge:(RCTBridge *)bridge
 {
@@ -259,35 +279,66 @@ RCT_EXPORT_MODULE(ReanimatedModule);
 
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(installTurboModule : (nonnull NSString *)valueUnpackerCode)
 {
-  facebook::jsi::Runtime *jsiRuntime = [self.bridge respondsToSelector:@selector(runtime)]
-      ? reinterpret_cast<facebook::jsi::Runtime *>(self.bridge.runtime)
-      : nullptr;
-
-  if (jsiRuntime) {
-    auto nativeReanimatedModule = reanimated::createReanimatedModule(
-        self.bridge, self.bridge.jsCallInvoker, std::string([valueUnpackerCode UTF8String]));
+  if (_isBridgeless) {
+#if REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED)
+    RCTCxxBridge *cxxBridge = (RCTCxxBridge *)[RCTBridge currentBridge];
+    auto &rnRuntime = *(jsi::Runtime *)cxxBridge.runtime;
+    auto executorFunction = ([executor = _runtimeExecutor](std::function<void(jsi::Runtime & runtime)> &&callback) {
+      // Convert to Objective-C block so it can be captured properly.
+      __block auto callbackBlock = callback;
+
+      [executor execute:^(jsi::Runtime &runtime) {
+        callbackBlock(runtime);
+      }];
+    });
+    auto nativeReanimatedModule = reanimated::createReanimatedModuleBridgeless(
+        _moduleRegistry, rnRuntime, std::string([valueUnpackerCode UTF8String]), executorFunction);
+    [self attachReactEventListener];
+    [self commonInit:nativeReanimatedModule withRnRuntime:rnRuntime];
+#else // REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED)
+    [NSException raise:@"Missing bridge" format:@"[Reanimated] Failed to obtain the bridge."];
+#endif // REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED)
+  } else {
+    facebook::jsi::Runtime *jsiRuntime = [self.bridge respondsToSelector:@selector(runtime)]
+        ? reinterpret_cast<facebook::jsi::Runtime *>(self.bridge.runtime)
+        : nullptr;
+
+    if (jsiRuntime) {
+      auto nativeReanimatedModule = reanimated::createReanimatedModule(
+          self.bridge, self.bridge.jsCallInvoker, std::string([valueUnpackerCode UTF8String]));
+      jsi::Runtime &rnRuntime = *jsiRuntime;
+
+      [self commonInit:nativeReanimatedModule withRnRuntime:rnRuntime];
+    }
+  }
+  return @YES;
+}
 
-    jsi::Runtime &rnRuntime = *jsiRuntime;
-    WorkletRuntimeCollector::install(rnRuntime);
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
+    (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return std::make_shared<facebook::react::NativeReanimatedModuleSpecJSI>(params);
+}
+#endif // RCT_NEW_ARCH_ENABLED
 
+- (void)commonInit:(std::shared_ptr<NativeReanimatedModule>)nativeReanimatedModule
+     withRnRuntime:(jsi::Runtime &)rnRuntime
+{
 #if __has_include(<UIKit/UIAccessibility.h>)
-    auto isReducedMotion = UIAccessibilityIsReduceMotionEnabled();
+  auto isReducedMotion = UIAccessibilityIsReduceMotionEnabled();
 #else
-    auto isReducedMotion = NSWorkspace.sharedWorkspace.accessibilityDisplayShouldReduceMotion;
+  auto isReducedMotion = NSWorkspace.sharedWorkspace.accessibilityDisplayShouldReduceMotion;
 #endif
-
-    RNRuntimeDecorator::decorate(rnRuntime, nativeReanimatedModule, isReducedMotion);
-
+  WorkletRuntimeCollector::install(rnRuntime);
+  RNRuntimeDecorator::decorate(rnRuntime, nativeReanimatedModule, isReducedMotion);
 #ifdef RCT_NEW_ARCH_ENABLED
-    weakNativeReanimatedModule_ = nativeReanimatedModule;
-    if (_surfacePresenter != nil) {
-      // reload, uiManager is null right now, we need to wait for `installReanimatedAfterReload`
-      [self injectDependencies:rnRuntime];
-    }
-#endif // RCT_NEW_ARCH_ENABLED
+  weakNativeReanimatedModule_ = nativeReanimatedModule;
+  if (self->_surfacePresenter != nil) {
+    // reload, uiManager is null right now, we need to wait for `installReanimatedAfterReload`
+    [self injectDependencies:rnRuntime];
   }
-
-  return nil;
+#endif // RCT_NEW_ARCH_ENABLED
 }
 
 @end

package/apple/REANodesManager.h

@@ -3,7 +3,7 @@
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <React/RCTSurfacePresenterStub.h>
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 #import <RNReanimated/READisplayLink.h>
 
@@ -33,7 +33,7 @@ typedef void (^REAPerformOperations)();
                       surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter;
 #else
 - (instancetype)initWithModule:(REAModule *)reanimatedModule uiManager:(RCTUIManager *)uiManager;
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 - (void)invalidate;
 - (void)operationsBatchDidComplete;
 
@@ -57,7 +57,7 @@ typedef void (^REAPerformOperations)();
                             nativeProps:(NSMutableDictionary *)nativeProps
                        trySynchronously:(BOOL)trySync;
 - (NSString *)obtainProp:(nonnull NSNumber *)viewTag propName:(nonnull NSString *)propName;
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 - (void)maybeFlushUIUpdatesQueue;
 
 @end

package/apple/REANodesManager.mm

@@ -12,15 +12,15 @@
 #import <react/renderer/uimanager/UIManager.h>
 #else
 #import <stdatomic.h>
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 #if __has_include(<RNScreens/RNSScreenStackHeaderConfig.h>)
 #import <RNScreens/RNSScreenStackHeaderConfig.h>
-#endif
+#endif // __has_include(<RNScreens/RNSScreenStackHeaderConfig.h>)
 
 #ifdef RCT_NEW_ARCH_ENABLED
 using namespace facebook::react;
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 // 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
@@ -71,7 +71,7 @@ using namespace facebook::react;
   // store reference to the observers array
   id oldObservers = [self.observerCoordinator valueForKey:@"_observers"];
 
-  // temporarily replace observers with a table conatining just nodesmanager (we need
+  // temporarily replace observers with a table containing just nodesManager (we need
   // this to capture mounting block)
   NSHashTable<id<RCTUIManagerObserver>> *soleObserver = [NSHashTable new];
   [soleObserver addObject:observer];
@@ -109,7 +109,7 @@ using namespace facebook::react;
 
 - (void)dealloc
 {
-  RCTAssert(_mounting == nil, @"Mouting block was set but never executed. This may lead to UI inconsistencies");
+  RCTAssert(_mounting == nil, @"Mounting block was set but never executed. This may lead to UI inconsistencies");
 }
 
 - (void)unblockUIThread
@@ -148,7 +148,7 @@ using namespace facebook::react;
 
 @end
 
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 @implementation REANodesManager {
   READisplayLink *_displayLink;
@@ -166,7 +166,7 @@ using namespace facebook::react;
 #else
   NSMutableArray<REANativeAnimationOp> *_operationsInBatch;
   volatile atomic_bool _shouldFlushUpdateBuffer;
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 }
 
 - (READisplayLink *)getDisplayLink
@@ -177,7 +177,7 @@ using namespace facebook::react;
     _displayLink = [READisplayLink displayLinkWithTarget:self selector:@selector(onAnimationFrame:)];
 #if !TARGET_OS_OSX
     _displayLink.preferredFramesPerSecond = 120; // will fallback to 60 fps for devices without Pro Motion display
-#endif
+#endif // TARGET_OS_OSX
     [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
   }
   return _displayLink;
@@ -226,7 +226,7 @@ using namespace facebook::react;
     _viewRegistry = [_uiManager valueForKey:@"_viewRegistry"];
     _shouldFlushUpdateBuffer = false;
   }
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
   [self useDisplayLinkOnMainQueue:^(READisplayLink *displayLink) {
     [displayLink setPaused:YES];
   }];
@@ -247,7 +247,7 @@ using namespace facebook::react;
 {
   _surfacePresenter = surfacePresenter;
 }
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)operationsBatchDidComplete
 {
@@ -279,7 +279,7 @@ using namespace facebook::react;
 {
   _performOperations = performOperations;
 }
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)startUpdatingOnAnimationFrame
 {
@@ -360,7 +360,7 @@ using namespace facebook::react;
     }
   }
   _wantRunUpdates = NO;
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -378,7 +378,7 @@ using namespace facebook::react;
     [uiManager updateView:reactTag viewName:viewName props:nativeProps];
   }];
 }
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 - (void)dispatchEvent:(id<RCTEvent>)event
 {
@@ -406,7 +406,7 @@ using namespace facebook::react;
   _uiProps = uiPropsSet;
   _nativeProps = nativePropsSet;
 }
-#endif
+#endif // RCT_NEW_ARCH_ENABLED
 
 - (BOOL)isNativeViewMounted:(NSNumber *)viewTag
 {
@@ -418,7 +418,7 @@ using namespace facebook::react;
   if ([view isKindOfClass:[RNSScreenStackHeaderConfig class]]) {
     return ((RNSScreenStackHeaderConfig *)view).screenView != nil;
   }
-#endif
+#endif // __has_include(<RNScreens/RNSScreenStackHeaderConfig.h>)
   return NO;
 }
 
@@ -521,22 +521,46 @@ using namespace facebook::react;
 {
   REAUIView *view = [self.uiManager viewForReactTag:viewTag];
 
-  NSString *result =
-      [NSString stringWithFormat:@"error: unknown propName %@, currently supported: opacity, zIndex", propName];
-
   if ([propName isEqualToString:@"opacity"]) {
 #if !TARGET_OS_OSX
     CGFloat alpha = view.alpha;
 #else
     CGFloat alpha = view.alphaValue;
-#endif
-    result = [@(alpha) stringValue];
+#endif // TARGET_OS_OSX
+    return [@(alpha) stringValue];
   } else if ([propName isEqualToString:@"zIndex"]) {
     NSInteger zIndex = view.reactZIndex;
-    result = [@(zIndex) stringValue];
+    return [@(zIndex) stringValue];
+  } else if ([propName isEqualToString:@"width"]) {
+    return [@(view.frame.size.width) stringValue];
+  } else if ([propName isEqualToString:@"height"]) {
+    return [@(view.frame.size.height) stringValue];
+  } else if ([propName isEqualToString:@"top"]) {
+    return [@(view.frame.origin.y) stringValue];
+  } else if ([propName isEqualToString:@"left"]) {
+    return [@(view.frame.origin.x) stringValue];
+  } else if ([propName isEqualToString:@"backgroundColor"]) {
+#if !TARGET_OS_OSX
+    UIColor *color = view.backgroundColor;
+#else
+    NSColor *color = view.backgroundColor;
+#endif
+    if (color == nil) {
+      return @"nil";
+    }
+    const size_t totalComponents = CGColorGetNumberOfComponents(color.CGColor);
+    const CGFloat *components = CGColorGetComponents(color.CGColor);
+    int r = 255 * components[MIN(0, totalComponents - 1)];
+    int g = 255 * components[MIN(1, totalComponents - 1)];
+    int b = 255 * components[MIN(2, totalComponents - 1)];
+    int alpha = 255 * components[MIN(3, totalComponents - 1)];
+    return [NSString stringWithFormat:@"#%02x%02x%02x%02x", r, g, b, alpha];
   }
 
-  return result;
+  return [NSString
+      stringWithFormat:
+          @"error: unknown propName %@, currently supported: opacity, zIndex, width, height, top, left, backgroundColor",
+          propName];
 }
 
 - (void)maybeFlushUpdateBuffer

package/apple/native/NativeProxy.h

@@ -1,7 +1,12 @@
 #if __cplusplus
 
+#import <REAAnimationsManager.h>
+#import <REAKeyboardEventObserver.h>
+#import <REAModule.h>
+#import <REANodesManager.h>
 #import <RNReanimated/NativeReanimatedModule.h>
 #import <React/RCTEventDispatcher.h>
+#import <ReanimatedSensorContainer.h>
 #include <memory>
 
 namespace reanimated {
@@ -11,6 +16,27 @@ std::shared_ptr<reanimated::NativeReanimatedModule> createReanimatedModule(
     const std::shared_ptr<facebook::react::CallInvoker> &jsInvoker,
     const std::string &valueUnpackerCode);
 
-}
+#if REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED)
+std::shared_ptr<reanimated::NativeReanimatedModule>
+createReanimatedModuleBridgeless(
+    RCTModuleRegistry *moduleRegistry,
+    jsi::Runtime &runtime,
+    const std::string &valueUnpackerCode,
+    RuntimeExecutor runtimeExecutor);
+#endif // REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED)
 
-#endif
+void commonInit(
+    REAModule *reaModule,
+    std::shared_ptr<NativeReanimatedModule> nativeReanimatedModule);
+
+#ifdef RCT_NEW_ARCH_ENABLED
+// nothing
+#else // RCT_NEW_ARCH_ENABLED
+void setupLayoutAnimationCallbacks(
+    std::shared_ptr<NativeReanimatedModule> nativeReanimatedModule,
+    REAAnimationsManager *animationsManager);
+#endif // RCT_NEW_ARCH_ENABLED
+
+} // namespace reanimated
+
+#endif //__cplusplus