Skip to content

Fix sticky header #7668

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

Merged
merged 5 commits into from
Jun 17, 2025
Merged

Fix sticky header #7668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a2d69d
Pause Reanimated commits only for commits coming from React
tomekzaw Jun 17, 2025
8ccef04
Reformat comment
tomekzaw Jun 17, 2025
b19131a
Add `#ifdef REACT_NATIVE_MINOR_VERSION`
tomekzaw Jun 17, 2025
9b293cd
Fix formatting
tomekzaw Jun 17, 2025
99a7923
Fix condition
tomekzaw Jun 17, 2025
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
16 changes: 14 additions & 2 deletions packages/react-native-reanimated/Common/cpp/reanimated/Fabric/ReanimatedCommitHook.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,12 @@ void ReanimatedCommitHook::maybeInitializeLayoutAnimations(
RootShadowNode::Unshared ReanimatedCommitHook::shadowTreeWillCommit(
ShadowTree const &,
RootShadowNode::Shared const &,
RootShadowNode::Unshared const &newRootShadowNode) noexcept {
RootShadowNode::Unshared const &newRootShadowNode
#if REACT_NATIVE_MINOR_VERSION >= 80
,
const ShadowTreeCommitOptions &commitOptions
#endif
) noexcept {
ReanimatedSystraceSection s("ReanimatedCommitHook::shadowTreeWillCommit");

maybeInitializeLayoutAnimations(newRootShadowNode->getSurfaceId());
Expand Down Expand Up @@ -86,8 +91,15 @@ RootShadowNode::Unshared ReanimatedCommitHook::shadowTreeWillCommit(
// props will be applied in ReanimatedCommitHook by UpdatesRegistryManager
// This is very important, since if we didn't pause Reanimated commits,
// it could lead to RN commits being delayed until the animation is finished
// (very bad).
// (very bad). We don't pause Reanimated commits for state updates coming
// from React Native as this would break sticky header animations.
#if REACT_NATIVE_MINOR_VERSION >= 80
if (commitOptions.source == ShadowTreeCommitSource::React) {
updatesRegistryManager_->pauseReanimatedCommits();
}
#else
updatesRegistryManager_->pauseReanimatedCommits();
#endif
}

return rootNode;
Expand Down
7 changes: 6 additions & 1 deletion packages/react-native-reanimated/Common/cpp/reanimated/Fabric/ReanimatedCommitHook.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ class ReanimatedCommitHook
RootShadowNode::Unshared shadowTreeWillCommit(
ShadowTree const &shadowTree,
RootShadowNode::Shared const &oldRootShadowNode,
RootShadowNode::Unshared const &newRootShadowNode) noexcept override;
RootShadowNode::Unshared const &newRootShadowNode
#if REACT_NATIVE_MINOR_VERSION >= 80
,
const ShadowTreeCommitOptions &commitOptions
#endif
) noexcept override;

private:
std::shared_ptr<UIManager> uiManager_;
Expand Down
Loading