react-native-windows 0.80.1 → 0.81.0-preview.4

package/ReactCommon/TEMP_UntilReactCommonUpdate/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,14 +23,26 @@ std::shared_ptr<facebook::react::TurboModule> NativeDOMModuleProvider(
 
 namespace facebook::react {
 
+namespace {
+inline std::shared_ptr<const ShadowNode> getShadowNode(
+    facebook::jsi::Runtime& runtime,
+    jsi::Value& shadowNodeValue) {
+  return Bridging<std::shared_ptr<const ShadowNode>>::fromJs(
+      runtime, shadowNodeValue);
+}
+} // namespace
+
 #pragma mark - Private helpers
 
+static UIManager& getUIManagerFromRuntime(facebook::jsi::Runtime& runtime) {
+  return UIManagerBinding::getBinding(runtime)->getUIManager();
+}
+
 static RootShadowNode::Shared getCurrentShadowTreeRevision(
     facebook::jsi::Runtime& runtime,
     SurfaceId surfaceId) {
-  auto& uiManager =
-      facebook::react::UIManagerBinding::getBinding(runtime)->getUIManager();
-  auto shadowTreeRevisionProvider = uiManager.getShadowTreeRevisionProvider();
+  auto shadowTreeRevisionProvider =
+      getUIManagerFromRuntime(runtime).getShadowTreeRevisionProvider();
   return shadowTreeRevisionProvider->getCurrentRevision(surfaceId);
 }
 
@@ -43,8 +55,7 @@ static RootShadowNode::Shared getCurrentShadowTreeRevision(
   }
 
   return getCurrentShadowTreeRevision(
-      runtime,
-      shadowNodeFromValue(runtime, nativeNodeReference)->getSurfaceId());
+      runtime, getShadowNode(runtime, nativeNodeReference)->getSurfaceId());
 }
 
 static facebook::react::PointerEventsProcessor&
@@ -55,7 +66,7 @@ getPointerEventsProcessorFromRuntime(facebook::jsi::Runtime& runtime) {
 
 static std::vector<facebook::jsi::Value>
 getArrayOfInstanceHandlesFromShadowNodes(
-    const ShadowNode::ListOfShared& nodes,
+    const std::vector<std::shared_ptr<const ShadowNode>>& nodes,
     facebook::jsi::Runtime& runtime) {
   // JSI doesn't support adding elements to an array after creation,
   // so we need to accumulate the values in a vector and then create
@@ -92,8 +103,8 @@ double NativeDOM::compareDocumentPosition(
     return dom::DOCUMENT_POSITION_DISCONNECTED;
   }
 
-  ShadowNode::Shared shadowNode;
-  ShadowNode::Shared otherShadowNode;
+  std::shared_ptr<const ShadowNode> shadowNode;
+  std::shared_ptr<const ShadowNode> otherShadowNode;
 
   // Check if document references are used
   if (nativeNodeReference.isNumber() || otherNativeNodeReference.isNumber()) {
@@ -102,13 +113,13 @@ double NativeDOM::compareDocumentPosition(
       return dom::DOCUMENT_POSITION_DISCONNECTED;
     } else if (nativeNodeReference.isNumber()) {
       // Only the first is a document
-      auto surfaceId = nativeNodeReference.asNumber();
+      auto surfaceId = static_cast<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
-        // documentElement
+        // `documentElement`
         return (surfaceId == otherShadowNode->getSurfaceId())
             ? dom::DOCUMENT_POSITION_CONTAINED_BY |
                 dom::DOCUMENT_POSITION_FOLLOWING
@@ -119,9 +130,9 @@ double NativeDOM::compareDocumentPosition(
       }
     } else {
       // Only the second is a document
-      auto otherSurfaceId = otherNativeNodeReference.asNumber();
-      shadowNode = shadowNodeFromValue(rt, nativeNodeReference);
-      otherShadowNode = getCurrentShadowTreeRevision(rt, static_cast<SurfaceId>(otherSurfaceId));
+      auto otherSurfaceId = static_cast<SurfaceId>(otherNativeNodeReference.asNumber());
+      shadowNode = getShadowNode(rt, nativeNodeReference);
+      otherShadowNode = getCurrentShadowTreeRevision(rt, otherSurfaceId);
 
       if (isRootShadowNode(*shadowNode)) {
         // If this is a root node, we just need to check if the other is its
@@ -135,8 +146,8 @@ double NativeDOM::compareDocumentPosition(
       }
     }
   } else {
-    shadowNode = shadowNodeFromValue(rt, nativeNodeReference);
-    otherShadowNode = shadowNodeFromValue(rt, otherNativeNodeReference);
+    shadowNode = getShadowNode(rt, nativeNodeReference);
+    otherShadowNode = getShadowNode(rt, otherNativeNodeReference);
   }
 
   return dom::compareDocumentPosition(
@@ -157,7 +168,7 @@ std::vector<jsi::Value> NativeDOM::getChildNodes(
   }
 
   auto childNodes = dom::getChildNodes(
-      currentRevision, *shadowNodeFromValue(rt, nativeNodeReference));
+      currentRevision, *getShadowNode(rt, nativeNodeReference));
   return getArrayOfInstanceHandlesFromShadowNodes(childNodes, rt);
 }
 
@@ -169,7 +180,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()};
@@ -200,7 +211,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);
 }
 
@@ -211,8 +222,9 @@ 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,
+    std::shared_ptr<const ShadowNode> shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -231,9 +243,8 @@ std::tuple<
     /* height: */ double>
 NativeDOM::getBoundingClientRect(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
+    std::shared_ptr<const ShadowNode> shadowNode,
     bool includeTransform) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -248,8 +259,7 @@ NativeDOM::getBoundingClientRect(
 
 std::tuple</* width: */ int, /* height: */ int> NativeDOM::getInnerSize(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
+    std::shared_ptr<const ShadowNode> shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -263,8 +273,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);
+    std::shared_ptr<const ShadowNode> shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -276,8 +285,9 @@ 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,
+    std::shared_ptr<const ShadowNode> shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -290,15 +300,13 @@ NativeDOM::getScrollSize(jsi::Runtime& rt, jsi::Value nativeElementReference) {
 
 std::string NativeDOM::getTagName(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
+    std::shared_ptr<const ShadowNode> shadowNode) {
   return dom::getTagName(*shadowNode);
 }
 
 std::string NativeDOM::getTextContent(
     jsi::Runtime& rt,
-    jsi::Value nativeNodeReference) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeNodeReference);
+    std::shared_ptr<const ShadowNode> shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -310,30 +318,27 @@ std::string NativeDOM::getTextContent(
 
 bool NativeDOM::hasPointerCapture(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
+    std::shared_ptr<const ShadowNode> 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,
+    std::shared_ptr<const ShadowNode> 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,
+    std::shared_ptr<const ShadowNode> 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).
@@ -342,8 +347,9 @@ 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,
+    std::shared_ptr<const ShadowNode> shadowNode) {
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -375,16 +381,15 @@ jsi::Value NativeDOM::linkRootNode(
       std::make_shared<InstanceHandle>(rt, instanceHandle, surfaceId);
   currentRevision->setInstanceHandle(instanceHandleWrapper);
 
-  return valueFromShadowNode(rt, currentRevision);
+  return Bridging<std::shared_ptr<const ShadowNode>>::toJs(rt, currentRevision);
 }
 
 #pragma mark - Legacy layout APIs (for ReactNativeElement).
 
 void NativeDOM::measure(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
+    std::shared_ptr<const ShadowNode> shadowNode,
     jsi::Function callback) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -406,9 +411,8 @@ void NativeDOM::measure(
 
 void NativeDOM::measureInWindow(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
+    std::shared_ptr<const ShadowNode> shadowNode,
     jsi::Function callback) {
-  auto shadowNode = shadowNodeFromValue(rt, nativeElementReference);
   auto currentRevision =
       getCurrentShadowTreeRevision(rt, shadowNode->getSurfaceId());
   if (currentRevision == nullptr) {
@@ -427,13 +431,10 @@ void NativeDOM::measureInWindow(
 
 void NativeDOM::measureLayout(
     jsi::Runtime& rt,
-    jsi::Value nativeElementReference,
-    jsi::Value relativeToNativeElementReference,
+    std::shared_ptr<const ShadowNode> shadowNode,
+    std::shared_ptr<const ShadowNode> 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) {
@@ -459,4 +460,16 @@ void NativeDOM::measureLayout(
        jsi::Value{rt, rect.height}});
 }
 
-} // namespace facebook::react
+// [windows MSVC cant handle backtick character in a preprocessor line
+#pragma mark - Legacy direct manipulation APIs (for ReactNativeElement).
+// windows]
+
+void NativeDOM::setNativeProps(
+    jsi::Runtime& rt,
+    std::shared_ptr<const ShadowNode> shadowNode,
+    jsi::Value updatePayload) {
+  getUIManagerFromRuntime(rt).setNativeProps_DEPRECATED(
+      shadowNode, RawProps(rt, updatePayload));
+}
+
+} // namespace facebook::react

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/nativemodule/dom/NativeDOM.h

@@ -11,14 +11,14 @@
 
 #include <string>
 
-#if __has_include("rncoreJSI.h") // Cmake headers on Android
-#include "rncoreJSI.h"
-#elif __has_include("FBReactNativeSpecJSI.h") // CocoaPod headers on Apple
+#if __has_include("FBReactNativeSpecJSI.h") // CocoaPod headers on Apple
 #include "FBReactNativeSpecJSI.h"
 #else
 #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 {
@@ -49,7 +49,9 @@ class NativeDOM : public NativeDOMCxxSpec<NativeDOM> {
       /* rightWidth: */ int,
       /* bottomWidth: */ int,
       /* leftWidth: */ int>
-  getBorderWidth(jsi::Runtime& rt, jsi::Value nativeElementReference);
+  getBorderWidth(
+      jsi::Runtime& rt,
+      std::shared_ptr<const ShadowNode> shadowNode);
 
   std::tuple<
       /* x: */ double,
@@ -58,37 +60,43 @@ class NativeDOM : public NativeDOMCxxSpec<NativeDOM> {
       /* height: */ double>
   getBoundingClientRect(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      std::shared_ptr<const ShadowNode> shadowNode,
       bool includeTransform);
 
   std::tuple</* width: */ int, /* height: */ int> getInnerSize(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference);
+      std::shared_ptr<const ShadowNode> shadowNode);
 
   std::tuple</* scrollLeft: */ double, /* scrollTop: */ double>
-  getScrollPosition(jsi::Runtime& rt, jsi::Value nativeElementReference);
+  getScrollPosition(
+      jsi::Runtime& rt,
+      std::shared_ptr<const ShadowNode> shadowNode);
 
   std::tuple</* scrollWidth: */ int, /* scrollHeight */ int> getScrollSize(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference);
+      std::shared_ptr<const ShadowNode> shadowNode);
 
-  std::string getTagName(jsi::Runtime& rt, jsi::Value nativeElementReference);
+  std::string getTagName(
+      jsi::Runtime& rt,
+      std::shared_ptr<const ShadowNode> shadowNode);
 
-  std::string getTextContent(jsi::Runtime& rt, jsi::Value nativeNodeReference);
+  std::string getTextContent(
+      jsi::Runtime& rt,
+      std::shared_ptr<const ShadowNode> shadowNode);
 
   bool hasPointerCapture(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      std::shared_ptr<const ShadowNode> shadowNode,
       double pointerId);
 
   void releasePointerCapture(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      std::shared_ptr<const ShadowNode> shadowNode,
       double pointerId);
 
   void setPointerCapture(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      std::shared_ptr<const ShadowNode> shadowNode,
       double pointerId);
 
 #pragma mark - Methods from the HTMLElement interface (for ReactNativeElement).
@@ -97,7 +105,7 @@ class NativeDOM : public NativeDOMCxxSpec<NativeDOM> {
       /* offsetParent: */ jsi::Value,
       /* top: */ double,
       /* left: */ double>
-  getOffset(jsi::Runtime& rt, jsi::Value nativeElementReference);
+  getOffset(jsi::Runtime& rt, std::shared_ptr<const ShadowNode> shadowNode);
 
 #pragma mark - Special methods to handle the root node.
 
@@ -110,20 +118,29 @@ class NativeDOM : public NativeDOMCxxSpec<NativeDOM> {
 
   void measure(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      std::shared_ptr<const ShadowNode> shadowNode,
       jsi::Function callback);
 
   void measureInWindow(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
+      std::shared_ptr<const ShadowNode> shadowNode,
       jsi::Function callback);
 
   void measureLayout(
       jsi::Runtime& rt,
-      jsi::Value nativeElementReference,
-      jsi::Value relativeToNativeElementReference,
+      std::shared_ptr<const ShadowNode> shadowNode,
+      std::shared_ptr<const ShadowNode> relativeToShadowNode,
       jsi::Function onFail,
       jsi::Function onSuccess);
+
+// [windows MSVC cant handle backtick character in a preprocessor line
+#pragma mark - Legacy direct manipulation APIs (for ReactNativeElement).
+// windows]
+
+  void setNativeProps(
+      jsi::Runtime& rt,
+      std::shared_ptr<const ShadowNode> shadowNode,
+      jsi::Value updatePayload);
 };
 
 } // namespace facebook::react