Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion apps/mobile/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"react-native-keyboard-controller": "1.21.13",
"react-native-nitro-markdown": "^0.5.0",
"react-native-nitro-modules": "0.35.9",
"react-native-reanimated": "4.5.1",
"react-native-reanimated": "4.5.3",
"react-native-safe-area-context": "~5.7.0",
"react-native-screens": "~4.26.0",
"react-native-shiki-engine": "^0.3.12",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@ index bc62f8fc31a1d3b08353df514bf4f954c6279ceb..0c16264538a13ae8b7bd4fd11e1227d8
}
layoutAnimations_.erase(layoutAnimationIt);
diff --git a/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy_Legacy.cpp b/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy_Legacy.cpp
index 9402e3e5ba4859ed344901b8b5884b9f708dd82b..2b1e4294ef798b7b6aabd04cc6663aae8297d034 100644
index df53d8dbf3c6a5ee6a7f210f5de854792aefefb5..6482f6528d271e0815ea8f2b2fae62d974962c9b 100644
--- a/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy_Legacy.cpp
+++ b/Common/cpp/reanimated/LayoutAnimations/LayoutAnimationsProxy_Legacy.cpp
@@ -119,6 +119,7 @@ std::optional<SurfaceId> LayoutAnimationsProxy_Legacy::endLayoutAnimation(int ta
@@ -155,6 +155,7 @@ std::optional<SurfaceId> LayoutAnimationsProxy_Legacy::endLayoutAnimation(int ta
if (--layoutAnimation.count > 0) {
return {};
}
+ layoutAnimation.isExitingWhenSettled = shouldRemove;
maybeSettledAnimationTags_.insert(tag);
auto surfaceId = layoutAnimation.finalView.surfaceId;

@@ -414,12 +415,7 @@ void LayoutAnimationsProxy_Legacy::addOngoingAnimations(SurfaceId surfaceId, Sha
@@ -453,12 +454,7 @@ void LayoutAnimationsProxy_Legacy::addOngoingAnimations(SurfaceId surfaceId, Sha
auto layoutAnimationIt = layoutAnimations_.find(tag);

if (layoutAnimationIt == layoutAnimations_.end() ||
Expand Down
20 changes: 10 additions & 10 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ patchedDependencies:
react-native-keyboard-controller@1.21.13: patches/react-native-keyboard-controller@1.21.13.patch
react-native-nitro-modules@0.35.9: patches/react-native-nitro-modules@0.35.9.patch
# Preserve the final layout frame. Backport of [#10171](https://github.com/software-mansion/react-native-reanimated/pull/10171).
react-native-reanimated@4.5.1: patches/react-native-reanimated@4.5.1.patch
react-native-reanimated@4.5.3: patches/react-native-reanimated@4.5.3.patch
react-native-screens@4.26.2: patches/react-native-screens@4.26.2.patch
uniwind@1.11.0: patches/uniwind@1.11.0.patch

Expand Down
Loading