Replace existing usages of shadowNodeFromValue with new bridging function (#51676)

Summary:
Pull Request resolved: #51676

Changelog: [internal]

This replaces all existing usages of `shadowNodeFromValue` (previously defined in `primitives.h`) to use the new bridging method to automatically convert `ShadowNode::Shared` from and to JS.

It also deletes the old method.

Reviewed By: javache

Differential Revision: D75597543

fbshipit-source-id: ab4e307dad80c7507b7ebd1cfa6621d020473d89

Author: rubennorte

packages/react-native/ReactCommon/react/nativemodule/dom/CMakeLists.txt

@@ -21,6 +21,7 @@ target_link_libraries(react_nativemodule_dom
         rrc_root
         react_codegen_rncore
         react_cxxreact
+        react_renderer_bridging
         react_renderer_dom
         react_renderer_uimanager
 )

packages/react-native/ReactCommon/react/nativemodule/dom/NativeDOM.cpp

@@ -6,11 +6,11 @@
  */
 
 #include "NativeDOM.h"
+#include <react/renderer/bridging/bridging.h>
 #include <react/renderer/components/root/RootShadowNode.h>
 #include <react/renderer/dom/DOM.h>
 #include <react/renderer/uimanager/PointerEventsProcessor.h>
 #include <react/renderer/uimanager/UIManagerBinding.h>
-#include <react/renderer/uimanager/primitives.h>
 
 #ifdef RN_DISABLE_OSS_PLUGIN_HEADER
 #include "Plugins.h"
@@ -23,6 +23,14 @@ std::shared_ptr<facebook::react::TurboModule> NativeDOMModuleProvider(
 
 namespace facebook::react {
 
+namespace {
+inline ShadowNode::Shared getShadowNode(
+    facebook::jsi::Runtime& runtime,
+    jsi::Value& shadowNodeValue) {
+  return Bridging<ShadowNode::Shared>::fromJs(runtime, shadowNodeValue);
+}
+} // namespace
+
 #pragma mark - Private helpers
 
 static UIManager& getUIManagerFromRuntime(facebook::jsi::Runtime& runtime) {
@@ -46,8 +54,7 @@ static RootShadowNode::Shared getCurrentShadowTreeRevision(
   }
 
   return getCurrentShadowTreeRevision(
-      runtime,
-      shadowNodeFromValue(runtime, nativeNodeReference)->getSurfaceId());
+      runtime, getShadowNode(runtime, nativeNodeReference)->getSurfaceId());
 }
 
 static facebook::react::PointerEventsProcessor&
@@ -107,7 +114,7 @@ double NativeDOM::compareDocumentPosition(
       // Only the first is a document
       auto surfaceId = nativeNodeReference.asNumber();
       shadowNode = currentRevision;
-      otherShadowNode = shadowNodeFromValue(rt, otherNativeNodeReference);
+      otherShadowNode = getShadowNode(rt, otherNativeNodeReference);
 
       if (isRootShadowNode(*otherShadowNode)) {
         // If the other is a root node, we just need to check if it is its
@@ -123,7 +130,7 @@ double NativeDOM::compareDocumentPosition(
     } else {
       // Only the second is a document
       auto otherSurfaceId = otherNativeNodeReference.asNumber();
-      shadowNode = shadowNodeFromValue(rt, nativeNodeReference);
+      shadowNode = getShadowNode(rt, nativeNodeReference);
       otherShadowNode = getCurrentShadowTreeRevision(rt, otherSurfaceId);
 
       if (isRootShadowNode(*shadowNode)) {
@@ -138,8 +145,8 @@ double NativeDOM::compareDocumentPosition(
       }
     }
   } else {
-    shadowNode = shadowNodeFromValue(rt, nativeNodeReference);
-    otherShadowNode = shadowNodeFromValue(rt, otherNativeNodeReference);
+    shadowNode = getShadowNode(rt, nativeNodeReference);
+    otherShadowNode = getShadowNode(rt, otherNativeNodeReference);
   }
 
   return dom::compareDocumentPosition(
@@ -160,7 +167,7 @@ std::vector<jsi::Value> NativeDOM::getChildNodes(
   }
 
   auto childNodes = dom::getChildNodes(
-      currentRevision, *shadowNodeFromValue(rt, nativeNodeReference));
+      currentRevision, *getShadowNode(rt, nativeNodeReference));
   return getArrayOfInstanceHandlesFromShadowNodes(childNodes, rt);
 }
 
@@ -172,7 +179,7 @@ jsi::Value NativeDOM::getParentNode(
     return jsi::Value::undefined();
   }
 
-  auto shadowNode = shadowNodeFromValue(rt, nativeNodeReference);
+  auto shadowNode = getShadowNode(rt, nativeNodeReference);
   if (isRootShadowNode(*shadowNode)) {
     // The parent of the root node is the document.
     return jsi::Value{shadowNode->getSurfaceId()};
@@ -203,7 +210,7 @@ bool NativeDOM::isConnected(jsi::Runtime& rt, jsi::Value nativeNodeReference) {
     return true;
   }
 
-  auto shadowNode = shadowNodeFromValue(rt, nativeNodeReference);
+  auto shadowNode = getShadowNode(rt, nativeNodeReference);
   return dom::isConnected(currentRevision, *shadowNode);
 }
 
@@ -214,8 +221,7 @@ std::tuple<
     /* rightWidth: */ int,
     /* bottomWidth: */ int,
     /* leftWidth: */ int>
-NativeDOM::getBorderWidth(jsi::Runtime& rt, jsi::Value nativeElementReference) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
+NativeDOM::getBorderWidth(jsi::Runtime& rt, ShadowNode::Shared shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -234,9 +240,8 @@ std::tuple<
     /* height: */ double>
 NativeDOM::getBoundingClientRect(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
+    ShadowNode::Shared shadowNode,
     bool includeTransform) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -251,8 +256,7 @@ NativeDOM::getBoundingClientRect(
 
 std::tuple</* width: */ int, /* height: */ int> NativeDOM::getInnerSize(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
+    ShadowNode::Shared shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -264,10 +268,7 @@ std::tuple</* width: */ int, /* height: */ int> NativeDOM::getInnerSize(
 }
 
 std::tuple</* scrollLeft: */ double, /* scrollTop: */ double>
-NativeDOM::getScrollPosition(
-    jsi::Runtime& rt,
-    jsi::Value nativeElementReference) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
+NativeDOM::getScrollPosition(jsi::Runtime& rt, ShadowNode::Shared shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -279,8 +280,7 @@ NativeDOM::getScrollPosition(
 }
 
 std::tuple</* scrollWidth: */ int, /* scrollHeight */ int>
-NativeDOM::getScrollSize(jsi::Runtime& rt, jsi::Value nativeElementReference) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
+NativeDOM::getScrollSize(jsi::Runtime& rt, ShadowNode::Shared shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -293,15 +293,13 @@ NativeDOM::getScrollSize(jsi::Runtime& rt, jsi::Value nativeElementReference) {
 
 std::string NativeDOM::getTagName(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
+    ShadowNode::Shared shadowNode) {
   return dom::getTagName(*shadowNode);
 }
 
 std::string NativeDOM::getTextContent(
     jsi::Runtime& rt,
-    jsi::Value nativeNodeReference) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeNodeReference);
+    ShadowNode::Shared shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -313,30 +311,27 @@ std::string NativeDOM::getTextContent(
 
 bool NativeDOM::hasPointerCapture(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
+    ShadowNode::Shared shadowNode,
     double pointerId) {
   bool isCapturing = getPointerEventsProcessorFromRuntime(rt).hasPointerCapture(
-      static_cast<PointerIdentifier>(pointerId),
-      shadowNodeFromValue(rt, nativeElementReference).get());
+      static_cast<PointerIdentifier>(pointerId), shadowNode.get());
   return isCapturing;
 }
 
 void NativeDOM::releasePointerCapture(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
+    ShadowNode::Shared shadowNode,
     double pointerId) {
   getPointerEventsProcessorFromRuntime(rt).releasePointerCapture(
-      static_cast<PointerIdentifier>(pointerId),
-      shadowNodeFromValue(rt, nativeElementReference).get());
+      static_cast<PointerIdentifier>(pointerId), shadowNode.get());
 }
 
 void NativeDOM::setPointerCapture(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
+    ShadowNode::Shared shadowNode,
     double pointerId) {
   getPointerEventsProcessorFromRuntime(rt).setPointerCapture(
-      static_cast<PointerIdentifier>(pointerId),
-      shadowNodeFromValue(rt, nativeElementReference));
+      static_cast<PointerIdentifier>(pointerId), shadowNode);
 }
 
 #pragma mark - Methods from the `HTMLElement` interface (for `ReactNativeElement`).
@@ -345,8 +340,7 @@ std::tuple<
     /* offsetParent: */ jsi::Value,
     /* top: */ double,
     /* left: */ double>
-NativeDOM::getOffset(jsi::Runtime& rt, jsi::Value nativeElementReference) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
+NativeDOM::getOffset(jsi::Runtime& rt, ShadowNode::Shared shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -378,16 +372,15 @@ jsi::Value NativeDOM::linkRootNode(
       std::make_shared<InstanceHandle>(rt, instanceHandle, surfaceId);
   currentRevision->setInstanceHandle(instanceHandleWrapper);
 
-  return valueFromShadowNode(rt, currentRevision);
+  return Bridging<ShadowNode::Shared>::toJs(rt, currentRevision);
 }
 
 #pragma mark - Legacy layout APIs (for `ReactNativeElement`).
 
 void NativeDOM::measure(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
+    ShadowNode::Shared shadowNode,
     jsi::Function callback) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -409,9 +402,8 @@ void NativeDOM::measure(
 
 void NativeDOM::measureInWindow(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
+    ShadowNode::Shared shadowNode,
     jsi::Function callback) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -430,13 +422,10 @@ void NativeDOM::measureInWindow(
 
 void NativeDOM::measureLayout(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
-    jsi::Value relativeToNativeElementReference,
+    ShadowNode::Shared shadowNode,
+    ShadowNode::Shared relativeToShadowNode,
     jsi::Function onFail,
     jsi::Function onSuccess) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
-  auto relativeToShadowNode =
-      shadowNodeFromValue(rt, relativeToNativeElementReference);
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -466,11 +455,10 @@ void NativeDOM::measureLayout(
 
 void NativeDOM::setNativeProps(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
+    ShadowNode::Shared shadowNode,
     jsi::Value updatePayload) {
   getUIManagerFromRuntime(rt).setNativeProps_DEPRECATED(
-      shadowNodeFromValue(rt, nativeElementReference),
-      RawProps(rt, updatePayload));
+      shadowNode, RawProps(rt, updatePayload));
 }
 
 } // namespace facebook::react

packages/react-native/ReactCommon/react/nativemodule/dom/NativeDOM.h

@@ -17,6 +17,8 @@
 #include <FBReactNativeSpec/FBReactNativeSpecJSI.h>
 #endif
 
+#include <react/renderer/bridging/bridging.h>
+#include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/ShadowNodeFamily.h>
 
 namespace facebook::react {
@@ -47,7 +49,7 @@ class NativeDOM : public NativeDOMCxxSpec<NativeDOM> {
       /* rightWidth: */ int,
       /* bottomWidth: */ int,
       /* leftWidth: */ int>
-  getBorderWidth(jsi::Runtime& rt, jsi::Value nativeElementReference);
+  getBorderWidth(jsi::Runtime& rt, ShadowNode::Shared shadowNode);
 
   std::tuple<
       /* x: */ double,
@@ -56,37 +58,37 @@ class NativeDOM : public NativeDOMCxxSpec<NativeDOM> {
       /* height: */ double>
   getBoundingClientRect(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      ShadowNode::Shared shadowNode,
       bool includeTransform);
 
   std::tuple</* width: */ int, /* height: */ int> getInnerSize(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference);
+      ShadowNode::Shared shadowNode);
 
   std::tuple</* scrollLeft: */ double, /* scrollTop: */ double>
-  getScrollPosition(jsi::Runtime& rt, jsi::Value nativeElementReference);
+  getScrollPosition(jsi::Runtime& rt, ShadowNode::Shared shadowNode);
 
   std::tuple</* scrollWidth: */ int, /* scrollHeight */ int> getScrollSize(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference);
+      ShadowNode::Shared shadowNode);
 
-  std::string getTagName(jsi::Runtime& rt, jsi::Value nativeElementReference);
+  std::string getTagName(jsi::Runtime& rt, ShadowNode::Shared shadowNode);
 
-  std::string getTextContent(jsi::Runtime& rt, jsi::Value nativeNodeReference);
+  std::string getTextContent(jsi::Runtime& rt, ShadowNode::Shared shadowNode);
 
   bool hasPointerCapture(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      ShadowNode::Shared shadowNode,
       double pointerId);
 
   void releasePointerCapture(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      ShadowNode::Shared shadowNode,
       double pointerId);
 
   void setPointerCapture(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      ShadowNode::Shared shadowNode,
       double pointerId);
 
 #pragma mark - Methods from the `HTMLElement` interface (for `ReactNativeElement`).
@@ -95,7 +97,7 @@ class NativeDOM : public NativeDOMCxxSpec<NativeDOM> {
       /* offsetParent: */ jsi::Value,
       /* top: */ double,
       /* left: */ double>
-  getOffset(jsi::Runtime& rt, jsi::Value nativeElementReference);
+  getOffset(jsi::Runtime& rt, ShadowNode::Shared shadowNode);
 
 #pragma mark - Special methods to handle the root node.
 
@@ -108,26 +110,26 @@ class NativeDOM : public NativeDOMCxxSpec<NativeDOM> {
 
   void measure(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      ShadowNode::Shared shadowNode,
       jsi::Function callback);
 
   void measureInWindow(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      ShadowNode::Shared shadowNode,
       jsi::Function callback);
 
   void measureLayout(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
-      jsi::Value relativeToNativeElementReference,
+      ShadowNode::Shared shadowNode,
+      ShadowNode::Shared relativeToShadowNode,
       jsi::Function onFail,
       jsi::Function onSuccess);
 
 #pragma mark - Legacy direct manipulation APIs (for `ReactNativeElement`).
 
   void setNativeProps(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      ShadowNode::Shared shadowNode,
       jsi::Value updatePayload);
 };
 

packages/react-native/ReactCommon/react/nativemodule/dom/React-domnativemodule.podspec

@@ -54,6 +54,7 @@ Pod::Spec.new do |s|
   s.dependency "Yoga"
   s.dependency "ReactCommon/turbomodule/core"
   s.dependency "React-Fabric"
+  s.dependency "React-Fabric/bridging"
   s.dependency "React-FabricComponents"
   add_dependency(s, "React-runtimeexecutor", :additional_framework_paths => ["platform/ios"])
   add_dependency(s, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"])