Reorganize YGNode

Differential Revision: D48712710

fbshipit-source-id: 5da259a13d0ffb6050bb8323ccb925b6ff9ecbba

packages/react-native/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNIVanilla.cpp

@@ -17,7 +17,7 @@
 
 // TODO: Reconcile missing layoutContext functionality from callbacks in the C
 // API and use that
-#include <yoga/YGNode.h>
+#include <yoga/node/Node.h>
 
 using namespace facebook;
 using namespace facebook::yoga;
@@ -688,7 +688,7 @@ static void jni_YGNodeSetHasMeasureFuncJNI(
     jobject /*obj*/,
     jlong nativePointer,
     jboolean hasMeasureFunc) {
-  _jlong2YGNodeRef(nativePointer)
+  static_cast<yoga::Node*>(_jlong2YGNodeRef(nativePointer))
       ->setMeasureFunc(hasMeasureFunc ? YGJNIMeasureFunc : nullptr);
 }
 
@@ -715,7 +715,7 @@ static void jni_YGNodeSetHasBaselineFuncJNI(
     jobject /*obj*/,
     jlong nativePointer,
     jboolean hasBaselineFunc) {
-  _jlong2YGNodeRef(nativePointer)
+  static_cast<yoga::Node*>(_jlong2YGNodeRef(nativePointer))
       ->setBaselineFunc(hasBaselineFunc ? YGJNIBaselineFunc : nullptr);
 }
 

packages/react-native/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJTypesVanilla.h

@@ -14,11 +14,12 @@
 #include "jni.h"
 
 class PtrJNodeMapVanilla {
-  std::map<YGNodeRef, size_t> ptrsToIdxs_;
-  jobjectArray javaNodes_;
+  std::map<YGNodeConstRef, size_t> ptrsToIdxs_{};
+  jobjectArray javaNodes_{};
 
 public:
-  PtrJNodeMapVanilla() : ptrsToIdxs_{}, javaNodes_{} {}
+  PtrJNodeMapVanilla() = default;
+
   PtrJNodeMapVanilla(jlongArray javaNativePointers, jobjectArray javaNodes)
       : javaNodes_{javaNodes} {
     using namespace facebook::yoga::vanillajni;
@@ -30,11 +31,11 @@ class PtrJNodeMapVanilla {
         javaNativePointers, 0, nativePointersSize, nativePointers.data());
 
     for (size_t i = 0; i < nativePointersSize; ++i) {
-      ptrsToIdxs_[(YGNodeRef) nativePointers[i]] = i;
+      ptrsToIdxs_[(YGNodeConstRef) nativePointers[i]] = i;
     }
   }
 
-  facebook::yoga::vanillajni::ScopedLocalRef<jobject> ref(YGNodeRef node) {
+  facebook::yoga::vanillajni::ScopedLocalRef<jobject> ref(YGNodeConstRef node) {
     using namespace facebook::yoga::vanillajni;
 
     JNIEnv* env = getCurrentEnv();

packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp

@@ -82,7 +82,7 @@ YogaLayoutableShadowNode::YogaLayoutableShadowNode(
   yogaNode_.setContext(this);
 
   // Newly created node must be `dirty` just because it is new.
-  // This is not a default for `YGNode`.
+  // This is not a default for `yoga::Node`.
   yogaNode_.setDirty(true);
 
   if (getTraits().check(ShadowNodeTraits::Trait::MeasurableYogaNode)) {
@@ -106,7 +106,7 @@ YogaLayoutableShadowNode::YogaLayoutableShadowNode(
       yogaConfig_(FabricDefaultYogaLog),
       yogaNode_(static_cast<YogaLayoutableShadowNode const &>(sourceShadowNode)
                     .yogaNode_) {
-  // Note, cloned `YGNode` instance (copied using copy-constructor) inherits
+  // Note, cloned `yoga::Node` instance (copied using copy-constructor) inherits
   // dirty flag, measure function, and other properties being set originally in
   // the `YogaLayoutableShadowNode` constructor above.
 
@@ -321,7 +321,8 @@ bool YogaLayoutableShadowNode::doesOwn(
 void YogaLayoutableShadowNode::updateYogaChildrenOwnersIfNeeded() {
   for (auto &childYogaNode : yogaNode_.getChildren()) {
     if (childYogaNode->getOwner() == &yogaNode_) {
-      childYogaNode->setOwner(reinterpret_cast<YGNodeRef>(0xBADC0FFEE0DDF00D));
+      childYogaNode->setOwner(
+          reinterpret_cast<yoga::Node *>(0xBADC0FFEE0DDF00D));
     }
   }
 }
@@ -336,7 +337,9 @@ void YogaLayoutableShadowNode::updateYogaChildren() {
   bool isClean = !yogaNode_.isDirty() &&
       getChildren().size() == yogaNode_.getChildren().size();
 
-  auto oldYogaChildren = isClean ? yogaNode_.getChildren() : YGVector{};
+  auto oldYogaChildren =
+      isClean ? yogaNode_.getChildren() : std::vector<yoga::Node *>{};
+
   yogaNode_.setChildren({});
   yogaLayoutableChildren_.clear();
 
@@ -829,9 +832,9 @@ YGSize YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector(
 }
 
 YogaLayoutableShadowNode &YogaLayoutableShadowNode::shadowNodeFromContext(
-    YGNode *yogaNode) {
+    YGNodeRef yogaNode) {
   return traitCast<YogaLayoutableShadowNode &>(
-      *static_cast<ShadowNode *>(yogaNode->getContext()));
+      *static_cast<ShadowNode *>(YGNodeGetContext(yogaNode)));
 }
 
 yoga::Config &YogaLayoutableShadowNode::initializeYogaConfig(

packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.h

@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include <yoga/YGNode.h>
+#include <yoga/node/Node.h>
 
 #include <react/debug/react_native_assert.h>
 #include <react/renderer/components/view/YogaStylableProps.h>
@@ -100,7 +100,7 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode {
    * Yoga node as `mutable` here to avoid `static_cast`ing the pointer to this
    * all the time.
    */
-  mutable YGNode yogaNode_;
+  mutable yoga::Node yogaNode_;
 
  private:
   /*
@@ -156,17 +156,17 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode {
   static yoga::Config &initializeYogaConfig(
       yoga::Config &config,
       YGConfigRef previousConfig = nullptr);
-  static YGNode *yogaNodeCloneCallbackConnector(
-      YGNode *oldYogaNode,
-      YGNode *parentYogaNode,
+  static YGNodeRef yogaNodeCloneCallbackConnector(
+      YGNodeRef oldYogaNode,
+      YGNodeRef parentYogaNode,
       int childIndex);
   static YGSize yogaNodeMeasureCallbackConnector(
-      YGNode *yogaNode,
+      YGNodeRef yogaNode,
       float width,
       YGMeasureMode widthMode,
       float height,
       YGMeasureMode heightMode);
-  static YogaLayoutableShadowNode &shadowNodeFromContext(YGNode *yogaNode);
+  static YogaLayoutableShadowNode &shadowNodeFromContext(YGNodeRef yogaNode);
 
 #pragma mark - RTL Legacy Autoflip
 

packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp

@@ -12,7 +12,6 @@
 #include <react/renderer/core/propsConversions.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
 #include <react/utils/CoreFeatures.h>
-#include <yoga/YGNode.h>
 #include <yoga/Yoga.h>
 
 #include "conversions.h"

packages/react-native/ReactCommon/react/renderer/components/view/conversions.h

@@ -18,8 +18,8 @@
 #include <react/renderer/graphics/Transform.h>
 #include <stdlib.h>
 #include <yoga/YGEnums.h>
-#include <yoga/YGNode.h>
 #include <yoga/Yoga.h>
+#include <yoga/node/Node.h>
 #include <cmath>
 #include <optional>
 
@@ -113,7 +113,7 @@ inline std::optional<Float> optionalFloatFromYogaValue(
   }
 }
 
-inline LayoutMetrics layoutMetricsFromYogaNode(YGNode &yogaNode) {
+inline LayoutMetrics layoutMetricsFromYogaNode(yoga::Node &yogaNode) {
   auto layoutMetrics = LayoutMetrics{};
 
   layoutMetrics.frame = Rect{

packages/react-native/ReactCommon/react/renderer/core/ShadowNodeTraits.h

@@ -60,7 +60,7 @@ class ShadowNodeTraits {
     // Any Yoga node (not only Leaf ones) can have this trait.
     DirtyYogaNode = 1 << 7,
 
-    // Inherits `YogaLayoutableShadowNode` and enforces that the `YGNode` is a
+    // Inherits `YogaLayoutableShadowNode` and enforces that the yoga node is a
     // leaf.
     LeafYogaNode = 1 << 8,
 

packages/react-native/ReactCommon/yoga/yoga/Utils.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "YGNode.h"
+#include <yoga/node/Node.h>
 #include <yoga/Yoga-internal.h>
 #include <yoga/style/CompactValue.h>
 
@@ -43,7 +43,7 @@ struct YGCollectFlexItemsRowValues {
   float totalFlexGrowFactors;
   float totalFlexShrinkScaledFactors;
   uint32_t endOfLineIndex;
-  std::vector<YGNodeRef> relativeChildren;
+  std::vector<facebook::yoga::Node*> relativeChildren;
   float remainingFreeSpace;
   // The size of the mainDim for the row after considering size, padding, margin
   // and border of flex items. This is used to calculate maxLineDim after going

packages/react-native/ReactCommon/yoga/yoga/YGNodePrint.cpp

@@ -12,9 +12,8 @@
 #include <yoga/YGEnums.h>
 
 #include "YGNodePrint.h"
-#include "YGNode.h"
 #include <yoga/Yoga-internal.h>
-#include "Utils.h"
+#include <yoga/Utils.h>
 
 namespace facebook::yoga {
 typedef std::string string;
@@ -92,7 +91,7 @@ static void appendEdges(
     const string& key,
     const Style::Edges& edges) {
   if (areFourValuesEqual(edges)) {
-    auto edgeValue = YGNode::computeEdgeValueForColumn(
+    auto edgeValue = yoga::Node::computeEdgeValueForColumn(
         edges, YGEdgeLeft, CompactValue::ofZero());
     appendNumberIfNotZero(base, key, edgeValue);
   } else {
@@ -110,16 +109,16 @@ static void appendEdgeIfNotUndefined(
     const YGEdge edge) {
   // TODO: this doesn't take RTL / YGEdgeStart / YGEdgeEnd into account
   auto value = (edge == YGEdgeLeft || edge == YGEdgeRight)
-      ? YGNode::computeEdgeValueForRow(
+      ? yoga::Node::computeEdgeValueForRow(
             edges, edge, edge, CompactValue::ofUndefined())
-      : YGNode::computeEdgeValueForColumn(
+      : yoga::Node::computeEdgeValueForColumn(
             edges, edge, CompactValue::ofUndefined());
   appendNumberIfNotUndefined(base, str, value);
 }
 
 void YGNodeToString(
     std::string& str,
-    YGNodeRef node,
+    yoga::Node* node,
     YGPrintOptions options,
     uint32_t level) {
   indent(str, level);
@@ -141,27 +140,27 @@ void YGNodeToString(
   if (options & YGPrintOptionsStyle) {
     appendFormattedString(str, "style=\"");
     const auto& style = node->getStyle();
-    if (style.flexDirection() != YGNode().getStyle().flexDirection()) {
+    if (style.flexDirection() != yoga::Node{}.getStyle().flexDirection()) {
       appendFormattedString(
           str,
           "flex-direction: %s; ",
           YGFlexDirectionToString(style.flexDirection()));
     }
-    if (style.justifyContent() != YGNode().getStyle().justifyContent()) {
+    if (style.justifyContent() != yoga::Node{}.getStyle().justifyContent()) {
       appendFormattedString(
           str,
           "justify-content: %s; ",
           YGJustifyToString(style.justifyContent()));
     }
-    if (style.alignItems() != YGNode().getStyle().alignItems()) {
+    if (style.alignItems() != yoga::Node{}.getStyle().alignItems()) {
       appendFormattedString(
           str, "align-items: %s; ", YGAlignToString(style.alignItems()));
     }
-    if (style.alignContent() != YGNode().getStyle().alignContent()) {
+    if (style.alignContent() != yoga::Node{}.getStyle().alignContent()) {
       appendFormattedString(
           str, "align-content: %s; ", YGAlignToString(style.alignContent()));
     }
-    if (style.alignSelf() != YGNode().getStyle().alignSelf()) {
+    if (style.alignSelf() != yoga::Node{}.getStyle().alignSelf()) {
       appendFormattedString(
           str, "align-self: %s; ", YGAlignToString(style.alignSelf()));
     }
@@ -170,33 +169,34 @@ void YGNodeToString(
     appendNumberIfNotAuto(str, "flex-basis", style.flexBasis());
     appendFloatOptionalIfDefined(str, "flex", style.flex());
 
-    if (style.flexWrap() != YGNode().getStyle().flexWrap()) {
+    if (style.flexWrap() != yoga::Node{}.getStyle().flexWrap()) {
       appendFormattedString(
           str, "flex-wrap: %s; ", YGWrapToString(style.flexWrap()));
     }
 
-    if (style.overflow() != YGNode().getStyle().overflow()) {
+    if (style.overflow() != yoga::Node{}.getStyle().overflow()) {
       appendFormattedString(
           str, "overflow: %s; ", YGOverflowToString(style.overflow()));
     }
 
-    if (style.display() != YGNode().getStyle().display()) {
+    if (style.display() != yoga::Node{}.getStyle().display()) {
       appendFormattedString(
           str, "display: %s; ", YGDisplayToString(style.display()));
     }
     appendEdges(str, "margin", style.margin());
     appendEdges(str, "padding", style.padding());
     appendEdges(str, "border", style.border());
 
-    if (YGNode::computeColumnGap(style.gap(), CompactValue::ofUndefined()) !=
-        YGNode::computeColumnGap(
-            YGNode().getStyle().gap(), CompactValue::ofUndefined())) {
+    if (yoga::Node::computeColumnGap(
+            style.gap(), CompactValue::ofUndefined()) !=
+        yoga::Node::computeColumnGap(
+            yoga::Node{}.getStyle().gap(), CompactValue::ofUndefined())) {
       appendNumberIfNotUndefined(
           str, "column-gap", style.gap()[YGGutterColumn]);
     }
-    if (YGNode::computeRowGap(style.gap(), CompactValue::ofUndefined()) !=
-        YGNode::computeRowGap(
-            YGNode().getStyle().gap(), CompactValue::ofUndefined())) {
+    if (yoga::Node::computeRowGap(style.gap(), CompactValue::ofUndefined()) !=
+        yoga::Node::computeRowGap(
+            yoga::Node{}.getStyle().gap(), CompactValue::ofUndefined())) {
       appendNumberIfNotUndefined(str, "row-gap", style.gap()[YGGutterRow]);
     }
 
@@ -211,7 +211,7 @@ void YGNodeToString(
     appendNumberIfNotAuto(
         str, "min-height", style.minDimensions()[YGDimensionHeight]);
 
-    if (style.positionType() != YGNode().getStyle().positionType()) {
+    if (style.positionType() != yoga::Node{}.getStyle().positionType()) {
       appendFormattedString(
           str, "position: %s; ", YGPositionTypeToString(style.positionType()));
     }
@@ -232,7 +232,7 @@ void YGNodeToString(
   if (options & YGPrintOptionsChildren && childCount > 0) {
     for (uint32_t i = 0; i < childCount; i++) {
       appendFormattedString(str, "\n");
-      YGNodeToString(str, YGNodeGetChild(node, i), options, level + 1);
+      YGNodeToString(str, node->getChild(i), options, level + 1);
     }
     appendFormattedString(str, "\n");
     indent(str, level);

packages/react-native/ReactCommon/yoga/yoga/YGNodePrint.h

@@ -12,12 +12,13 @@
 #include <string>
 
 #include <yoga/Yoga.h>
+#include <yoga/node/Node.h>
 
 namespace facebook::yoga {
 
 void YGNodeToString(
     std::string& str,
-    YGNodeRef node,
+    yoga::Node* node,
     YGPrintOptions options,
     uint32_t level);
 

packages/react-native/ReactCommon/yoga/yoga/Yoga-internal.h

@@ -16,8 +16,6 @@
 
 #include <yoga/style/CompactValue.h>
 
-using YGVector = std::vector<YGNodeRef>;
-
 YG_EXTERN_C_BEGIN
 
 void YGNodeCalculateLayoutWithContext(