Codemod format for trailing commas incoming change [5/n]

Summary: Adding trailing commas.

Differential Revision: D80174965

.github/actions/clang-format/action.yml

@@ -1,23 +0,0 @@
-name: Clang Format
-inputs:
-  directory:
-    description: Directory to Lint
-    required: true
-  version:
-    description: LLVM version to use # Should be kept roughly in sync with arcanist
-    required: false
-    default: 12
-
-runs:
-  using: "composite"
-  steps:
-    - name: Install
-      shell: bash
-      run: sudo apt-get install -y clang-format-${{ inputs.version }}
-
-    - name: clang-format
-      working-directory: ${{ inputs.directory }}
-      shell: bash
-      env:
-        BASHOPTS: extglob:nullglob
-      run: clang-format-${{ inputs.version }} --dry-run --Werror **/*.{h,hh,hpp,c,cpp,cc,m,mm}

.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

.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@v3
+        uses: actions/upload-artifact@v4
         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@v3
+        uses: actions/upload-artifact@v4
         with:
           name: 'snapshot-artifacts'
           path: '~/.m2/repository/'

.github/workflows/validate-cpp.yml

@@ -97,13 +97,3 @@ jobs:
           cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=Release
           cmake --build build
         working-directory: capture
-
-  clang-format:
-    name: Format
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: clang-format
-        uses: ./.github/actions/clang-format

.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@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: npm-package
           path: javascript/yoga-layout.tar.gz

.gitignore

@@ -73,3 +73,6 @@ local.properties
 
 # Docusarus build
 .docusaurus
+
+# Android Studio
+.idea

build.gradle

@@ -9,6 +9,7 @@ plugins {
     id("com.android.library") version "8.7.1" apply false
     id("com.android.application") version "8.7.1" apply false
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+    id 'org.jetbrains.kotlin.android' version '2.1.20' apply false
 }
 
 allprojects {
@@ -34,6 +35,8 @@ nexusPublishing {
         sonatype {
             username.set(sonatypeUsername)
             password.set(sonatypePassword)
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
         }
     }
 }

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),

cmake/project-defaults.cmake

@@ -19,8 +19,8 @@ add_compile_options(
     # Enable warnings and warnings as errors
     /W4
     /WX
-    # Disable RTTI
-    $<$<COMPILE_LANGUAGE:CXX>:/GR->
+    # Enable RTTI
+    $<$<COMPILE_LANGUAGE:CXX>:/GR>
     # Use /O2 (Maximize Speed)
     $<$<CONFIG:RELEASE>:/O2>)
 
@@ -34,8 +34,8 @@ add_compile_options(
     # Enable warnings and warnings as errors
     -Wall
     -Werror
-    # Disable RTTI
-    $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
+    # Enable RTTI
+    $<$<COMPILE_LANGUAGE:CXX>:-frtti>
     # Use -O2 (prioritize speed)
     $<$<CONFIG:RELEASE>:-O2>
     # Enable separate sections per function/data item

gentest/fixtures/YGAlignItemsTest.html

@@ -240,3 +240,14 @@
   <div style="position:relative; width:50px; height:50px;">
   </div>
 </div>
+
+<div id="align_items_non_stretch_s526008"
+  style="flex-direction: column; width: 400px; height: 400px;">
+  <div style="flex-direction: row;">
+    <div style="flex-direction: column; align-items: flex-start;">
+      <div>
+        <div style="width: 0; height: 10px;"></div>
+      </div>
+    </div>
+  </div>
+</div>

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>

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);`,

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());`,

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,
+        )}}));`,
       );
     },
   },

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++) {

gradle/gradle-enterprise.gradle.kts.sample

@@ -1,17 +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.
- */
-
-// You can use this script to configure the gradleEnterprise{} block in your build.
-// You need to rename this file to ./gradle/gradle-enterprise.gradle.kts in order for
-// this to be processed.
-extensions.getByName("gradleEnterprise").withGroovyBuilder {
-    setProperty("server", "https://your-gradle-enterprise-instance.example.com")
-    getProperty("buildScan").withGroovyBuilder {
-        "publishAlways"()
-        "tag"(if(System.getenv("CI") != null) "CI" else "Local")
-    }
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,7 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -130,10 +133,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -141,7 +147,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +155,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +204,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

java/AndroidManifest.xml

@@ -1,4 +1,17 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.facebook.yoga"
+          android:versionCode="1"
+          android:versionName="1.0"
+    >
 
     <application/>
 

java/build.gradle.kts

@@ -9,6 +9,7 @@ plugins {
   id("com.android.library")
   id("maven-publish")
   id("signing")
+  id("org.jetbrains.kotlin.android")
 }
 
 group = "com.facebook.yoga"
@@ -30,6 +31,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") } }
@@ -47,6 +49,8 @@ android {
     }
   }
 
+  kotlinOptions { jvmTarget = "1.8" }
+
   publishing {
     multipleVariants {
       withSourcesJar()
@@ -59,6 +63,7 @@ android {
 dependencies {
   implementation("com.google.code.findbugs:jsr305:3.0.2")
   implementation("com.facebook.soloader:soloader:0.10.5")
+  implementation("androidx.core:core-ktx:1.16.0")
   testImplementation("junit:junit:4.12")
 }
 

java/com/facebook/yoga/LayoutPassReason.java

@@ -1,43 +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.
- */
-
-package com.facebook.yoga;
-
-public enum LayoutPassReason {
-  INITIAL(0),
-  ABS_LAYOUT(1),
-  STRETCH(2),
-  MULTILINE_STRETCH(3),
-  FLEX_LAYOUT(4),
-  MEASURE(5),
-  ABS_MEASURE(6),
-  FLEX_MEASURE(7);
-
-  private final int mIntValue;
-
-  LayoutPassReason(int intValue) {
-    mIntValue = intValue;
-  }
-
-  public int intValue() {
-    return mIntValue;
-  }
-
-  public static LayoutPassReason fromInt(int value) {
-    switch (value) {
-      case 0: return INITIAL;
-      case 1: return ABS_LAYOUT;
-      case 2: return STRETCH;
-      case 3: return MULTILINE_STRETCH;
-      case 4: return FLEX_LAYOUT;
-      case 5: return MEASURE;
-      case 6: return ABS_MEASURE;
-      case 7: return FLEX_MEASURE;
-      default: throw new IllegalArgumentException("Unknown enum value: " + value);
-    }
-  }
-}

java/com/facebook/yoga/LayoutPassReason.kt

@@ -0,0 +1,35 @@
+/*
+ * 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.
+ */
+
+package com.facebook.yoga
+
+public enum class LayoutPassReason(public val intValue: Int) {
+  INITIAL(0),
+  ABS_LAYOUT(1),
+  STRETCH(2),
+  MULTILINE_STRETCH(3),
+  FLEX_LAYOUT(4),
+  MEASURE(5),
+  ABS_MEASURE(6),
+  FLEX_MEASURE(7);
+
+  public companion object {
+    @JvmStatic
+    public fun fromInt(value: Int): LayoutPassReason =
+        when (value) {
+          0 -> INITIAL
+          1 -> ABS_LAYOUT
+          2 -> STRETCH
+          3 -> MULTILINE_STRETCH
+          4 -> FLEX_LAYOUT
+          5 -> MEASURE
+          6 -> ABS_MEASURE
+          7 -> FLEX_MEASURE
+          else -> throw IllegalArgumentException("Unknown enum value: $value")
+        }
+  }
+}

java/com/facebook/yoga/YogaBaselineFunction.kt

@@ -5,12 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.yoga;
+package com.facebook.yoga
 
-public interface YogaBaselineFunction {
+public fun interface YogaBaselineFunction {
   /**
    * Return the baseline of the node in points. When no baseline function is set the baseline
    * default to the computed height of the node.
    */
-  float baseline(YogaNode node, float width, float height);
+  public fun baseline(node: YogaNode, width: Float, height: Float): Float
 }

java/com/facebook/yoga/YogaConfigFactory.kt

@@ -5,10 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.yoga;
+package com.facebook.yoga
 
-public abstract class YogaConfigFactory {
-  public static YogaConfig create() {
-    return new YogaConfigJNIFinalizer();
-  }
+public object YogaConfigFactory {
+  @JvmStatic public fun create(): YogaConfig = YogaConfigJNIFinalizer()
 }

java/com/facebook/yoga/YogaConstants.java

@@ -1,25 +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.
- */
-
-package com.facebook.yoga;
-
-public class YogaConstants {
-
-  public static final float UNDEFINED = Float.NaN;
-
-  public static boolean isUndefined(float value) {
-    return Float.compare(value, UNDEFINED) == 0;
-  }
-
-  public static boolean isUndefined(YogaValue value) {
-    return value.unit == YogaUnit.UNDEFINED;
-  }
-
-  public static float getUndefined() {
-    return UNDEFINED;
-  }
-}

java/com/facebook/yoga/YogaConstants.kt

@@ -0,0 +1,18 @@
+/*
+ * 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.
+ */
+
+package com.facebook.yoga
+
+public object YogaConstants {
+  @JvmField public val UNDEFINED: Float = Float.NaN
+
+  @JvmStatic public fun isUndefined(value: Float): Boolean = value.compareTo(UNDEFINED) == 0
+
+  @JvmStatic public fun isUndefined(value: YogaValue): Boolean = value.unit == YogaUnit.UNDEFINED
+
+  @JvmStatic public fun getUndefined(): Float = UNDEFINED
+}

java/com/facebook/yoga/YogaLayoutType.java

@@ -1,35 +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.
- */
-
-package com.facebook.yoga;
-
-public enum YogaLayoutType {
-  LAYOUT(0),
-  MEASURE(1),
-  CACHED_LAYOUT(2),
-  CACHED_MEASURE(3);
-
-  private final int mIntValue;
-
-  YogaLayoutType(int intValue) {
-    mIntValue = intValue;
-  }
-
-  public int intValue() {
-    return mIntValue;
-  }
-
-  public static YogaLayoutType fromInt(int value) {
-    switch (value) {
-      case 0: return LAYOUT;
-      case 1: return MEASURE;
-      case 2: return CACHED_LAYOUT;
-      case 3: return CACHED_MEASURE;
-      default: throw new IllegalArgumentException("Unknown enum value: " + value);
-    }
-  }
-}

java/com/facebook/yoga/YogaLayoutType.kt

@@ -0,0 +1,27 @@
+/*
+ * 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.
+ */
+
+package com.facebook.yoga
+
+public enum class YogaLayoutType(public val intValue: Int) {
+  LAYOUT(0),
+  MEASURE(1),
+  CACHED_LAYOUT(2),
+  CACHED_MEASURE(3);
+
+  public companion object {
+    @JvmStatic
+    public fun fromInt(value: Int): YogaLayoutType =
+        when (value) {
+          0 -> LAYOUT
+          1 -> MEASURE
+          2 -> CACHED_LAYOUT
+          3 -> CACHED_MEASURE
+          else -> throw IllegalArgumentException("Unknown enum value: $value")
+        }
+  }
+}

java/com/facebook/yoga/YogaLogger.kt

@@ -5,16 +5,15 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.yoga;
+package com.facebook.yoga
 
-import com.facebook.yoga.annotations.DoNotStrip;
+import com.facebook.yoga.annotations.DoNotStrip
 
 /**
- * Interface for receiving logs from native layer. Use by setting YogaNode.setLogger(myLogger);
- * See YogaLogLevel for the different log levels.
+ * Interface for receiving logs from native layer. Use by setting YogaNode.setLogger(myLogger); See
+ * YogaLogLevel for the different log levels.
  */
 @DoNotStrip
-public interface YogaLogger {
-  @DoNotStrip
-  void log(YogaLogLevel level, String message);
+public fun interface YogaLogger {
+  @DoNotStrip public fun log(level: YogaLogLevel, message: String)
 }

java/com/facebook/yoga/YogaMeasureFunction.java

@@ -1,20 +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.
- */
-
-package com.facebook.yoga;
-
-public interface YogaMeasureFunction {
-  /**
-   * Return a value created by YogaMeasureOutput.make(width, height);
-   */
-  long measure(
-      YogaNode node,
-      float width,
-      YogaMeasureMode widthMode,
-      float height,
-      YogaMeasureMode heightMode);
-}

java/com/facebook/yoga/YogaMeasureFunction.kt

@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+
+package com.facebook.yoga
+
+public fun interface YogaMeasureFunction {
+  /** Return a value created by YogaMeasureOutput.make(width, height); */
+  public fun measure(
+      node: YogaNode,
+      width: Float,
+      widthMode: YogaMeasureMode,
+      height: Float,
+      heightMode: YogaMeasureMode,
+  ): Long
+}

java/com/facebook/yoga/YogaMeasureOutput.java

@@ -1,32 +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.
- */
-
-package com.facebook.yoga;
-
-/**
- * Helpers for building measure output value.
- */
-public class YogaMeasureOutput {
-
-  public static long make(float width, float height) {
-    final int wBits = Float.floatToRawIntBits(width);
-    final int hBits = Float.floatToRawIntBits(height);
-    return ((long) wBits) << 32 | ((long) hBits);
-  }
-
-  public static long make(int width, int height) {
-    return make((float) width, (float) height);
-  }
-
-  public static float getWidth(long measureOutput) {
-    return Float.intBitsToFloat((int) (0xFFFFFFFF & (measureOutput >> 32)));
-  }
-
-  public static float getHeight(long measureOutput) {
-    return Float.intBitsToFloat((int) (0xFFFFFFFF & measureOutput));
-  }
-}

java/com/facebook/yoga/YogaMeasureOutput.kt

@@ -0,0 +1,29 @@
+/*
+ * 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.
+ */
+
+package com.facebook.yoga
+
+/** Helpers for building measure output value. */
+public object YogaMeasureOutput {
+  @JvmStatic
+  public fun make(width: Float, height: Float): Long {
+    val wBits = java.lang.Float.floatToRawIntBits(width)
+    val hBits = java.lang.Float.floatToRawIntBits(height)
+    return (wBits.toLong()) shl 32 or (hBits.toLong())
+  }
+
+  @JvmStatic
+  public fun make(width: Int, height: Int): Long = make(width.toFloat(), height.toFloat())
+
+  @JvmStatic
+  public fun getWidth(measureOutput: Long): Float =
+      java.lang.Float.intBitsToFloat((0xFFFFFFFFL and (measureOutput shr 32)).toInt())
+
+  @JvmStatic
+  public fun getHeight(measureOutput: Long): Float =
+      java.lang.Float.intBitsToFloat((0xFFFFFFFFL and measureOutput).toInt())
+}

java/com/facebook/yoga/YogaNative.java

@@ -1,141 +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.
- */
-
-package com.facebook.yoga;
-
-import com.facebook.yoga.annotations.DoNotStrip;
-import com.facebook.soloader.SoLoader;
-
-@DoNotStrip
-public class YogaNative {
-  static {
-    SoLoader.loadLibrary("yoga");
-  }
-
-  // JNI methods that use Vanilla JNI
-  // YGConfig related
-  static native long jni_YGConfigNewJNI();
-  static native void jni_YGConfigFreeJNI(long nativePointer);
-  static native void jni_YGConfigSetExperimentalFeatureEnabledJNI(long nativePointer, int feature, boolean enabled);
-  static native void jni_YGConfigSetUseWebDefaultsJNI(long nativePointer, boolean useWebDefaults);
-  static native void jni_YGConfigSetPointScaleFactorJNI(long nativePointer, float pixelsInPoint);
-  static native void jni_YGConfigSetErrataJNI(long nativePointer, int errata);
-  static native int jni_YGConfigGetErrataJNI(long nativePointer);
-  static native void jni_YGConfigSetLoggerJNI(long nativePointer, YogaLogger logger);
-
-  // YGNode related
-  static native long jni_YGNodeNewJNI();
-  static native long jni_YGNodeNewWithConfigJNI(long configPointer);
-  static native void jni_YGNodeFinalizeJNI(long nativePointer);
-  static native void jni_YGNodeResetJNI(long nativePointer);
-  static native void jni_YGNodeInsertChildJNI(long nativePointer, long childPointer, int index);
-  static native void jni_YGNodeSwapChildJNI(long nativePointer, long childPointer, int index);
-  static native void jni_YGNodeSetIsReferenceBaselineJNI(long nativePointer, boolean isReferenceBaseline);
-  static native boolean jni_YGNodeIsReferenceBaselineJNI(long nativePointer);
-  static native void jni_YGNodeRemoveAllChildrenJNI(long nativePointer);
-  static native void jni_YGNodeRemoveChildJNI(long nativePointer, long childPointer);
-  static native void jni_YGNodeCalculateLayoutJNI(long nativePointer, float width, float height, long[] nativePointers, YogaNodeJNIBase[] nodes);
-  static native void jni_YGNodeMarkDirtyJNI(long nativePointer);
-  static native boolean jni_YGNodeIsDirtyJNI(long nativePointer);
-  static native void jni_YGNodeCopyStyleJNI(long dstNativePointer, long srcNativePointer);
-  static native int jni_YGNodeStyleGetDirectionJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetDirectionJNI(long nativePointer, int direction);
-  static native int jni_YGNodeStyleGetFlexDirectionJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexDirectionJNI(long nativePointer, int flexDirection);
-  static native int jni_YGNodeStyleGetJustifyContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetJustifyContentJNI(long nativePointer, int justifyContent);
-  static native int jni_YGNodeStyleGetAlignItemsJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetAlignItemsJNI(long nativePointer, int alignItems);
-  static native int jni_YGNodeStyleGetAlignSelfJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetAlignSelfJNI(long nativePointer, int alignSelf);
-  static native int jni_YGNodeStyleGetAlignContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetAlignContentJNI(long nativePointer, int alignContent);
-  static native int jni_YGNodeStyleGetPositionTypeJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetPositionTypeJNI(long nativePointer, int positionType);
-  static native int jni_YGNodeStyleGetBoxSizingJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetBoxSizingJNI(long nativePointer, int boxSizing);
-  static native int jni_YGNodeStyleGetFlexWrapJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexWrapJNI(long nativePointer, int wrapType);
-  static native int jni_YGNodeStyleGetOverflowJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetOverflowJNI(long nativePointer, int overflow);
-  static native int jni_YGNodeStyleGetDisplayJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetDisplayJNI(long nativePointer, int display);
-  static native float jni_YGNodeStyleGetFlexJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexJNI(long nativePointer, float flex);
-  static native float jni_YGNodeStyleGetFlexGrowJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexGrowJNI(long nativePointer, float flexGrow);
-  static native float jni_YGNodeStyleGetFlexShrinkJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexShrinkJNI(long nativePointer, float flexShrink);
-  static native long jni_YGNodeStyleGetFlexBasisJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexBasisJNI(long nativePointer, float flexBasis);
-  static native void jni_YGNodeStyleSetFlexBasisPercentJNI(long nativePointer, float percent);
-  static native void jni_YGNodeStyleSetFlexBasisAutoJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexBasisMaxContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexBasisFitContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexBasisStretchJNI(long nativePointer);
-  static native long jni_YGNodeStyleGetMarginJNI(long nativePointer, int edge);
-  static native void jni_YGNodeStyleSetMarginJNI(long nativePointer, int edge, float margin);
-  static native void jni_YGNodeStyleSetMarginPercentJNI(long nativePointer, int edge, float percent);
-  static native void jni_YGNodeStyleSetMarginAutoJNI(long nativePointer, int edge);
-  static native long jni_YGNodeStyleGetPaddingJNI(long nativePointer, int edge);
-  static native void jni_YGNodeStyleSetPaddingJNI(long nativePointer, int edge, float padding);
-  static native void jni_YGNodeStyleSetPaddingPercentJNI(long nativePointer, int edge, float percent);
-  static native float jni_YGNodeStyleGetBorderJNI(long nativePointer, int edge);
-  static native void jni_YGNodeStyleSetBorderJNI(long nativePointer, int edge, float border);
-  static native long jni_YGNodeStyleGetPositionJNI(long nativePointer, int edge);
-  static native void jni_YGNodeStyleSetPositionJNI(long nativePointer, int edge, float position);
-  static native void jni_YGNodeStyleSetPositionPercentJNI(long nativePointer, int edge, float percent);
-  static native void jni_YGNodeStyleSetPositionAutoJNI(long nativePointer, int edge);
-  static native long jni_YGNodeStyleGetWidthJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetWidthJNI(long nativePointer, float width);
-  static native void jni_YGNodeStyleSetWidthPercentJNI(long nativePointer, float percent);
-  static native void jni_YGNodeStyleSetWidthAutoJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetWidthMaxContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetWidthFitContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetWidthStretchJNI(long nativePointer);
-  static native long jni_YGNodeStyleGetHeightJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetHeightJNI(long nativePointer, float height);
-  static native void jni_YGNodeStyleSetHeightPercentJNI(long nativePointer, float percent);
-  static native void jni_YGNodeStyleSetHeightAutoJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetHeightMaxContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetHeightFitContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetHeightStretchJNI(long nativePointer);
-  static native long jni_YGNodeStyleGetMinWidthJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetMinWidthJNI(long nativePointer, float minWidth);
-  static native void jni_YGNodeStyleSetMinWidthPercentJNI(long nativePointer, float percent);
-  static native void jni_YGNodeStyleSetMinWidthMaxContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetMinWidthFitContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetMinWidthStretchJNI(long nativePointer);
-  static native long jni_YGNodeStyleGetMinHeightJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetMinHeightJNI(long nativePointer, float minHeight);
-  static native void jni_YGNodeStyleSetMinHeightPercentJNI(long nativePointer, float percent);
-  static native void jni_YGNodeStyleSetMinHeightMaxContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetMinHeightFitContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetMinHeightStretchJNI(long nativePointer);
-  static native long jni_YGNodeStyleGetMaxWidthJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetMaxWidthJNI(long nativePointer, float maxWidth);
-  static native void jni_YGNodeStyleSetMaxWidthPercentJNI(long nativePointer, float percent);
-  static native void jni_YGNodeStyleSetMaxWidthMaxContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetMaxWidthFitContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetMaxWidthStretchJNI(long nativePointer);
-  static native long jni_YGNodeStyleGetMaxHeightJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetMaxHeightJNI(long nativePointer, float maxheight);
-  static native void jni_YGNodeStyleSetMaxHeightPercentJNI(long nativePointer, float percent);
-  static native void jni_YGNodeStyleSetMaxHeightMaxContentJNI(long nativePointer);
-  static native void jni_YGNodeStyleSetMaxHeightFitContentJNI(long nativePointer);
-  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 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);
-  static native void jni_YGNodeSetHasBaselineFuncJNI(long nativePointer, boolean hasMeasureFunc);
-  static native void jni_YGNodeSetStyleInputsJNI(long nativePointer, float[] styleInputsArray, int size);
-  static native long jni_YGNodeCloneJNI(long nativePointer);
-  static native void jni_YGNodeSetAlwaysFormsContainingBlockJNI(long nativePointer, boolean alwaysFormContainingBlock);
-}

java/com/facebook/yoga/YogaNative.kt

@@ -0,0 +1,331 @@
+/*
+ * 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.
+ */
+
+package com.facebook.yoga
+
+import com.facebook.soloader.SoLoader
+import com.facebook.yoga.annotations.DoNotStrip
+
+@DoNotStrip
+public object YogaNative {
+  init {
+    SoLoader.loadLibrary("yoga")
+  }
+
+  // JNI methods that use Vanilla JNI
+  // YGConfig related
+  @JvmStatic public external fun jni_YGConfigNewJNI(): Long
+
+  @JvmStatic public external fun jni_YGConfigFreeJNI(nativePointer: Long)
+
+  @JvmStatic
+  public external fun jni_YGConfigSetExperimentalFeatureEnabledJNI(
+      nativePointer: Long,
+      feature: Int,
+      enabled: Boolean
+  )
+
+  @JvmStatic
+  public external fun jni_YGConfigSetUseWebDefaultsJNI(nativePointer: Long, useWebDefaults: Boolean)
+
+  @JvmStatic
+  public external fun jni_YGConfigSetPointScaleFactorJNI(nativePointer: Long, pixelsInPoint: Float)
+
+  @JvmStatic public external fun jni_YGConfigSetErrataJNI(nativePointer: Long, errata: Int)
+
+  @JvmStatic public external fun jni_YGConfigGetErrataJNI(nativePointer: Long): Int
+
+  @JvmStatic public external fun jni_YGConfigSetLoggerJNI(nativePointer: Long, logger: YogaLogger)
+
+  // YGNode related
+  @JvmStatic public external fun jni_YGNodeNewJNI(): Long
+
+  @JvmStatic public external fun jni_YGNodeNewWithConfigJNI(configPointer: Long): Long
+
+  @JvmStatic public external fun jni_YGNodeFinalizeJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeResetJNI(nativePointer: Long)
+
+  @JvmStatic
+  public external fun jni_YGNodeInsertChildJNI(nativePointer: Long, childPointer: Long, index: Int)
+
+  @JvmStatic
+  public external fun jni_YGNodeSwapChildJNI(nativePointer: Long, childPointer: Long, index: Int)
+
+  @JvmStatic
+  public external fun jni_YGNodeSetIsReferenceBaselineJNI(
+      nativePointer: Long,
+      isReferenceBaseline: Boolean
+  )
+
+  @JvmStatic public external fun jni_YGNodeIsReferenceBaselineJNI(nativePointer: Long): Boolean
+
+  @JvmStatic public external fun jni_YGNodeRemoveAllChildrenJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeRemoveChildJNI(nativePointer: Long, childPointer: Long)
+
+  @JvmStatic
+  public external fun jni_YGNodeCalculateLayoutJNI(
+      nativePointer: Long,
+      width: Float,
+      height: Float,
+      nativePointers: LongArray,
+      nodes: Array<YogaNodeJNIBase>
+  )
+
+  @JvmStatic public external fun jni_YGNodeMarkDirtyJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeIsDirtyJNI(nativePointer: Long): Boolean
+
+  @JvmStatic
+  public external fun jni_YGNodeCopyStyleJNI(dstNativePointer: Long, srcNativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetDirectionJNI(nativePointer: Long): Int
+
+  @JvmStatic public external fun jni_YGNodeStyleSetDirectionJNI(nativePointer: Long, direction: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetFlexDirectionJNI(nativePointer: Long): Int
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetFlexDirectionJNI(nativePointer: Long, flexDirection: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetJustifyContentJNI(nativePointer: Long): Int
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetJustifyContentJNI(nativePointer: Long, justifyContent: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetAlignItemsJNI(nativePointer: Long): Int
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetAlignItemsJNI(nativePointer: Long, alignItems: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetAlignSelfJNI(nativePointer: Long): Int
+
+  @JvmStatic public external fun jni_YGNodeStyleSetAlignSelfJNI(nativePointer: Long, alignSelf: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetAlignContentJNI(nativePointer: Long): Int
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetAlignContentJNI(nativePointer: Long, alignContent: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetPositionTypeJNI(nativePointer: Long): Int
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetPositionTypeJNI(nativePointer: Long, positionType: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetBoxSizingJNI(nativePointer: Long): Int
+
+  @JvmStatic public external fun jni_YGNodeStyleSetBoxSizingJNI(nativePointer: Long, boxSizing: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetFlexWrapJNI(nativePointer: Long): Int
+
+  @JvmStatic public external fun jni_YGNodeStyleSetFlexWrapJNI(nativePointer: Long, wrapType: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetOverflowJNI(nativePointer: Long): Int
+
+  @JvmStatic public external fun jni_YGNodeStyleSetOverflowJNI(nativePointer: Long, overflow: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetDisplayJNI(nativePointer: Long): Int
+
+  @JvmStatic public external fun jni_YGNodeStyleSetDisplayJNI(nativePointer: Long, display: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetFlexJNI(nativePointer: Long): Float
+
+  @JvmStatic public external fun jni_YGNodeStyleSetFlexJNI(nativePointer: Long, flex: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetFlexGrowJNI(nativePointer: Long): Float
+
+  @JvmStatic public external fun jni_YGNodeStyleSetFlexGrowJNI(nativePointer: Long, flexGrow: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetFlexShrinkJNI(nativePointer: Long): Float
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetFlexShrinkJNI(nativePointer: Long, flexShrink: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetFlexBasisJNI(nativePointer: Long): Long
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetFlexBasisJNI(nativePointer: Long, flexBasis: Float)
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetFlexBasisPercentJNI(nativePointer: Long, percent: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetFlexBasisAutoJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetFlexBasisMaxContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetFlexBasisFitContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetFlexBasisStretchJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetMarginJNI(nativePointer: Long, edge: Int): Long
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetMarginJNI(nativePointer: Long, edge: Int, margin: Float)
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetMarginPercentJNI(
+      nativePointer: Long,
+      edge: Int,
+      percent: Float
+  )
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMarginAutoJNI(nativePointer: Long, edge: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetPaddingJNI(nativePointer: Long, edge: Int): Long
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetPaddingJNI(nativePointer: Long, edge: Int, padding: Float)
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetPaddingPercentJNI(
+      nativePointer: Long,
+      edge: Int,
+      percent: Float
+  )
+
+  @JvmStatic public external fun jni_YGNodeStyleGetBorderJNI(nativePointer: Long, edge: Int): Float
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetBorderJNI(nativePointer: Long, edge: Int, border: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetPositionJNI(nativePointer: Long, edge: Int): Long
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetPositionJNI(nativePointer: Long, edge: Int, position: Float)
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetPositionPercentJNI(
+      nativePointer: Long,
+      edge: Int,
+      percent: Float
+  )
+
+  @JvmStatic public external fun jni_YGNodeStyleSetPositionAutoJNI(nativePointer: Long, edge: Int)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetWidthJNI(nativePointer: Long): Long
+
+  @JvmStatic public external fun jni_YGNodeStyleSetWidthJNI(nativePointer: Long, width: Float)
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetWidthPercentJNI(nativePointer: Long, percent: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetWidthAutoJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetWidthMaxContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetWidthFitContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetWidthStretchJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetHeightJNI(nativePointer: Long): Long
+
+  @JvmStatic public external fun jni_YGNodeStyleSetHeightJNI(nativePointer: Long, height: Float)
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetHeightPercentJNI(nativePointer: Long, percent: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetHeightAutoJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetHeightMaxContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetHeightFitContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetHeightStretchJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetMinWidthJNI(nativePointer: Long): Long
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMinWidthJNI(nativePointer: Long, minWidth: Float)
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetMinWidthPercentJNI(nativePointer: Long, percent: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMinWidthMaxContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMinWidthFitContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMinWidthStretchJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetMinHeightJNI(nativePointer: Long): Long
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetMinHeightJNI(nativePointer: Long, minHeight: Float)
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetMinHeightPercentJNI(nativePointer: Long, percent: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMinHeightMaxContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMinHeightFitContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMinHeightStretchJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetMaxWidthJNI(nativePointer: Long): Long
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMaxWidthJNI(nativePointer: Long, maxWidth: Float)
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetMaxWidthPercentJNI(nativePointer: Long, percent: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMaxWidthMaxContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMaxWidthFitContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMaxWidthStretchJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetMaxHeightJNI(nativePointer: Long): Long
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetMaxHeightJNI(nativePointer: Long, maxheight: Float)
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetMaxHeightPercentJNI(nativePointer: Long, percent: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMaxHeightMaxContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMaxHeightFitContentJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleSetMaxHeightStretchJNI(nativePointer: Long)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetAspectRatioJNI(nativePointer: Long): Float
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetAspectRatioJNI(nativePointer: Long, aspectRatio: Float)
+
+  @JvmStatic public external fun jni_YGNodeStyleGetGapJNI(nativePointer: Long, gutter: Int): Long
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetGapJNI(nativePointer: Long, gutter: Int, gapLength: Float)
+
+  @JvmStatic
+  public external fun jni_YGNodeStyleSetGapPercentJNI(
+      nativePointer: Long,
+      gutter: Int,
+      gapLength: Float
+  )
+
+  @JvmStatic
+  public external fun jni_YGNodeSetHasMeasureFuncJNI(nativePointer: Long, hasMeasureFunc: Boolean)
+
+  @JvmStatic
+  public external fun jni_YGNodeSetHasBaselineFuncJNI(nativePointer: Long, hasMeasureFunc: Boolean)
+
+  @JvmStatic
+  public external fun jni_YGNodeSetStyleInputsJNI(
+      nativePointer: Long,
+      styleInputsArray: FloatArray,
+      size: Int
+  )
+
+  @JvmStatic public external fun jni_YGNodeCloneJNI(nativePointer: Long): Long
+
+  @JvmStatic
+  public external fun jni_YGNodeSetAlwaysFormsContainingBlockJNI(
+      nativePointer: Long,
+      alwaysFormContainingBlock: Boolean
+  )
+}

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);
 

java/com/facebook/yoga/YogaNodeFactory.java

@@ -1,18 +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.
- */
-
-package com.facebook.yoga;
-
-public abstract class YogaNodeFactory {
-  public static YogaNode create() {
-    return new YogaNodeJNIFinalizer();
-  }
-
-  public static YogaNode create(YogaConfig config) {
-    return new YogaNodeJNIFinalizer(config);
-  }
-}

java/com/facebook/yoga/YogaNodeFactory.kt

@@ -0,0 +1,14 @@
+/*
+ * 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.
+ */
+
+package com.facebook.yoga
+
+public object YogaNodeFactory {
+  @JvmStatic public fun create(): YogaNode = YogaNodeJNIFinalizer()
+
+  @JvmStatic public fun create(config: YogaConfig): YogaNode = YogaNodeJNIFinalizer(config)
+}

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

java/com/facebook/yoga/YogaStyleInputs.java

@@ -1,51 +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.
- */
-
-package com.facebook.yoga;
-
-public class YogaStyleInputs {
-  public static final short LAYOUT_DIRECTION = 0;
-  public static final short FLEX_DIRECTION = 1;
-  public static final short FLEX = 2;
-  public static final short FLEX_GROW = 3;
-  public static final short FLEX_SHRINK = 4;
-  public static final short FLEX_BASIS = 5;
-  public static final short FLEX_BASIS_PERCENT = 6;
-  public static final short FLEX_BASIS_AUTO = 7;
-  public static final short FLEX_WRAP = 8;
-  public static final short WIDTH = 9;
-  public static final short WIDTH_PERCENT = 10;
-  public static final short WIDTH_AUTO = 11;
-  public static final short MIN_WIDTH = 12;
-  public static final short MIN_WIDTH_PERCENT = 13;
-  public static final short MAX_WIDTH = 14;
-  public static final short MAX_WIDTH_PERCENT = 15;
-  public static final short HEIGHT = 16;
-  public static final short HEIGHT_PERCENT = 17;
-  public static final short HEIGHT_AUTO = 18;
-  public static final short MIN_HEIGHT = 19;
-  public static final short MIN_HEIGHT_PERCENT = 20;
-  public static final short MAX_HEIGHT = 21;
-  public static final short MAX_HEIGHT_PERCENT = 22;
-  public static final short JUSTIFY_CONTENT = 23;
-  public static final short ALIGN_ITEMS = 24;
-  public static final short ALIGN_SELF = 25;
-  public static final short ALIGN_CONTENT = 26;
-  public static final short POSITION_TYPE = 27;
-  public static final short ASPECT_RATIO = 28;
-  public static final short OVERFLOW = 29;
-  public static final short DISPLAY = 30;
-  public static final short MARGIN = 31;
-  public static final short MARGIN_PERCENT = 32;
-  public static final short MARGIN_AUTO = 33;
-  public static final short PADDING = 34;
-  public static final short PADDING_PERCENT = 35;
-  public static final short BORDER = 36;
-  public static final short POSITION = 37;
-  public static final short POSITION_PERCENT = 38;
-  public static final short IS_REFERENCE_BASELINE = 39;
-}

java/com/facebook/yoga/YogaStyleInputs.kt

@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package com.facebook.yoga
+
+public object YogaStyleInputs {
+  public const val LAYOUT_DIRECTION: Short = 0
+  public const val FLEX_DIRECTION: Short = 1
+  public const val FLEX: Short = 2
+  public const val FLEX_GROW: Short = 3
+  public const val FLEX_SHRINK: Short = 4
+  public const val FLEX_BASIS: Short = 5
+  public const val FLEX_BASIS_PERCENT: Short = 6
+  public const val FLEX_BASIS_AUTO: Short = 7
+  public const val FLEX_WRAP: Short = 8
+  public const val WIDTH: Short = 9
+  public const val WIDTH_PERCENT: Short = 10
+  public const val WIDTH_AUTO: Short = 11
+  public const val MIN_WIDTH: Short = 12
+  public const val MIN_WIDTH_PERCENT: Short = 13
+  public const val MAX_WIDTH: Short = 14
+  public const val MAX_WIDTH_PERCENT: Short = 15
+  public const val HEIGHT: Short = 16
+  public const val HEIGHT_PERCENT: Short = 17
+  public const val HEIGHT_AUTO: Short = 18
+  public const val MIN_HEIGHT: Short = 19
+  public const val MIN_HEIGHT_PERCENT: Short = 20
+  public const val MAX_HEIGHT: Short = 21
+  public const val MAX_HEIGHT_PERCENT: Short = 22
+  public const val JUSTIFY_CONTENT: Short = 23
+  public const val ALIGN_ITEMS: Short = 24
+  public const val ALIGN_SELF: Short = 25
+  public const val ALIGN_CONTENT: Short = 26
+  public const val POSITION_TYPE: Short = 27
+  public const val ASPECT_RATIO: Short = 28
+  public const val OVERFLOW: Short = 29
+  public const val DISPLAY: Short = 30
+  public const val MARGIN: Short = 31
+  public const val MARGIN_PERCENT: Short = 32
+  public const val MARGIN_AUTO: Short = 33
+  public const val PADDING: Short = 34
+  public const val PADDING_PERCENT: Short = 35
+  public const val BORDER: Short = 36
+  public const val POSITION: Short = 37
+  public const val POSITION_PERCENT: Short = 38
+  public const val IS_REFERENCE_BASELINE: Short = 39
+}

java/com/facebook/yoga/annotations/DoNotStrip.java

@@ -1,18 +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.
- */
-
-package com.facebook.yoga.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import static java.lang.annotation.RetentionPolicy.CLASS;
-
-@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.CONSTRUCTOR })
-@Retention(CLASS)
-public @interface DoNotStrip { }

java/com/facebook/yoga/annotations/DoNotStrip.kt

@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+
+package com.facebook.yoga.annotations
+
+@Target(
+    AnnotationTarget.CLASS,
+    AnnotationTarget.FIELD,
+    AnnotationTarget.FUNCTION,
+    AnnotationTarget.PROPERTY_GETTER,
+    AnnotationTarget.PROPERTY_SETTER,
+    AnnotationTarget.CONSTRUCTOR,
+)
+@Retention(AnnotationRetention.BINARY)
+public annotation class DoNotStrip

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",

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);

java/tests/generated/com/facebook/yoga/YGAlignItemsTest.java

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<e8d11c0e97041bb2f1487f0d87363fdc>>
+ * @generated SignedSource<<84597dd8b2c4f3aac1f21abe68f25308>>
  * generated by gentest/gentest-driver.ts from gentest/fixtures/YGAlignItemsTest.html
  */
 
@@ -2293,6 +2293,86 @@ public class YGAlignItemsTest {
     assertEquals(50f, root_child1.getLayoutHeight(), 0.0f);
   }
 
+  @Test
+  public void test_align_items_non_stretch_s526008() {
+    YogaConfig config = YogaConfigFactory.create();
+
+    final YogaNode root = createNode(config);
+    root.setPositionType(YogaPositionType.ABSOLUTE);
+    root.setWidth(400f);
+    root.setHeight(400f);
+
+    final YogaNode root_child0 = createNode(config);
+    root_child0.setFlexDirection(YogaFlexDirection.ROW);
+    root.addChildAt(root_child0, 0);
+
+    final YogaNode root_child0_child0 = createNode(config);
+    root_child0_child0.setAlignItems(YogaAlign.FLEX_START);
+    root_child0.addChildAt(root_child0_child0, 0);
+
+    final YogaNode root_child0_child0_child0 = createNode(config);
+    root_child0_child0.addChildAt(root_child0_child0_child0, 0);
+
+    final YogaNode root_child0_child0_child0_child0 = createNode(config);
+    root_child0_child0_child0_child0.setHeight(10f);
+    root_child0_child0_child0.addChildAt(root_child0_child0_child0_child0, 0);
+    root.setDirection(YogaDirection.LTR);
+    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(400f, root.getLayoutWidth(), 0.0f);
+    assertEquals(400f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(400f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(10f, root_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0_child0.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child0_child0.getLayoutWidth(), 0.0f);
+    assertEquals(10f, root_child0_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0_child0_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0_child0_child0.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child0_child0_child0.getLayoutWidth(), 0.0f);
+    assertEquals(10f, root_child0_child0_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0_child0_child0_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0_child0_child0_child0.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child0_child0_child0_child0.getLayoutWidth(), 0.0f);
+    assertEquals(10f, root_child0_child0_child0_child0.getLayoutHeight(), 0.0f);
+
+    root.setDirection(YogaDirection.RTL);
+    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(400f, root.getLayoutWidth(), 0.0f);
+    assertEquals(400f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(400f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(10f, root_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(400f, root_child0_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0_child0.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child0_child0.getLayoutWidth(), 0.0f);
+    assertEquals(10f, root_child0_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0_child0_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0_child0_child0.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child0_child0_child0.getLayoutWidth(), 0.0f);
+    assertEquals(10f, root_child0_child0_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0_child0_child0_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0_child0_child0_child0.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child0_child0_child0_child0.getLayoutWidth(), 0.0f);
+    assertEquals(10f, root_child0_child0_child0_child0.getLayoutHeight(), 0.0f);
+  }
+
   private YogaNode createNode(YogaConfig config) {
     return mNodeFactory.create(config);
   }

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() {

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;
 

javascript/tests/generated/YGAlignItemsTest.test.ts

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<075a0b67003e5c4a1f51bd99da71c700>>
+ * @generated SignedSource<<fd80af208d8635435f86ffa8f3810b39>>
  * generated by gentest/gentest-driver.ts from gentest/fixtures/YGAlignItemsTest.html
  */
 
@@ -2442,3 +2442,88 @@ test('align_stretch_with_row_reverse', () => {
     config.free();
   }
 });
+test('align_items_non_stretch_s526008', () => {
+  const config = Yoga.Config.create();
+  let root;
+
+  try {
+    root = Yoga.Node.create(config);
+    root.setPositionType(PositionType.Absolute);
+    root.setWidth(400);
+    root.setHeight(400);
+
+    const root_child0 = Yoga.Node.create(config);
+    root_child0.setFlexDirection(FlexDirection.Row);
+    root.insertChild(root_child0, 0);
+
+    const root_child0_child0 = Yoga.Node.create(config);
+    root_child0_child0.setAlignItems(Align.FlexStart);
+    root_child0.insertChild(root_child0_child0, 0);
+
+    const root_child0_child0_child0 = Yoga.Node.create(config);
+    root_child0_child0.insertChild(root_child0_child0_child0, 0);
+
+    const root_child0_child0_child0_child0 = Yoga.Node.create(config);
+    root_child0_child0_child0_child0.setHeight(10);
+    root_child0_child0_child0.insertChild(root_child0_child0_child0_child0, 0);
+    root.calculateLayout(undefined, undefined, Direction.LTR);
+
+    expect(root.getComputedLeft()).toBe(0);
+    expect(root.getComputedTop()).toBe(0);
+    expect(root.getComputedWidth()).toBe(400);
+    expect(root.getComputedHeight()).toBe(400);
+
+    expect(root_child0.getComputedLeft()).toBe(0);
+    expect(root_child0.getComputedTop()).toBe(0);
+    expect(root_child0.getComputedWidth()).toBe(400);
+    expect(root_child0.getComputedHeight()).toBe(10);
+
+    expect(root_child0_child0.getComputedLeft()).toBe(0);
+    expect(root_child0_child0.getComputedTop()).toBe(0);
+    expect(root_child0_child0.getComputedWidth()).toBe(0);
+    expect(root_child0_child0.getComputedHeight()).toBe(10);
+
+    expect(root_child0_child0_child0.getComputedLeft()).toBe(0);
+    expect(root_child0_child0_child0.getComputedTop()).toBe(0);
+    expect(root_child0_child0_child0.getComputedWidth()).toBe(0);
+    expect(root_child0_child0_child0.getComputedHeight()).toBe(10);
+
+    expect(root_child0_child0_child0_child0.getComputedLeft()).toBe(0);
+    expect(root_child0_child0_child0_child0.getComputedTop()).toBe(0);
+    expect(root_child0_child0_child0_child0.getComputedWidth()).toBe(0);
+    expect(root_child0_child0_child0_child0.getComputedHeight()).toBe(10);
+
+    root.calculateLayout(undefined, undefined, Direction.RTL);
+
+    expect(root.getComputedLeft()).toBe(0);
+    expect(root.getComputedTop()).toBe(0);
+    expect(root.getComputedWidth()).toBe(400);
+    expect(root.getComputedHeight()).toBe(400);
+
+    expect(root_child0.getComputedLeft()).toBe(0);
+    expect(root_child0.getComputedTop()).toBe(0);
+    expect(root_child0.getComputedWidth()).toBe(400);
+    expect(root_child0.getComputedHeight()).toBe(10);
+
+    expect(root_child0_child0.getComputedLeft()).toBe(400);
+    expect(root_child0_child0.getComputedTop()).toBe(0);
+    expect(root_child0_child0.getComputedWidth()).toBe(0);
+    expect(root_child0_child0.getComputedHeight()).toBe(10);
+
+    expect(root_child0_child0_child0.getComputedLeft()).toBe(0);
+    expect(root_child0_child0_child0.getComputedTop()).toBe(0);
+    expect(root_child0_child0_child0.getComputedWidth()).toBe(0);
+    expect(root_child0_child0_child0.getComputedHeight()).toBe(10);
+
+    expect(root_child0_child0_child0_child0.getComputedLeft()).toBe(0);
+    expect(root_child0_child0_child0_child0.getComputedTop()).toBe(0);
+    expect(root_child0_child0_child0_child0.getComputedWidth()).toBe(0);
+    expect(root_child0_child0_child0_child0.getComputedHeight()).toBe(10);
+  } finally {
+    if (typeof root !== 'undefined') {
+      root.freeRecursive();
+    }
+
+    config.free();
+  }
+});

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
 

settings.gradle.kts

@@ -19,10 +19,11 @@ include(":yoga")
 
 project(":yoga").projectDir = file("java")
 
-rootProject.name = "yoga-github"
-
-// If you specify a file inside gradle/gradle-enterprise.gradle.kts
-// you can configure your custom Gradle Enterprise instance
-if (file("./gradle/gradle-enterprise.gradle.kts").exists()) {
-  apply(from = "./gradle/gradle-enterprise.gradle.kts")
+gradleEnterprise {
+  buildScan {
+    termsOfServiceUrl = "https://gradle.com/terms-of-service"
+    termsOfServiceAgree = "yes"
+  }
 }
+
+rootProject.name = "yoga-github"

tests/.clang-tidy

@@ -0,0 +1,7 @@
+---
+InheritParentConfig: true
+Checks: '
+-facebook-hte-CArray,
+-modernize-avoid-c-arrays,
+'
+...

tests/YGPersistentNodeCloningTest.cpp

@@ -0,0 +1,214 @@
+/*
+ * 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());
+}
+
+TEST_F(YGPersistentNodeCloningTest, clone_leaf_display_contents_node) {
+  // <View id="A">
+  //   <View id="B" style={{ display: 'contents' }} />
+  // </View>
+
+  auto b = std::make_shared<NodeWrapper>(config);
+  auto a = std::make_shared<NodeWrapper>(config, std::vector{b});
+  YGNodeStyleSetDisplay(b->node, YGDisplayContents);
+
+  // We don't expect any cloning during the first layout
+  onClone = [](...) { FAIL(); };
+
+  YGNodeCalculateLayout(a->node, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  auto aPrime = std::make_shared<NodeWrapper>(config, std::vector{b});
+
+  std::vector<NodeWrapper*> nodesCloned;
+  // We should clone "C"
+  onClone = [&](YGNodeConstRef oldNode,
+                YGNodeConstRef /*owner*/,
+                size_t /*childIndex*/) {
+    nodesCloned.push_back(static_cast<NodeWrapper*>(YGNodeGetContext(oldNode)));
+  };
+
+  YGNodeCalculateLayout(aPrime->node, 100, 100, YGDirectionLTR);
+
+  EXPECT_EQ(nodesCloned.size(), 1);
+  EXPECT_EQ(nodesCloned[0], b.get());
+}
+
+} // namespace facebook::yoga

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(
@@ -121,3 +161,23 @@ 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);
+}

tests/generated/YGAlignItemsTest.cpp

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * clang-format off
- * @generated SignedSource<<71295a398c89ea424490884a05e2c77c>>
+ * @generated SignedSource<<1db57b05babb408c08efcec7dbdf16fb>>
  * generated by gentest/gentest-driver.ts from gentest/fixtures/YGAlignItemsTest.html
  */
 
@@ -2310,3 +2310,84 @@ TEST(YogaTest, align_stretch_with_row_reverse) {
 
   YGConfigFree(config);
 }
+
+TEST(YogaTest, align_items_non_stretch_s526008) {
+  YGConfigRef config = YGConfigNew();
+
+  YGNodeRef root = YGNodeNewWithConfig(config);
+  YGNodeStyleSetPositionType(root, YGPositionTypeAbsolute);
+  YGNodeStyleSetWidth(root, 400);
+  YGNodeStyleSetHeight(root, 400);
+
+  YGNodeRef root_child0 = YGNodeNewWithConfig(config);
+  YGNodeStyleSetFlexDirection(root_child0, YGFlexDirectionRow);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  YGNodeRef root_child0_child0 = YGNodeNewWithConfig(config);
+  YGNodeStyleSetAlignItems(root_child0_child0, YGAlignFlexStart);
+  YGNodeInsertChild(root_child0, root_child0_child0, 0);
+
+  YGNodeRef root_child0_child0_child0 = YGNodeNewWithConfig(config);
+  YGNodeInsertChild(root_child0_child0, root_child0_child0_child0, 0);
+
+  YGNodeRef root_child0_child0_child0_child0 = YGNodeNewWithConfig(config);
+  YGNodeStyleSetHeight(root_child0_child0_child0_child0, 10);
+  YGNodeInsertChild(root_child0_child0_child0, root_child0_child0_child0_child0, 0);
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
+  ASSERT_FLOAT_EQ(400, YGNodeLayoutGetWidth(root));
+  ASSERT_FLOAT_EQ(400, YGNodeLayoutGetHeight(root));
+
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0));
+  ASSERT_FLOAT_EQ(400, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child0));
+
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetWidth(root_child0_child0));
+  ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child0_child0));
+
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetWidth(root_child0_child0_child0));
+  ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child0_child0_child0));
+
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0_child0_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0_child0_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetWidth(root_child0_child0_child0_child0));
+  ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child0_child0_child0_child0));
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionRTL);
+
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
+  ASSERT_FLOAT_EQ(400, YGNodeLayoutGetWidth(root));
+  ASSERT_FLOAT_EQ(400, YGNodeLayoutGetHeight(root));
+
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0));
+  ASSERT_FLOAT_EQ(400, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child0));
+
+  ASSERT_FLOAT_EQ(400, YGNodeLayoutGetLeft(root_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetWidth(root_child0_child0));
+  ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child0_child0));
+
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetWidth(root_child0_child0_child0));
+  ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child0_child0_child0));
+
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0_child0_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0_child0_child0_child0));
+  ASSERT_FLOAT_EQ(0, YGNodeLayoutGetWidth(root_child0_child0_child0_child0));
+  ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child0_child0_child0_child0));
+
+  YGNodeFreeRecursive(root);
+
+  YGConfigFree(config);
+}

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);
   }

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!

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 main axis, distributing
+**Space between**: Evenly space wrapped lines across the container's cross axis, distributing
 remaining space between the lines.
 
-**Space around**: Evenly space wrapped lines across the container's main axis, distributing
+**Space around**: Evenly space wrapped lines across the container's cross 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 main axis, distributing
+**Space evenly**: Evenly space wrapped lines across the container's cross 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.

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`);
 }

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>
   );

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,
   };
 }

yoga/YGNodeLayout.cpp

@@ -90,3 +90,11 @@ 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,4 +32,14 @@ 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/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) {

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);

yoga/YGValue.h

@@ -72,9 +72,9 @@ inline bool operator==(const YGValue& lhs, const YGValue& rhs) {
     case YGUnitPoint:
     case YGUnitPercent:
       return lhs.value == rhs.value;
+    default:
+      return false;
   }
-
-  return false;
 }
 
 inline bool operator!=(const YGValue& lhs, const YGValue& rhs) {

yoga/Yoga.h

@@ -11,11 +11,11 @@
  * `#include <yoga/Yoga.h>` includes all of Yoga's public headers.
  */
 
-#include <yoga/YGConfig.h>
-#include <yoga/YGEnums.h>
-#include <yoga/YGMacros.h>
-#include <yoga/YGNode.h>
-#include <yoga/YGNodeLayout.h>
-#include <yoga/YGNodeStyle.h>
-#include <yoga/YGPixelGrid.h>
-#include <yoga/YGValue.h>
+#include <yoga/YGConfig.h> // IWYU pragma: export
+#include <yoga/YGEnums.h> // IWYU pragma: export
+#include <yoga/YGMacros.h> // IWYU pragma: export
+#include <yoga/YGNode.h> // IWYU pragma: export
+#include <yoga/YGNodeLayout.h> // IWYU pragma: export
+#include <yoga/YGNodeStyle.h> // IWYU pragma: export
+#include <yoga/YGPixelGrid.h> // IWYU pragma: export
+#include <yoga/YGValue.h> // IWYU pragma: export

yoga/algorithm/CalculateLayout.cpp

@@ -415,6 +415,12 @@ static void measureNodeWithoutChildren(
       Dimension::Height);
 }
 
+inline bool isFixedSize(float dim, SizingMode sizingMode) {
+  return sizingMode == SizingMode::StretchFit ||
+      (yoga::isDefined(dim) && sizingMode == SizingMode::FitContent &&
+       dim <= 0.0);
+}
+
 static bool measureNodeWithFixedSize(
     yoga::Node* const node,
     const Direction direction,
@@ -424,12 +430,8 @@ static bool measureNodeWithFixedSize(
     const SizingMode heightSizingMode,
     const float ownerWidth,
     const float ownerHeight) {
-  if ((yoga::isDefined(availableWidth) &&
-       widthSizingMode == SizingMode::FitContent && availableWidth <= 0.0f) ||
-      (yoga::isDefined(availableHeight) &&
-       heightSizingMode == SizingMode::FitContent && availableHeight <= 0.0f) ||
-      (widthSizingMode == SizingMode::StretchFit &&
-       heightSizingMode == SizingMode::StretchFit)) {
+  if (isFixedSize(availableWidth, widthSizingMode) &&
+      isFixedSize(availableHeight, heightSizingMode)) {
     node->setLayoutMeasuredDimension(
         boundAxis(
             node,
@@ -476,16 +478,19 @@ static void zeroOutLayoutRecursively(yoga::Node* const node) {
 }
 
 static void cleanupContentsNodesRecursively(yoga::Node* const node) {
-  for (auto child : node->getChildren()) {
-    if (child->style().display() == Display::Contents) {
-      child->getLayout() = {};
-      child->setLayoutDimension(0, Dimension::Width);
-      child->setLayoutDimension(0, Dimension::Height);
-      child->setHasNewLayout(true);
-      child->setDirty(false);
-      child->cloneChildrenIfNeeded();
+  if (node->hasContentsChildren()) [[unlikely]] {
+    node->cloneContentsChildrenIfNeeded();
+    for (auto child : node->getChildren()) {
+      if (child->style().display() == Display::Contents) {
+        child->getLayout() = {};
+        child->setLayoutDimension(0, Dimension::Width);
+        child->setLayoutDimension(0, Dimension::Height);
+        child->setHasNewLayout(true);
+        child->setDirty(false);
+        child->cloneChildrenIfNeeded();
 
-      cleanupContentsNodesRecursively(child);
+        cleanupContentsNodesRecursively(child);
+      }
     }
   }
 }
@@ -1213,10 +1218,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 +1785,7 @@ static void calculateLayoutImpl(
                                     crossAxis,
                                     direction,
                                     unclampedCrossDim,
-                                    ownerHeight,
+                                    crossAxisOwnerSize,
                                     ownerWidth) -
         paddingAndBorderAxisCross;
 
@@ -2268,10 +2273,10 @@ bool calculateLayoutInternal(
         ownerWidth,
         ownerHeight,
         performLayout,
+        reason,
         layoutMarkerData,
         depth,
-        generationCount,
-        reason);
+        generationCount);
 
     layout->lastOwnerDirection = ownerDirection;
     layout->configVersion = node->getConfig()->getVersion();

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();
 

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,

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,32 +97,34 @@ 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 bool hasFractionalWidth =
-        !yoga::inexactEquals(fmod(nodeWidth * pointScaleFactor, 1.0), 0) &&
-        !yoga::inexactEquals(fmod(nodeWidth * pointScaleFactor, 1.0), 1.0);
-    const bool hasFractionalHeight =
-        !yoga::inexactEquals(fmod(nodeHeight * pointScaleFactor, 1.0), 0) &&
-        !yoga::inexactEquals(fmod(nodeHeight * pointScaleFactor, 1.0), 1.0);
 
-    node->setLayoutDimension(
+    const double scaledNodeWith = nodeWidth * pointScaleFactor;
+    const bool hasFractionalWidth =
+        !yoga::inexactEquals(round(scaledNodeWith), scaledNodeWith);
+
+    const double scaledNodeHeight = nodeHeight * pointScaleFactor;
+    const bool hasFractionalHeight =
+        !yoga::inexactEquals(round(scaledNodeHeight), scaledNodeHeight);
+
+    node->getLayout().setDimension(
+        Dimension::Width,
         roundValueToPixelGrid(
             absoluteNodeRight,
             pointScaleFactor,
             (textRounding && hasFractionalWidth),
             (textRounding && !hasFractionalWidth)) -
             roundValueToPixelGrid(
-                absoluteNodeLeft, pointScaleFactor, false, textRounding),
-        Dimension::Width);
+                absoluteNodeLeft, pointScaleFactor, false, textRounding));
 
-    node->setLayoutDimension(
+    node->getLayout().setDimension(
+        Dimension::Height,
         roundValueToPixelGrid(
             absoluteNodeBottom,
             pointScaleFactor,
             (textRounding && hasFractionalHeight),
             (textRounding && !hasFractionalHeight)) -
             roundValueToPixelGrid(
-                absoluteNodeTop, pointScaleFactor, false, textRounding),
-        Dimension::Height);
+                absoluteNodeTop, pointScaleFactor, false, textRounding));
   }
 
   for (yoga::Node* child : node->getChildren()) {

yoga/debug/AssertFatal.cpp

@@ -19,6 +19,7 @@ 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;
-  int measures;
-  uint32_t maxMeasureCache;
-  int cachedLayouts;
-  int cachedMeasures;
-  int measureCallbacks;
+  int layouts = 0;
+  int measures = 0;
+  uint32_t maxMeasureCache = 0;
+  int cachedLayouts = 0;
+  int cachedMeasures = 0;
+  int measureCallbacks = 0;
   std::array<int, static_cast<uint8_t>(LayoutPassReason::COUNT)>
       measureCallbackReasonsCount;
 };

yoga/node/LayoutResults.h

@@ -66,10 +66,18 @@ 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)];
   }
@@ -113,6 +121,7 @@ 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

@@ -181,6 +181,17 @@ void Node::setDirty(bool isDirty) {
   }
 }
 
+void Node::setChildren(const std::vector<Node*>& children) {
+  children_ = children;
+
+  contentsChildrenCount_ = 0;
+  for (const auto& child : children) {
+    if (child->style().display() == Display::Contents) {
+      contentsChildrenCount_++;
+    }
+  }
+}
+
 bool Node::removeChild(Node* child) {
   auto p = std::find(children_.begin(), children_.end(), child);
   if (p != children_.end()) {
@@ -245,8 +256,9 @@ 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);
+  layout_.setRawDimension(dimension, lengthValue);
 }
 
 // If both left and right are defined, then use left. Otherwise return +left or
@@ -379,6 +391,23 @@ void Node::cloneChildrenIfNeeded() {
     if (child->getOwner() != this) {
       child = resolveRef(config_->cloneNode(child, this, i));
       child->setOwner(this);
+
+      if (child->hasContentsChildren()) [[unlikely]] {
+        child->cloneContentsChildrenIfNeeded();
+      }
+    }
+    i += 1;
+  }
+}
+
+void Node::cloneContentsChildrenIfNeeded() {
+  size_t i = 0;
+  for (Node*& child : children_) {
+    if (child->style().display() == Display::Contents &&
+        child->getOwner() != this) {
+      child = resolveRef(config_->cloneNode(child, this, i));
+      child->setOwner(this);
+      child->cloneChildrenIfNeeded();
     }
     i += 1;
   }

yoga/node/Node.h

@@ -96,6 +96,10 @@ class YG_EXPORT Node : public ::YGNode {
     return config_->hasErrata(errata);
   }
 
+  bool hasContentsChildren() const {
+    return contentsChildrenCount_ != 0;
+  }
+
   YGDirtiedFunc getDirtiedFunc() const {
     return dirtiedFunc_;
   }
@@ -244,22 +248,19 @@ class YG_EXPORT Node : public ::YGNode {
     owner_ = owner;
   }
 
-  void setChildren(const std::vector<Node*>& children) {
-    children_ = children;
-  }
-
   // TODO: rvalue override for setChildren
 
   void setConfig(Config* config);
 
   void setDirty(bool isDirty);
+  void setChildren(const std::vector<Node*>& children);
   void setLayoutLastOwnerDirection(Direction direction);
   void setLayoutComputedFlexBasis(FloatOptional computedFlexBasis);
   void setLayoutComputedFlexBasisGeneration(
       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);
@@ -286,6 +287,7 @@ class YG_EXPORT Node : public ::YGNode {
   void removeChild(size_t index);
 
   void cloneChildrenIfNeeded();
+  void cloneContentsChildrenIfNeeded();
   void markDirtyAndPropagate();
   float resolveFlexGrow() const;
   float resolveFlexShrink() const;