Update Yarn to 1.22.22 (#1798)

Summary:
Pull Request resolved: https://github.com/facebook/yoga/pull/1798

X-link: https://github.com/facebook/react-native/pull/49947

Changelog:

[General][Internal] Generate `yarn.lock` with Yarn 1.22.22

Reviewed By: huntie

Differential Revision: D70792047

.github/workflows/publish-android-release.yml

@@ -24,7 +24,7 @@ jobs:
           ORG_GRADLE_PROJECT_SIGNING_PWD: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_PWD }}
 
       - name: Upload Build Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: 'snapshot-artifacts'
           path: '~/.m2/repository/'

.github/workflows/publish-android-snashot.yml

@@ -23,7 +23,7 @@ jobs:
           ORG_GRADLE_PROJECT_USE_SNAPSHOT: true
 
       - name: Upload Build Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: 'snapshot-artifacts'
           path: '~/.m2/repository/'

.github/workflows/validate-js.yml

@@ -110,7 +110,7 @@ jobs:
         run: yarn pack --filename yoga-layout.tar.gz
         working-directory: javascript
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v3
         with:
           name: npm-package
           path: javascript/yoga-layout.tar.gz

tests/YGPersistentNodeCloningTest.cpp

@@ -1,184 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <gtest/gtest.h>
-#include <yoga/Yoga.h>
-#include <yoga/config/Config.h>
-#include <yoga/node/Node.h>
-
-#include <functional>
-#include <memory>
-#include <vector>
-
-namespace facebook::yoga {
-
-struct YGPersistentNodeCloningTest : public ::testing::Test {
-  struct NodeWrapper {
-    explicit NodeWrapper(
-        YGConfigRef config,
-        std::vector<std::shared_ptr<NodeWrapper>> children = {})
-        : node{YGNodeNewWithConfig(config)}, children{std::move(children)} {
-      YGNodeSetContext(node, this);
-
-      auto privateNode = resolveRef(node);
-      for (const auto& child : this->children) {
-        auto privateChild = resolveRef(child->node);
-        // Claim first ownership of not yet owned nodes, to avoid immediately
-        // cloning them
-        if (YGNodeGetOwner(child->node) == nullptr) {
-          privateChild->setOwner(privateNode);
-        }
-        privateNode->insertChild(privateChild, privateNode->getChildCount());
-      }
-    }
-
-    // Clone, with current children, for mutation
-    NodeWrapper(const NodeWrapper& other)
-        : node{YGNodeClone(other.node)}, children{other.children} {
-      YGNodeSetContext(node, this);
-
-      auto privateNode = resolveRef(node);
-      privateNode->setOwner(nullptr);
-    }
-
-    // Clone, with new children
-    NodeWrapper(
-        const NodeWrapper& other,
-        std::vector<std::shared_ptr<NodeWrapper>> children)
-        : node{YGNodeClone(other.node)}, children{std::move(children)} {
-      YGNodeSetContext(node, this);
-
-      auto privateNode = resolveRef(node);
-      privateNode->setOwner(nullptr);
-      privateNode->setChildren({});
-      privateNode->setDirty(true);
-
-      for (const auto& child : this->children) {
-        auto privateChild = resolveRef(child->node);
-        // Claim first ownership of not yet owned nodes, to avoid immediately
-        // cloning them
-        if (YGNodeGetOwner(child->node) == nullptr) {
-          privateChild->setOwner(privateNode);
-        }
-        privateNode->insertChild(privateChild, privateNode->getChildCount());
-      }
-    }
-
-    NodeWrapper(NodeWrapper&&) = delete;
-
-    ~NodeWrapper() {
-      YGNodeFree(node);
-    }
-
-    NodeWrapper& operator=(const NodeWrapper& other) = delete;
-    NodeWrapper& operator=(NodeWrapper&& other) = delete;
-
-    YGNodeRef node;
-    std::vector<std::shared_ptr<NodeWrapper>> children;
-  };
-
-  struct ConfigWrapper {
-    ConfigWrapper() {
-      YGConfigSetCloneNodeFunc(
-          config,
-          [](YGNodeConstRef oldNode, YGNodeConstRef owner, size_t childIndex) {
-            onClone(oldNode, owner, childIndex);
-            auto wrapper = static_cast<NodeWrapper*>(YGNodeGetContext(owner));
-            auto old = static_cast<NodeWrapper*>(YGNodeGetContext(oldNode));
-
-            wrapper->children[childIndex] = std::make_shared<NodeWrapper>(*old);
-            return wrapper->children[childIndex]->node;
-          });
-    }
-
-    ConfigWrapper(const ConfigWrapper&) = delete;
-    ConfigWrapper(ConfigWrapper&&) = delete;
-
-    ~ConfigWrapper() {
-      YGConfigFree(config);
-    }
-
-    ConfigWrapper& operator=(const ConfigWrapper&) = delete;
-    ConfigWrapper& operator=(ConfigWrapper&&) = delete;
-
-    YGConfigRef config{YGConfigNew()};
-  };
-
-  ConfigWrapper configWrapper;
-  YGConfigRef config{configWrapper.config};
-
-  void SetUp() override {
-    onClone = [](...) {};
-  }
-
-  // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
-  static inline std::function<void(YGNodeConstRef, YGNodeConstRef, size_t)>
-      onClone;
-};
-
-TEST_F(
-    YGPersistentNodeCloningTest,
-    changing_sibling_height_does_not_clone_neighbors) {
-  // <ScrollView>
-  //   <View id="Sibling" style={{ height: 1 }} />
-  //   <View id="A" style={{ height: 1 }}>
-  //     <View id="B">
-  //       <View id="C">
-  //         <View id="D"/>
-  //       </View>
-  //     </View>
-  //   </View>
-  // </ScrollView>
-
-  auto sibling = std::make_shared<NodeWrapper>(config);
-  YGNodeStyleSetHeight(sibling->node, 1);
-
-  auto d = std::make_shared<NodeWrapper>(config);
-  auto c = std::make_shared<NodeWrapper>(config, std::vector{d});
-  auto b = std::make_shared<NodeWrapper>(config, std::vector{c});
-  auto a = std::make_shared<NodeWrapper>(config, std::vector{b});
-  YGNodeStyleSetHeight(a->node, 1);
-
-  auto scrollContentView =
-      std::make_shared<NodeWrapper>(config, std::vector{sibling, a});
-  YGNodeStyleSetPositionType(scrollContentView->node, YGPositionTypeAbsolute);
-
-  auto scrollView =
-      std::make_shared<NodeWrapper>(config, std::vector{scrollContentView});
-  YGNodeStyleSetWidth(scrollView->node, 100);
-  YGNodeStyleSetHeight(scrollView->node, 100);
-
-  // We don't expect any cloning during the first layout
-  onClone = [](...) { FAIL(); };
-
-  YGNodeCalculateLayout(
-      scrollView->node, YGUndefined, YGUndefined, YGDirectionLTR);
-
-  auto siblingPrime = std::make_shared<NodeWrapper>(config);
-  YGNodeStyleSetHeight(siblingPrime->node, 2);
-
-  auto scrollContentViewPrime = std::make_shared<NodeWrapper>(
-      *scrollContentView, std::vector{siblingPrime, a});
-  auto scrollViewPrime = std::make_shared<NodeWrapper>(
-      *scrollView, std::vector{scrollContentViewPrime});
-
-  std::vector<NodeWrapper*> nodesCloned;
-  // We should only need to clone "A"
-  onClone = [&](YGNodeConstRef oldNode,
-                YGNodeConstRef /*owner*/,
-                size_t /*childIndex*/) {
-    nodesCloned.push_back(static_cast<NodeWrapper*>(YGNodeGetContext(oldNode)));
-  };
-
-  YGNodeCalculateLayout(
-      scrollViewPrime->node, YGUndefined, YGUndefined, YGDirectionLTR);
-
-  EXPECT_EQ(nodesCloned.size(), 1);
-  EXPECT_EQ(nodesCloned[0], a.get());
-}
-
-} // namespace facebook::yoga

tests/YGRoundingFunctionTest.cpp

@@ -161,23 +161,3 @@ TEST(YogaTest, per_node_point_scale_factor) {
   YGConfigFree(config2);
   YGConfigFree(config3);
 }
-
-TEST(YogaTest, raw_layout_dimensions) {
-  YGConfigRef config = YGConfigNew();
-  YGConfigSetPointScaleFactor(config, 0.5f);
-
-  YGNodeRef root = YGNodeNewWithConfig(config);
-  YGNodeStyleSetWidth(root, 11.5f);
-  YGNodeStyleSetHeight(root, 9.5f);
-
-  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
-
-  ASSERT_EQ(YGNodeLayoutGetWidth(root), 12.0f);
-  ASSERT_EQ(YGNodeLayoutGetHeight(root), 10.0f);
-  ASSERT_EQ(YGNodeLayoutGetRawWidth(root), 11.5f);
-  ASSERT_EQ(YGNodeLayoutGetRawHeight(root), 9.5f);
-
-  YGNodeFreeRecursive(root);
-
-  YGConfigFree(config);
-}

website/docs/styling/align-content.mdx

@@ -17,15 +17,15 @@ has effect when items are wrapped to multiple lines using [flex wrap](/docs/styl
 
 **Center**: Align wrapped lines in the center of the container's cross axis.
 
-**Space between**: Evenly space wrapped lines across the container's cross axis, distributing
+**Space between**: Evenly space wrapped lines across the container's main axis, distributing
 remaining space between the lines.
 
-**Space around**: Evenly space wrapped lines across the container's cross axis, distributing
+**Space around**: Evenly space wrapped lines across the container's main axis, distributing
 remaining space around the lines. Compared to space between using
 space around will result in space being distributed to the beginning of
 the first lines and end of the last line.
 
-**Space evenly**: Evenly space wrapped lines across the container's cross axis, distributing
+**Space evenly**: Evenly space wrapped lines across the container's main axis, distributing
 remaining space around the lines. Compared to space around, space evenly will not
 double the gaps between children. The size of gaps between children and between
 the parent's edges and the first/last child will all be equal.

yarn.lock

@@ -10173,7 +10173,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -10264,7 +10273,14 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -11164,7 +11180,16 @@ word-wrap@^1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
   integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

yoga/YGNodeLayout.cpp

@@ -90,11 +90,3 @@ float YGNodeLayoutGetPadding(YGNodeConstRef node, YGEdge edge) {
   return getResolvedLayoutProperty<&LayoutResults::padding>(
       node, scopedEnum(edge));
 }
-
-float YGNodeLayoutGetRawHeight(YGNodeConstRef node) {
-  return resolveRef(node)->getLayout().rawDimension(Dimension::Height);
-}
-
-float YGNodeLayoutGetRawWidth(YGNodeConstRef node) {
-  return resolveRef(node)->getLayout().rawDimension(Dimension::Width);
-}

yoga/YGNodeLayout.h

@@ -32,14 +32,4 @@ YG_EXPORT float YGNodeLayoutGetMargin(YGNodeConstRef node, YGEdge edge);
 YG_EXPORT float YGNodeLayoutGetBorder(YGNodeConstRef node, YGEdge edge);
 YG_EXPORT float YGNodeLayoutGetPadding(YGNodeConstRef node, YGEdge edge);
 
-/**
- * Return the measured height of the node, before layout rounding
- */
-YG_EXPORT float YGNodeLayoutGetRawHeight(YGNodeConstRef node);
-
-/**
- * Return the measured width of the node, before layout rounding
- */
-YG_EXPORT float YGNodeLayoutGetRawWidth(YGNodeConstRef node);
-
 YG_EXTERN_C_END

yoga/algorithm/PixelGrid.cpp

@@ -106,25 +106,25 @@ void roundLayoutResultsToPixelGrid(
     const bool hasFractionalHeight =
         !yoga::inexactEquals(round(scaledNodeHeight), scaledNodeHeight);
 
-    node->getLayout().setDimension(
-        Dimension::Width,
+    node->setLayoutDimension(
         roundValueToPixelGrid(
             absoluteNodeRight,
             pointScaleFactor,
             (textRounding && hasFractionalWidth),
             (textRounding && !hasFractionalWidth)) -
             roundValueToPixelGrid(
-                absoluteNodeLeft, pointScaleFactor, false, textRounding));
+                absoluteNodeLeft, pointScaleFactor, false, textRounding),
+        Dimension::Width);
 
-    node->getLayout().setDimension(
-        Dimension::Height,
+    node->setLayoutDimension(
         roundValueToPixelGrid(
             absoluteNodeBottom,
             pointScaleFactor,
             (textRounding && hasFractionalHeight),
             (textRounding && !hasFractionalHeight)) -
             roundValueToPixelGrid(
-                absoluteNodeTop, pointScaleFactor, false, textRounding));
+                absoluteNodeTop, pointScaleFactor, false, textRounding),
+        Dimension::Height);
   }
 
   for (yoga::Node* child : node->getChildren()) {

yoga/algorithm/SizingMode.h

@@ -27,7 +27,7 @@ enum class SizingMode {
   StretchFit,
 
   /**
-   * A box's "ideal" size in a given axis when given infinite available space.
+   * A box’s “ideal” size in a given axis when given infinite available space.
    * Usually this is the smallest size the box could take in that axis while
    * still fitting around its contents, i.e. minimizing unfilled space while
    * avoiding overflow.

yoga/debug/AssertFatal.cpp

@@ -19,7 +19,6 @@ namespace facebook::yoga {
 #if defined(__cpp_exceptions)
   throw std::logic_error(message);
 #else
-  static_cast<void>(message); // Unused
   std::terminate();
 #endif
 }

yoga/event/event.h

@@ -36,12 +36,12 @@ enum struct LayoutPassReason : int {
 };
 
 struct LayoutData {
-  int layouts = 0;
-  int measures = 0;
-  uint32_t maxMeasureCache = 0;
-  int cachedLayouts = 0;
-  int cachedMeasures = 0;
-  int measureCallbacks = 0;
+  int layouts;
+  int measures;
+  uint32_t maxMeasureCache;
+  int cachedLayouts;
+  int cachedMeasures;
+  int measureCallbacks;
   std::array<int, static_cast<uint8_t>(LayoutPassReason::COUNT)>
       measureCallbackReasonsCount;
 };

yoga/node/LayoutResults.h

@@ -66,18 +66,10 @@ struct LayoutResults {
     return measuredDimensions_[yoga::to_underlying(axis)];
   }
 
-  float rawDimension(Dimension axis) const {
-    return rawDimensions_[yoga::to_underlying(axis)];
-  }
-
   void setMeasuredDimension(Dimension axis, float dimension) {
     measuredDimensions_[yoga::to_underlying(axis)] = dimension;
   }
 
-  void setRawDimension(Dimension axis, float dimension) {
-    rawDimensions_[yoga::to_underlying(axis)] = dimension;
-  }
-
   float position(PhysicalEdge physicalEdge) const {
     return position_[yoga::to_underlying(physicalEdge)];
   }
@@ -121,7 +113,6 @@ struct LayoutResults {
 
   std::array<float, 2> dimensions_ = {{YGUndefined, YGUndefined}};
   std::array<float, 2> measuredDimensions_ = {{YGUndefined, YGUndefined}};
-  std::array<float, 2> rawDimensions_ = {{YGUndefined, YGUndefined}};
   std::array<float, 4> position_ = {};
   std::array<float, 4> margin_ = {};
   std::array<float, 4> border_ = {};

yoga/node/Node.cpp

@@ -247,7 +247,6 @@ void Node::setLayoutHadOverflow(bool hadOverflow) {
 
 void Node::setLayoutDimension(float lengthValue, Dimension dimension) {
   layout_.setDimension(dimension, lengthValue);
-  layout_.setRawDimension(dimension, lengthValue);
 }
 
 // If both left and right are defined, then use left. Otherwise return +left or