diff --git a/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.cpp b/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.cpp index 8190c7c2f76..6add3a25cdf 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.cpp @@ -67,4 +67,26 @@ jsi::Value NativeViewTransition::findPseudoElementShadowNodeByTag( return jsi::Value::null(); } +void NativeViewTransition::waitForTransitionAnimation( + jsi::Runtime& rt, + double animationId) { + auto& uiManager = UIManagerBinding::getBinding(rt)->getUIManager(); + auto* viewTransitionDelegate = uiManager.getViewTransitionDelegate(); + if (viewTransitionDelegate != nullptr) { + viewTransitionDelegate->waitForTransitionAnimation( + static_cast(animationId)); + } +} + +void NativeViewTransition::transitionAnimationFinished( + jsi::Runtime& rt, + double animationId) { + auto& uiManager = UIManagerBinding::getBinding(rt)->getUIManager(); + auto* viewTransitionDelegate = uiManager.getViewTransitionDelegate(); + if (viewTransitionDelegate != nullptr) { + viewTransitionDelegate->transitionAnimationFinished( + static_cast(animationId)); + } +} + } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.h b/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.h index f3311f40bef..55593f7c2f6 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.h +++ b/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.h @@ -28,6 +28,10 @@ class NativeViewTransition : public NativeViewTransitionCxxSpec onCompleteCallback; }; std::queue pendingTransitions_{}; + + // Tracks animation IDs that must complete before onCompleteCallback_ fires. + // Animations are registered via waitForTransitionAnimation (called from JS + // after connectAnimatedNodeToView) and removed via transitionAnimationFinished. + std::unordered_set pendingAnimationIds_{}; + std::function onCompleteCallback_{nullptr}; }; } // namespace facebook::react diff --git a/packages/react-native/src/private/viewtransition/specs/NativeViewTransition.js b/packages/react-native/src/private/viewtransition/specs/NativeViewTransition.js index c9fa79cd363..c3bebd47352 100644 --- a/packages/react-native/src/private/viewtransition/specs/NativeViewTransition.js +++ b/packages/react-native/src/private/viewtransition/specs/NativeViewTransition.js @@ -24,6 +24,8 @@ export interface Spec extends TurboModule { nativeTag: number, }; +findPseudoElementShadowNodeByTag: (reactTag: number) => ?unknown /* Node */; + +waitForTransitionAnimation: (animationId: number) => void; + +transitionAnimationFinished: (animationId: number) => void; } export default TurboModuleRegistry.get(