Skip to content

fix(mobile): skip unhandled animation events on Android #13325

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
AKolenda wants to merge 1 commit into from
+28 −6
Closed

fix(mobile): skip unhandled animation events on Android #13325

Show file tree
Hide file tree
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
22 changes: 22 additions & 0 deletions patches/react-native-reanimated@4.5.5.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,25 @@ index f9711f4eb6185ea99e08280ff90edd45e4152e12..ca812666ca54ec55d9d4409910b21ae9
continue;
}

diff --git a/android/src/main/java/com/swmansion/reanimated/NodesManager.kt b/android/src/main/java/com/swmansion/reanimated/NodesManager.kt
--- a/android/src/main/java/com/swmansion/reanimated/NodesManager.kt
+++ b/android/src/main/java/com/swmansion/reanimated/NodesManager.kt
@@ -207,2 +207,8 @@
if (UiThreadUtil.isOnUiThread()) {
+ // SVG layout events can arrive during drawing. Do not flush unrelated updates
+ // unless an animation handler is registered for this event.
+ val eventName = mCustomEventNamesResolver.resolveCustomEventName(event.eventName) ?: return
+ if (!mNativeProxy!!.isAnyHandlerWaitingForEvent(eventName, event.viewTag)) {
+ return
+ }
// Ensure draw-pass tracking is attached before event handling; the backend reads
diff --git a/Common/cpp/reanimated/Events/UIEventHandlerRegistry.cpp b/Common/cpp/reanimated/Events/UIEventHandlerRegistry.cpp
--- a/Common/cpp/reanimated/Events/UIEventHandlerRegistry.cpp
+++ b/Common/cpp/reanimated/Events/UIEventHandlerRegistry.cpp
@@ -89,2 +89,6 @@
const std::lock_guard<std::mutex> lock(instanceMutex);
+ auto handlersWithoutTag = eventMappingsWithoutTag.find(eventName);
+ if (handlersWithoutTag != eventMappingsWithoutTag.end() && !handlersWithoutTag->second.empty()) {
+ return true;
+ }
const auto eventHash = std::make_pair(emitterReactTag, eventName);
12 changes: 6 additions & 6 deletions pnpm-lock.yaml
View file
Open in desktop

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

Loading