Skip to content

Commit 403d543

Browse files
Bartlomiej Bloniarzfacebook-github-bot
authored andcommitted
Run AnimationBackend commit hook on ReactRevisionMerge commits
Summary: `AnimationBackendCommitHook` reconciles animated props during React commits to prevent React from overwriting animation-driven prop updates. Commits with source `ReactRevisionMerge` were being excluded, which currently was not a problem, because this source is only used with fabricCommitBranching which is currently disabled. Changelog: [General][Fixed] - Add `ReactRevisionMerge` source to the AnimationBackendCommitHook Differential Revision: D110459778
1 parent 6422737 commit 403d543

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

packages/react-native/ReactCommon/react/renderer/animationbackend/AnimationBackendCommitHook.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ RootShadowNode::Unshared AnimationBackendCommitHook::shadowTreeWillCommit(
2424
const RootShadowNode::Unshared& newRootShadowNode,
2525
const ShadowTreeCommitOptions& commitOptions) noexcept {
2626
if (commitOptions.source != ShadowTreeCommitSource::React &&
27-
commitOptions.source != ShadowTreeCommitSource::AnimationEndSync) {
27+
commitOptions.source != ShadowTreeCommitSource::AnimationEndSync &&
28+
commitOptions.source != ShadowTreeCommitSource::ReactRevisionMerge) {
2829
return newRootShadowNode;
2930
}
3031

0 commit comments

Comments
 (0)