From 698a936e4d7edf2418c705ea2bc02759ec8f192c Mon Sep 17 00:00:00 2001 From: Paige Sun Date: Fri, 5 Nov 2021 14:14:18 -0700 Subject: [PATCH] Minor Style: Make viewName nullable in native animated modules for Fabric Summary: Make viewName in native animations nullable, because viewName is not used when the RCTAnimationNode is managed by Fabric. Changelog: [Internal] Minor: Make viewName nullable in native animated modules for Fabric Reviewed By: philIip Differential Revision: D32196270 fbshipit-source-id: 76d05dc7fd2850efb097f953ccd22fd3f6d80599 --- Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h | 2 +- Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m | 3 ++- Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h index 78325388a6..be67bc9e49 100644 --- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h +++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h @@ -40,7 +40,7 @@ - (void)connectAnimatedNodeToView:(nonnull NSNumber *)nodeTag viewTag:(nonnull NSNumber *)viewTag - viewName:(nonnull NSString *)viewName; + viewName:(NSString *)viewName; - (void)restoreDefaultValues:(nonnull NSNumber *)nodeTag; diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m index e7fb791193..e8ccccd5ba 100644 --- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m +++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m @@ -146,10 +146,11 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName) - (void)connectAnimatedNodeToView:(nonnull NSNumber *)nodeTag viewTag:(nonnull NSNumber *)viewTag - viewName:(nonnull NSString *)viewName + viewName:(NSString *)viewName { RCTAnimatedNode *node = _animationNodes[nodeTag]; if ([node isKindOfClass:[RCTPropsAnimatedNode class]]) { + // viewName is not used when node is managed by Fabric [(RCTPropsAnimatedNode *)node connectToView:viewTag viewName:viewName bridge:_bridge diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm index 16986e1b24..c126ddb3b5 100644 --- a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm +++ b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm @@ -188,8 +188,8 @@ RCT_EXPORT_METHOD(connectAnimatedNodeToView:(double)nodeTag [_nodeIDsManagedByFabric addObject:@(nodeTag)]; } [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) { - NSString *viewName; // Not used when node is managed by Fabric. Nodes are always managed by Fabric in Bridgeless. - [nodesManager connectAnimatedNodeToView:[NSNumber numberWithDouble:nodeTag] viewTag:[NSNumber numberWithDouble:viewTag] viewName:viewName]; + // viewName is not used when node is managed by Fabric, and nodes are always managed by Fabric in Bridgeless. + [nodesManager connectAnimatedNodeToView:[NSNumber numberWithDouble:nodeTag] viewTag:[NSNumber numberWithDouble:viewTag] viewName:nil]; }]; }