Clear AnimatedPropsRegistry on surface stop (#56485)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/56485

## Changelog:

[Internal] [Fixed] - Clear AnimatedPropsRegistry on surface stop

When `useSharedAnimatedBackend` is enabled, the `AnimatedPropsRegistry` accumulates
`SurfaceContext` entries (containing `shared_ptr<ShadowNodeFamily>` and `PropsSnapshot`
data) for each surface that has animated views. These entries are never cleaned up when
a surface is destroyed via `UIManager::stopSurface()`, because that method only calls
the legacy `stopSurfaceForAnimationDelegate()` — the shared backend's registry is untouched.

We also see increased `RetryableMountingLayerException` errors in production which stack trace
shows there are mount items committing to surface that no longer exists.

This change:
1. Adds `animationBackend_->clearRegistry(surfaceId)` to `UIManager::stopSurface()`
2. Changes `AnimatedPropsRegistry::clear()` to fully erase the `surfaceContexts_` map
   entry instead of just clearing its contents

Reviewed By: christophpurrer

Differential Revision: D101354994

fbshipit-source-id: c7668f728050a0d3f5c09ad5ca51e48450c1b87e
This commit is contained in:
Zeya Peng authored and meta-codesync[bot] committed 2026-04-20 07:48:25 -07:00
1 parent 46c0177162
commit 1433e43348
12 files changed
+46 -10

No files matched your search

@@ -1536,6 +1536,7 @@ class facebook::react::AnimatedNode {
class facebook::react::AnimatedPropsRegistry {
public std::pair<std::unordered_set<std::shared_ptr<const facebook::react::ShadowNodeFamily>>&, facebook::react::SnapshotMap&> getMap(facebook::react::SurfaceId surfaceId);
public void clear(facebook::react::SurfaceId surfaceId);
public void clearOnSurfaceStop(facebook::react::SurfaceId surfaceId);
public void update(const std::unordered_map<facebook::react::SurfaceId, facebook::react::SurfaceUpdates>& surfaceUpdates);
}
@@ -1545,6 +1546,7 @@ class facebook::react::AnimationBackend : public facebook::react::UIManagerAnima
public using ResumeCallback = std::function<void()>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) override;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) override;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) override;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) override;
@@ -5226,6 +5228,7 @@ class facebook::react::UIManagerAnimationBackend {
public using Callback = std::function<facebook::react::AnimationMutations(facebook::react::AnimationTimestamp)>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) = 0;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) = 0;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) = 0;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) = 0;
@@ -13650,4 +13653,4 @@ struct std::hash<facebook::react::jsinspector_modern::UniqueMonostate<key>> {
}
void YGJNIVanilla::registerNatives(JNIEnv* env);
void YGJNIVanilla::registerNatives(JNIEnv* env);
@@ -1535,6 +1535,7 @@ class facebook::react::AnimatedNode {
class facebook::react::AnimatedPropsRegistry {
public std::pair<std::unordered_set<std::shared_ptr<const facebook::react::ShadowNodeFamily>>&, facebook::react::SnapshotMap&> getMap(facebook::react::SurfaceId surfaceId);
public void clear(facebook::react::SurfaceId surfaceId);
public void clearOnSurfaceStop(facebook::react::SurfaceId surfaceId);
public void update(const std::unordered_map<facebook::react::SurfaceId, facebook::react::SurfaceUpdates>& surfaceUpdates);
}
@@ -1544,6 +1545,7 @@ class facebook::react::AnimationBackend : public facebook::react::UIManagerAnima
public using ResumeCallback = std::function<void()>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) override;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) override;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) override;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) override;
@@ -5217,6 +5219,7 @@ class facebook::react::UIManagerAnimationBackend {
public using Callback = std::function<facebook::react::AnimationMutations(facebook::react::AnimationTimestamp)>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) = 0;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) = 0;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) = 0;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) = 0;
@@ -13506,4 +13509,4 @@ struct std::hash<facebook::react::jsinspector_modern::UniqueMonostate<key>> {
}
void YGJNIVanilla::registerNatives(JNIEnv* env);
void YGJNIVanilla::registerNatives(JNIEnv* env);
@@ -4481,6 +4481,7 @@ class facebook::react::AnimatedNode {
class facebook::react::AnimatedPropsRegistry {
public std::pair<std::unordered_set<std::shared_ptr<const facebook::react::ShadowNodeFamily>>&, facebook::react::SnapshotMap&> getMap(facebook::react::SurfaceId surfaceId);
public void clear(facebook::react::SurfaceId surfaceId);
public void clearOnSurfaceStop(facebook::react::SurfaceId surfaceId);
public void update(const std::unordered_map<facebook::react::SurfaceId, facebook::react::SurfaceUpdates>& surfaceUpdates);
}
@@ -4490,6 +4491,7 @@ class facebook::react::AnimationBackend : public facebook::react::UIManagerAnima
public using ResumeCallback = std::function<void()>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) override;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) override;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) override;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) override;
@@ -7791,6 +7793,7 @@ class facebook::react::UIManagerAnimationBackend {
public using Callback = std::function<facebook::react::AnimationMutations(facebook::react::AnimationTimestamp)>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) = 0;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) = 0;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) = 0;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) = 0;
@@ -16242,4 +16245,4 @@ class FB::LazyVector {
public using reference = T;
public using size_type = std::int32_t;
public using value_type = T;
}
}
@@ -4480,6 +4480,7 @@ class facebook::react::AnimatedNode {
class facebook::react::AnimatedPropsRegistry {
public std::pair<std::unordered_set<std::shared_ptr<const facebook::react::ShadowNodeFamily>>&, facebook::react::SnapshotMap&> getMap(facebook::react::SurfaceId surfaceId);
public void clear(facebook::react::SurfaceId surfaceId);
public void clearOnSurfaceStop(facebook::react::SurfaceId surfaceId);
public void update(const std::unordered_map<facebook::react::SurfaceId, facebook::react::SurfaceUpdates>& surfaceUpdates);
}
@@ -4489,6 +4490,7 @@ class facebook::react::AnimationBackend : public facebook::react::UIManagerAnima
public using ResumeCallback = std::function<void()>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) override;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) override;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) override;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) override;
@@ -7782,6 +7784,7 @@ class facebook::react::UIManagerAnimationBackend {
public using Callback = std::function<facebook::react::AnimationMutations(facebook::react::AnimationTimestamp)>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) = 0;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) = 0;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) = 0;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) = 0;
@@ -16108,4 +16111,4 @@ class FB::LazyVector {
public using reference = T;
public using size_type = std::int32_t;
public using value_type = T;
}
}
@@ -864,6 +864,7 @@ class facebook::react::AnimatedNode {
class facebook::react::AnimatedPropsRegistry {
public std::pair<std::unordered_set<std::shared_ptr<const facebook::react::ShadowNodeFamily>>&, facebook::react::SnapshotMap&> getMap(facebook::react::SurfaceId surfaceId);
public void clear(facebook::react::SurfaceId surfaceId);
public void clearOnSurfaceStop(facebook::react::SurfaceId surfaceId);
public void update(const std::unordered_map<facebook::react::SurfaceId, facebook::react::SurfaceUpdates>& surfaceUpdates);
}
@@ -873,6 +874,7 @@ class facebook::react::AnimationBackend : public facebook::react::UIManagerAnima
public using ResumeCallback = std::function<void()>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) override;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) override;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) override;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) override;
@@ -3688,6 +3690,7 @@ class facebook::react::UIManagerAnimationBackend {
public using Callback = std::function<facebook::react::AnimationMutations(facebook::react::AnimationTimestamp)>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) = 0;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) = 0;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) = 0;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) = 0;
@@ -10596,4 +10599,4 @@ struct std::hash<facebook::react::jsinspector_modern::ExecutionContextSelector>
template <size_t key>
struct std::hash<facebook::react::jsinspector_modern::UniqueMonostate<key>> {
public size_t operator()(const facebook::react::jsinspector_modern::UniqueMonostate<key>&) const noexcept;
}
}
@@ -863,6 +863,7 @@ class facebook::react::AnimatedNode {
class facebook::react::AnimatedPropsRegistry {
public std::pair<std::unordered_set<std::shared_ptr<const facebook::react::ShadowNodeFamily>>&, facebook::react::SnapshotMap&> getMap(facebook::react::SurfaceId surfaceId);
public void clear(facebook::react::SurfaceId surfaceId);
public void clearOnSurfaceStop(facebook::react::SurfaceId surfaceId);
public void update(const std::unordered_map<facebook::react::SurfaceId, facebook::react::SurfaceUpdates>& surfaceUpdates);
}
@@ -872,6 +873,7 @@ class facebook::react::AnimationBackend : public facebook::react::UIManagerAnima
public using ResumeCallback = std::function<void()>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) override;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) override;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) override;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) override;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) override;
@@ -3679,6 +3681,7 @@ class facebook::react::UIManagerAnimationBackend {
public using Callback = std::function<facebook::react::AnimationMutations(facebook::react::AnimationTimestamp)>;
public virtual facebook::react::CallbackId start(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void clearRegistry(facebook::react::SurfaceId surfaceId) = 0;
public virtual void clearRegistryOnSurfaceStop(facebook::react::SurfaceId surfaceId) = 0;
public virtual void onAnimationFrame(facebook::react::AnimationTimestamp timestamp) = 0;
public virtual void pushAnimationMutations(const facebook::react::UIManagerAnimationBackend::Callback& callback) = 0;
public virtual void registerJSInvoker(std::shared_ptr<facebook::react::CallInvoker> jsInvoker) = 0;
@@ -10587,4 +10590,4 @@ struct std::hash<facebook::react::jsinspector_modern::ExecutionContextSelector>
template <size_t key>
struct std::hash<facebook::react::jsinspector_modern::UniqueMonostate<key>> {
public size_t operator()(const facebook::react::jsinspector_modern::UniqueMonostate<key>&) const noexcept;
}
}