diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt index f76c676af87..06ee1e4f503 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManagerBinding.kt @@ -57,8 +57,6 @@ internal class FabricUIManagerBinding : HybridClassBase() { external fun findNextFocusableElement(parentTag: Int, focusedTag: Int, direction: Int): Int - external fun findRelativeTopMostParent(rootTag: Int, childTag: Int): Int - external fun stopSurface(surfaceId: Int) external fun stopSurfaceWithSurfaceHandler(surfaceHandler: SurfaceHandlerBinding) diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp index 8edbea0fbe7..5473ceb47d5 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.cpp @@ -244,40 +244,6 @@ jint FabricUIManagerBinding::findNextFocusableElement( return nextNode->getTag(); } -jint FabricUIManagerBinding::findRelativeTopMostParent( - jint rootTag, - jint childTag) { - std::shared_ptr uimanager = getScheduler()->getUIManager(); - - ShadowNode::Shared childShadowNode = - uimanager->findShadowNodeByTag_DEPRECATED(childTag); - ShadowNode::Shared rootShadowNode = - uimanager->findShadowNodeByTag_DEPRECATED(rootTag); - - if (childShadowNode == nullptr || rootShadowNode == nullptr) { - return -1; - } - - ShadowNode::AncestorList ancestorList = - childShadowNode->getFamily().getAncestors(*rootShadowNode); - - if (ancestorList.empty() || ancestorList.size() < 2) { - return -1; - } - - // ignore the first ancestor as it is the rootShadowNode itself - for (auto it = std::next(ancestorList.begin()); it != ancestorList.end(); - ++it) { - auto& ancestor = *it; - if (ancestor.first.get().getTraits().check( - ShadowNodeTraits::Trait::FormsStackingContext)) { - return ancestor.first.get().getTag(); - } - } - - return -1; -} - // Used by non-bridgeless+Fabric void FabricUIManagerBinding::startSurfaceWithConstraints( jint surfaceId, @@ -753,9 +719,6 @@ void FabricUIManagerBinding::registerNatives() { makeNativeMethod( "findNextFocusableElement", FabricUIManagerBinding::findNextFocusableElement), - makeNativeMethod( - "findRelativeTopMostParent", - FabricUIManagerBinding::findRelativeTopMostParent), }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h index e045425269d..fd298701562 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerBinding.h @@ -135,8 +135,6 @@ class FabricUIManagerBinding : public jni::HybridClass, jint findNextFocusableElement(jint parentTag, jint focusedTag, jint direction); - jint findRelativeTopMostParent(jint rootTag, jint childTag); - void uninstallFabricUIManager(); // Private member variables