diff --git a/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.cpp b/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.cpp index 6fb69012df4..8190c7c2f76 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.cpp @@ -51,4 +51,20 @@ std::optional NativeViewTransition::getViewTransitionInstance( return result; } +jsi::Value NativeViewTransition::findPseudoElementShadowNodeByTag( + jsi::Runtime& rt, + double reactTag) { + auto& uiManager = UIManagerBinding::getBinding(rt)->getUIManager(); + auto* viewTransitionDelegate = uiManager.getViewTransitionDelegate(); + if (viewTransitionDelegate != nullptr) { + auto shadowNode = viewTransitionDelegate->findPseudoElementShadowNodeByTag( + static_cast(reactTag)); + if (shadowNode) { + return Bridging>::toJs(rt, shadowNode); + } + } + + return jsi::Value::null(); +} + } // 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 bd5cb3b424f..f3311f40bef 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.h +++ b/packages/react-native/ReactCommon/react/nativemodule/viewtransition/NativeViewTransition.h @@ -26,6 +26,8 @@ class NativeViewTransition : public NativeViewTransitionCxxSpec getViewTransitionInstance(jsi::Runtime &rt, const std::string &name, const std::string &pseudo); + + jsi::Value findPseudoElementShadowNodeByTag(jsi::Runtime &rt, double reactTag); }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h index f8f82d1433f..d3685775c35 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h @@ -57,6 +57,16 @@ class UIManagerViewTransitionDelegate { { return std::nullopt; } + + // Similar to UIManager::findShadowNodeByTag, but searches all direct children + // of the root node (where pseudo-element nodes live) rather than just the + // first child. Pseudo-element nodes are appended as additional children of the + // root node, rather than inserted into the main React tree, to avoid + // disrupting the user-created component tree. + virtual std::shared_ptr findPseudoElementShadowNodeByTag(Tag /*tag*/) const + { + return nullptr; + } }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp b/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp index 30a891fd83c..d67ad6e24a8 100644 --- a/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp +++ b/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp @@ -227,6 +227,36 @@ std::optional ViewTransitionModule::pullTransaction( surfaceId, number, std::move(mutations), telemetry}; } +std::shared_ptr +ViewTransitionModule::findPseudoElementShadowNodeByTag(Tag tag) const { + if (uiManager_ == nullptr) { + return nullptr; + } + + auto shadowNode = std::shared_ptr{}; + + uiManager_->getShadowTreeRegistry().enumerate( + [&](const ShadowTree& shadowTree, bool& stop) { + const auto rootShadowNode = + shadowTree.getCurrentRevision().rootShadowNode; + + if (rootShadowNode != nullptr) { + const auto& children = rootShadowNode->getChildren(); + // Pseudo element nodes are appended after the first child (the main + // React tree), so iterate from index 1 onwards. + for (size_t i = 1; i < children.size(); ++i) { + if (children[i]->getTag() == tag) { + shadowNode = children[i]; + stop = true; + return; + } + } + } + }); + + return shadowNode; +} + void ViewTransitionModule::cancelViewTransitionName( const ShadowNode& shadowNode, const std::string& name) { diff --git a/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.h b/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.h index 3a340a96883..ae585978b40 100644 --- a/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.h +++ b/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.h @@ -76,6 +76,8 @@ class ViewTransitionModule : public UIManagerViewTransitionDelegate, const TransactionTelemetry &telemetry, ShadowViewMutationList mutations) const override; + std::shared_ptr findPseudoElementShadowNodeByTag(Tag tag) const override; + // Animation state structure for storing minimal view data struct AnimationKeyFrameViewLayoutMetrics { Point originFromRoot; @@ -102,8 +104,8 @@ class ViewTransitionModule : public UIManagerViewTransitionDelegate, // used for cancel/restore viewTransitionName std::unordered_map> cancelledNameRegistry_{}; - // pseudo-element nodes keyed by transition name, appended to/removed from root children at next ShadowTree commit - // TODO: T262559264 should be cleaned up from ShadowTree as soon as transition animation ends + // pseudo-element nodes keyed by transition name, appended to root children via UIManagerCommitHook + // TODO: T262559264 pseudo elements should be cleaned up as soon as transition animation ends std::unordered_map> oldPseudoElementNodes_{}; struct InactivePseudoElement { diff --git a/packages/react-native/src/private/viewtransition/specs/NativeViewTransition.js b/packages/react-native/src/private/viewtransition/specs/NativeViewTransition.js index 1c56f51e1f3..c9fa79cd363 100644 --- a/packages/react-native/src/private/viewtransition/specs/NativeViewTransition.js +++ b/packages/react-native/src/private/viewtransition/specs/NativeViewTransition.js @@ -23,6 +23,7 @@ export interface Spec extends TurboModule { height: number, nativeTag: number, }; + +findPseudoElementShadowNodeByTag: (reactTag: number) => ?unknown /* Node */; } export default TurboModuleRegistry.get(