Skip to content

Fix blocking animating non-layout props through commitUpdates after the View was synchronously animated #55340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coado wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix blocking animating non-layout props through commitUpdates after the View was synchronously animated #55340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions packages/react-native/React/Fabric/Mounting/RCTMountingManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#import <React/RCTLog.h>
#import <React/RCTUtils.h>
#import <cxxreact/TraceSection.h>
#import <react/featureflags/ReactNativeFeatureFlags.h>
#import <react/renderer/components/root/RootShadowNode.h>
#import <react/renderer/core/LayoutableShadowNode.h>
#import <react/renderer/core/RawProps.h>
Expand Down Expand Up @@ -286,7 +287,6 @@ - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
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();

Expand All @@ -296,13 +296,18 @@ - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
return;
}

NSSet<NSString *> *propKeys = componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN ?: [NSSet new];

if (!ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
NSArray<NSString *> *propsKeysToBeUpdated = extractKeysFromFollyDynamic(props);
propKeys = [propKeys setByAddingObjectsFromArray:propsKeysToBeUpdated];
}

SurfaceId surfaceId = RCTSurfaceIdForView(componentView);
Props::Shared oldProps = [componentView props];
Props::Shared newProps = componentDescriptor.cloneProps(
PropsParserContext{surfaceId, *_contextContainer}, oldProps, RawProps(std::move(props)));

NSSet<NSString *> *propKeys = componentView.propKeysManagedByAnimated_DO_NOT_USE_THIS_IS_BROKEN ?: [NSSet new];
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;
Expand Down
Loading