diff --git a/packages/react-native/Libraries/ReactNative/FabricUIManager.js b/packages/react-native/Libraries/ReactNative/FabricUIManager.js index 40de0d069c7..13130d08310 100644 --- a/packages/react-native/Libraries/ReactNative/FabricUIManager.js +++ b/packages/react-native/Libraries/ReactNative/FabricUIManager.js @@ -97,6 +97,16 @@ export interface Spec { +unstable_ContinuousEventPriority: number; +unstable_IdleEventPriority: number; +unstable_getCurrentEventPriority: () => number; + +unstable_getViewTransitionInstance: ( + name: string, + pseudo: string, + ) => ?{ + x: number, + y: number, + width: number, + height: number, + nativeTag: number, + }; } let nativeFabricUIManagerProxy: ?Spec; @@ -129,6 +139,7 @@ const CACHED_PROPERTIES = [ 'unstable_ContinuousEventPriority', 'unstable_IdleEventPriority', 'unstable_getCurrentEventPriority', + 'unstable_getViewTransitionInstance', ]; // This is exposed as a getter because apps using the legacy renderer AND diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp index 4b405f2db2b..3c9276d0e2f 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp @@ -1152,6 +1152,43 @@ jsi::Value UIManagerBinding::get( }); } + if (methodName == "unstable_getViewTransitionInstance") { + auto paramCount = 2; + return jsi::Function::createFromHostFunction( + runtime, + name, + paramCount, + [uiManager, methodName, paramCount]( + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, + size_t count) -> jsi::Value { + validateArgumentCount(runtime, methodName, paramCount, count); + + auto nameStr = arguments[0].asString(runtime).utf8(runtime); + auto pseudoStr = arguments[1].asString(runtime).utf8(runtime); + + auto* viewTransitionDelegate = uiManager->getViewTransitionDelegate(); + if (viewTransitionDelegate == nullptr) { + return jsi::Value::undefined(); + } + + auto instance = viewTransitionDelegate->getViewTransitionInstance( + nameStr, pseudoStr); + if (!instance) { + return jsi::Value::undefined(); + } + auto result = jsi::Object(runtime); + result.setProperty(runtime, "x", instance->x); + result.setProperty(runtime, "y", instance->y); + result.setProperty(runtime, "width", instance->width); + result.setProperty(runtime, "height", instance->height); + result.setProperty( + runtime, "nativeTag", static_cast(instance->nativeTag)); + return result; + }); + } + return jsi::Value::undefined(); } diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h index 8df388b57b9..8e15c214932 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerViewTransitionDelegate.h @@ -8,7 +8,9 @@ #pragma once #include +#include #include +#include namespace facebook::react { @@ -35,6 +37,21 @@ class UIManagerViewTransitionDelegate { } virtual void startViewTransitionEnd() {} + + struct ViewTransitionInstance { + Float x{0}; + Float y{0}; + Float width{0}; + Float height{0}; + Tag nativeTag{-1}; + }; + + virtual std::optional getViewTransitionInstance( + const std::string &name, + const std::string &pseudo) + { + return std::nullopt; + } }; } // 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 ec1e0dba67c..d0b014a563f 100644 --- a/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp +++ b/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.cpp @@ -138,6 +138,38 @@ void ViewTransitionModule::startViewTransitionEnd() { transitionStarted_ = false; } +std::optional +ViewTransitionModule::getViewTransitionInstance( + const std::string& name, + const std::string& pseudo) { + // Look up layout based on pseudo type ("old" or "new") + if (pseudo == "new") { + auto it = newLayout_.find(name); + if (it != newLayout_.end()) { + const auto& view = it->second; + return ViewTransitionInstance{ + .x = view.layoutMetrics.originFromRoot.x, + .y = view.layoutMetrics.originFromRoot.y, + .width = view.layoutMetrics.size.width, + .height = view.layoutMetrics.size.height, + .nativeTag = view.tag}; + } + } else if (pseudo == "old") { + auto it = oldLayout_.find(name); + if (it != oldLayout_.end()) { + const auto& view = it->second; + return ViewTransitionInstance{ + .x = view.layoutMetrics.originFromRoot.x, + .y = view.layoutMetrics.originFromRoot.y, + .width = view.layoutMetrics.size.width, + .height = view.layoutMetrics.size.height, + .nativeTag = view.tag}; + } + } + + return std::nullopt; +} + void ViewTransitionModule::onTransitionAnimationEnd( const std::unordered_set& names, Tag newTag, diff --git a/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.h b/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.h index 1efa8c65002..c9d617f7f17 100644 --- a/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.h +++ b/packages/react-native/ReactCommon/react/renderer/viewtransition/ViewTransitionModule.h @@ -45,6 +45,9 @@ class ViewTransitionModule : public UIManagerViewTransitionDelegate { void startViewTransitionEnd() override; + std::optional getViewTransitionInstance(const std::string &name, const std::string &pseudo) + override; + // Animation state structure for storing minimal view data struct AnimationKeyFrameViewLayoutMetrics { Point originFromRoot;