refactor native animated to pass folly::dynamic to fabric

sammy-SC · facebook-github-bot · commit 63a5a70cf23f · 2025-05-16T01:48:44.000-07:00
Differential Revision: D74738548
diff --git a/packages/react-native/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.mm b/packages/react-native/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.mm
@@ -13,6 +13,7 @@
 #import <React/RCTStyleAnimatedNode.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTValueAnimatedNode.h>
+#import <react/utils/FollyConvert.h>
 
 @implementation RCTPropsAnimatedNode {
   NSNumber *_connectedViewTag;
@@ -61,9 +62,12 @@ - (void)updateView
 {
   if (_managedByFabric) {
     if (_bridge.surfacePresenter) {
-      [_bridge.surfacePresenter synchronouslyUpdateViewOnUIThread:_connectedViewTag props:_propsDictionary];
+      [_bridge.surfacePresenter
+          synchronouslyUpdateViewOnUIThread:_connectedViewTag.integerValue
+                                      props:facebook::react::convertIdToFollyDynamic(_propsDictionary)];
     } else {
-      [_surfacePresenter synchronouslyUpdateViewOnUIThread:_connectedViewTag props:_propsDictionary];
+      [_surfacePresenter synchronouslyUpdateViewOnUIThread:_connectedViewTag.integerValue
+                                                     props:facebook::react::convertIdToFollyDynamic(_propsDictionary)];
     }
   } else {
     [_bridge.uiManager synchronouslyUpdateViewOnUIThread:_connectedViewTag
diff --git a/packages/react-native/React/Base/RCTViewRegistry.m b/packages/react-native/React/Base/RCTViewRegistry.m
@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTSurfacePresenterStub.h>
 #import <React/RCTUIManager.h>
 
 #import "RCTBridge.h"
diff --git a/packages/react-native/React/CxxUtils/RCTFollyConvert.h b/packages/react-native/React/CxxUtils/RCTFollyConvert.h
@@ -16,6 +16,7 @@ namespace facebook::react {
 folly::dynamic convertIdToFollyDynamic(id json);
 [[deprecated(
     "This function is deprecated, please use /ReactCommon/react/utils/platform/ios/react/utils/FollyConvert.h instead")]]
-id convertFollyDynamicToId(const folly::dynamic& dyn);
+id convertFollyDynamicToId(const folly::dynamic &dyn);
+NSArray<NSString *> *extractKeysFromFollyDynamic(const folly::dynamic &dyn);
 
 } // namespace facebook::react
diff --git a/packages/react-native/React/CxxUtils/RCTFollyConvert.mm b/packages/react-native/React/CxxUtils/RCTFollyConvert.mm
@@ -113,4 +113,20 @@ id convertFollyDynamicToId(const folly::dynamic &dyn)
   return nil;
 }
 
+NSArray<NSString *> *extractKeysFromFollyDynamic(const folly::dynamic &dyn)
+{
+  NSMutableArray<NSString *> *result = [NSMutableArray new];
+
+  if (dyn.type() == folly::dynamic::OBJECT) {
+    for (const auto &elem : dyn.items()) {
+      NSString *key = [[NSString alloc] initWithBytes:elem.first.c_str()
+                                               length:elem.first.size()
+                                             encoding:NSUTF8StringEncoding];
+      [result addObject:key];
+    }
+  }
+
+  return result;
+}
+
 } // namespace facebook::react
diff --git a/packages/react-native/React/Fabric/Mounting/RCTMountingManager.h b/packages/react-native/React/Fabric/Mounting/RCTMountingManager.h
@@ -67,7 +67,7 @@ NS_ASSUME_NONNULL_BEGIN
            forShadowView:(const facebook::react::ShadowView &)shadowView;
 
 - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
-                             changedProps:(NSDictionary *)props
+                             changedProps:(folly::dynamic)props
                       componentDescriptor:(const facebook::react::ComponentDescriptor &)componentDescriptor;
 @end
 
diff --git a/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm b/packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm
@@ -282,25 +282,34 @@ - (void)setIsJSResponder:(BOOL)isJSResponder
 }
 
 - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
-                             changedProps:(NSDictionary *)props
+                             changedProps:(folly::dynamic)props
                       componentDescriptor:(const ComponentDescriptor &)componentDescriptor
 {
   RCTAssertMainQueue();
+  NSArray<NSString *> *propsKeysToBeUpdated = extractKeysFromFollyDynamic(props);
+  bool updatesTransform = props.find("transform") != props.items().end();
+  bool updatesOpacity = props.find("opacity") != props.items().end();
+
   UIView<RCTComponentViewProtocol> *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag];
+  if (!componentView) {
+    RCTLogWarn(@"Attempted to update view with tag %ld, but it no longer exists", (long)reactTag);
+    return;
+  }
+
   SurfaceId surfaceId = RCTSurfaceIdForView(componentView);
   Props::Shared oldProps = [componentView props];
   Props::Shared newProps = componentDescriptor.cloneProps(
-      PropsParserContext{surfaceId, *_contextContainer.get()}, oldProps, RawProps(convertIdToFollyDynamic(props)));
+      PropsParserContext{surfaceId, *_contextContainer.get()}, oldProps, RawProps(std::move(props)));
 
   NSSet<NSString *> *propKeys = componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN ?: [NSSet new];
-  propKeys = [propKeys setByAddingObjectsFromArray:props.allKeys];
+  propKeys = [propKeys setByAddingObjectsFromArray:propsKeysToBeUpdated];
   componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN = nil;
   [componentView updateProps:newProps oldProps:oldProps];
   componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN = propKeys;
 
   const auto &newViewProps = static_cast<const ViewProps &>(*newProps);
 
-  if (props[@"transform"]) {
+  if (updatesTransform) {
     auto layoutMetrics = LayoutMetrics();
     layoutMetrics.frame.size.width = componentView.layer.bounds.size.width;
     layoutMetrics.frame.size.height = componentView.layer.bounds.size.height;
@@ -309,7 +318,7 @@ - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
       componentView.layer.transform = newTransform;
     }
   }
-  if (props[@"opacity"] && componentView.layer.opacity != (float)newViewProps.opacity) {
+  if (updatesOpacity && componentView.layer.opacity != (float)newViewProps.opacity) {
     componentView.layer.opacity = newViewProps.opacity;
   }
 
diff --git a/packages/react-native/React/Fabric/RCTSurfacePresenter.h b/packages/react-native/React/Fabric/RCTSurfacePresenter.h
@@ -65,7 +65,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (nullable RCTFabricSurface *)surfaceForRootTag:(ReactTag)rootTag;
 
-- (BOOL)synchronouslyUpdateViewOnUIThread:(NSNumber *)reactTag props:(NSDictionary *)props;
+- (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag props:(folly::dynamic)props;
 
 - (void)setupAnimationDriverWithSurfaceHandler:(const facebook::react::SurfaceHandler &)surfaceHandler;
 
diff --git a/packages/react-native/React/Fabric/RCTSurfacePresenter.mm b/packages/react-native/React/Fabric/RCTSurfacePresenter.mm
@@ -148,28 +148,27 @@ - (UIView *)findComponentViewWithTag_DO_NOT_USE_DEPRECATED:(NSInteger)tag
   return componentView;
 }
 
-- (BOOL)synchronouslyUpdateViewOnUIThread:(NSNumber *)reactTag props:(NSDictionary *)props
+- (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag props:(folly::dynamic)props
 {
   RCTScheduler *scheduler = [self scheduler];
   if (!scheduler) {
-    return NO;
+    return;
   }
-
-  ReactTag tag = [reactTag integerValue];
   UIView<RCTComponentViewProtocol> *componentView =
-      [_mountingManager.componentViewRegistry findComponentViewWithTag:tag];
+      [_mountingManager.componentViewRegistry findComponentViewWithTag:reactTag];
   if (componentView == nil) {
-    return NO; // This view probably isn't managed by Fabric
+    return; // This view probably isn't managed by Fabric
   }
   ComponentHandle handle = [[componentView class] componentDescriptorProvider].handle;
   auto *componentDescriptor = [scheduler findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN:handle];
 
   if (!componentDescriptor) {
-    return YES;
+    return;
   }
 
-  [_mountingManager synchronouslyUpdateViewOnUIThread:tag changedProps:props componentDescriptor:*componentDescriptor];
-  return YES;
+  [_mountingManager synchronouslyUpdateViewOnUIThread:reactTag
+                                         changedProps:std::move(props)
+                                  componentDescriptor:*componentDescriptor];
 }
 
 - (void)setupAnimationDriverWithSurfaceHandler:(const facebook::react::SurfaceHandler &)surfaceHandler
diff --git a/packages/react-native/React/Modules/RCTSurfacePresenterStub.h b/packages/react-native/React/Modules/RCTSurfacePresenterStub.h
@@ -9,6 +9,7 @@
 
 #import <React/RCTBridge.h>
 #import <React/RCTBridgeProxy.h>
+#import <folly/dynamic.h>
 
 @protocol RCTSurfaceProtocol;
 
@@ -32,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (id<RCTSurfaceProtocol>)createFabricSurfaceForModuleName:(NSString *)moduleName
                                          initialProperties:(NSDictionary *)initialProperties;
 - (nullable UIView *)findComponentViewWithTag_DO_NOT_USE_DEPRECATED:(NSInteger)tag;
-- (BOOL)synchronouslyUpdateViewOnUIThread:(NSNumber *)reactTag props:(NSDictionary *)props;
+- (void)synchronouslyUpdateViewOnUIThread:(NSInteger)reactTag props:(folly::dynamic)props;
 - (void)addObserver:(id<RCTSurfacePresenterObserver>)observer;
 - (void)removeObserver:(id<RCTSurfacePresenterObserver>)observer;
 
diff --git a/packages/react-native/React/Modules/RCTSurfacePresenterStub.mm b/packages/react-native/React/Modules/RCTSurfacePresenterStub.mm
diff --git a/packages/react-native/ReactCommon/react/utils/platform/ios/react/utils/FollyConvert.h b/packages/react-native/ReactCommon/react/utils/platform/ios/react/utils/FollyConvert.h
@@ -12,6 +12,7 @@
 namespace facebook::react {
 
 folly::dynamic convertIdToFollyDynamic(id json);
-id convertFollyDynamicToId(const folly::dynamic& dyn);
+id convertFollyDynamicToId(const folly::dynamic &dyn);
+NSArray<NSString *> *extractKeysFromFollyDynamic(const folly::dynamic &dyn);
 
 } // namespace facebook::react
diff --git a/packages/react-native/ReactCommon/react/utils/platform/ios/react/utils/FollyConvert.mm b/packages/react-native/ReactCommon/react/utils/platform/ios/react/utils/FollyConvert.mm
@@ -113,4 +113,20 @@ id convertFollyDynamicToId(const folly::dynamic &dyn)
   return nil;
 }
 
+NSArray<NSString *> *extractKeysFromFollyDynamic(const folly::dynamic &dyn)
+{
+  NSMutableArray<NSString *> *result = [NSMutableArray new];
+
+  if (dyn.type() == folly::dynamic::OBJECT) {
+    for (const auto &elem : dyn.items()) {
+      NSString *key = [[NSString alloc] initWithBytes:elem.first.c_str()
+                                               length:elem.first.size()
+                                             encoding:NSUTF8StringEncoding];
+      [result addObject:key];
+    }
+  }
+
+  return result;
+}
+
 } // namespace facebook::react

Original file line number	Diff line number	Diff line change
`@@ -148,28 +148,27 @@ - (UIView *)findComponentViewWithTag_DO_NOT_USE_DEPRECATED:(NSInteger)tag`
`148`	`148`	`return componentView;`
`149`	`149`	`}`
`150`	`150`
`151`		`-- (BOOL)synchronouslyUpdateViewOnUIThread:(NSNumber )reactTag props:(NSDictionary )props`
	`151`	`+- (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag props:(folly::dynamic)props`
`152`	`152`	`{`
`153`	`153`	`RCTScheduler *scheduler = [self scheduler];`
`154`	`154`	`if (!scheduler) {`
`155`		`- return NO;`
	`155`	`+ return;`
`156`	`156`	`}`
`157`		`-`
`158`		`- ReactTag tag = [reactTag integerValue];`
`159`	`157`	`UIView<RCTComponentViewProtocol> *componentView =`
`160`		`- [_mountingManager.componentViewRegistry findComponentViewWithTag:tag];`
	`158`	`+ [_mountingManager.componentViewRegistry findComponentViewWithTag:reactTag];`
`161`	`159`	`if (componentView == nil) {`
`162`		`- return NO; // This view probably isn't managed by Fabric`
	`160`	`+ return; // This view probably isn't managed by Fabric`
`163`	`161`	`}`
`164`	`162`	`ComponentHandle handle = [[componentView class] componentDescriptorProvider].handle;`
`165`	`163`	`auto *componentDescriptor = [scheduler findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN:handle];`
`166`	`164`
`167`	`165`	`if (!componentDescriptor) {`
`168`		`- return YES;`
	`166`	`+ return;`
`169`	`167`	`}`
`170`	`168`
`171`		`- [_mountingManager synchronouslyUpdateViewOnUIThread:tag changedProps:props componentDescriptor:*componentDescriptor];`
`172`		`- return YES;`
	`169`	`+ [_mountingManager synchronouslyUpdateViewOnUIThread:reactTag`
	`170`	`+ changedProps:std::move(props)`
	`171`	`+ componentDescriptor:*componentDescriptor];`
`173`	`172`	`}`
`174`	`173`
`175`	`174`	`- (void)setupAnimationDriverWithSurfaceHandler:(const facebook::react::SurfaceHandler &)surfaceHandler`