Skip to content

Fix LayoutAnimation crash from mutation sort ordering #56629

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

Closed
fkgozali wants to merge 1 commit into from
+8 −3
Closed

Fix LayoutAnimation crash from mutation sort ordering #56629

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/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ void LayoutAnimationDriver::animationMutationsForFrame(
}
}

// Record boundary: animation-frame Updates above this point carry
// parentTag from before any structural changes and must execute first.
auto animationUpdatesEnd = mutationsList.size();

// Clear out finished animations
for (auto it = inflightAnimations_.begin();
it != inflightAnimations_.end();) {
Expand All @@ -99,10 +103,11 @@ void LayoutAnimationDriver::animationMutationsForFrame(
}
}

// Final step: make sure that all operations execute in the proper order.
// REMOVE operations with highest indices must operate first.
// Sort only the final mutations from completed animations.
// Animation-frame Updates must stay before structural mutations because
// they reference views by their pre-structural-change parentTag.
std::stable_sort(
mutationsList.begin(),
mutationsList.begin() + static_cast<ptrdiff_t>(animationUpdatesEnd),
mutationsList.end(),
&shouldFirstComeBeforeSecondMutation);
}
Expand Down
Loading