huh?

Update clang-format version
Try fixing CI after GHA Ubuntu 24.04 Update
2025-01-21 11:50:12 -08:00 · 2025-01-21 11:48:21 -08:00 · 2025-01-21 11:44:49 -08:00 · 2024-12-30 12:38:48 -08:00 · 2024-12-30 12:38:48 -08:00 · 2024-12-12 11:11:49 -08:00
36 changed files with 2415 additions and 446 deletions
--- a/.github/actions/clang-format/action.yml
+++ b/.github/actions/clang-format/action.yml
@@ -6,7 +6,7 @@ inputs:
  version:
    description: LLVM version to use # Should be kept roughly in sync with arcanist
    required: false
-    default: 12
+    default: 18

 runs:
  using: "composite"
--- a/.github/actions/setup-cpp/action.yml
+++ b/.github/actions/setup-cpp/action.yml
@@ -16,6 +16,7 @@ runs:
      if: ${{ inputs.toolchain == 'Clang' }}
      shell: bash
      run: |
+        sudo apt-get install -y libc++-dev libc++abi-dev
        echo "CC=/usr/bin/clang" >> $GITHUB_ENV
        echo "CXX=/usr/bin/clang++" >> $GITHUB_ENV
        echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV
--- a/.github/workflows/validate-cpp.yml
+++ b/.github/workflows/validate-cpp.yml
@@ -107,3 +107,5 @@ jobs:

      - name: clang-format
        uses: ./.github/actions/clang-format
+        with:
+          directory: yoga
--- a/capture/NodeToString.cpp
+++ b/capture/NodeToString.cpp
@@ -225,17 +225,17 @@ static void serializeTreeImpl(
    appendEdges<&YGNodeStyleGetPosition>(
        j, "position", node, defaultNode.get());

-    appendFloatIfNotDefault(
+    appendYGValueIfNotDefault(
        j["style"],
        "gap",
        YGNodeStyleGetGap(node, YGGutterAll),
        YGNodeStyleGetGap(defaultNode.get(), YGGutterAll));
-    appendFloatIfNotDefault(
+    appendYGValueIfNotDefault(
        j["style"],
        "column-gap",
        YGNodeStyleGetGap(node, YGGutterColumn),
        YGNodeStyleGetGap(defaultNode.get(), YGGutterColumn));
-    appendFloatIfNotDefault(
+    appendYGValueIfNotDefault(
        j["style"],
        "row-gap",
        YGNodeStyleGetGap(node, YGGutterRow),
--- a/gentest/fixtures/YGIntrinsicSizeTest.html
+++ b/gentest/fixtures/YGIntrinsicSizeTest.html
@@ -157,6 +157,31 @@
    </div>
 </div>

+<div id="contains_inner_text_max_width_max_height_column" style="width:2000px; align-items: flex-start;">
+    <div style="max-width: 50px;">
+        Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed eleifasd et tortor ac auctor. Integer at
+        volutpat
+        libero, sed elementum dui interdum id. Aliquam consectetur massa vel neque aliquet, quis consequat risus
+        fringilla. Fusce rhoncus ipsum tempor eros aliquam, vel tempus metus ullamcorper. Nam at nulla sed tellus
+        vestibulum fringilla vel sit amet ligula. Proin velit lectus, euismod sit amet quam vel ultricies dolor,
+        vitae
+        finibus lorem ipsum. Pellentesque molestie at mi sit amet dictum. Donec vehicula lacinia felis sit amet
+        consectetur. Praesent sodales enim sapien, sed varius ipsum pellentesque vel. Aenean eu mi eu justo
+        tincidunt
+        finibus vel sit amet ipsum. Sed bibasdum purus vel ipsum sagittis, quis fermentum dolor lobortis. Etiam
+        vulputate eleifasd lectus vel varius.
+        Phasellus imperdiet lectus sit amet ipsum egestas, ut bibasdum ipsum malesuada. Vestibulum ante ipsum primis
+        in
+        faucibus orci luctus et ultrices posuere cubilia Curae; Sed mollis eros sit amet elit porttitor, vel
+        venenatis
+        turpis venenatis. Nulla tempus tortor at eros efficitur, sit amet dapibus ipsum malesuada. Ut at mauris sed
+        nunc
+        malesuada convallis. Duis id sem vel magna varius eleifasd vel at est. Donec eget orci a ipsum tempor
+        lobortis.
+        Sed at consectetur ipsum.
+    </div>
+</div>
+

 <div id="contains_inner_text_max_width" style="width:2000px;height:2000px;align-items: flex-start;">
    <div style="flex-direction:row;max-width:100px">
@@ -229,7 +254,7 @@
    </div>
 </div>

-<div data-disabled="true" id="fit_content_width" style="width: 90px; position: relative;">
+<div data-disabled="true" id="fit_content_width" style="width: 90px;">
    <div style="flex-direction: row; width: fit-content; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -240,7 +265,7 @@
    </div>
 </div>

-<div data-disabled="true" id="stretch_width" style="width: 500px; position: relative;">
+<div id="stretch_width" style="width: 500px;">
    <div style="flex-direction: row; width: -webkit-fill-available; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -260,7 +285,7 @@
    </div>
 </div>

-<div data-disabled="true" id="fit_content_height" style="height: 90px; position: relative;">
+<div data-disabled="true" id="fit_content_height" style="height: 90px; ">
    <div style="height: fit-content; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -271,7 +296,7 @@
    </div>
 </div>

-<div data-disabled="true" id="stretch_height" style="height: 500px; position: relative;">
+<div data-disabled="true" id="stretch_height" style="height: 500px;">
    <div style="height: -webkit-fill-available; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -291,7 +316,7 @@
    </div>
 </div>

-<div data-disabled="true" id="fit_content_flex_basis_column" style="height: 90px; position: relative;">
+<div data-disabled="true" id="fit_content_flex_basis_column" style="height: 90px;">
    <div style="flex-basis: fit-content; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -302,7 +327,7 @@
    </div>
 </div>

-<div data-disabled="true" id="stretch_flex_basis_column" style="height: 500px; position: relative;">
+<div id="stretch_flex_basis_column" style="height: 500px;">
    <div style="flex-basis: -webkit-fill-available; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -313,7 +338,7 @@
    </div>
 </div>

-<div id="max_content_flex_basis_row" style="flex-direction: row; flex-basis: max-content; flex-wrap: wrap;">
+<div data-disabled="true" id="max_content_flex_basis_row" style="flex-direction: row; flex-basis: max-content; flex-wrap: wrap;">
    <div style="width: 50px; height: 50px;">
    </div>
    <div style="width: 100px; height: 500px;">
@@ -322,7 +347,7 @@
    </div>
 </div>

-<div data-disabled="true" id="fit_content_flex_basis_row" style="width: 90px; position: relative;">
+<div data-disabled="true" id="fit_content_flex_basis_row" style="width: 90px;">
    <div style="flex-direction: row; flex-basis: fit-content; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -333,7 +358,7 @@
    </div>
 </div>

-<div data-disabled="true" id="stretch_flex_basis_row" style="width: 500px; position: relative;">
+<div data-disabled="true" id="stretch_flex_basis_row" style="width: 500px;">
    <div style="flex-direction: row; flex-basis: -webkit-fill-available; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -344,7 +369,8 @@
    </div>
 </div>

-<div data-disabled="true" id="max_content_max_width" style="flex-direction: row; max-width:max-content; width: 200px; flex-wrap: wrap;">
+<div data-disabled="true" id="max_content_max_width"
+    style="flex-direction: row; max-width:max-content; width: 200px; flex-wrap: wrap;">
    <div style="width: 50px; height: 50px;">
    </div>
    <div style="width: 100px; height: 50px;">
@@ -353,7 +379,7 @@
    </div>
 </div>

-<div data-disabled="true" id="fit_content_max_width" style="width: 90px; position: relative;">
+<div data-disabled="true" id="fit_content_max_width" style="width: 90px;">
    <div style="flex-direction: row; max-width: fit-content; width: 110px; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -364,7 +390,7 @@
    </div>
 </div>

-<div data-disabled="true" id="stretch_max_width" style="width: 500px; position: relative;">
+<div data-disabled="true" id="stretch_max_width" style="width: 500px;">
    <div style="flex-direction: row; max-width: -webkit-fill-available; width: 600px; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -375,7 +401,8 @@
    </div>
 </div>

-<div data-disabled="true" id="max_content_min_width" style="flex-direction: row; min-width:max-content; width: 100px; flex-wrap: wrap;">
+<div data-disabled="true" id="max_content_min_width"
+    style="flex-direction: row; min-width:max-content; width: 100px; flex-wrap: wrap;">
    <div style="width: 50px; height: 50px;">
    </div>
    <div style="width: 100px; height: 50px;">
@@ -384,7 +411,7 @@
    </div>
 </div>

-<div data-disabled="true" id="fit_content_min_width" style="width: 90px; position: relative;">
+<div data-disabled="true" id="fit_content_min_width" style="width: 90px;">
    <div style="flex-direction: row; min-width: fit-content; width: 90px; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -395,7 +422,7 @@
    </div>
 </div>

-<div data-disabled="true" id="stretch_min_width" style="width: 500px; position: relative;">
+<div data-disabled="true" id="stretch_min_width" style="width: 500px;">
    <div style="flex-direction: row; min-width: -webkit-fill-available; width: 400px; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -415,7 +442,7 @@
    </div>
 </div>

-<div data-disabled="true" id="fit_content_max_height" style="height: 90px; position: relative;">
+<div data-disabled="true" id="fit_content_max_height" style="height: 90px;">
    <div style="max-height: fit-content; height: 110px; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -426,7 +453,7 @@
    </div>
 </div>

-<div data-disabled="true" id="stretch_max_height" style="height: 500px; position: relative;">
+<div data-disabled="true" id="stretch_max_height" style="height: 500px;">
    <div style="max-height: -webkit-fill-available; flex-wrap: wrap; height: 600px;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -446,7 +473,7 @@
    </div>
 </div>

-<div data-disabled="true" id="fit_content_min_height" style="height: 90px; position: relative;">
+<div data-disabled="true" id="fit_content_min_height" style="height: 90px;">
    <div style="min-height: fit-content; height: 90px; flex-wrap: wrap;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -457,7 +484,7 @@
    </div>
 </div>

-<div data-disabled="true" id="stretch_min_height" style="height: 500px; position: relative;">
+<div data-disabled="true" id="stretch_min_height" style="height: 500px;">
    <div style="min-height: -webkit-fill-available; flex-wrap: wrap; height: 400px;">
        <div style="width: 50px; height: 50px;">
        </div>
@@ -467,3 +494,75 @@
        </div>
    </div>
 </div>
+
+<div data-disabled="true" id="text_max_content_width" style="width: 200px">
+    <div style="width: max-content;">
+        <div style="flex-direction:row;">
+            Lorem ipsum sdafhasdfkjlasdhlkajsfhasldkfhasdlkahsdflkjasdhflaksdfasdlkjhasdlfjahsdfljkasdhalsdfhas dolor sit amet
+        </div>
+    </div>
+</div>
+
+<div data-disabled="true" id="text_stretch_width" style="width: 200px">
+    <div style="width: -webkit-fill-available;">
+        <div style="flex-direction:row;">
+            Lorem ipsum dolor sit amet
+        </div>
+    </div>
+</div>
+
+<div data-disabled="true" id="text_fit_content_width" style="width: 200px">
+    <div style="width: fit-content;">
+        <div style="flex-direction:row;">
+            Lorem ipsum sdafhasdfkjlasdhlkajsfhasldkfhasdlkahsdflkjasdhflaksdfasdlkjhasdlfjahsdfljkasdhalsdfhas dolor sit amet
+        </div>
+    </div>
+</div>
+
+<div data-disabled="true" id="text_max_content_min_width" style="width: 200px">
+    <div style="min-width: max-content; width: 200px;">
+        <div style="flex-direction:row;">
+            Lorem ipsum sdafhasdfkjlasdhlkajsfhasldkfhasdlkahsdflkjasdhflaksdfasdlkjhasdlfjahsdfljkasdhalsdfhas dolor sit amet
+        </div>
+    </div>
+</div>
+
+<div data-disabled="true" id="text_stretch_min_width" style="width: 200px">
+    <div style="min-width: -webkit-fill-available; width: 100px;">
+        <div style="flex-direction:row;">
+            Lorem ipsum dolor sit amet
+        </div>
+    </div>
+</div>
+
+<div data-disabled="true" data-disabled="true" id="text_fit_content_min_width" style="width: 200px">
+    <div style="min-width: fit-content; width: 300px">
+        <div style="flex-direction:row;">
+            Lorem ipsum sdafhasdfkjlasdhlkajsfhasldkfhasdlkahsdflkjasdhflaksdfasdlkjhasdlfjahsdfljkasdhalsdfhas dolor sit amet
+        </div>
+    </div>
+</div>
+
+<div data-disabled="true" id="text_max_content_max_width" style="width: 200px">
+    <div style="max-width: max-content; width: 2000px;">
+        <div style="flex-direction:row;">
+            Lorem ipsum sdafhasdfkjlasdhlkajsfhasldkfhasdlkahsdflkjasdhflaksdfasdlkjhasdlfjahsdfljkasdhalsdfhas dolor sit amet
+        </div>
+    </div>
+</div>
+
+<div data-disabled="true" id="text_stretch_max_width" style="width: 200px">
+    <div style="max-width: -webkit-fill-available; width: 300px;">
+        <div style="flex-direction:row;">
+            Lorem ipsum dolor sit amet
+        </div>
+    </div>
+</div>
+
+<div data-disabled="true" id="text_fit_content_max_width" style="width: 200px">
+    <div style="max-width: fit-content; width: 1000px">
+        <div style="flex-direction:row;">
+            Lorem ipsum sdafhasdfkjlasdhlkajsfhasldkfhasdlkahsdflkjasdhflaksdfasdlkjhasdlfjahsdfljkasdhalsdfhas dolor sit amet
+        </div>
+    </div>
+</div>
--- a/gentest/gentest-cpp.js
+++ b/gentest/gentest-cpp.js
@@ -502,7 +502,7 @@ CPPEmitter.prototype = Object.create(Emitter.prototype, {
  },

  YGNodeSetMeasureFunc: {
-    value: function (nodeName, innerText) {
+    value: function (nodeName, innerText, _) {
      this.push(`YGNodeSetContext(${nodeName}, (void*)"${innerText}");`);
      this.push(
        `YGNodeSetMeasureFunc(${nodeName}, &facebook::yoga::test::IntrinsicSizeMeasure);`,
--- a/gentest/gentest-java.js
+++ b/gentest/gentest-java.js
@@ -467,7 +467,7 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
  },

  YGNodeSetMeasureFunc: {
-    value: function (nodeName, innerText) {
+    value: function (nodeName, innerText, _) {
      this.push(`${nodeName}.setData("${innerText}");`);
      this.push(
        `${nodeName}.setMeasureFunction(new TestUtils.intrinsicMeasureFunction());`,
--- a/gentest/gentest-javascript.js
+++ b/gentest/gentest-javascript.js
@@ -429,9 +429,11 @@ JavascriptEmitter.prototype = Object.create(Emitter.prototype, {
  },

  YGNodeSetMeasureFunc: {
-    value: function (nodeName, innerText) {
+    value: function (nodeName, innerText, flexDirection) {
      this.push(
-        `${nodeName}.setMeasureFunc(instrinsicSizeMeasureFunc.bind("${innerText}"));`,
+        `${nodeName}.setMeasureFunc(instrinsicSizeMeasureFunc.bind({text: "${innerText}", flexDirection: ${toValueJavascript(
+          flexDirection,
+        )}}));`,
      );
    },
  },
--- a/gentest/gentest.js
+++ b/gentest/gentest.js
@@ -533,7 +533,11 @@ function setupTestTree(
  }

  if (node.innerText && node.children.length === 0) {
-    e.YGNodeSetMeasureFunc(nodeName, node.innerText);
+    e.YGNodeSetMeasureFunc(
+      nodeName,
+      node.innerText,
+      flexDirectionValue(e, node.style['flex-direction']),
+    );
  }

  for (let i = 0; i < node.children.length; i++) {
--- a/java/build.gradle.kts
+++ b/java/build.gradle.kts
@@ -30,6 +30,7 @@ android {
    consumerProguardFiles("proguard-rules.pro")

    ndk { abiFilters.addAll(setOf("x86", "x86_64", "armeabi-v7a", "arm64-v8a")) }
+    externalNativeBuild { cmake { arguments("-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON") } }
  }

  externalNativeBuild { cmake { path("CMakeLists.txt") } }
--- a/java/com/facebook/yoga/YogaNative.java
+++ b/java/com/facebook/yoga/YogaNative.java
@@ -130,7 +130,7 @@ public class YogaNative {
  static native void jni_YGNodeStyleSetMaxHeightStretchJNI(long nativePointer);
  static native float jni_YGNodeStyleGetAspectRatioJNI(long nativePointer);
  static native void jni_YGNodeStyleSetAspectRatioJNI(long nativePointer, float aspectRatio);
-  static native float jni_YGNodeStyleGetGapJNI(long nativePointer, int gutter);
+  static native long jni_YGNodeStyleGetGapJNI(long nativePointer, int gutter);
  static native void jni_YGNodeStyleSetGapJNI(long nativePointer, int gutter, float gapLength);
  static native void jni_YGNodeStyleSetGapPercentJNI(long nativePointer, int gutter, float gapLength);
  static native void jni_YGNodeSetHasMeasureFuncJNI(long nativePointer, boolean hasMeasureFunc);
--- a/java/com/facebook/yoga/YogaNode.java
+++ b/java/com/facebook/yoga/YogaNode.java
@@ -236,7 +236,7 @@ public abstract class YogaNode implements YogaProps {

  public abstract void setAspectRatio(float aspectRatio);

-  public abstract float getGap(YogaGutter gutter);
+  public abstract YogaValue getGap(YogaGutter gutter);

  public abstract void setGap(YogaGutter gutter, float gapLength);

--- a/java/com/facebook/yoga/YogaNodeJNIBase.java
+++ b/java/com/facebook/yoga/YogaNodeJNIBase.java
@@ -811,8 +811,8 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
  }

  @Override
-  public float getGap(YogaGutter gutter) {
-    return YogaNative.jni_YGNodeStyleGetGapJNI(mNativePointer, gutter.intValue());
+  public YogaValue getGap(YogaGutter gutter) {
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetGapJNI(mNativePointer, gutter.intValue()));
  }

  @Override
--- a/java/jni/YGJNIVanilla.cpp
+++ b/java/jni/YGJNIVanilla.cpp
@@ -725,13 +725,13 @@ jni_YGNodeCloneJNI(JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) {
  return reinterpret_cast<jlong>(clonedYogaNode);
 }

-static jfloat jni_YGNodeStyleGetGapJNI(
+static jlong jni_YGNodeStyleGetGapJNI(
    JNIEnv* /*env*/,
    jobject /*obj*/,
    jlong nativePointer,
    jint gutter) {
-  return (jfloat)YGNodeStyleGetGap(
-      _jlong2YGNodeRef(nativePointer), static_cast<YGGutter>(gutter));
+  return YogaValue::asJavaLong(YGNodeStyleGetGap(
+      _jlong2YGNodeRef(nativePointer), static_cast<YGGutter>(gutter)));
 }

 static void jni_YGNodeStyleSetGapJNI(
@@ -1057,7 +1057,7 @@ static JNINativeMethod methods[] = {
    {"jni_YGNodeSetHasMeasureFuncJNI",
     "(JZ)V",
     (void*)jni_YGNodeSetHasMeasureFuncJNI},
-    {"jni_YGNodeStyleGetGapJNI", "(JI)F", (void*)jni_YGNodeStyleGetGapJNI},
+    {"jni_YGNodeStyleGetGapJNI", "(JI)J", (void*)jni_YGNodeStyleGetGapJNI},
    {"jni_YGNodeStyleSetGapJNI", "(JIF)V", (void*)jni_YGNodeStyleSetGapJNI},
    {"jni_YGNodeStyleSetGapPercentJNI",
     "(JIF)V",
--- a/java/tests/com/facebook/yoga/utils/TestUtils.java
+++ b/java/tests/com/facebook/yoga/utils/TestUtils.java
@@ -11,6 +11,7 @@ import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
 import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaNode;
+import com.facebook.yoga.YogaFlexDirection;

 public class TestUtils {

@@ -43,9 +44,13 @@ public class TestUtils {
      } else if (heightMode == YogaMeasureMode.AT_MOST) {
        measuredHeight =
            Math.min(
-                caclulateHeight(text, Math.max(measuredWidth, getWidestWordWidth(text))), height);
+                caclulateHeight(text, node.getFlexDirection() == YogaFlexDirection.COLUMN 
+                  ? measuredWidth 
+                  : Math.max(measuredWidth, getWidestWordWidth(text))), height);
      } else {
-        measuredHeight = caclulateHeight(text, Math.max(measuredWidth, getWidestWordWidth(text)));
+        measuredHeight = caclulateHeight(text, node.getFlexDirection() == YogaFlexDirection.COLUMN 
+          ? measuredWidth 
+          : Math.max(measuredWidth, getWidestWordWidth(text)));
      }

      return YogaMeasureOutput.make(measuredWidth, measuredHeight);
--- a/java/tests/generated/com/facebook/yoga/YGIntrinsicSizeTest.java
+++ b/java/tests/generated/com/facebook/yoga/YGIntrinsicSizeTest.java
--- a/javascript/src/Node.cpp
+++ b/javascript/src/Node.cpp
@@ -439,8 +439,9 @@ Value Node::getPadding(int edge) const {
      YGNodeStyleGetPadding(m_node, static_cast<YGEdge>(edge)));
 }

-float Node::getGap(int gutter) {
-  return YGNodeStyleGetGap(m_node, static_cast<YGGutter>(gutter));
+Value Node::getGap(int gutter) const {
+  return Value::fromYGValue(
+      YGNodeStyleGetGap(m_node, static_cast<YGGutter>(gutter)));
 }

 bool Node::isReferenceBaseline() {
--- a/javascript/src/Node.h
+++ b/javascript/src/Node.h
@@ -186,7 +186,7 @@ class Node {

  Value getPadding(int edge) const;

-  float getGap(int gutter);
+  Value getGap(int gutter) const;

  int getBoxSizing(void) const;

--- a/javascript/tests/generated/YGIntrinsicSizeTest.test.ts
+++ b/javascript/tests/generated/YGIntrinsicSizeTest.test.ts
--- a/javascript/tests/tools/utils.ts
+++ b/javascript/tests/tools/utils.ts
@@ -5,17 +5,23 @@
 * LICENSE file in the root directory of this source tree.
 */

-import {MeasureMode} from 'yoga-layout';
+import {FlexDirection, MeasureMode} from 'yoga-layout';
+
+type MeasureContext = {
+  text: string;
+  flexDirection: FlexDirection;
+};

 export function instrinsicSizeMeasureFunc(
-  this: string,
+  this: MeasureContext,
  width: number,
  widthMode: MeasureMode,
  height: number,
  heightMode: MeasureMode,
 ): {width: number; height: number} {
-  const textLength = this.length;
-  const words = this.split(' ');
+  const textLength = this.text.length;
+  const words = this.text.split(' ');
+  const flexDirection = this.flexDirection;
  const widthPerChar = 10;
  const heightPerChar = 10;

@@ -53,7 +59,10 @@ export function instrinsicSizeMeasureFunc(
      return heightPerChar;
    }

-    const maxLineWidth = Math.max(longestWordWidth(), measuredWidth);
+    const maxLineWidth =
+      flexDirection == FlexDirection.Column
+        ? measuredWidth
+        : Math.max(longestWordWidth(), measuredWidth);

    //if fixed width < width of widest word, take width of widest word

--- a/tests/YGRoundingFunctionTest.cpp
+++ b/tests/YGRoundingFunctionTest.cpp
@@ -8,6 +8,8 @@
 #include <gtest/gtest.h>
 #include <yoga/Yoga.h>

+#include <cmath>
+
 TEST(YogaTest, rounding_value) {
  // Test that whole numbers are rounded to whole despite ceil/floor flags
  ASSERT_FLOAT_EQ(6.0, YGRoundValueToPixelGrid(6.000001, 2.0, false, false));
@@ -39,6 +41,44 @@ TEST(YogaTest, rounding_value) {
  ASSERT_FLOAT_EQ(-6.0, YGRoundValueToPixelGrid(-5.99, 2.0, false, false));
  ASSERT_FLOAT_EQ(-5.5, YGRoundValueToPixelGrid(-5.99, 2.0, true, false));
  ASSERT_FLOAT_EQ(-6.0, YGRoundValueToPixelGrid(-5.99, 2.0, false, true));
+
+  // Rounding up/down halfway values is as expected for both positive and
+  // negative numbers
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.5, 1.0, false, false));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.4, 1.0, false, false));
+  ASSERT_FLOAT_EQ(-4, YGRoundValueToPixelGrid(-3.6, 1.0, false, false));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.499999, 1.0, false, false));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.500001, 1.0, false, false));
+  ASSERT_FLOAT_EQ(-4, YGRoundValueToPixelGrid(-3.5001, 1.0, false, false));
+
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.5, 1.0, true, false));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.4, 1.0, true, false));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.6, 1.0, true, false));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.499999, 1.0, true, false));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.500001, 1.0, true, false));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.5001, 1.0, true, false));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.00001, 1.0, true, false));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3, 1.0, true, false));
+
+  ASSERT_FLOAT_EQ(-4, YGRoundValueToPixelGrid(-3.5, 1.0, false, true));
+  ASSERT_FLOAT_EQ(-4, YGRoundValueToPixelGrid(-3.4, 1.0, false, true));
+  ASSERT_FLOAT_EQ(-4, YGRoundValueToPixelGrid(-3.6, 1.0, false, true));
+  ASSERT_FLOAT_EQ(-4, YGRoundValueToPixelGrid(-3.499999, 1.0, false, true));
+  ASSERT_FLOAT_EQ(-4, YGRoundValueToPixelGrid(-3.500001, 1.0, false, true));
+  ASSERT_FLOAT_EQ(-4, YGRoundValueToPixelGrid(-3.5001, 1.0, false, true));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3.00001, 1.0, false, true));
+  ASSERT_FLOAT_EQ(-3, YGRoundValueToPixelGrid(-3, 1.0, false, true));
+
+  // NAN is treated as expected:
+  ASSERT_TRUE(std::isnan(YGRoundValueToPixelGrid(
+      std::numeric_limits<double>::quiet_NaN(), 1.5, false, false)));
+  ASSERT_TRUE(std::isnan(YGRoundValueToPixelGrid(
+      1.5, std::numeric_limits<double>::quiet_NaN(), false, false)));
+  ASSERT_TRUE(std::isnan(YGRoundValueToPixelGrid(
+      std::numeric_limits<double>::quiet_NaN(),
+      std::numeric_limits<double>::quiet_NaN(),
+      false,
+      false)));
 }

 static YGSize measureText(
--- a/tests/generated/YGIntrinsicSizeTest.cpp
+++ b/tests/generated/YGIntrinsicSizeTest.cpp
--- a/tests/util/TestUtil.cpp
+++ b/tests/util/TestUtil.cpp
@@ -90,14 +90,20 @@ YGSize IntrinsicSizeMeasure(
    measuredHeight = std::min(
        calculateHeight(
            innerText,
-            std::max(longestWordWidth(innerText, widthPerChar), measuredWidth),
+            YGNodeStyleGetFlexDirection(node) == YGFlexDirectionColumn
+                ? measuredWidth
+                : std::max(
+                      longestWordWidth(innerText, widthPerChar), measuredWidth),
            widthPerChar,
            heightPerChar),
        height);
  } else {
    measuredHeight = calculateHeight(
        innerText,
-        std::max(longestWordWidth(innerText, widthPerChar), measuredWidth),
+        YGNodeStyleGetFlexDirection(node) == YGFlexDirectionColumn
+            ? measuredWidth
+            : std::max(
+                  longestWordWidth(innerText, widthPerChar), measuredWidth),
        widthPerChar,
        heightPerChar);
  }
--- a/website/blog/2024-12-02-announcing-yoga-3.2.md
+++ b/website/blog/2024-12-02-announcing-yoga-3.2.md
@@ -0,0 +1,83 @@
+---
+slug: announcing-yoga-3.2
+title: Announcing Yoga 3.2
+authors:
+  - NickGerleman
+---
+
+import Playground from '@site/src/components/Playground';
+
+Yoga 3.2 is a new minor version of Yoga, used by React Native 0.77.
+
+## Highlights
+
+1. Support for `box-sizing`
+2. Support for `display: contents`
+3. Bug fixes and improvements
+
+## `box-sizing`
+
+Yoga [now supports](https://github.com/facebook/yoga/commit/671ae61a39d02091d1e73fe773d6a09f2f93cda4) [`box-sizing`](https://developer.mozilla.org/en-US/docs/Web/CSS/box-sizing) on styles, allowing sizing values to influence the content box instead of the border box.
+
+:::warning
+
+To preserve compatibility, Yoga nodes default to `box-sizing: border-box`, even if `UseWebDefaults` is set. We recommend manually setting node defaults instead of using the `UseWebDefaults` API.
+
+:::
+
+<Playground code={`<Layout config={{useWebDefaults: true}}>
+  <Node
+    style={{
+      width: 100,
+      height: 100,
+      padding: 50,
+      boxSizing: "border-box",
+    }}>
+  </Node>
+</Layout>`} />
+
+<Playground code={`<Layout config={{useWebDefaults: true}}>
+    <Node
+    style={{
+      width: 100,
+      height: 100,
+      padding: 50,
+      boxSizing: "content-box",
+    }}>
+  </Node>
+</Layout>`} />
+
+
+
+## `display: contents`
+
+Yoga nodes [may now be set to `display: contents`](https://github.com/facebook/yoga/commit/68bb2343d2b470962065789d09016bba8e785340) to remove them from the layout flow, while preserving and hoisting the node's children. This may be used by the higher level UI framework to allow more easily composing wrapper components (such as those which may need to handle events, without influencing child layout). Thanks [@j-piasecki](https://github.com/j-piasecki) for the contribution!
+
+<Playground code={`<Layout config={{useWebDefaults: false}}>
+  <Node
+    style={{
+      width: 100,
+      height: 100,
+      gap: 10,
+    }}
+  >
+    <Node style={{display: "contents"}}>
+      <Node style={{flexGrow: 1}} />
+      <Node style={{flexGrow: 1}} />
+      <Node style={{flexGrow: 1}} />
+    </Node>
+  </Node>
+</Layout>`} />
+
+
+## Removal of legacy absolute positioning
+
+Yoga 3.0 introduced a new algorithm used for absolute positioning. This algorithm is more correct than the one previously used, but led to observed compatibility issues with existing code, so we left the option to disable it via the `AbsolutePositioningIncorrect` erratum (enabled by default in frameworks like React Native). Yoga 3.2 removes the legacy absolute positioning path, but ports over the main compatibility quirk under a new erratum `AbsolutePositionWithoutInsetsExcludesPadding` (where the previous incorrect behavior would omit padding when a position was not specified on the absolute node). Errata users should see more correct absolute positioning behavior, while preserving compatibility with existing code.
+
+## Fixed non-global YogaConfig in Java bindings
+
+Yoga would previously allow garbage collection of a `YogaConfig` if it was not retained outside of the Yoga tree. This could result in confusing errors caused by use-after free. Yoga nodes [now correctly retain the configs they are using](https://github.com/facebook/yoga/commit/22b018c957e930de950338ad87f4ef8d59e8a169). Thanks [@michaeltroger](https://github.com/michaeltroger) for this fix!
+
+## Fixed behavior when combining `align-items` with `align-content`
+
+A regression [was fixed](https://github.com/facebook/yoga/commit/77c99870127e9c2d46a07264fa372025334d8fd0) in how Yoga handles some combinations of `align-content` and `align-items`. Thanks [@phuccvx12](https://github.com/phuccvx12) for this fix!
--- a/website/src/components/FlexStyle.ts
+++ b/website/src/components/FlexStyle.ts
@@ -63,7 +63,7 @@ export type FlexStyle = {
  bottom?: number | `${number}%`;
  boxSizing?: 'border-box' | 'content-box';
  direction?: 'ltr' | 'rtl';
-  display?: 'none' | 'flex';
+  display?: 'none' | 'flex' | 'contents';
  end?: number | `${number}%`;
  flex?: number;
  flexBasis?: number | 'auto' | `${number}%`;
@@ -360,12 +360,14 @@ function direction(str?: 'ltr' | 'rtl'): Direction {
  throw new Error(`"${str}" is not a valid value for direction`);
 }

-function display(str?: 'none' | 'flex'): Display {
+function display(str?: 'none' | 'flex' | 'contents'): Display {
  switch (str) {
    case 'none':
      return Display.None;
    case 'flex':
      return Display.Flex;
+    case 'contents':
+      return Display.Contents;
  }
  throw new Error(`"${str}" is not a valid value for display`);
 }
--- a/website/src/components/LayoutBox.tsx
+++ b/website/src/components/LayoutBox.tsx
@@ -16,6 +16,7 @@ export type LayoutMetrics = {
  width: number;
  height: number;
  overflow?: 'visible' | 'hidden' | 'scroll';
+  display?: 'flex' | 'none' | 'contents';
  children?: LayoutMetrics[];
 };

@@ -49,7 +50,11 @@ export default function LayoutBox({metrics, depth, className}: Props) {
        position: depth === 0 ? 'relative' : 'absolute',
      }}>
      {children?.map((child, i) => (
-        <LayoutBox key={i} metrics={child} depth={depth + 1} />
+        <LayoutBox
+          key={i}
+          metrics={child}
+          depth={style.display === 'contents' ? depth : depth + 1}
+        />
      ))}
    </div>
  );
--- a/website/src/components/YogaViewer.tsx
+++ b/website/src/components/YogaViewer.tsx
@@ -8,7 +8,12 @@
 */

 import {useMemo} from 'react';
-import Yoga, {Direction, Overflow, Node as YogaNode} from 'yoga-layout';
+import Yoga, {
+  Direction,
+  Display,
+  Overflow,
+  Node as YogaNode,
+} from 'yoga-layout';
 import {FlexStyle, applyStyle} from './FlexStyle';
 import LayoutBox from './LayoutBox';

@@ -109,6 +114,16 @@ function metricsFromYogaNode(node: YogaNode): LayoutMetrics {
          return 'visible';
      }
    })(),
+    display: (() => {
+      switch (node.getDisplay()) {
+        case Display.Flex:
+          return 'flex';
+        case Display.None:
+          return 'none';
+        case Display.Contents:
+          return 'contents';
+      }
+    })(),
    children,
  };
 }
--- a/yarn.lock
+++ b/yarn.lock
@@ -4049,9 +4049,9 @@ cosmiconfig@^8.1.3, cosmiconfig@^8.2.0:
    path-type "^4.0.0"

 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
-  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
  dependencies:
    path-key "^3.1.0"
    shebang-command "^2.0.0"
@@ -10173,16 +10173,7 @@ string-length@^4.0.1:
    char-regex "^1.0.2"
    strip-ansi "^6.0.0"

-"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:
+"string-width-cjs@npm:string-width@^4.2.0", 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==
@@ -10273,14 +10264,7 @@ stringify-object@^3.3.0:
    is-obj "^1.0.1"
    is-regexp "^1.0.0"

-"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:
+"strip-ansi-cjs@npm:strip-ansi@^6.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==
@@ -11180,16 +11164,7 @@ 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":
-  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:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.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==
--- a/yoga/YGNodeStyle.cpp
+++ b/yoga/YGNodeStyle.cpp
@@ -293,13 +293,8 @@ void YGNodeStyleSetGapPercent(YGNodeRef node, YGGutter gutter, float percent) {
      node, scopedEnum(gutter), StyleLength::percent(percent));
 }

-float YGNodeStyleGetGap(const YGNodeConstRef node, const YGGutter gutter) {
-  auto gapLength = resolveRef(node)->style().gap(scopedEnum(gutter));
-  if (gapLength.isUndefined() || gapLength.isAuto()) {
-    return YGUndefined;
-  }
-
-  return static_cast<YGValue>(gapLength).value;
+YGValue YGNodeStyleGetGap(const YGNodeConstRef node, const YGGutter gutter) {
+  return (YGValue)resolveRef(node)->style().gap(scopedEnum(gutter));
 }

 void YGNodeStyleSetAspectRatio(const YGNodeRef node, const float aspectRatio) {
--- a/yoga/YGNodeStyle.h
+++ b/yoga/YGNodeStyle.h
@@ -96,7 +96,7 @@ YG_EXPORT void
 YGNodeStyleSetGap(YGNodeRef node, YGGutter gutter, float gapLength);
 YG_EXPORT void
 YGNodeStyleSetGapPercent(YGNodeRef node, YGGutter gutter, float gapLength);
-YG_EXPORT float YGNodeStyleGetGap(YGNodeConstRef node, YGGutter gutter);
+YG_EXPORT YGValue YGNodeStyleGetGap(YGNodeConstRef node, YGGutter gutter);

 YG_EXPORT void YGNodeStyleSetBoxSizing(YGNodeRef node, YGBoxSizing boxSizing);
 YG_EXPORT YGBoxSizing YGNodeStyleGetBoxSizing(YGNodeConstRef node);
--- a/yoga/algorithm/CalculateLayout.cpp
+++ b/yoga/algorithm/CalculateLayout.cpp
@@ -1213,10 +1213,10 @@ static void calculateLayoutImpl(
    const float ownerWidth,
    const float ownerHeight,
    const bool performLayout,
+    const LayoutPassReason reason,
    LayoutData& layoutMarkerData,
    const uint32_t depth,
-    const uint32_t generationCount,
-    const LayoutPassReason reason) {
+    const uint32_t generationCount) {
  yoga::assertFatalWithNode(
      node,
      yoga::isUndefined(availableWidth)
@@ -1780,7 +1780,7 @@ static void calculateLayoutImpl(
                                    crossAxis,
                                    direction,
                                    unclampedCrossDim,
-                                    ownerHeight,
+                                    crossAxisOwnerSize,
                                    ownerWidth) -
        paddingAndBorderAxisCross;

@@ -2268,10 +2268,10 @@ bool calculateLayoutInternal(
        ownerWidth,
        ownerHeight,
        performLayout,
+        reason,
        layoutMarkerData,
        depth,
-        generationCount,
-        reason);
+        generationCount);

    layout->lastOwnerDirection = ownerDirection;
    layout->configVersion = node->getConfig()->getVersion();
--- a/yoga/algorithm/FlexLine.cpp
+++ b/yoga/algorithm/FlexLine.cpp
@@ -17,7 +17,7 @@ FlexLine calculateFlexLine(
    yoga::Node* const node,
    const Direction ownerDirection,
    const float ownerWidth,
-    const float mainAxisownerSize,
+    const float mainAxisOwnerSize,
    const float availableInnerWidth,
    const float availableInnerMainDim,
    Node::LayoutableChildren::Iterator& iterator,
@@ -70,7 +70,7 @@ FlexLine calculateFlexLine(
            direction,
            mainAxis,
            child->getLayout().computedFlexBasis,
-            mainAxisownerSize,
+            mainAxisOwnerSize,
            ownerWidth)
            .unwrap();

--- a/yoga/algorithm/FlexLine.h
+++ b/yoga/algorithm/FlexLine.h
@@ -66,7 +66,7 @@ FlexLine calculateFlexLine(
    yoga::Node* node,
    Direction ownerDirection,
    float ownerWidth,
-    float mainAxisownerSize,
+    float mainAxisOwnerSize,
    float availableInnerWidth,
    float availableInnerMainDim,
    Node::LayoutableChildren::Iterator& iterator,
--- a/yoga/algorithm/PixelGrid.cpp
+++ b/yoga/algorithm/PixelGrid.cpp
@@ -66,7 +66,8 @@ void roundLayoutResultsToPixelGrid(
    yoga::Node* const node,
    const double absoluteLeft,
    const double absoluteTop) {
-  const auto pointScaleFactor = node->getConfig()->getPointScaleFactor();
+  const auto pointScaleFactor =
+      static_cast<double>(node->getConfig()->getPointScaleFactor());

  const double nodeLeft = node->getLayout().position(PhysicalEdge::Left);
  const double nodeTop = node->getLayout().position(PhysicalEdge::Top);
@@ -80,7 +81,7 @@ void roundLayoutResultsToPixelGrid(
  const double absoluteNodeRight = absoluteNodeLeft + nodeWidth;
  const double absoluteNodeBottom = absoluteNodeTop + nodeHeight;

-  if (pointScaleFactor != 0.0f) {
+  if (pointScaleFactor != 0.0) {
    // If a node has a custom measure function we never want to round down its
    // size as this could lead to unwanted text truncation.
    const bool textRounding = node->getNodeType() == NodeType::Text;
@@ -96,12 +97,14 @@ void roundLayoutResultsToPixelGrid(
    // We multiply dimension by scale factor and if the result is close to the
    // whole number, we don't have any fraction To verify if the result is close
    // to whole number we want to check both floor and ceil numbers
+
+    const double scaledNodeWith = nodeWidth * pointScaleFactor;
    const bool hasFractionalWidth =
-        !yoga::inexactEquals(fmod(nodeWidth * pointScaleFactor, 1.0), 0) &&
-        !yoga::inexactEquals(fmod(nodeWidth * pointScaleFactor, 1.0), 1.0);
+        !yoga::inexactEquals(round(scaledNodeWith), scaledNodeWith);
+
+    const double scaledNodeHeight = nodeHeight * pointScaleFactor;
    const bool hasFractionalHeight =
-        !yoga::inexactEquals(fmod(nodeHeight * pointScaleFactor, 1.0), 0) &&
-        !yoga::inexactEquals(fmod(nodeHeight * pointScaleFactor, 1.0), 1.0);
+        !yoga::inexactEquals(round(scaledNodeHeight), scaledNodeHeight);

    node->setLayoutDimension(
        roundValueToPixelGrid(
--- a/yoga/node/Node.cpp
+++ b/yoga/node/Node.cpp
@@ -245,8 +245,8 @@ void Node::setLayoutHadOverflow(bool hadOverflow) {
  layout_.setHadOverflow(hadOverflow);
 }

-void Node::setLayoutDimension(float LengthValue, Dimension dimension) {
-  layout_.setDimension(dimension, LengthValue);
+void Node::setLayoutDimension(float lengthValue, Dimension dimension) {
+  layout_.setDimension(dimension, lengthValue);
 }

 // If both left and right are defined, then use left. Otherwise return +left or
--- a/yoga/node/Node.h
+++ b/yoga/node/Node.h
@@ -259,7 +259,7 @@ class YG_EXPORT Node : public ::YGNode {
      uint32_t computedFlexBasisGeneration);
  void setLayoutMeasuredDimension(float measuredDimension, Dimension dimension);
  void setLayoutHadOverflow(bool hadOverflow);
-  void setLayoutDimension(float LengthValue, Dimension dimension);
+  void setLayoutDimension(float lengthValue, Dimension dimension);
  void setLayoutDirection(Direction direction);
  void setLayoutMargin(float margin, PhysicalEdge edge);
  void setLayoutBorder(float border, PhysicalEdge edge);
Author	SHA1	Message	Date
Nick Gerleman	74face1db4	huh?	2025-01-21 11:50:12 -08:00
Nick Gerleman	cb6dd1d01e	Update clang-format version	2025-01-21 11:48:21 -08:00
Nick Gerleman	f3793303f3	Try fixing CI after GHA Ubuntu 24.04 Update New GHA images seem to have dropped the preinstalled libc++ package. Let's manually install it during setup.	2025-01-21 11:44:49 -08:00
Ruslan Shestopalyuk	9591210a7a	Add more unit tests for rounding values to pixel grid (#1776 ) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1776 # Changelog: [Internal] - I was looking into some profiling results and noticed that Yoga has some quirky custom logic when it comes to rounding to the pixel grid, especially for the values that are halfway through. There are already unit tests in place, but those cases weren't covered, so I am adding these extra corner cases here, to make sure they are covered in case that the actual rounding function may get modified (which it might make sense to, as it's currently can be more expensive than it could have been in some scenarios). Reviewed By: christophpurrer Differential Revision: D67712673 fbshipit-source-id: da1b7339a8939ced8d91f15441bc7d1f8af768c8	2024-12-30 12:38:48 -08:00
Ruslan Shestopalyuk	91997d6cd3	Avoid calling fmod twice in roundLayoutResultsToPixelGrid (#1775 ) Summary: X-link: https://github.com/facebook/litho/pull/1036 Pull Request resolved: https://github.com/facebook/yoga/pull/1775 X-link: https://github.com/facebook/react-native/pull/48404 ## Changelog: [Internal] - This popped up when profiling some heavy UI performance, calling `fmod` operation in Yoga's `roundLayoutResultsToPixelGrid` in `PixelGrid.cpp` can be expensive, furthermore it turns out that some of the calls were redundant. This replaces the duplicate calls to fmod with an equivalent single round operation, which for e.g. clang compiler on Windows brings the code in question from ~50 instructions (including 4 call instructions to the fmod function) down to ~30 instructions (without any external calls), and the layout operation being ~1% more efficient for the particular benchmark I was looking into. Reviewed By: christophpurrer Differential Revision: D67689065 fbshipit-source-id: 2a074a1cb81bd7f7a3c414050b9ddda2ba90180f	2024-12-30 12:38:48 -08:00
Joe Vilches	909e4bea6e	Fix test util to measure text properly based on flex direction (#1768 ) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1768 Depending on the flex direction text will either be capped to the measured size or to the longest word, so I added that functionality Reviewed By: mlord93 Differential Revision: D67106199 fbshipit-source-id: 0b4691768809004043a847f3fc5f7b94e92f1575	2024-12-12 11:11:49 -08:00
Nicola Corti	13f4adbbcd	Add 16K support for standalone Yoga (#1766 ) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1766 While we added support for 16K pages for yoga through React Native, the standalone version we upload to Maven Central wasn't handled. This fixes it. Reviewed By: NickGerleman Differential Revision: D66975933 fbshipit-source-id: 36a8404e2f2a60a44b9a39e478b23d1829bc542e	2024-12-10 09:34:38 -08:00
heoblitz	ae2d06d0f5	Update YGNodeStyleGetGap to return YGValue (#1753 ) Summary: X-link: https://github.com/facebook/react-native/pull/47973 Gap can be styled using both `points` and `percentages`, but YGNodeStyleGetGap currently returns a float value. To maintain alignment with the `padding` and `margin` functionalities and allow it to be handled in bridging code, this function has been updated to return YGValue. Pull Request resolved: https://github.com/facebook/yoga/pull/1753 Reviewed By: joevilches Differential Revision: D66513236 Pulled By: NickGerleman fbshipit-source-id: b7110855c037f20780f031f22a945bde4446687d	2024-12-09 13:38:05 -08:00
Joe Vilches	5478812db3	Use crossAxisOwnerSize instead of ownerHeight in cross axis bound call (#1763 ) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1763 X-link: https://github.com/facebook/react-native/pull/48080 Small bug that I noticed while doing intrinsic sizing. We have the ownerHeight as the axis size despite bounding the length of the cross axis. This should therefore be the crossAxisOwnerSize, which might be the width in some cases Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D66736539 fbshipit-source-id: 528fc438b3327cd6f7890ea0ba408e4ce7b0f02c	2024-12-06 15:34:06 -08:00
Joe Vilches	050ac8a413	Properly camelcase mainAxisownerSize in FlexLine (#1762 ) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1762 X-link: https://github.com/facebook/react-native/pull/48077 OCD strikes again. Grepped this time to make sure we didn't miss any cases for this specific param name Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D66715777 fbshipit-source-id: 3e881a15b3b2836a4a55b11d7ec621541b92a05d	2024-12-03 19:16:56 -08:00
Nick Gerleman	733ba24064	Add Yoga 3.2 Release notes (#1761 ) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1761 Whips up some release notes for what is new since Yoga 3.1. https://github.com/facebook/yoga/compare/v3.1.0...v3.2.0 The relevant packages have already been published. Reviewed By: joevilches Differential Revision: D66679637 fbshipit-source-id: dd94e2a52f2bdc80541c331d1fb39de82669cc7a	2024-12-02 17:39:41 -08:00
Joe Vilches	e177477144	Add text based intrinsic sizing tests (#1759 ) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1759 We just have block based tests right now. Intrinsic sizing is commonly used with text so lets add a few there. Reviewed By: NickGerleman Differential Revision: D66662940 fbshipit-source-id: f8b91419c89d22d79a91d3bd8c7da70429c827fb	2024-12-02 17:29:49 -08:00
Joe Vilches	76ffdbc25d	Back out "Back out "[yoga][gentest][intrinsic sizing] Gentest and initial tests for intrinsic sizing"" (#1758 ) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1758 Original commit changeset: 52d6cc754cb9 Original Phabricator Diff: D66332308 Reviewed By: NickGerleman Differential Revision: D66662663 fbshipit-source-id: fb3a0d10ec0f0149aeee510148f26ada8eff7e47	2024-12-02 17:29:49 -08:00
Joe Vilches	f99e657acd	Back out "Back out "[yoga][intrinsic sizing] Update public API for intrinsic sizing setters"" Summary: Original commit changeset: 793f77dad021 Original Phabricator Diff: D66332309 Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D66662661 fbshipit-source-id: 22ed3ac9492f0a563c041ce4cb5fba4b65b53211	2024-12-02 17:29:49 -08:00
Joe Vilches	a9246bc7db	Back out "Back out "[yoga][intrinsic sizing] Modify private apis to set, store, and get intrinsic sizing keywords"" (#1756 ) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1756 X-link: https://github.com/facebook/react-native/pull/48049 Changelog: [Internal] Original commit changeset: 1d596964e0c8 Original Phabricator Diff: D66332307 Reviewed By: NickGerleman Differential Revision: D66662662 fbshipit-source-id: 4f9ac2b1557b848f519dcd728d7097b52f1190b3	2024-12-02 17:29:49 -08:00
Joe Vilches	be72b8e8aa	Align order of params between calculateLayoutInternal and calculateLayoutImpl (#1755 ) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1755 X-link: https://github.com/facebook/react-native/pull/47975 I've been working with callsites here and its annoying if you switch these that you need to move these params around too. Let's just make them the same order Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D66519836 fbshipit-source-id: 2e98e671270a053c6e62372e2003f1ca67774ec9	2024-11-26 22:48:24 -08:00
Joe Vilches	b876f596d9	Camel case LengthValue in Node.cpp (#1754 ) Summary: X-link: https://github.com/facebook/react-native/pull/47971 Pull Request resolved: https://github.com/facebook/yoga/pull/1754 This was annoying me Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D66510734 fbshipit-source-id: d1b952f2e82e7018b16dc0c572d9b98aec18c0e5	2024-11-26 15:23:08 -08:00
Joe Vilches	be00354b71	Back out "Modify private apis to set, store, and get intrinsic sizing keywords" (#1750 ) Summary: X-link: https://github.com/facebook/react-native/pull/47895 Pull Request resolved: https://github.com/facebook/yoga/pull/1750 These APIs were only added so that we could do TDD as we work on intrinsic sizing functionality. As of right now they do nothing. We are aiming on publishing a new version of Yoga soon so for the time being we are going to back these out so as not to confuse anyone with this new functionality. Ideally we get to a point where we have some temporary experimental header to stage these in but this is a bit time sensitive so just backing out for now Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D66332307 fbshipit-source-id: 1d596964e0c893091c541988506e8b80fa6d1957	2024-11-25 00:40:03 -08:00
Joe Vilches	0c995496c8	Back out "Update public API for intrinsic sizing setters" (#1752 ) Summary: X-link: https://github.com/facebook/react-native/pull/47896 Pull Request resolved: https://github.com/facebook/yoga/pull/1752 These APIs were only added so that we could do TDD as we work on intrinsic sizing functionality. As of right now they do nothing. We are aiming on publishing a new version of Yoga soon so for the time being we are going to back these out so as not to confuse anyone with this new functionality. Ideally we get to a point where we have some temporary experimental header to stage these in but this is a bit time sensitive so just backing out for now Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D66332309 fbshipit-source-id: 793f77dad021fa5e57b52c36ae954307636bcbf0	2024-11-25 00:40:03 -08:00
Joe Vilches	c12e732fab	Back out "Gentest and initial tests for intrinsic sizing" (#1751 ) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1751 Original commit changeset: 1e3e7214fab0 Original Phabricator Diff: D64145117 Reviewed By: NickGerleman Differential Revision: D66332308 fbshipit-source-id: 52d6cc754cb931e851e444bac2c946907a098235	2024-11-25 00:40:03 -08:00