mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
clear up props registry in shared backend on js thread (#56677)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/56677 ## Changelog: [Internal] [Fixed] - clear up props registry in shared backend on js thread stopSurface is usually called from main thread, but `animatedPropsRegistry_->getMap` in animationBackendCommitHook is called from js thread. Removing the surface props entry on ui thread can cause race condition (getMap() result on js thread becomes undefined) https://www.internalfb.com/code/fbsource/[26d70084020e]/xplat/js/react-native-github/packages/react-native/ReactCommon/react/renderer/animationbackend/AnimationBackendCommitHook.cpp?lines=26-31 Reviewed By: christophpurrer Differential Revision: D103752709 fbshipit-source-id: b779237cce7eb22d5da608232361909a0fa9628a
This commit is contained in:
1 parent
fbdbf4ad6b
commit
0d20210fbe
1 file changed
+12
-4
@@ -275,10 +275,6 @@ ShadowTree::Unique UIManager::stopSurface(SurfaceId surfaceId) const {
|
||||
// Stop any ongoing layout animations.
|
||||
stopSurfaceForAnimationDelegate(surfaceId);
|
||||
|
||||
if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
|
||||
animationBackend_->clearRegistryOnSurfaceStop(surfaceId);
|
||||
}
|
||||
|
||||
// Waiting for all concurrent commits to be finished and unregistering the
|
||||
// `ShadowTree`.
|
||||
auto shadowTree = getShadowTreeRegistry().remove(surfaceId);
|
||||
@@ -295,6 +291,18 @@ ShadowTree::Unique UIManager::stopSurface(SurfaceId surfaceId) const {
|
||||
leakChecker_->stopSurface(surfaceId);
|
||||
}
|
||||
}
|
||||
|
||||
if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
|
||||
runtimeExecutor_(
|
||||
[surfaceId,
|
||||
animationBackendWeak = std::weak_ptr<UIManagerAnimationBackend>(
|
||||
animationBackend_)](jsi::Runtime& /*runtime*/) {
|
||||
if (auto animationBackend = animationBackendWeak.lock()) {
|
||||
animationBackend->clearRegistryOnSurfaceStop(surfaceId);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return shadowTree;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user