Merge branch 'main' into fix-invalidate-owner-size

Summary:
GitHub actions supports terminal colors, but most programs won't output color to a non-interactive terminal. We can control this via env variable, so that GTest output in GitHub actions is colorized.

Before:
{F847577544}

After:
{F847577610}

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

Reviewed By: christophpurrer

Differential Revision: D42537630

Pulled By: NickGerleman

fbshipit-source-id: 28b22c061200026bf167c1a31d6a58445ba70214

.buckconfig

@@ -1,9 +0,0 @@
-[cxx]
-  gtest_dep = //lib/gtest:gtest
-[android]
-  target = Google Inc.:Google APIs:19
-[ndk]
-  ndk_version = r10e
-  compiler = clang
-  app_platform = android-19
-  cpu_abis = armv7, x86

.clang-format

@@ -0,0 +1,168 @@
+Language: Cpp
+AccessModifierOffset: -2
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands: false
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: false
+BreakBeforeBraces: Attach
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+BreakStringLiterals: true
+ColumnLimit: 80
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+FixNamespaceComments: true
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth: 2
+IndentWrappedFunctionNames: false
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+PenaltyReturnTypeOnItsOwnLine: 2000
+PointerAlignment: Left
+ReflowComments: true
+SortIncludes: false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+Standard: Cpp11
+UseTab: Never
+---
+Language: ObjC
+AccessModifierOffset: -1
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveBitFields: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands: DontAlign
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit: 80
+CommentPragmas: '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat: false
+FixNamespaceComments: true
+ForEachMacros:
+  - FOR_EACH
+  - FOR_EACH_R
+  - FOR_EACH_RANGE
+IncludeBlocks: Preserve
+IncludeCategories:
+  - Regex:           '^<.*\.h(pp)?>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
+IndentCaseLabels: true
+IndentCaseBlocks: false
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentExternBlock: AfterExternBlock
+IndentWidth: 2
+IndentWrappedFunctionNames: false
+InsertTrailingCommas: None
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments: true
+SortIncludes: true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+Standard: Latest
+TabWidth: 8
+UseCRLF: false
+UseTab: Never
+...

.clang-format-ignore

@@ -0,0 +1 @@
+^lib/.*

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.github/actions/black/action.yml

@@ -0,0 +1,25 @@
+name: Black Formatter
+inputs:
+  directory:
+    description: Directory to Lint
+    required: true
+  version:
+    description: pypi version of "black" to use
+    required: false
+    default: 22.3.0
+
+runs:
+  using: "composite"
+  steps:
+    - name: Ensure supported Python selected
+      uses: actions/setup-python@v4
+      with:
+        python-version: '>=3.6.2'
+
+    - name: pip install
+      shell: bash
+      run: pip install black==${{ inputs.version }}
+
+    - name: black
+      shell: bash
+      run: black --check ${{ inputs.directory }}

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

@@ -0,0 +1,23 @@
+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/install-emsdk/action.yml

@@ -0,0 +1,23 @@
+name: Install emsdk (including emcc)
+inputs:
+  version:
+    description: EMCC Version to install
+    required: false
+    default: 3.1.28
+
+runs:
+  using: "composite"
+  steps:
+    - name: Clone emsdk repo
+      working-directory: ${{ runner.temp }}
+      shell: bash
+      run: git clone https://github.com/emscripten-core/emsdk.git
+
+    - name: emdsk install
+      working-directory: ${{ runner.temp }}/emsdk
+      shell: bash
+      run: |
+        ./emsdk install ${{ inputs.version }}
+        ./emsdk activate ${{ inputs.version }}
+        echo $RUNNER_TEMP/emsdk >> $GITHUB_PATH
+        echo $RUNNER_TEMP/emsdk/upstream/emscripten >> $GITHUB_PATH

.github/actions/install-ninja/action.yml

@@ -0,0 +1,14 @@
+name: Install Ninja
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install ninja (Linux)
+      if: ${{ runner.os == 'Linux' }}
+      shell: bash
+      run: sudo apt-get install -y ninja-build
+
+    - name: Install ninja (Windows)
+      if: ${{ runner.os == 'Windows' }}
+      shell: powershell
+      run: choco install ninja

.github/actions/setup-android/action.yml

@@ -0,0 +1,10 @@
+name: Setup Android envirionment
+
+runs:
+  using: "composite"
+  steps:
+    - name: Select Java Version
+      uses: actions/setup-java@v2
+      with:
+        distribution: temurin
+        java-version: 11

.github/actions/setup-apple/action.yml

@@ -0,0 +1,9 @@
+name: Setup Apple envirionment
+
+runs:
+  using: "composite"
+  steps:
+    # TODO: This and Ruby should be versioned
+    - name: Install Cocoapods
+      shell: bash
+      run: sudo gem install cocoapods

.github/actions/setup-cpp/action.yml

@@ -0,0 +1,12 @@
+name: Setup C++ envirionment
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install Ninja
+      if: ${{ runner.os != 'Windows' }}
+      uses: ./.github/actions/install-ninja
+
+    - name: Setup VS Developer Command Prompt
+      if: ${{ runner.os == 'Windows' }}
+      uses: ilammy/msvc-dev-cmd@v1

.github/actions/setup-js/action.yml

@@ -0,0 +1,20 @@
+name: Setup JavaScript envirionment
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install Node
+      uses: actions/setup-node@v1
+      with:
+        node-version: 18.x
+
+    - name: Install emsdk
+      uses: ./.github/actions/install-emsdk
+
+    - name: Install Ninja
+      uses: ./.github/actions/install-ninja
+
+    - name: yarn install
+      shell: bash
+      run: yarn install --frozen-lockfile
+      working-directory: javascript

.github/actions/setup-website/action.yml

@@ -0,0 +1,18 @@
+name: Setup Website envirionment
+
+runs:
+  using: "composite"
+  steps:
+    # TODO: Update to latest when website is moved to the workspace version of
+    # yoga-layout
+    - name: Install Node
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
+
+    # TODO: the website should be in a yarn workspace with the library, but the
+    # current version of gatsby is incompatible with hoisting.
+    - name: yarn install
+      shell: bash
+      run: yarn install --frozen-lockfile
+      working-directory: website

.github/workflows/publish-android.yml

@@ -0,0 +1,29 @@
+name: Android
+
+on:
+  release:
+    types:
+      - created
+  workflow_dispatch:
+
+jobs:
+  publish:
+    name: Publish to Maven Central
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-android
+
+      - name: Publish and release
+        run: |
+          ./gradlew :yoga:assembleRelease publish --info
+          ./gradlew closeAndReleaseRepository
+        env:
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_KEY_CONTENTS }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}

.github/workflows/publish-website.yml

@@ -0,0 +1,32 @@
+name: Website
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  publish:
+    name: Publish to GitHub Pages
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-website
+
+      - name: yarn build
+        run: yarn build
+        working-directory: website
+
+      - uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_branch: gh-pages
+          publish_dir: website/public
+          cname: yogalayout.com
+          keep_files: true
+          user_name: 'Yoga-bot'
+          user_email: 'yogabot@fb.com'

.github/workflows/validate-android.yml

@@ -0,0 +1,26 @@
+name: Android
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build [${{ matrix.os }}][${{ matrix.mode }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        mode: [Debug, Release]
+        os: [ubuntu-latest, windows-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-android
+
+      - name: Build
+        run: ./gradlew assemble${{ matrix.mode }} --stacktrace

.github/workflows/validate-apple.yml

@@ -0,0 +1,55 @@
+name: Apple
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  lint-pods:
+    name: Lint
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-apple
+
+      - name: pod spec lint
+        run: pod spec lint --verbose
+        continue-on-error: true # Apple Build is Broken
+
+  build-sample:
+    name: Build [${{ matrix.mode }}]
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        mode: [Debug, Release]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-apple
+
+      - name: pod install
+        run: pod install
+        working-directory: ./YogaKit/YogaKitSample
+        continue-on-error: true # Apple Build is Broken
+
+      # TODO: xcodebuild
+
+  clang-format:
+    name: Format
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: clang-format
+        uses: ./.github/actions/clang-format
+        with:
+          directory: ./YogaKit

.github/workflows/validate-cpp.yml

@@ -0,0 +1,64 @@
+name: C++
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+env:
+  GTEST_COLOR: 1
+
+jobs:
+  test:
+    name: Build and Test [${{ matrix.os }}][${{ matrix.mode }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        mode: [Debug, Release]
+        os: [ubuntu-latest] # TODO: fix issues building GTest Binary with MSVC in GitHub Actions
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-cpp
+
+      - name: Unit tests
+        run: ./unit_tests ${{ matrix.mode }}
+
+  benchmark:
+    name: Benchmark [${{ matrix.os }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-cpp
+
+      - name: Build benchmark
+        run: |
+          cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=Release
+          cmake --build build
+        working-directory: benchmark
+
+      - name: Run benchmark
+        run: ./build/benchmark
+        working-directory: benchmark
+
+  clang-format:
+    name: Format
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: clang-format
+        uses: ./.github/actions/clang-format
+        with:
+          directory: ./yoga

.github/workflows/validate-js.yml

@@ -0,0 +1,74 @@
+name: JavaScript
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+env:
+  FORCE_COLOR: 3
+
+jobs:
+  benchmark:
+    name: Benchmark [${{ matrix.os }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-js
+
+      - name: yarn benchmark
+        run: yarn benchmark
+        working-directory: javascript
+
+  build:
+    name: Build [${{ matrix.os }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-js
+
+      - name: yarn build
+        run: yarn build
+        working-directory: javascript
+
+  test:
+    name: Test [${{ matrix.os }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-js
+
+      - name: yarn test
+        run: yarn test
+        working-directory: javascript
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: yarn install
+        run: yarn install --frozen-lockfile
+        working-directory: javascript
+
+      - name: yarn lint
+        run: yarn lint
+        working-directory: javascript

.github/workflows/validate-python.yml

@@ -0,0 +1,21 @@
+name: Python
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  format:
+    name: Format
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: black --check
+        uses: ./.github/actions/black
+        with:
+          directory: ${{ github.workspace }}

.github/workflows/validate-website.yml

@@ -0,0 +1,23 @@
+name: Website
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-website
+
+      - name: yarn build
+        run: yarn build
+        working-directory: website

.gitignore

@@ -5,14 +5,15 @@
 /.buckconfig.local
 /.buckd
 /gentest/test.html
-.buckversion
+.buck-java11
 
 # Jekyll
 /.sass-cache/
 /_site/
 
 # Visual studio code
-.vscode
+!.vscode
+
 *.pdb
 *.tlog
 *.obj
@@ -63,3 +64,7 @@ Carthage/Build
 
 # Gradle
 .gradle
+
+# NDK/CMake
+.cxx
+.externalNativeBuild

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "lib/gtest/googletest"]
-	path = lib/gtest/googletest
-	url = https://github.com/google/googletest.git

.swift-version

@@ -1 +0,0 @@
-3.0

.travis.yml

@@ -1,118 +0,0 @@
-# Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
-os: osx
-osx_image: xcode8.2
-language: cpp
-compiler: clang
-
-env:
-  - TARGET=c
-  - TARGET=java
-  - TARGET=net
-  - TARGET=ios
-  - TARGET=js
-  - TARGET=android
-
-before_install:
-  - brew update > /dev/null
-  - brew tap facebook/fb
-  - brew install buck
-
-  # Java
-  - |
-    if [[ $TARGET = "java" ]]; then
-      brew cask install java &&
-      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) &&
-      export PATH=$JAVA_HOME/bin:$PATH
-    fi
-
-  # .NET
-  - |
-    if [[ $TARGET = "net" ]]; then
-      brew install mono
-    fi
-
-  # iOS
-  - |
-    if [[ $TARGET = "ios" ]]; then
-      brew outdated xctool || brew upgrade xctool
-    fi
-
-  # Emscripten (used for js tests)
-  # Note: cannot be ran on Linux (because it will compile Clang from its sources :|)
-  - |
-    if [[ $TARGET = "js" ]]; then
-      wget -O /tmp/emsdk-portable.tar.gz https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz &&
-      tar xf /tmp/emsdk-portable.tar.gz -C /tmp/ &&
-      /tmp/emsdk_portable/emsdk install latest >& /dev/null &&
-      /tmp/emsdk_portable/emsdk activate latest
-    fi
-
-  # Android
-  - |
-    if [[ $TARGET = "android" ]]; then
-      brew cask install java &&
-      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) &&
-      export PATH=$JAVA_HOME/bin:$PATH &&
-      brew install android-sdk &&
-      export ANDROID_SDK=/usr/local/opt/android-sdk &&
-      export ANDROID_HOME=/usr/local/opt/android-sdk
-      $ANDROID_SDK/tools/android update sdk --filter android-19,addon-google_apis-google-19
-    fi
-
-  # JavaScript
-  - |
-    if [[ $TARGET = "js" ]]; then (
-      cd javascript &&
-      npm install &&
-      unset CC && unset CXX && unset LINK &&
-      source /tmp/emsdk_portable/emsdk_env.sh &&
-      npm run build:browser
-    ) fi
-
-script:
-  # C
-  - |
-    if [[ $TARGET = "c" ]]; then
-      buck test --verbose 0 //:yoga &&
-      buck run --verbose 0 //benchmark:benchmark &&
-      git checkout HEAD^ &&
-      buck run --verbose 0 //benchmark:benchmark
-    fi
-
-  # Java
-  - |
-    if [[ $TARGET = "java" ]]; then
-      buck test --verbose 0 //java:java
-    fi
-
-  # .NET
-  - |
-    if [[ $TARGET = "net" ]]; then
-      sh csharp/tests/Facebook.Yoga/test_macos.sh
-    fi
-
-  # iOS
-  - |
-    if [[ $TARGET = "ios" ]]; then
-      buck test --verbose 0 //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64
-    fi
-
-  # Android
-  - |
-    if [[ $TARGET = "android" ]]; then
-      buck build --verbose 0 //android/sample:sample
-    fi
-
-  # JavaScript
-  - |
-    if [[ $TARGET = "js" ]]; then (
-      cd javascript &&
-      npm run test:all &&
-      npm run bench
-    ) fi

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "ms-vscode.cpptools",
+    "EditorConfig.EditorConfig",
+    "dbaeumer.vscode-eslint",
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,25 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Debug C++ Unit tests (lldb)",
+      "type": "cppdbg",
+      "MIMode": "lldb",
+      "request": "launch",
+      "program": "${workspaceFolder}/tests/build/yogatests",
+      "cwd": "${workspaceFolder}",
+      "preLaunchTask": "Build Unit Tests"
+    },
+    {
+      "name": "Debug C++ Unit tests (vsdbg)",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/tests/build/yogatests",
+      "cwd": "${workspaceFolder}",
+      "preLaunchTask": "Build Unit Tests"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+  "editor.formatOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  },
+  "eslint.format.enable": true,
+  "eslint.packageManager": "yarn",
+  "eslint.enable": true,
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+  "eslint.workingDirectories": [
+    {
+      "mode": "auto"
+    }
+  ],
+}

.vscode/tasks.json

@@ -0,0 +1,23 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Build Unit Tests",
+      "type": "shell",
+      "command": "(which ninja && cmake -B build -S . -D CMAKE_BUILD_TYPE=Debug -G Ninja || cmake -B build -S . -D CMAKE_BUILD_TYPE=Debug) && cmake --build build",
+      "windows": {
+        "command": "(where ninja && cmake -B build -S . -D CMAKE_BUILD_TYPE=Debug -G Ninja || cmake -B build -S . -D CMAKE_BUILD_TYPE=Debug) && cmake --build build",
+      },
+      "group": "build",
+      "options": {
+        "cwd": "tests"
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      }
+    }
+  ]
+}

BUCK

@@ -1,42 +0,0 @@
-# Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
-include_defs('//YOGA_DEFS')
-
-GMOCK_OVERRIDE_FLAGS = [
-  # gmock does not mark mocked methods as override, ignore the warnings in tests
-  '-Wno-inconsistent-missing-override',
-]
-
-COMPILER_FLAGS = BASE_COMPILER_FLAGS + ['-std=c11', '-fPIC']
-TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + ['-std=c++11']
-
-cxx_library(
-  name = 'yoga',
-  soname = 'libyogacore.$(ext)',
-  srcs = glob(['yoga/*.c']),
-  tests=[':YogaTests'],
-  exported_headers = subdir_glob([('', 'yoga/*.h')]),
-  header_namespace = '',
-  compiler_flags = COMPILER_FLAGS,
-  deps = [] if THIS_IS_FBOBJC else [
-    yoga_dep('lib/fb:ndklog'),
-  ],
-  visibility = ['PUBLIC'],
-)
-
-cxx_test(
-  name = 'YogaTests',
-  contacts = ['emilsj@fb.com'],
-  srcs = glob(['tests/*.cpp']),
-  compiler_flags = TEST_COMPILER_FLAGS,
-  deps = [
-    ':yoga',
-    GTEST_TARGET,
-  ],
-  visibility = ['PUBLIC'],
-)

CMakeLists.txt

@@ -0,0 +1,52 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+project(yoga-all)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/project-defaults.cmake)
+
+add_subdirectory(yoga)
+add_subdirectory(tests)
+
+# cmake install config
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+
+# declare target to install
+install(TARGETS yogacore EXPORT yoga-targets
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+# install header files
+install(DIRECTORY
+    "${CMAKE_CURRENT_LIST_DIR}/yoga"
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    FILES_MATCHING PATTERN "*.h"
+)
+
+# install target config
+install(EXPORT yoga-targets
+    FILE yogaTargets.cmake
+    NAMESPACE yoga::
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/yoga
+)
+
+
+# generate config file
+configure_package_config_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/yoga-config.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/yogaConfig.cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/yoga
+)
+
+# install config file
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/yogaConfig.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/yoga
+)

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at <opensource-conduct@fb.com>. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

CONTRIBUTING.md

@@ -2,9 +2,13 @@
 We want to make contributing to this project as easy and transparent as
 possible.
 
+## Code of Conduct
+
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.fb.com/codeofconduct/) so that you can understand what actions will and will not be tolerated.
+
 ## Pull Requests
 We actively welcome your pull requests.
-1. Fork the repo and create your branch from `master`.
+1. Fork the repo and create your branch from `main`.
 2. If you've added code that should be tested, add tests
 3. If you've changed APIs, update the documentation.
 4. Ensure the test suite passes.
@@ -25,9 +29,6 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
 disclosure of security bugs. In those cases, please go through the process
 outlined on that page and do not file a public issue.
 
-## Coding Style
-* format.sh
-
 ## License
 By contributing to yoga, you agree that your contributions will be licensed
-under its BSD license.
+under its MIT license.

LICENSE

@@ -1,30 +1,21 @@
-BSD License
+MIT License
 
-For yoga software
+Copyright (c) Facebook, Inc. and its affiliates.
 
-Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

PATENTS

@@ -1,33 +0,0 @@
-Additional Grant of Patent Rights Version 2
-
-"Software" means the yoga software distributed by Facebook, Inc.
-
-Facebook, Inc. (“Facebook”) hereby grants to each recipient of the Software
-(“you”) a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
-(subject to the termination provision below) license under any Necessary
-Claims, to make, have made, use, sell, offer to sell, import, and otherwise
-transfer the Software. For avoidance of doubt, no license is granted under
-Facebook's rights in any patent claims that are infringed by (i) modifications
-to the Software made by you or any third party or (ii) the Software in
-combination with any software or other technology.
-
-The license granted hereunder will terminate, automatically and without notice,
-if you (or any of your subsidiaries, corporate affiliates or agents) initiate
-directly or indirectly, or take a direct financial interest in, any Patent
-Assertion: (i) against Facebook or any of its subsidiaries or corporate
-affiliates, (ii) against any party if such Patent Assertion arises in whole or
-in part from any software, technology, product or service of Facebook or any of
-its subsidiaries or corporate affiliates, or (iii) against any party relating
-to the Software. Notwithstanding the foregoing, if Facebook or any of its
-subsidiaries or corporate affiliates files a lawsuit alleging patent
-infringement against you in the first instance, and you respond by filing a
-patent infringement counterclaim in that lawsuit against that party that is
-unrelated to the Software, the license granted hereunder will not terminate
-under section (i) of this paragraph due to such counterclaim.
-
-A "Necessary Claim" is a claim of a patent owned by Facebook that is
-necessarily infringed by the Software standing alone.
-
-A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
-or contributory infringement or inducement to infringe any patent, including a
-cross-claim or counterclaim.

README.md

@@ -1,21 +1,24 @@
-# Yoga [![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout)
+# Yoga [![Support Ukraine](https://img.shields.io/badge/Support-Ukraine-FFD500?style=flat&labelColor=005BBB)](https://opensource.fb.com/support-ukraine) [![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![Maven Central](https://img.shields.io/maven-central/v/com.facebook.yoga/yoga)](https://search.maven.org/artifact/com.facebook.yoga/yoga)
+
+Yoga is an embeddable and performant flexbox layout engine with bindings for multiple languages.
 
-[![C Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=c&label=C)](https://travis-ci.org/facebook/yoga)
-[![Java Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=java&label=Java)](https://travis-ci.org/facebook/yoga)
-[![iOS Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=ios&label=iOS)](https://travis-ci.org/facebook/yoga)
-[![.NET Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=net&label=.NET)](https://travis-ci.org/facebook/yoga)
-[![JavaScript Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=js&label=JavaScript)](https://travis-ci.org/facebook/yoga)
-[![Android Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=android&label=Android)](https://travis-ci.org/facebook/yoga)
 
 ## Building
-Yoga builds with [buck](https://buckbuild.com). Make sure you install buck before contributing to Yoga. Yoga's main implementation is in C, with bindings to supported languages and frameworks. When making changes to Yoga please ensure the changes are also propagated to these bindings when applicable.
+Yoga's main implementation targets C++ 14 with accompanying build logic in CMake. A wrapper is provided to build the main library and run unit tests.
 
-## Testing
-For testing we rely on [gtest](https://github.com/google/googletest) as a submodule. After cloning Yoga run `git submodule init` followed by `git submodule update`.
+```sh
+./unit_tests <Debug|Release>
+```
 
-For any changes you make you should ensure that all the tests are passing. In case you make any fixes or additions to the library please also add tests for that change to ensure we don't break anything in the future. Tests are located in the `tests` directory. Run the tests by executing `buck test //:yoga`.
+While not required, this script will use [ninja](https://ninja-build.org/) if it is installed for faster builds.
 
-Instead of manually writing a test which ensures parity with web implementations of Flexbox you can run `gentest/gentest.rb` to generated a test for you. You can write html which you want to verify in Yoga, in `gentest/fixtures` folder, such as the following.
+Yoga is additionally part of the [vcpkg](https://github.com/Microsoft/vcpkg/) collection of ports maintained by Microsoft and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
+
+
+
+## Adding Tests
+
+Many of Yoga's tests are automatically generated, using HTML fixtures describing node structure. These are rendered in Chrome to generate an expected layout result for the tree. New fixtures can be added to `gentest/fixtures`.
 
 ```html
 <div id="my_test" style="width: 100px; height: 100px; align-items: center;">
@@ -23,15 +26,11 @@ Instead of manually writing a test which ensures parity with web implementations
 </div>
 ```
 
-Run `gentest/gentest.rb` to generate test code and re-run `buck test //:yoga` to validate the behavior. One test case will be generated for every root `div` in the input html.
+To generate new tests from added fixtures:
+1. Run `bundle install` in the `gentest` directory to install dependencies of the test generator.
+2. Run `ruby gentest.rb` in the `gentest` directory.
 
-You may need to install the latest watir-webdriver gem (`gem install watir-webdriver`) and [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/) to run `gentest/gentest.rb` Ruby script.
 
-### .NET
-.NET testing is not integrated in buck yet, you might need to set up .NET testing environment. We have a script which to launch C# test on macOS, `csharp/tests/Facebook.Yoga/test_macos.sh`.
+## Debugging
 
-## Code style
-For the main C implementation of Yoga clang-format is used to ensure a consistent code style. Please run `bash format.sh` before submitting a pull request. For other languages just try to follow the current code style.
-
-## Benchmarks
-Benchmarks are located in `benchmark/YGBenchmark.c` and can be run with `buck run //benchmark:benchmark`. If you think your change has affected performance please run this before and after your change to validate that nothing has regressed. Benchmarks are run on every commit in CI.
+Yoga provides a VSCode "launch.json" configuration which allows debugging unit tests. Simply add your breakpoints, and run "Debug C++ Unit tests (lldb)" (or "Debug C++ Unit tests (vsdbg)" on Windows).

YOGA_DEFS

@@ -1,42 +0,0 @@
-
-YOGA_ROOT = '//...'
-JAVA_TARGET = '//java:java'
-INFER_ANNOTATIONS_TARGET = '//lib/infer-annotations:infer-annotations'
-JSR_305_TARGET = '//lib/jsr-305:jsr-305'
-JUNIT_TARGET = '//lib/junit:junit'
-PROGRUARD_ANNOTATIONS_TARGET = '//java/com/facebook/proguard/annotations:annotations'
-SOLOADER_TARGET = '//lib/soloader:soloader'
-GTEST_TARGET = '//lib/gtest:gtest'
-JNI_TARGET = '//lib/jni:jni'
-FBJNI_TARGET = '//lib/fb:fbjni'
-APPCOMPAT_TARGET = '//lib/appcompat:appcompat'
-ANDROID_SUPPORT_TARGET = '//lib/android-support:android-support'
-ANDROID_TARGET = '//android:android'
-ANDROID_JAVA_TARGET = '//android/src/main/java/com/facebook/yoga/android:android'
-ANDROID_RES_TARGET = '//android:res'
-ANDROID_SAMPLE_JAVA_TARGET = '//android/sample/java/com/facebook/samples/yoga:yoga'
-ANDROID_SAMPLE_RES_TARGET = '//android/sample:res'
-
-THIS_IS_FBOBJC = False
-
-CXX_LIBRARY_WHITELIST = [
-  '//:yoga',
-  '//lib/fb:fbjni',
-  '//java:jni',
-]
-
-BASE_COMPILER_FLAGS = [
-  '-fno-omit-frame-pointer',
-  '-fexceptions',
-  '-Wall',
-  '-Werror',
-  '-O3',
-]
-
-def yoga_dep(dep):
-  return '//' + dep
-
-with allow_unsafe_import():
-  import os.path
-def isdir(filename):
-  return os.path.isdir(filename)

Yoga.podspec

@@ -1,9 +1,15 @@
+# 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.
+
+
 Pod::Spec.new do |spec|
   spec.name = 'Yoga'
-  spec.version = '1.1.0'
-  spec.license =  { :type => 'BSD', :file => "LICENSE" }
-  spec.homepage = 'https://facebook.github.io/yoga/'
-  spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/c/'
+  spec.version = '1.14.0'
+  spec.license =  { :type => 'MIT', :file => "LICENSE" }
+  spec.homepage = 'https://yogalayout.com/'
+  spec.documentation_url = 'https://yogalayout.com/docs'
 
   spec.summary = 'Yoga is a cross-platform layout engine which implements Flexbox.'
   spec.description = 'Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.'
@@ -11,18 +17,23 @@ Pod::Spec.new do |spec|
   spec.authors = 'Facebook'
   spec.source = {
     :git => 'https://github.com/facebook/yoga.git',
-    :tag => 'v2017.02.07.00',
+    :tag => spec.version.to_s,
   }
-
+  spec.platforms = { :ios => "8.0", :osx => "10.7", :tvos => "10.0", :watchos => "2.0" }
   spec.module_name = 'yoga'
   spec.requires_arc = false
+  spec.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES'
+  }
   spec.compiler_flags = [
       '-fno-omit-frame-pointer',
       '-fexceptions',
       '-Wall',
       '-Werror',
-      '-std=c11',
+      '-std=c++14',
       '-fPIC'
   ]
-  spec.source_files = 'yoga/**/*.{c,h}'
+  spec.source_files = 'yoga/**/*.{c,h,cpp}'
+  spec.public_header_files = 'yoga/*.h'
+
 end

YogaKit.podspec

@@ -1,9 +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.
+
 podspec = Pod::Spec.new do |spec|
   spec.name = 'YogaKit'
-  spec.version = '1.1.0'
-  spec.license =  { :type => 'BSD', :file => "LICENSE" }
+  spec.version = '1.18.1'
+  spec.license =  { :type => 'MIT', :file => "LICENSE" }
   spec.homepage = 'https://facebook.github.io/yoga/'
-  spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/yogakit/'
+  spec.documentation_url = 'https://facebook.github.io/yoga/docs/'
 
   spec.summary = 'Yoga is a cross-platform layout engine which implements Flexbox.'
   spec.description = 'Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.'
@@ -11,17 +16,22 @@ podspec = Pod::Spec.new do |spec|
   spec.authors = 'Facebook'
   spec.source = {
     :git => 'https://github.com/facebook/yoga.git',
-    :tag => 'v2017.02.07.00',
+    :tag => "1.18.0",
   }
 
   spec.platform = :ios
   spec.ios.deployment_target = '8.0'
   spec.ios.frameworks = 'UIKit'
-
-  spec.dependency 'Yoga', '~> 1.1'
-  spec.source_files = 'YogaKit/Source/*.{h,m}'
+  spec.module_name = 'YogaKit'
+  spec.dependency 'Yoga', '~> 1.14'
+  # Fixes the bug related the xcode 11 not able to find swift related frameworks.
+  # https://github.com/Carthage/Carthage/issues/2825
+  # https://twitter.com/krzyzanowskim/status/1151549874653081601?s=21
+  spec.pod_target_xcconfig = {"LD_VERIFY_BITCODE": "NO"}
+  spec.source_files = 'YogaKit/Source/*.{h,m,swift}'
   spec.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h'
   spec.private_header_files = 'YogaKit/Source/YGLayout+Private.h'
+  spec.swift_version = '5.1'
 end
 
 # See https://github.com/facebook/yoga/pull/366

YogaKit/BUCK

@@ -1,58 +0,0 @@
-# Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
-include_defs('//YOGA_DEFS')
-
-COMPILER_FLAGS = [
-  '-fobjc-arc',
-  '-Wconditional-uninitialized',
-  '-Wdangling-else',
-  '-Wdeprecated-declarations',
-  '-Wimplicit-retain-self',
-  '-Wincomplete-implementation',
-  '-Wobjc-method-access',
-  '-Wobjc-missing-super-calls',
-  '-Wmismatched-return-types',
-  '-Wreturn-type',
-  '-Wno-global-constructors',
-  '-Wno-shadow',
-  '-Wunused-const-variable',
-  '-Wunused-function',
-  '-Wunused-property-ivar',
-  '-Wunused-result',
-  '-Wunused-value',
-]
-
-apple_library(
-  name = 'YogaKit',
-  compiler_flags = COMPILER_FLAGS,
-  srcs = glob(['Source/**/*.m']),
-  exported_headers = glob(['Source/**/*.h']),
-  frameworks = [
-    '$SDKROOT/System/Library/Frameworks/Foundation.framework',
-    '$SDKROOT/System/Library/Frameworks/UIKit.framework',
-  ],
-  deps = [
-    yoga_dep(':yoga'),
-  ],
-  visibility = ['PUBLIC'],
-)
-
-apple_test(
-  name = 'YogaKitTests',
-  compiler_flags = COMPILER_FLAGS,
-  info_plist = 'Tests/Info.plist',
-  srcs = glob(['Tests/**/*.m']),
-  frameworks = [
-    '$SDKROOT/System/Library/Frameworks/CoreGraphics.framework',
-    '$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework',
-  ],
-  deps = [
-    ':YogaKit',
-  ],
-  visibility = ['PUBLIC'],
-)

YogaKit/CHANGELOG.md

@@ -1,46 +0,0 @@
-# CHANGELOG
-
-The changelog for `YogaKit`.
-
-1.2.0 (**upcoming release**)
------
-
-### Breaking Changes
-
-- `applyLayout()` has now been changed to `applyLayout(preservingOrigin:)`.
-
-- Computed properties are no longer reflected in getter's of the affected properties.
-```swift
-// OLD
-view.yoga.margin = 10
-view.yoga.marginTop  // 10
-view.yoga.marginLeft // 10
-
-// NEW
-view.yoga.margin = 10
-view.yoga.marginTop // 0
-view.yoga.marginLeft // 0
-```
-
-### Enhancements
-
-- Pixel Rounding now uses `roundf()` instead of `round()`.
-
-- There is now a method that allows "bulk" updates to YGLayout.
-```objc
-[view configureLayoutWithBlock:^(YGLayout *layout) {
-  layout.isEnabled = YES;
-  layout.width = 50;
-  layout.height = 50;
-}];
-```
-
-```swift
-view.configureLayout { (layout) in
-  layout.isEnabled = true
-  layout.width = 50
-  layout.height = 50
-}
-```
-
-- Added new `isDirty` property, and make `markDirty` a little more performant.

YogaKit/README.md

@@ -8,15 +8,14 @@
 YogaKit is available to install via [CocoaPods](https://cocoapods.org/).
 
 ```
-pod 'YogaKit', '~> 1.1'
+pod 'YogaKit', '~> 1.7'
 ```
 
 ## Getting Started
-Checkout the docs [here](https://facebook.github.io/yoga/docs/api/yogakit/).
 
-We also have a sample project. To try it out, clone this repo and open `YogaKitSample.xcodeproj` in the [YogaKitSample](https://github.com/facebook/yoga/tree/master/YogaKit/YogaKitSample) directory.
+We have a sample project. To try it out, clone this repo and open `YogaKitSample.xcodeproj` in the [YogaKitSample](https://github.com/facebook/yoga/tree/main/YogaKit/YogaKitSample) directory.
 
 ## Contributing
 We welcome all pull-requests! At Facebook we sync the open source version of `YogaKit` daily, so we're always testing the latest changes.
 
-See the [CONTRIBUTING](https://github.com/facebook/yoga/blob/master/CONTRIBUTING) file for how to help out.
+See the [CONTRIBUTING.md](https://github.com/facebook/yoga/blob/main/CONTRIBUTING.md) file for how to help out.

YogaKit/Source/UIView+Yoga.h

@@ -1,30 +1,33 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
-#import "YGLayout.h"
 #import <UIKit/UIKit.h>
+#import "YGLayout.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void (^YGLayoutConfigurationBlock)(YGLayout *);
+typedef void (^YGLayoutConfigurationBlock)(YGLayout* layout);
 
 @interface UIView (Yoga)
 
 /**
  The YGLayout that is attached to this view. It is lazily created.
  */
-@property (nonatomic, readonly, strong) YGLayout *yoga;
+@property(nonatomic, readonly, strong) YGLayout* yoga;
+/**
+ Indicates whether or not Yoga is enabled
+ */
+@property(nonatomic, readonly, assign) BOOL isYogaEnabled;
 
 /**
- In ObjC land, every time you access `view.yoga.*` you are adding another `objc_msgSend`
- to your code. If you plan on making multiple changes to YGLayout, it's more performant
- to use this method, which uses a single objc_msgSend call.
+ In ObjC land, every time you access `view.yoga.*` you are adding another
+ `objc_msgSend` to your code. If you plan on making multiple changes to
+ YGLayout, it's more performant to use this method, which uses a single
+ objc_msgSend call.
  */
 - (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block
     NS_SWIFT_NAME(configureLayout(block:));

YogaKit/Source/UIView+Yoga.m

@@ -1,33 +1,34 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
+#import <objc/runtime.h>
 #import "UIView+Yoga.h"
 #import "YGLayout+Private.h"
-#import <objc/runtime.h>
 
-static const void *kYGYogaAssociatedKey = &kYGYogaAssociatedKey;
+static const void* kYGYogaAssociatedKey = &kYGYogaAssociatedKey;
 
 @implementation UIView (YogaKit)
 
-- (YGLayout *)yoga
-{
-  YGLayout *yoga = objc_getAssociatedObject(self, kYGYogaAssociatedKey);
+- (YGLayout*)yoga {
+  YGLayout* yoga = objc_getAssociatedObject(self, kYGYogaAssociatedKey);
   if (!yoga) {
     yoga = [[YGLayout alloc] initWithView:self];
-    objc_setAssociatedObject(self, kYGYogaAssociatedKey, yoga, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    objc_setAssociatedObject(
+        self, kYGYogaAssociatedKey, yoga, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
   }
 
   return yoga;
 }
 
-- (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block
-{
+- (BOOL)isYogaEnabled {
+  return objc_getAssociatedObject(self, kYGYogaAssociatedKey) != nil;
+}
+
+- (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block {
   if (block != nil) {
     block(self.yoga);
   }

YogaKit/Source/YGLayout+Private.h

@@ -1,19 +1,17 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
-#import "YGLayout.h"
 #import <yoga/Yoga.h>
+#import "YGLayout.h"
 
 @interface YGLayout ()
 
-@property (nonatomic, assign, readonly) YGNodeRef node;
+@property(nonatomic, assign, readonly) YGNodeRef node;
 
-- (instancetype)initWithView:(UIView *)view;
+- (instancetype)initWithView:(UIView*)view;
 
 @end

YogaKit/Source/YGLayout.h

@@ -1,122 +1,170 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
 #import <yoga/YGEnums.h>
+#import <yoga/YGMacros.h>
+#import <yoga/Yoga.h>
+
+YG_EXTERN_C_BEGIN
+
+extern YGValue YGPointValue(CGFloat value) NS_SWIFT_UNAVAILABLE(
+    "Use the swift Int and FloatingPoint extensions instead");
+extern YGValue YGPercentValue(CGFloat value) NS_SWIFT_UNAVAILABLE(
+    "Use the swift Int and FloatingPoint extensions instead");
+
+YG_EXTERN_C_END
+
+typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
+  YGDimensionFlexibilityFlexibleWidth = 1 << 0,
+  YGDimensionFlexibilityFlexibleHeight = 1 << 1,
+};
 
 @interface YGLayout : NSObject
 
 /**
-  The property that decides if we should include this view when calculating layout. Defaults to YES.
- */
-@property (nonatomic, readwrite, assign, setter=setIncludedInLayout:) BOOL isIncludedInLayout;
+ Make default init unavailable, as it will not initialise YGNode which is
+ required for the setters and getters of YGLayout's properties to work properly.
+*/
+- (instancetype)init
+    __attribute__((unavailable("you are not meant to initialise YGLayout")));
 
 /**
- The property that decides during layout/sizing whether or not styling properties should be applied.
- Defaults to NO.
+ Make default init unavailable, as it will not initialise YGNode which is
+ required for the setters and getters of YGLayout's properties to work properly.
  */
-@property (nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;
++ (instancetype)new
+    __attribute__((unavailable("you are not meant to initialise YGLayout")));
 
-@property (nonatomic, readwrite, assign) YGDirection direction;
-@property (nonatomic, readwrite, assign) YGFlexDirection flexDirection;
-@property (nonatomic, readwrite, assign) YGJustify justifyContent;
-@property (nonatomic, readwrite, assign) YGAlign alignContent;
-@property (nonatomic, readwrite, assign) YGAlign alignItems;
-@property (nonatomic, readwrite, assign) YGAlign alignSelf;
-@property (nonatomic, readwrite, assign) YGPositionType position;
-@property (nonatomic, readwrite, assign) YGWrap flexWrap;
-@property (nonatomic, readwrite, assign) YGOverflow overflow;
-@property (nonatomic, readwrite, assign) YGDisplay display;
+/**
+  The property that decides if we should include this view when calculating
+  layout. Defaults to YES.
+ */
+@property(nonatomic, readwrite, assign, setter=setIncludedInLayout:)
+    BOOL isIncludedInLayout;
 
-@property (nonatomic, readwrite, assign) CGFloat flexGrow;
-@property (nonatomic, readwrite, assign) CGFloat flexShrink;
-@property (nonatomic, readwrite, assign) CGFloat flexBasis;
+/**
+ The property that decides during layout/sizing whether or not styling
+ properties should be applied. Defaults to NO.
+ */
+@property(nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;
 
-@property (nonatomic, readwrite, assign) CGFloat left;
-@property (nonatomic, readwrite, assign) CGFloat top;
-@property (nonatomic, readwrite, assign) CGFloat right;
-@property (nonatomic, readwrite, assign) CGFloat bottom;
-@property (nonatomic, readwrite, assign) CGFloat start;
-@property (nonatomic, readwrite, assign) CGFloat end;
+@property(nonatomic, readwrite, assign) YGDirection direction;
+@property(nonatomic, readwrite, assign) YGFlexDirection flexDirection;
+@property(nonatomic, readwrite, assign) YGJustify justifyContent;
+@property(nonatomic, readwrite, assign) YGAlign alignContent;
+@property(nonatomic, readwrite, assign) YGAlign alignItems;
+@property(nonatomic, readwrite, assign) YGAlign alignSelf;
+@property(nonatomic, readwrite, assign) YGPositionType position;
+@property(nonatomic, readwrite, assign) YGWrap flexWrap;
+@property(nonatomic, readwrite, assign) YGOverflow overflow;
+@property(nonatomic, readwrite, assign) YGDisplay display;
 
-@property (nonatomic, readwrite, assign) CGFloat marginLeft;
-@property (nonatomic, readwrite, assign) CGFloat marginTop;
-@property (nonatomic, readwrite, assign) CGFloat marginRight;
-@property (nonatomic, readwrite, assign) CGFloat marginBottom;
-@property (nonatomic, readwrite, assign) CGFloat marginStart;
-@property (nonatomic, readwrite, assign) CGFloat marginEnd;
-@property (nonatomic, readwrite, assign) CGFloat marginHorizontal;
-@property (nonatomic, readwrite, assign) CGFloat marginVertical;
-@property (nonatomic, readwrite, assign) CGFloat margin;
+@property(nonatomic, readwrite, assign) CGFloat flex;
+@property(nonatomic, readwrite, assign) CGFloat flexGrow;
+@property(nonatomic, readwrite, assign) CGFloat flexShrink;
+@property(nonatomic, readwrite, assign) YGValue flexBasis;
 
-@property (nonatomic, readwrite, assign) CGFloat paddingLeft;
-@property (nonatomic, readwrite, assign) CGFloat paddingTop;
-@property (nonatomic, readwrite, assign) CGFloat paddingRight;
-@property (nonatomic, readwrite, assign) CGFloat paddingBottom;
-@property (nonatomic, readwrite, assign) CGFloat paddingStart;
-@property (nonatomic, readwrite, assign) CGFloat paddingEnd;
-@property (nonatomic, readwrite, assign) CGFloat paddingHorizontal;
-@property (nonatomic, readwrite, assign) CGFloat paddingVertical;
-@property (nonatomic, readwrite, assign) CGFloat padding;
+@property(nonatomic, readwrite, assign) YGValue left;
+@property(nonatomic, readwrite, assign) YGValue top;
+@property(nonatomic, readwrite, assign) YGValue right;
+@property(nonatomic, readwrite, assign) YGValue bottom;
+@property(nonatomic, readwrite, assign) YGValue start;
+@property(nonatomic, readwrite, assign) YGValue end;
 
-@property (nonatomic, readwrite, assign) CGFloat borderLeftWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderTopWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderRightWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderBottomWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderStartWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderEndWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderWidth;
+@property(nonatomic, readwrite, assign) YGValue marginLeft;
+@property(nonatomic, readwrite, assign) YGValue marginTop;
+@property(nonatomic, readwrite, assign) YGValue marginRight;
+@property(nonatomic, readwrite, assign) YGValue marginBottom;
+@property(nonatomic, readwrite, assign) YGValue marginStart;
+@property(nonatomic, readwrite, assign) YGValue marginEnd;
+@property(nonatomic, readwrite, assign) YGValue marginHorizontal;
+@property(nonatomic, readwrite, assign) YGValue marginVertical;
+@property(nonatomic, readwrite, assign) YGValue margin;
 
-@property (nonatomic, readwrite, assign) CGFloat width;
-@property (nonatomic, readwrite, assign) CGFloat height;
-@property (nonatomic, readwrite, assign) CGFloat minWidth;
-@property (nonatomic, readwrite, assign) CGFloat minHeight;
-@property (nonatomic, readwrite, assign) CGFloat maxWidth;
-@property (nonatomic, readwrite, assign) CGFloat maxHeight;
+@property(nonatomic, readwrite, assign) YGValue paddingLeft;
+@property(nonatomic, readwrite, assign) YGValue paddingTop;
+@property(nonatomic, readwrite, assign) YGValue paddingRight;
+@property(nonatomic, readwrite, assign) YGValue paddingBottom;
+@property(nonatomic, readwrite, assign) YGValue paddingStart;
+@property(nonatomic, readwrite, assign) YGValue paddingEnd;
+@property(nonatomic, readwrite, assign) YGValue paddingHorizontal;
+@property(nonatomic, readwrite, assign) YGValue paddingVertical;
+@property(nonatomic, readwrite, assign) YGValue padding;
+
+@property(nonatomic, readwrite, assign) CGFloat borderLeftWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderTopWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderRightWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderBottomWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderStartWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderEndWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderWidth;
+
+@property(nonatomic, readwrite, assign) YGValue width;
+@property(nonatomic, readwrite, assign) YGValue height;
+@property(nonatomic, readwrite, assign) YGValue minWidth;
+@property(nonatomic, readwrite, assign) YGValue minHeight;
+@property(nonatomic, readwrite, assign) YGValue maxWidth;
+@property(nonatomic, readwrite, assign) YGValue maxHeight;
 
 // Yoga specific properties, not compatible with flexbox specification
-@property (nonatomic, readwrite, assign) CGFloat aspectRatio;
+@property(nonatomic, readwrite, assign) CGFloat aspectRatio;
 
 /**
  Get the resolved direction of this node. This won't be YGDirectionInherit
  */
-@property (nonatomic, readonly, assign) YGDirection resolvedDirection;
+@property(nonatomic, readonly, assign) YGDirection resolvedDirection;
 
 /**
- Perform a layout calculation and update the frames of the views in the hierarchy with the results.
- If the origin is not preserved, the root view's layout results will applied from {0,0}.
+ Perform a layout calculation and update the frames of the views in the
+ hierarchy with the results. If the origin is not preserved, the root view's
+ layout results will applied from {0,0}.
  */
 - (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
     NS_SWIFT_NAME(applyLayout(preservingOrigin:));
 
 /**
- Returns the size of the view if no constraints were given. This could equivalent to calling [self
- sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
+ Perform a layout calculation and update the frames of the views in the
+ hierarchy with the results. If the origin is not preserved, the root view's
+ layout results will applied from {0,0}.
  */
-@property (nonatomic, readonly, assign) CGSize intrinsicSize;
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
+               dimensionFlexibility:(YGDimensionFlexibility)dimensionFlexibility
+    NS_SWIFT_NAME(applyLayout(preservingOrigin:dimensionFlexibility:));
+
+/**
+ Returns the size of the view if no constraints were given. This could
+ equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
+ */
+@property(nonatomic, readonly, assign) CGSize intrinsicSize;
+
+/**
+  Returns the size of the view based on provided constraints. Pass NaN for an
+  unconstrained dimension.
+ */
+- (CGSize)calculateLayoutWithSize:(CGSize)size
+    NS_SWIFT_NAME(calculateLayout(with:));
 
 /**
  Returns the number of children that are using Flexbox.
  */
-@property (nonatomic, readonly, assign) NSUInteger numberOfChildren;
+@property(nonatomic, readonly, assign) NSUInteger numberOfChildren;
 
 /**
- Return a BOOL indiciating whether or not we this node contains any subviews that are included in
- Yoga's layout.
+ Return a BOOL indiciating whether or not we this node contains any subviews
+ that are included in Yoga's layout.
  */
-@property (nonatomic, readonly, assign) BOOL isLeaf;
+@property(nonatomic, readonly, assign) BOOL isLeaf;
 
 /**
  Return's a BOOL indicating if a view is dirty. When a node is dirty
  it usually indicates that it will be remeasured on the next layout pass.
  */
-@property (nonatomic, readonly, assign) BOOL isDirty;
+@property(nonatomic, readonly, assign) BOOL isDirty;
 
 /**
  Mark that a view's layout needs to be recalculated. Only works for leaf views.

YogaKit/Source/YGLayout.m

@@ -1,132 +1,205 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
-#import "YGLayout+Private.h"
 #import "UIView+Yoga.h"
+#import "YGLayout+Private.h"
 
-#define YG_PROPERTY(type, lowercased_name, capitalized_name)    \
-- (type)lowercased_name                                         \
-{                                                               \
-  return YGNodeStyleGet##capitalized_name(self.node);           \
-}                                                               \
-                                                                \
-- (void)set##capitalized_name:(type)lowercased_name             \
-{                                                               \
-  YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
-}
+#define YG_PROPERTY(type, lowercased_name, capitalized_name)      \
+  -(type)lowercased_name {                                        \
+    return YGNodeStyleGet##capitalized_name(self.node);           \
+  }                                                               \
+                                                                  \
+  -(void)set##capitalized_name : (type)lowercased_name {          \
+    YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
+  }
 
-#define YG_VALUE_PROPERTY(lowercased_name, capitalized_name)    \
-- (CGFloat)lowercased_name                                      \
-{                                                               \
-  YGValue value = YGNodeStyleGet##capitalized_name(self.node);  \
-  if (value.unit == YGUnitPoint) {                              \
-    return value.value;                                         \
-  } else {                                                      \
-    return YGUndefined;                                         \
-  }                                                             \
-}                                                               \
-                                                                \
-- (void)set##capitalized_name:(CGFloat)lowercased_name          \
-{                                                               \
-  YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
-}
+#define YG_VALUE_PROPERTY(lowercased_name, capitalized_name)                \
+  -(YGValue)lowercased_name {                                               \
+    return YGNodeStyleGet##capitalized_name(self.node);                     \
+  }                                                                         \
+                                                                            \
+  -(void)set##capitalized_name : (YGValue)lowercased_name {                 \
+    switch (lowercased_name.unit) {                                         \
+      case YGUnitUndefined:                                                 \
+        YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value); \
+        break;                                                              \
+      case YGUnitPoint:                                                     \
+        YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value); \
+        break;                                                              \
+      case YGUnitPercent:                                                   \
+        YGNodeStyleSet##capitalized_name##Percent(                          \
+            self.node, lowercased_name.value);                              \
+        break;                                                              \
+      default:                                                              \
+        NSAssert(NO, @"Not implemented");                                   \
+    }                                                                       \
+  }
 
-#define YG_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge) \
-- (CGFloat)lowercased_name                                                         \
-{                                                                                  \
-  return YGNodeStyleGet##property(self.node, edge);                                \
-}
+#define YG_AUTO_VALUE_PROPERTY(lowercased_name, capitalized_name)           \
+  -(YGValue)lowercased_name {                                               \
+    return YGNodeStyleGet##capitalized_name(self.node);                     \
+  }                                                                         \
+                                                                            \
+  -(void)set##capitalized_name : (YGValue)lowercased_name {                 \
+    switch (lowercased_name.unit) {                                         \
+      case YGUnitPoint:                                                     \
+        YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value); \
+        break;                                                              \
+      case YGUnitPercent:                                                   \
+        YGNodeStyleSet##capitalized_name##Percent(                          \
+            self.node, lowercased_name.value);                              \
+        break;                                                              \
+      case YGUnitAuto:                                                      \
+        YGNodeStyleSet##capitalized_name##Auto(self.node);                  \
+        break;                                                              \
+      default:                                                              \
+        NSAssert(NO, @"Not implemented");                                   \
+    }                                                                       \
+  }
 
-#define YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge) \
-- (void)set##capitalized_name:(CGFloat)lowercased_name                             \
-{                                                                                  \
-  YGNodeStyleSet##property(self.node, edge, lowercased_name);                      \
-}
+#define YG_EDGE_PROPERTY_GETTER(                             \
+    type, lowercased_name, capitalized_name, property, edge) \
+  -(type)lowercased_name {                                   \
+    return YGNodeStyleGet##property(self.node, edge);        \
+  }
+
+#define YG_EDGE_PROPERTY_SETTER(                                \
+    lowercased_name, capitalized_name, property, edge)          \
+  -(void)set##capitalized_name : (CGFloat)lowercased_name {     \
+    YGNodeStyleSet##property(self.node, edge, lowercased_name); \
+  }
 
 #define YG_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
-YG_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge)  \
-YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
+  YG_EDGE_PROPERTY_GETTER(                                                  \
+      CGFloat, lowercased_name, capitalized_name, property, edge)           \
+  YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
 
-#define YG_VALUE_EDGE_PROPERTY_GETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
-- (CGFloat)objc_lowercased_name                                                                  \
-{                                                                                                \
-  YGValue value = YGNodeStyleGet##c_name(self.node, edge);                                       \
-  if (value.unit == YGUnitPoint) {                                                               \
-    return value.value;                                                                          \
-  } else {                                                                                       \
-    return YGUndefined;                                                                          \
-  }                                                                                              \
+#define YG_VALUE_EDGE_PROPERTY_SETTER(                                       \
+    objc_lowercased_name, objc_capitalized_name, c_name, edge)               \
+  -(void)set##objc_capitalized_name : (YGValue)objc_lowercased_name {        \
+    switch (objc_lowercased_name.unit) {                                     \
+      case YGUnitUndefined:                                                  \
+        YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name.value); \
+        break;                                                               \
+      case YGUnitPoint:                                                      \
+        YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name.value); \
+        break;                                                               \
+      case YGUnitPercent:                                                    \
+        YGNodeStyleSet##c_name##Percent(                                     \
+            self.node, edge, objc_lowercased_name.value);                    \
+        break;                                                               \
+      default:                                                               \
+        NSAssert(NO, @"Not implemented");                                    \
+    }                                                                        \
+  }
+
+#define YG_VALUE_EDGE_PROPERTY(                                   \
+    lowercased_name, capitalized_name, property, edge)            \
+  YG_EDGE_PROPERTY_GETTER(                                        \
+      YGValue, lowercased_name, capitalized_name, property, edge) \
+  YG_VALUE_EDGE_PROPERTY_SETTER(                                  \
+      lowercased_name, capitalized_name, property, edge)
+
+#define YG_VALUE_EDGES_PROPERTIES(lowercased_name, capitalized_name) \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Left,                                         \
+      capitalized_name##Left,                                        \
+      capitalized_name,                                              \
+      YGEdgeLeft)                                                    \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Top,                                          \
+      capitalized_name##Top,                                         \
+      capitalized_name,                                              \
+      YGEdgeTop)                                                     \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Right,                                        \
+      capitalized_name##Right,                                       \
+      capitalized_name,                                              \
+      YGEdgeRight)                                                   \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Bottom,                                       \
+      capitalized_name##Bottom,                                      \
+      capitalized_name,                                              \
+      YGEdgeBottom)                                                  \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Start,                                        \
+      capitalized_name##Start,                                       \
+      capitalized_name,                                              \
+      YGEdgeStart)                                                   \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##End,                                          \
+      capitalized_name##End,                                         \
+      capitalized_name,                                              \
+      YGEdgeEnd)                                                     \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Horizontal,                                   \
+      capitalized_name##Horizontal,                                  \
+      capitalized_name,                                              \
+      YGEdgeHorizontal)                                              \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Vertical,                                     \
+      capitalized_name##Vertical,                                    \
+      capitalized_name,                                              \
+      YGEdgeVertical)                                                \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name, capitalized_name, capitalized_name, YGEdgeAll)
+
+YGValue YGPointValue(CGFloat value) {
+  return (YGValue){.value = value, .unit = YGUnitPoint};
 }
 
-#define YG_VALUE_EDGE_PROPERTY_SETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
-- (void)set##objc_capitalized_name:(CGFloat)objc_lowercased_name                                 \
-{                                                                                                \
-  YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name);                                 \
+YGValue YGPercentValue(CGFloat value) {
+  return (YGValue){.value = value, .unit = YGUnitPercent};
 }
 
-#define YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
-YG_VALUE_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge)  \
-YG_VALUE_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
-
-#define YG_VALUE_EDGES_PROPERTIES(lowercased_name, capitalized_name)                                                            \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Left, capitalized_name##Left, capitalized_name, YGEdgeLeft)                             \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Top, capitalized_name##Top, capitalized_name, YGEdgeTop)                                \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Right, capitalized_name##Right, capitalized_name, YGEdgeRight)                          \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Bottom, capitalized_name##Bottom, capitalized_name, YGEdgeBottom)                       \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Start, capitalized_name##Start, capitalized_name, YGEdgeStart)                          \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##End, capitalized_name##End, capitalized_name, YGEdgeEnd)                                \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Horizontal, capitalized_name##Horizontal, capitalized_name, YGEdgeHorizontal) \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Vertical, capitalized_name##Vertical, capitalized_name, YGEdgeVertical)       \
-YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, capitalized_name, YGEdgeAll)
+static YGConfigRef globalConfig;
 
 @interface YGLayout ()
 
-@property (nonatomic, weak, readonly) UIView *view;
+@property(nonatomic, weak, readonly) UIView* view;
+@property(nonatomic, assign, readonly) BOOL isUIView;
 
 @end
 
 @implementation YGLayout
 
-@synthesize isEnabled=_isEnabled;
-@synthesize isIncludedInLayout=_isIncludedInLayout;
-@synthesize node=_node;
+@synthesize isEnabled = _isEnabled;
+@synthesize isIncludedInLayout = _isIncludedInLayout;
+@synthesize node = _node;
 
-+ (void)initialize
-{
-  YGSetExperimentalFeatureEnabled(YGExperimentalFeatureWebFlexBasis, true);
++ (void)initialize {
+  globalConfig = YGConfigNew();
+  YGConfigSetExperimentalFeatureEnabled(
+      globalConfig, YGExperimentalFeatureWebFlexBasis, true);
+  YGConfigSetPointScaleFactor(globalConfig, [UIScreen mainScreen].scale);
 }
 
-- (instancetype)initWithView:(UIView*)view
-{
+- (instancetype)initWithView:(UIView*)view {
   if (self = [super init]) {
     _view = view;
-    _node = YGNodeNew();
-    YGNodeSetContext(_node, (__bridge void *) view);
+    _node = YGNodeNewWithConfig(globalConfig);
+    YGNodeSetContext(_node, (__bridge void*)view);
     _isEnabled = NO;
     _isIncludedInLayout = YES;
+    _isUIView = [view isMemberOfClass:[UIView class]];
   }
 
   return self;
 }
 
-- (void)dealloc
-{
+- (void)dealloc {
   YGNodeFree(self.node);
 }
 
-- (BOOL)isDirty
-{
+- (BOOL)isDirty {
   return YGNodeIsDirty(self.node);
 }
 
-- (void)markDirty
-{
+- (void)markDirty {
   if (self.isDirty || !self.isLeaf) {
     return;
   }
@@ -135,24 +208,24 @@ YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, capitalized_name, YGEd
   // the measure function. Since we already know that this is a leaf,
   // this *should* be fine. Forgive me Hack Gods.
   const YGNodeRef node = self.node;
-  if (YGNodeGetMeasureFunc(node) == NULL) {
+  if (!YGNodeHasMeasureFunc(node)) {
     YGNodeSetMeasureFunc(node, YGMeasureView);
   }
 
   YGNodeMarkDirty(node);
 }
 
-- (NSUInteger)numberOfChildren
-{
+- (NSUInteger)numberOfChildren {
   return YGNodeGetChildCount(self.node);
 }
 
-- (BOOL)isLeaf
-{
-  NSAssert([NSThread isMainThread], @"This method must be called on the main thread.");
+- (BOOL)isLeaf {
+  NSAssert(
+      [NSThread isMainThread],
+      @"This method must be called on the main thread.");
   if (self.isEnabled) {
-    for (UIView *subview in self.view.subviews) {
-      YGLayout *const yoga = subview.yoga;
+    for (UIView* subview in self.view.subviews) {
+      YGLayout* const yoga = subview.yoga;
       if (yoga.isEnabled && yoga.isIncludedInLayout) {
         return NO;
       }
@@ -164,13 +237,11 @@ YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, capitalized_name, YGEd
 
 #pragma mark - Style
 
-- (YGPositionType)position
-{
+- (YGPositionType)position {
   return YGNodeStyleGetPositionType(self.node);
 }
 
-- (void)setPosition:(YGPositionType)position
-{
+- (void)setPosition:(YGPositionType)position {
   YGNodeStyleSetPositionType(self.node, position);
 }
 
@@ -184,9 +255,10 @@ YG_PROPERTY(YGWrap, flexWrap, FlexWrap)
 YG_PROPERTY(YGOverflow, overflow, Overflow)
 YG_PROPERTY(YGDisplay, display, Display)
 
+YG_PROPERTY(CGFloat, flex, Flex)
 YG_PROPERTY(CGFloat, flexGrow, FlexGrow)
 YG_PROPERTY(CGFloat, flexShrink, FlexShrink)
-YG_VALUE_PROPERTY(flexBasis, FlexBasis)
+YG_AUTO_VALUE_PROPERTY(flexBasis, FlexBasis)
 
 YG_VALUE_EDGE_PROPERTY(left, Left, Position, YGEdgeLeft)
 YG_VALUE_EDGE_PROPERTY(top, Top, Position, YGEdgeTop)
@@ -205,46 +277,57 @@ YG_EDGE_PROPERTY(borderStartWidth, BorderStartWidth, Border, YGEdgeStart)
 YG_EDGE_PROPERTY(borderEndWidth, BorderEndWidth, Border, YGEdgeEnd)
 YG_EDGE_PROPERTY(borderWidth, BorderWidth, Border, YGEdgeAll)
 
-YG_VALUE_PROPERTY(width, Width)
-YG_VALUE_PROPERTY(height, Height)
+YG_AUTO_VALUE_PROPERTY(width, Width)
+YG_AUTO_VALUE_PROPERTY(height, Height)
 YG_VALUE_PROPERTY(minWidth, MinWidth)
 YG_VALUE_PROPERTY(minHeight, MinHeight)
 YG_VALUE_PROPERTY(maxWidth, MaxWidth)
 YG_VALUE_PROPERTY(maxHeight, MaxHeight)
 YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
 
+YG_EDGE_PROPERTY(columnGap, ColumnGap, Gap, YGGutterColumn)
+YG_EDGE_PROPERTY(rowGap, RowGap, Gap, YGGutterRow)
+YG_EDGE_PROPERTY(gap, Gap, Gap, YGGutterAll)
+
 #pragma mark - Layout and Sizing
 
-- (YGDirection)resolvedDirection
-{
+- (YGDirection)resolvedDirection {
   return YGNodeLayoutGetDirection(self.node);
 }
 
-- (void)applyLayout
-{
+- (void)applyLayout {
   [self calculateLayoutWithSize:self.view.bounds.size];
   YGApplyLayoutToViewHierarchy(self.view, NO);
 }
 
-- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
-{
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin {
   [self calculateLayoutWithSize:self.view.bounds.size];
   YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
 }
 
-- (CGSize)intrinsicSize
-{
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
+               dimensionFlexibility:
+                   (YGDimensionFlexibility)dimensionFlexibility {
+  CGSize size = self.view.bounds.size;
+  if (dimensionFlexibility & YGDimensionFlexibilityFlexibleWidth) {
+    size.width = YGUndefined;
+  }
+  if (dimensionFlexibility & YGDimensionFlexibilityFlexibleHeight) {
+    size.height = YGUndefined;
+  }
+  [self calculateLayoutWithSize:size];
+  YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
+}
+
+- (CGSize)intrinsicSize {
   const CGSize constrainedSize = {
-    .width = YGUndefined,
-    .height = YGUndefined,
+      .width = YGUndefined,
+      .height = YGUndefined,
   };
   return [self calculateLayoutWithSize:constrainedSize];
 }
 
-#pragma mark - Private
-
-- (CGSize)calculateLayoutWithSize:(CGSize)size
-{
+- (CGSize)calculateLayoutWithSize:(CGSize)size {
   NSAssert([NSThread isMainThread], @"Yoga calculation must be done on main.");
   NSAssert(self.isEnabled, @"Yoga is not enabled for this view.");
 
@@ -252,44 +335,55 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
 
   const YGNodeRef node = self.node;
   YGNodeCalculateLayout(
-    node,
-    size.width,
-    size.height,
-    YGNodeStyleGetDirection(node));
+      node, size.width, size.height, YGNodeStyleGetDirection(node));
 
-  return (CGSize) {
-    .width = YGNodeLayoutGetWidth(node),
-    .height = YGNodeLayoutGetHeight(node),
+  return (CGSize){
+      .width = YGNodeLayoutGetWidth(node),
+      .height = YGNodeLayoutGetHeight(node),
   };
 }
 
+#pragma mark - Private
+
 static YGSize YGMeasureView(
-  YGNodeRef node,
-  float width,
-  YGMeasureMode widthMode,
-  float height,
-  YGMeasureMode heightMode)
-{
-  const CGFloat constrainedWidth = (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
-  const CGFloat constrainedHeight = (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX: height;
+    YGNodeRef node,
+    float width,
+    YGMeasureMode widthMode,
+    float height,
+    YGMeasureMode heightMode) {
+  const CGFloat constrainedWidth =
+      (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
+  const CGFloat constrainedHeight =
+      (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : height;
 
-  UIView *view = (__bridge UIView*) YGNodeGetContext(node);
-  const CGSize sizeThatFits = [view sizeThatFits:(CGSize) {
-    .width = constrainedWidth,
-    .height = constrainedHeight,
-  }];
+  UIView* view = (__bridge UIView*)YGNodeGetContext(node);
+  CGSize sizeThatFits = CGSizeZero;
 
-  return (YGSize) {
-    .width = YGSanitizeMeasurement(constrainedWidth, sizeThatFits.width, widthMode),
-    .height = YGSanitizeMeasurement(constrainedHeight, sizeThatFits.height, heightMode),
+  // The default implementation of sizeThatFits: returns the existing size of
+  // the view. That means that if we want to layout an empty UIView, which
+  // already has got a frame set, its measured size should be CGSizeZero, but
+  // UIKit returns the existing size.
+  //
+  // See https://github.com/facebook/yoga/issues/606 for more information.
+  if (!view.yoga.isUIView || [view.subviews count] > 0) {
+    sizeThatFits = [view sizeThatFits:(CGSize){
+                                          .width = constrainedWidth,
+                                          .height = constrainedHeight,
+                                      }];
+  }
+
+  return (YGSize){
+      .width = YGSanitizeMeasurement(
+          constrainedWidth, sizeThatFits.width, widthMode),
+      .height = YGSanitizeMeasurement(
+          constrainedHeight, sizeThatFits.height, heightMode),
   };
 }
 
 static CGFloat YGSanitizeMeasurement(
-  CGFloat constrainedSize,
-  CGFloat measuredSize,
-  YGMeasureMode measureMode)
-{
+    CGFloat constrainedSize,
+    CGFloat measuredSize,
+    YGMeasureMode measureMode) {
   CGFloat result;
   if (measureMode == YGMeasureModeExactly) {
     result = constrainedSize;
@@ -302,13 +396,14 @@ static CGFloat YGSanitizeMeasurement(
   return result;
 }
 
-static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *subviews)
-{
+static BOOL YGNodeHasExactSameChildren(
+    const YGNodeRef node,
+    NSArray<UIView*>* subviews) {
   if (YGNodeGetChildCount(node) != subviews.count) {
     return NO;
   }
 
-  for (int i=0; i<subviews.count; i++) {
+  for (int i = 0; i < subviews.count; i++) {
     if (YGNodeGetChild(node, i) != subviews[i].yoga.node) {
       return NO;
     }
@@ -317,9 +412,8 @@ static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *
   return YES;
 }
 
-static void YGAttachNodesFromViewHierachy(UIView *const view)
-{
-  YGLayout *const yoga = view.yoga;
+static void YGAttachNodesFromViewHierachy(UIView* const view) {
+  YGLayout* const yoga = view.yoga;
   const YGNodeRef node = yoga.node;
 
   // Only leaf nodes should have a measure function
@@ -329,83 +423,85 @@ static void YGAttachNodesFromViewHierachy(UIView *const view)
   } else {
     YGNodeSetMeasureFunc(node, NULL);
 
-    NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
-    for (UIView *subview in view.subviews) {
-      if (subview.yoga.isIncludedInLayout) {
+    NSMutableArray<UIView*>* subviewsToInclude =
+        [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
+    for (UIView* subview in view.subviews) {
+      if (subview.yoga.isEnabled && subview.yoga.isIncludedInLayout) {
         [subviewsToInclude addObject:subview];
       }
     }
 
     if (!YGNodeHasExactSameChildren(node, subviewsToInclude)) {
       YGRemoveAllChildren(node);
-      for (int i=0; i<subviewsToInclude.count; i++) {
+      for (int i = 0; i < subviewsToInclude.count; i++) {
         YGNodeInsertChild(node, subviewsToInclude[i].yoga.node, i);
       }
     }
 
-    for (UIView *const subview in subviewsToInclude) {
+    for (UIView* const subview in subviewsToInclude) {
       YGAttachNodesFromViewHierachy(subview);
     }
   }
 }
 
-static void YGRemoveAllChildren(const YGNodeRef node)
-{
+static void YGRemoveAllChildren(const YGNodeRef node) {
   if (node == NULL) {
     return;
   }
 
-  while (YGNodeGetChildCount(node) > 0) {
-    YGNodeRemoveChild(node, YGNodeGetChild(node, YGNodeGetChildCount(node) - 1));
-  }
+  YGNodeRemoveAllChildren(node);
 }
 
-static CGFloat YGRoundPixelValue(CGFloat value)
-{
+static CGFloat YGRoundPixelValue(CGFloat value) {
   static CGFloat scale;
   static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^(){
+  dispatch_once(&onceToken, ^() {
     scale = [UIScreen mainScreen].scale;
   });
 
   return roundf(value * scale) / scale;
 }
 
-static void YGApplyLayoutToViewHierarchy(UIView *view, BOOL preserveOrigin)
-{
-  NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
+static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
+  NSCAssert(
+      [NSThread isMainThread],
+      @"Framesetting should only be done on the main thread.");
 
-  const YGLayout *yoga = view.yoga;
+  const YGLayout* yoga = view.yoga;
 
   if (!yoga.isIncludedInLayout) {
-     return;
+    return;
   }
 
   YGNodeRef node = yoga.node;
   const CGPoint topLeft = {
-    YGNodeLayoutGetLeft(node),
-    YGNodeLayoutGetTop(node),
+      YGNodeLayoutGetLeft(node),
+      YGNodeLayoutGetTop(node),
   };
 
   const CGPoint bottomRight = {
-    topLeft.x + YGNodeLayoutGetWidth(node),
-    topLeft.y + YGNodeLayoutGetHeight(node),
+      topLeft.x + YGNodeLayoutGetWidth(node),
+      topLeft.y + YGNodeLayoutGetHeight(node),
   };
 
   const CGPoint origin = preserveOrigin ? view.frame.origin : CGPointZero;
-  view.frame = (CGRect) {
-    .origin = {
-      .x = YGRoundPixelValue(topLeft.x + origin.x),
-      .y = YGRoundPixelValue(topLeft.y + origin.y),
-    },
-    .size = {
-      .width = YGRoundPixelValue(bottomRight.x) - YGRoundPixelValue(topLeft.x),
-      .height = YGRoundPixelValue(bottomRight.y) - YGRoundPixelValue(topLeft.y),
-    },
+  view.frame = (CGRect){
+      .origin =
+          {
+              .x = YGRoundPixelValue(topLeft.x + origin.x),
+              .y = YGRoundPixelValue(topLeft.y + origin.y),
+          },
+      .size =
+          {
+              .width = YGRoundPixelValue(bottomRight.x) -
+                  YGRoundPixelValue(topLeft.x),
+              .height = YGRoundPixelValue(bottomRight.y) -
+                  YGRoundPixelValue(topLeft.y),
+          },
   };
 
   if (!yoga.isLeaf) {
-    for (NSUInteger i=0; i<view.subviews.count; i++) {
+    for (NSUInteger i = 0; i < view.subviews.count; i++) {
       YGApplyLayoutToViewHierarchy(view.subviews[i], NO);
     }
   }

YogaKit/Source/YGLayoutExtensions.swift

@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+import yoga;
+postfix operator %
+
+extension Int {
+    public static postfix func %(value: Int) -> YGValue {
+        return YGValue(value: Float(value), unit: .percent)
+    }
+}
+
+extension Float {
+    public static postfix func %(value: Float) -> YGValue {
+        return YGValue(value: value, unit: .percent)
+    }
+}
+
+extension CGFloat {
+    public static postfix func %(value: CGFloat) -> YGValue {
+        return YGValue(value: Float(value), unit: .percent)
+    }
+}
+
+extension YGValue : ExpressibleByIntegerLiteral, ExpressibleByFloatLiteral {
+    public init(integerLiteral value: Int) {
+        self = YGValue(value: Float(value), unit: .point)
+    }
+
+    public init(floatLiteral value: Float) {
+        self = YGValue(value: value, unit: .point)
+    }
+
+    public init(_ value: Float) {
+        self = YGValue(value: value, unit: .point)
+    }
+
+    public init(_ value: CGFloat) {
+        self = YGValue(value: Float(value), unit: .point)
+    }
+}

YogaKit/Tests/YogaKitTests.m

@@ -1,10 +1,8 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <XCTest/XCTest.h>
@@ -18,32 +16,30 @@
 
 @implementation YogaKitTests
 
-- (void)testConfigureLayoutIsNoOpWithNilBlock
-{
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  XCTAssertNoThrow([view configureLayoutWithBlock:nil]);
+- (void)testConfigureLayoutIsNoOpWithNilBlock {
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+  id block = nil;
+  XCTAssertNoThrow([view configureLayoutWithBlock:block]);
 }
 
-- (void)testConfigureLayoutBlockWorksWithValidBlock
-{
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  [view configureLayoutWithBlock:^(YGLayout *layout){
+- (void)testConfigureLayoutBlockWorksWithValidBlock {
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+  [view configureLayoutWithBlock:^(YGLayout* layout) {
     XCTAssertNotNil(layout);
     layout.isEnabled = YES;
-    layout.width = 25;
+    layout.width = YGPointValue(25);
   }];
 
   XCTAssertTrue(view.yoga.isEnabled);
-  XCTAssertEqual(view.yoga.width, 25);
+  XCTAssertEqual(view.yoga.width.value, 25);
 }
 
-- (void)testNodesAreDeallocedWithSingleView
-{
-  __weak YGLayout *layoutRef = nil;
+- (void)testNodesAreDeallocedWithSingleView {
+  __weak YGLayout* layoutRef = nil;
 
   @autoreleasepool {
-    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-    view.yoga.flexBasis = 1;
+    UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+    view.yoga.flexBasis = YGPointValue(1);
 
     layoutRef = view.yoga;
     XCTAssertNotNil(layoutRef);
@@ -54,19 +50,18 @@
   XCTAssertNil(layoutRef);
 }
 
-- (void)testNodesAreDeallocedCascade
-{
-  __weak YGLayout *topLayout = nil;
-  __weak YGLayout *subviewLayout = nil;
+- (void)testNodesAreDeallocedCascade {
+  __weak YGLayout* topLayout = nil;
+  __weak YGLayout* subviewLayout = nil;
 
   @autoreleasepool {
-    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
     topLayout = view.yoga;
-    topLayout.flexBasis = 1;
+    topLayout.flexBasis = YGPointValue(1);
 
-    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
     subviewLayout = subview.yoga;
-    subviewLayout.flexBasis = 1;
+    subviewLayout.flexBasis = YGPointValue(1);
 
     view = nil;
   }
@@ -75,9 +70,8 @@
   XCTAssertNil(subviewLayout);
 }
 
-- (void)testIsEnabled
-{
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+- (void)testIsEnabled {
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
   XCTAssertFalse(view.yoga.isEnabled);
 
   view.yoga.isEnabled = YES;
@@ -87,34 +81,35 @@
   XCTAssertFalse(view.yoga.isEnabled);
 }
 
-- (void)testSizeThatFitsAsserts
-{
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  dispatch_sync(dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL), ^(void){
-    XCTAssertThrows(view.yoga.intrinsicSize);
-  });
+- (void)testSizeThatFitsAsserts {
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+  dispatch_sync(
+      dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL),
+      ^(void) {
+        XCTAssertThrows(view.yoga.intrinsicSize);
+      });
 }
 
-- (void)testSizeThatFitsSmoke
-{
-  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
+- (void)testSizeThatFitsSmoke {
+  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
   container.yoga.alignItems = YGAlignFlexStart;
 
-  UILabel *longTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
-  longTextLabel.text = @"This is a very very very very very very very very long piece of text.";
+  UILabel* longTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+  longTextLabel.text =
+      @"This is a very very very very very very very very long piece of text.";
   longTextLabel.lineBreakMode = NSLineBreakByTruncatingTail;
   longTextLabel.numberOfLines = 1;
   longTextLabel.yoga.isEnabled = YES;
   longTextLabel.yoga.flexShrink = 1;
   [container addSubview:longTextLabel];
 
-  UIView *textBadgeView = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* textBadgeView = [[UIView alloc] initWithFrame:CGRectZero];
   textBadgeView.yoga.isEnabled = YES;
-  textBadgeView.yoga.margin = 0;
-  textBadgeView.yoga.width = 10;
-  textBadgeView.yoga.height = 10;
+  textBadgeView.yoga.margin = YGPointValue(0);
+  textBadgeView.yoga.width = YGPointValue(10);
+  textBadgeView.yoga.height = YGPointValue(10);
   [container addSubview:textBadgeView];
 
   const CGSize textBadgeViewSize = textBadgeView.yoga.intrinsicSize;
@@ -125,24 +120,34 @@
   const CGSize longTextLabelSize = longTextLabel.yoga.intrinsicSize;
 
   XCTAssertEqual(longTextLabelSize.height, containerSize.height);
-  XCTAssertEqual(longTextLabelSize.width + textBadgeView.yoga.intrinsicSize.width, containerSize.width);
+  XCTAssertEqual(
+      longTextLabelSize.width + textBadgeView.yoga.intrinsicSize.width,
+      containerSize.width);
 }
 
-- (void)testPreservingOrigin
-{
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,50,75)];
+- (void)testSizeThatFitsEmptyView {
+  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(10, 10, 200, 200)];
+  view.yoga.isEnabled = YES;
+
+  const CGSize viewSize = view.yoga.intrinsicSize;
+  XCTAssertEqual(viewSize.height, 0);
+  XCTAssertEqual(viewSize.width, 0);
+}
+
+- (void)testPreservingOrigin {
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 50, 75)];
   container.yoga.isEnabled = YES;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
   view.yoga.isEnabled = YES;
-  view.yoga.flexBasis = 0;
+  view.yoga.flexBasis = YGPointValue(0);
   view.yoga.flexGrow = 1;
   [container addSubview:view];
 
-  UIView *view2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* view2 = [[UIView alloc] initWithFrame:CGRectZero];
   view2.yoga.isEnabled = YES;
-  view2.yoga.marginTop = 25;
-  view2.yoga.flexBasis = 0;
+  view2.yoga.marginTop = YGPointValue(25);
+  view2.yoga.flexBasis = YGPointValue(0);
   view2.yoga.flexGrow = 1;
   [container addSubview:view2];
 
@@ -153,12 +158,63 @@
   XCTAssertEqual(25, view2.frame.origin.y);
 }
 
-- (void)testMarkingDirtyOnlyWorksOnLeafNodes
-{
-  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
+- (void)testContainerWithFlexibleWidthGetsCorrectlySized {
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
   container.yoga.isEnabled = YES;
 
-  UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  view.yoga.isEnabled = YES;
+  view.yoga.width = YGPointValue(100);
+  view.yoga.height = YGPointValue(100);
+  [container addSubview:view];
+
+  [container.yoga
+      applyLayoutPreservingOrigin:YES
+             dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth];
+  XCTAssertEqual(100, container.frame.size.width);
+  XCTAssertEqual(200, container.frame.size.height);
+}
+
+- (void)testContainerWithFlexibleHeightGetsCorrectlySized {
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
+  container.yoga.isEnabled = YES;
+
+  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  view.yoga.isEnabled = YES;
+  view.yoga.width = YGPointValue(100);
+  view.yoga.height = YGPointValue(100);
+  [container addSubview:view];
+
+  [container.yoga
+      applyLayoutPreservingOrigin:YES
+             dimensionFlexibility:YGDimensionFlexibilityFlexibleHeight];
+  XCTAssertEqual(200, container.frame.size.width);
+  XCTAssertEqual(100, container.frame.size.height);
+}
+
+- (void)testContainerWithFlexibleWidthAndHeightGetsCorrectlySized {
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
+  container.yoga.isEnabled = YES;
+
+  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  view.yoga.isEnabled = YES;
+  view.yoga.width = YGPointValue(100);
+  view.yoga.height = YGPointValue(100);
+  [container addSubview:view];
+
+  [container.yoga
+      applyLayoutPreservingOrigin:YES
+             dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth |
+             YGDimensionFlexibilityFlexibleHeight];
+  XCTAssertEqual(100, container.frame.size.width);
+  XCTAssertEqual(100, container.frame.size.height);
+}
+
+- (void)testMarkingDirtyOnlyWorksOnLeafNodes {
+  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
+  container.yoga.isEnabled = YES;
+
+  UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
   subview.yoga.isEnabled = YES;
   [container addSubview:subview];
 
@@ -171,14 +227,13 @@
   XCTAssertTrue(subview.yoga.isDirty);
 }
 
-- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation
-{
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 50)];
+- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation {
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 50)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
   container.yoga.alignItems = YGAlignFlexStart;
 
-  UILabel *view = [[UILabel alloc] initWithFrame:CGRectZero];
+  UILabel* view = [[UILabel alloc] initWithFrame:CGRectZero];
   view.text = @"This is a short text.";
   view.numberOfLines = 1;
   view.yoga.isEnabled = YES;
@@ -196,61 +251,70 @@
   XCTAssertFalse(CGSizeEqualToSize(view.frame.size, viewSizeAfterFirstPass));
 }
 
-- (void)testFrameAndOriginPlacement
-{
+- (void)testFrameAndOriginPlacement {
   const CGSize containerSize = CGSizeMake(320, 50);
 
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
+  UIView* container = [[UIView alloc]
+      initWithFrame:CGRectMake(
+                        0, 0, containerSize.width, containerSize.height)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
   [container.yoga applyLayoutPreservingOrigin:YES];
 
-  XCTAssertEqualWithAccuracy(subview2.frame.origin.x, CGRectGetMaxX(subview1.frame), FLT_EPSILON);
-  XCTAssertEqualWithAccuracy(subview3.frame.origin.x, CGRectGetMaxX(subview2.frame), FLT_EPSILON);
+  XCTAssertEqualWithAccuracy(
+      subview2.frame.origin.x, CGRectGetMaxX(subview1.frame), FLT_EPSILON);
+  XCTAssertEqualWithAccuracy(
+      subview3.frame.origin.x, CGRectGetMaxX(subview2.frame), FLT_EPSILON);
 
   CGFloat totalWidth = 0;
-  for (UIView *view in container.subviews) {
+  for (UIView* view in container.subviews) {
     totalWidth += view.bounds.size.width;
   }
 
-  XCTAssertEqual(containerSize.width, totalWidth, @"The container's width is %.6f, the subviews take up %.6f", containerSize.width, totalWidth);
+  XCTAssertEqual(
+      containerSize.width,
+      totalWidth,
+      @"The container's width is %.6f, the subviews take up %.6f",
+      containerSize.width,
+      totalWidth);
 }
 
-- (void)testThatLayoutIsCorrectWhenWeSwapViewOrder
-{
+- (void)testThatLayoutIsCorrectWhenWeSwapViewOrder {
   const CGSize containerSize = CGSizeMake(300, 50);
 
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
+  UIView* container = [[UIView alloc]
+      initWithFrame:CGRectMake(
+                        0, 0, containerSize.width, containerSize.height)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
@@ -272,32 +336,33 @@
   XCTAssertTrue(CGRectEqualToRect(subview2.frame, CGRectMake(100, 0, 100, 50)));
 }
 
-- (void)testThatWeRespectIncludeInLayoutFlag
-{
+- (void)testThatWeRespectIncludeInLayoutFlag {
   const CGSize containerSize = CGSizeMake(300, 50);
 
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
+  UIView* container = [[UIView alloc]
+      initWithFrame:CGRectMake(
+                        0, 0, containerSize.width, containerSize.height)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
   [container.yoga applyLayoutPreservingOrigin:YES];
 
-  for (UIView *subview in container.subviews) {
+  for (UIView* subview in container.subviews) {
     XCTAssertEqual(subview.bounds.size.width, 100);
   }
 
@@ -307,27 +372,27 @@
   XCTAssertEqual(subview1.bounds.size.width, 150);
   XCTAssertEqual(subview2.bounds.size.width, 150);
 
-  // We don't set the frame to zero, so, it should be set to what it was previously at.
+  // We don't set the frame to zero, so, it should be set to what it was
+  // previously at.
   XCTAssertEqual(subview3.bounds.size.width, 100);
 }
 
-- (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews
-{
-  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
+- (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews {
+  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.isIncludedInLayout = NO;
   [container addSubview:subview1];
 
-  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.isIncludedInLayout = NO;
   [container addSubview:subview2];
 
-  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.isIncludedInLayout = YES;
   [container addSubview:subview3];
@@ -340,23 +405,22 @@
   XCTAssertEqual(container.yoga.numberOfChildren, 2);
 }
 
-- (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond
-{
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+- (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond {
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   subview3.yoga.isIncludedInLayout = NO;
@@ -376,266 +440,292 @@
   XCTAssertEqual(subview3.bounds.size.width, 100);
 }
 
-- (void)testIsLeafFlag
-{
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+- (void)testIsLeafFlag {
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
   XCTAssertTrue(view.yoga.isLeaf);
 
-  for (int i=0; i<10; i++) {
-    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+  for (int i = 0; i < 10; i++) {
+    UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
     [view addSubview:subview];
   }
   XCTAssertTrue(view.yoga.isLeaf);
 
   view.yoga.isEnabled = YES;
-  view.yoga.width = 50.0;
+  view.yoga.width = YGPointValue(50);
   XCTAssertTrue(view.yoga.isLeaf);
 
-  UIView *const subview = view.subviews[0];
+  UIView* const subview = view.subviews[0];
   subview.yoga.isEnabled = YES;
-  subview.yoga.width = 50.0;
+  subview.yoga.width = YGPointValue(50);
   XCTAssertFalse(view.yoga.isLeaf);
 }
 
-- (void)testThatWeCorrectlyAttachNestedViews
-{
-    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-    container.yoga.isEnabled = YES;
-    container.yoga.flexDirection = YGFlexDirectionColumn;
+- (void)testThatWeCorrectlyAttachNestedViews {
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionColumn;
 
-    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview1.yoga.isEnabled = YES;
-    subview1.yoga.width = 100;
-    subview1.yoga.flexGrow = 1;
-    subview1.yoga.flexDirection = YGFlexDirectionColumn;
-    [container addSubview:subview1];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  subview1.yoga.isEnabled = YES;
+  subview1.yoga.width = YGPointValue(100);
+  subview1.yoga.flexGrow = 1;
+  subview1.yoga.flexDirection = YGFlexDirectionColumn;
+  [container addSubview:subview1];
 
-    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview2.yoga.isEnabled = YES;
-    subview2.yoga.width = 150;
-    subview2.yoga.flexGrow = 1;
-    subview2.yoga.flexDirection = YGFlexDirectionColumn;
-    [container addSubview:subview2];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  subview2.yoga.isEnabled = YES;
+  subview2.yoga.width = YGPointValue(150);
+  subview2.yoga.flexGrow = 1;
+  subview2.yoga.flexDirection = YGFlexDirectionColumn;
+  [container addSubview:subview2];
 
-    for (UIView *view in @[subview1, subview2]) {
-        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
-        someView.yoga.isEnabled = YES;
-        someView.yoga.flexGrow = 1;
-        [view addSubview:someView];
-    }
-    [container.yoga applyLayoutPreservingOrigin:YES];
+  for (UIView* view in @[ subview1, subview2 ]) {
+    UIView* someView = [[UIView alloc] initWithFrame:CGRectZero];
+    someView.yoga.isEnabled = YES;
+    someView.yoga.flexGrow = 1;
+    [view addSubview:someView];
+  }
+  [container.yoga applyLayoutPreservingOrigin:YES];
 
-    // Add the same amount of new views, reapply layout.
-    for (UIView *view in @[subview1, subview2]) {
-        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
-        someView.yoga.isEnabled = YES;
-        someView.yoga.flexGrow = 1;
-        [view addSubview:someView];
-    }
-    [container.yoga applyLayoutPreservingOrigin:YES];
+  // Add the same amount of new views, reapply layout.
+  for (UIView* view in @[ subview1, subview2 ]) {
+    UIView* someView = [[UIView alloc] initWithFrame:CGRectZero];
+    someView.yoga.isEnabled = YES;
+    someView.yoga.flexGrow = 1;
+    [view addSubview:someView];
+  }
+  [container.yoga applyLayoutPreservingOrigin:YES];
 
-    XCTAssertEqual(subview1.bounds.size.width, 100);
-    XCTAssertEqual(subview1.bounds.size.height, 25);
-    for (UIView *subview in subview1.subviews) {
-        const CGSize subviewSize = subview.bounds.size;
-        XCTAssertNotEqual(subviewSize.width, 0);
-        XCTAssertNotEqual(subviewSize.height, 0);
-        XCTAssertFalse(isnan(subviewSize.height));
-        XCTAssertFalse(isnan(subviewSize.width));
-    }
+  XCTAssertEqual(subview1.bounds.size.width, 100);
+  XCTAssertEqual(subview1.bounds.size.height, 25);
+  for (UIView* subview in subview1.subviews) {
+    const CGSize subviewSize = subview.bounds.size;
+    XCTAssertNotEqual(subviewSize.width, 0);
+    XCTAssertNotEqual(subviewSize.height, 0);
+    XCTAssertFalse(isnan(subviewSize.height));
+    XCTAssertFalse(isnan(subviewSize.width));
+  }
 
-    XCTAssertEqual(subview2.bounds.size.width, 150);
-    XCTAssertEqual(subview2.bounds.size.height, 25);
-    for (UIView *subview in subview2.subviews) {
-        const CGSize subviewSize = subview.bounds.size;
-        XCTAssertNotEqual(subviewSize.width, 0);
-        XCTAssertNotEqual(subviewSize.height, 0);
-        XCTAssertFalse(isnan(subviewSize.height));
-        XCTAssertFalse(isnan(subviewSize.width));
-    }
+  XCTAssertEqual(subview2.bounds.size.width, 150);
+  XCTAssertEqual(subview2.bounds.size.height, 25);
+  for (UIView* subview in subview2.subviews) {
+    const CGSize subviewSize = subview.bounds.size;
+    XCTAssertNotEqual(subviewSize.width, 0);
+    XCTAssertNotEqual(subviewSize.height, 0);
+    XCTAssertFalse(isnan(subviewSize.height));
+    XCTAssertFalse(isnan(subviewSize.width));
+  }
 }
 
-- (void)testThatANonLeafNodeCanBecomeALeafNode
-{
-    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-    container.yoga.isEnabled = YES;
+- (void)testThatANonLeafNodeCanBecomeALeafNode {
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+  container.yoga.isEnabled = YES;
 
-    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview1.yoga.isEnabled = YES;
-    [container addSubview:subview1];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  subview1.yoga.isEnabled = YES;
+  [container addSubview:subview1];
 
-    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview2.yoga.isEnabled = YES;
-    [subview1 addSubview:subview2];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  subview2.yoga.isEnabled = YES;
+  [subview1 addSubview:subview2];
 
-    [container.yoga applyLayoutPreservingOrigin:YES];
-    [subview2 removeFromSuperview];
-    [container.yoga applyLayoutPreservingOrigin:YES];
+  [container.yoga applyLayoutPreservingOrigin:YES];
+  [subview2 removeFromSuperview];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 }
 
-- (void)testPositionalPropertiesWork
-{
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-
-  view.yoga.left = 1;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeLeft).value, 1);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeLeft).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.left, 1);
-
-  view.yoga.right = 2;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeRight).value, 2);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeRight).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.right, 2);
-
-  view.yoga.top = 3;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeTop).value, 3);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeTop).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.top, 3);
-
-  view.yoga.bottom = 4;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeBottom).value, 4);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeBottom).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.bottom, 4);
-
-  view.yoga.start = 5;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeStart).value, 5);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeStart).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.start, 5);
-
-  view.yoga.end = 6;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeEnd).value, 6);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeEnd).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.end, 6);
+- (void)testPointPercent {
+  XCTAssertEqual(YGPointValue(1).value, 1);
+  XCTAssertEqual(YGPointValue(1).unit, YGUnitPoint);
+  XCTAssertEqual(YGPercentValue(2).value, 2);
+  XCTAssertEqual(YGPercentValue(2).unit, YGUnitPercent);
 }
 
-- (void)testMarginPropertiesWork
-{
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+- (void)testPositionalPropertiesWork {
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
 
-  view.yoga.margin = 1;
-  XCTAssertEqual(view.yoga.margin, 1);
-  XCTAssertTrue(isnan(view.yoga.marginLeft));
-  XCTAssertTrue(isnan(view.yoga.marginRight));
-  XCTAssertTrue(isnan(view.yoga.marginStart));
-  XCTAssertTrue(isnan(view.yoga.marginEnd));
-  XCTAssertTrue(isnan(view.yoga.marginTop));
-  XCTAssertTrue(isnan(view.yoga.marginBottom));
-  XCTAssertTrue(isnan(view.yoga.marginHorizontal));
-  XCTAssertTrue(isnan(view.yoga.marginVertical));
+  view.yoga.left = YGPointValue(1);
+  XCTAssertEqual(view.yoga.left.value, 1);
+  XCTAssertEqual(view.yoga.left.unit, YGUnitPoint);
+  view.yoga.left = YGPercentValue(2);
+  XCTAssertEqual(view.yoga.left.value, 2);
+  XCTAssertEqual(view.yoga.left.unit, YGUnitPercent);
 
-  view.yoga.marginHorizontal = 2;
-  XCTAssertEqual(view.yoga.marginHorizontal, 2);
-  XCTAssertTrue(isnan(view.yoga.marginLeft));
-  XCTAssertTrue(isnan(view.yoga.marginRight));
-  XCTAssertTrue(isnan(view.yoga.marginStart));
-  XCTAssertTrue(isnan(view.yoga.marginEnd));
+  view.yoga.right = YGPointValue(3);
+  XCTAssertEqual(view.yoga.right.value, 3);
+  XCTAssertEqual(view.yoga.right.unit, YGUnitPoint);
+  view.yoga.right = YGPercentValue(4);
+  XCTAssertEqual(view.yoga.right.value, 4);
+  XCTAssertEqual(view.yoga.right.unit, YGUnitPercent);
 
-  view.yoga.marginVertical = 3;
-  XCTAssertEqual(view.yoga.marginVertical, 3);
-  XCTAssertTrue(isnan(view.yoga.marginTop));
-  XCTAssertTrue(isnan(view.yoga.marginBottom));
+  view.yoga.top = YGPointValue(5);
+  XCTAssertEqual(view.yoga.top.value, 5);
+  XCTAssertEqual(view.yoga.top.unit, YGUnitPoint);
+  view.yoga.top = YGPercentValue(6);
+  XCTAssertEqual(view.yoga.top.value, 6);
+  XCTAssertEqual(view.yoga.top.unit, YGUnitPercent);
 
-  view.yoga.marginLeft = 4;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeLeft).value, 4);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeLeft).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginLeft, 4);
+  view.yoga.bottom = YGPointValue(7);
+  XCTAssertEqual(view.yoga.bottom.value, 7);
+  XCTAssertEqual(view.yoga.bottom.unit, YGUnitPoint);
+  view.yoga.bottom = YGPercentValue(8);
+  XCTAssertEqual(view.yoga.bottom.value, 8);
+  XCTAssertEqual(view.yoga.bottom.unit, YGUnitPercent);
 
-  view.yoga.marginRight = 5;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeRight).value, 5);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeRight).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginRight, 5);
+  view.yoga.start = YGPointValue(9);
+  XCTAssertEqual(view.yoga.start.value, 9);
+  XCTAssertEqual(view.yoga.start.unit, YGUnitPoint);
+  view.yoga.start = YGPercentValue(10);
+  XCTAssertEqual(view.yoga.start.value, 10);
+  XCTAssertEqual(view.yoga.start.unit, YGUnitPercent);
 
-  view.yoga.marginTop = 6;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeTop).value, 6);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeTop).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginTop, 6);
-
-  view.yoga.marginBottom = 7;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeBottom).value, 7);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeBottom).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginBottom, 7);
-
-  view.yoga.marginStart = 8;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeStart).value, 8);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeStart).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginStart, 8);
-
-  view.yoga.marginEnd = 9;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeEnd).value, 9);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeEnd).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginEnd, 9);
+  view.yoga.end = YGPointValue(11);
+  XCTAssertEqual(view.yoga.end.value, 11);
+  XCTAssertEqual(view.yoga.end.unit, YGUnitPoint);
+  view.yoga.end = YGPercentValue(12);
+  XCTAssertEqual(view.yoga.end.value, 12);
+  XCTAssertEqual(view.yoga.end.unit, YGUnitPercent);
 }
 
-- (void)testPaddingPropertiesWork
-{
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+- (void)testMarginPropertiesWork {
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
 
-  view.yoga.padding = 1;
-  XCTAssertEqual(view.yoga.padding, 1);
-  XCTAssertTrue(isnan(view.yoga.paddingLeft));
-  XCTAssertTrue(isnan(view.yoga.paddingRight));
-  XCTAssertTrue(isnan(view.yoga.paddingStart));
-  XCTAssertTrue(isnan(view.yoga.paddingEnd));
-  XCTAssertTrue(isnan(view.yoga.paddingTop));
-  XCTAssertTrue(isnan(view.yoga.paddingBottom));
-  XCTAssertTrue(isnan(view.yoga.paddingHorizontal));
-  XCTAssertTrue(isnan(view.yoga.paddingVertical));
+  view.yoga.margin = YGPointValue(1);
+  XCTAssertEqual(view.yoga.margin.value, 1);
+  XCTAssertEqual(view.yoga.margin.unit, YGUnitPoint);
+  view.yoga.margin = YGPercentValue(2);
+  XCTAssertEqual(view.yoga.margin.value, 2);
+  XCTAssertEqual(view.yoga.margin.unit, YGUnitPercent);
 
-  view.yoga.paddingHorizontal = 2;
-  XCTAssertEqual(view.yoga.paddingHorizontal, 2);
-  XCTAssertTrue(isnan(view.yoga.paddingLeft));
-  XCTAssertTrue(isnan(view.yoga.paddingRight));
-  XCTAssertTrue(isnan(view.yoga.paddingStart));
-  XCTAssertTrue(isnan(view.yoga.paddingEnd));
+  view.yoga.marginHorizontal = YGPointValue(3);
+  XCTAssertEqual(view.yoga.marginHorizontal.value, 3);
+  XCTAssertEqual(view.yoga.marginHorizontal.unit, YGUnitPoint);
+  view.yoga.marginHorizontal = YGPercentValue(4);
+  XCTAssertEqual(view.yoga.marginHorizontal.value, 4);
+  XCTAssertEqual(view.yoga.marginHorizontal.unit, YGUnitPercent);
 
-  view.yoga.paddingVertical = 3;
-  XCTAssertEqual(view.yoga.paddingVertical, 3);
-  XCTAssertTrue(isnan(view.yoga.paddingTop));
-  XCTAssertTrue(isnan(view.yoga.paddingBottom));
+  view.yoga.marginVertical = YGPointValue(5);
+  XCTAssertEqual(view.yoga.marginVertical.value, 5);
+  XCTAssertEqual(view.yoga.marginVertical.unit, YGUnitPoint);
+  view.yoga.marginVertical = YGPercentValue(6);
+  XCTAssertEqual(view.yoga.marginVertical.value, 6);
+  XCTAssertEqual(view.yoga.marginVertical.unit, YGUnitPercent);
 
-  view.yoga.paddingLeft = 4;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeLeft).value, 4);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeLeft).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingLeft, 4);
+  view.yoga.marginLeft = YGPointValue(7);
+  XCTAssertEqual(view.yoga.marginLeft.value, 7);
+  XCTAssertEqual(view.yoga.marginLeft.unit, YGUnitPoint);
+  view.yoga.marginLeft = YGPercentValue(8);
+  XCTAssertEqual(view.yoga.marginLeft.value, 8);
+  XCTAssertEqual(view.yoga.marginLeft.unit, YGUnitPercent);
 
-  view.yoga.paddingRight = 5;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeRight).value, 5);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeRight).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingRight, 5);
+  view.yoga.marginRight = YGPointValue(9);
+  XCTAssertEqual(view.yoga.marginRight.value, 9);
+  XCTAssertEqual(view.yoga.marginRight.unit, YGUnitPoint);
+  view.yoga.marginRight = YGPercentValue(10);
+  XCTAssertEqual(view.yoga.marginRight.value, 10);
+  XCTAssertEqual(view.yoga.marginRight.unit, YGUnitPercent);
 
-  view.yoga.paddingTop = 6;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeTop).value, 6);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeTop).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingTop, 6);
+  view.yoga.marginTop = YGPointValue(11);
+  XCTAssertEqual(view.yoga.marginTop.value, 11);
+  XCTAssertEqual(view.yoga.marginTop.unit, YGUnitPoint);
+  view.yoga.marginTop = YGPercentValue(12);
+  XCTAssertEqual(view.yoga.marginTop.value, 12);
+  XCTAssertEqual(view.yoga.marginTop.unit, YGUnitPercent);
 
-  view.yoga.paddingBottom = 7;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeBottom).value, 7);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeBottom).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingBottom, 7);
+  view.yoga.marginBottom = YGPointValue(13);
+  XCTAssertEqual(view.yoga.marginBottom.value, 13);
+  XCTAssertEqual(view.yoga.marginBottom.unit, YGUnitPoint);
+  view.yoga.marginBottom = YGPercentValue(14);
+  XCTAssertEqual(view.yoga.marginBottom.value, 14);
+  XCTAssertEqual(view.yoga.marginBottom.unit, YGUnitPercent);
 
-  view.yoga.paddingStart = 8;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeStart).value, 8);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeStart).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingStart, 8);
+  view.yoga.marginStart = YGPointValue(15);
+  XCTAssertEqual(view.yoga.marginStart.value, 15);
+  XCTAssertEqual(view.yoga.marginStart.unit, YGUnitPoint);
+  view.yoga.marginStart = YGPercentValue(16);
+  XCTAssertEqual(view.yoga.marginStart.value, 16);
+  XCTAssertEqual(view.yoga.marginStart.unit, YGUnitPercent);
 
-  view.yoga.paddingEnd = 9;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeEnd).value, 9);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeEnd).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingEnd, 9);
+  view.yoga.marginEnd = YGPointValue(17);
+  XCTAssertEqual(view.yoga.marginEnd.value, 17);
+  XCTAssertEqual(view.yoga.marginEnd.unit, YGUnitPoint);
+  view.yoga.marginEnd = YGPercentValue(18);
+  XCTAssertEqual(view.yoga.marginEnd.value, 18);
+  XCTAssertEqual(view.yoga.marginEnd.unit, YGUnitPercent);
 }
 
-- (void)testBorderWidthPropertiesWork
-{
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+- (void)testPaddingPropertiesWork {
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+
+  view.yoga.padding = YGPointValue(1);
+  XCTAssertEqual(view.yoga.padding.value, 1);
+  XCTAssertEqual(view.yoga.padding.unit, YGUnitPoint);
+  view.yoga.padding = YGPercentValue(2);
+  XCTAssertEqual(view.yoga.padding.value, 2);
+  XCTAssertEqual(view.yoga.padding.unit, YGUnitPercent);
+
+  view.yoga.paddingHorizontal = YGPointValue(3);
+  XCTAssertEqual(view.yoga.paddingHorizontal.value, 3);
+  XCTAssertEqual(view.yoga.paddingHorizontal.unit, YGUnitPoint);
+  view.yoga.paddingHorizontal = YGPercentValue(4);
+  XCTAssertEqual(view.yoga.paddingHorizontal.value, 4);
+  XCTAssertEqual(view.yoga.paddingHorizontal.unit, YGUnitPercent);
+
+  view.yoga.paddingVertical = YGPointValue(5);
+  XCTAssertEqual(view.yoga.paddingVertical.value, 5);
+  XCTAssertEqual(view.yoga.paddingVertical.unit, YGUnitPoint);
+  view.yoga.paddingVertical = YGPercentValue(6);
+  XCTAssertEqual(view.yoga.paddingVertical.value, 6);
+  XCTAssertEqual(view.yoga.paddingVertical.unit, YGUnitPercent);
+
+  view.yoga.paddingLeft = YGPointValue(7);
+  XCTAssertEqual(view.yoga.paddingLeft.value, 7);
+  XCTAssertEqual(view.yoga.paddingLeft.unit, YGUnitPoint);
+  view.yoga.paddingLeft = YGPercentValue(8);
+  XCTAssertEqual(view.yoga.paddingLeft.value, 8);
+  XCTAssertEqual(view.yoga.paddingLeft.unit, YGUnitPercent);
+
+  view.yoga.paddingRight = YGPointValue(9);
+  XCTAssertEqual(view.yoga.paddingRight.value, 9);
+  XCTAssertEqual(view.yoga.paddingRight.unit, YGUnitPoint);
+  view.yoga.paddingRight = YGPercentValue(10);
+  XCTAssertEqual(view.yoga.paddingRight.value, 10);
+  XCTAssertEqual(view.yoga.paddingRight.unit, YGUnitPercent);
+
+  view.yoga.paddingTop = YGPointValue(11);
+  XCTAssertEqual(view.yoga.paddingTop.value, 11);
+  XCTAssertEqual(view.yoga.paddingTop.unit, YGUnitPoint);
+  view.yoga.paddingTop = YGPercentValue(12);
+  XCTAssertEqual(view.yoga.paddingTop.value, 12);
+  XCTAssertEqual(view.yoga.paddingTop.unit, YGUnitPercent);
+
+  view.yoga.paddingBottom = YGPointValue(13);
+  XCTAssertEqual(view.yoga.paddingBottom.value, 13);
+  XCTAssertEqual(view.yoga.paddingBottom.unit, YGUnitPoint);
+  view.yoga.paddingBottom = YGPercentValue(14);
+  XCTAssertEqual(view.yoga.paddingBottom.value, 14);
+  XCTAssertEqual(view.yoga.paddingBottom.unit, YGUnitPercent);
+
+  view.yoga.paddingStart = YGPointValue(15);
+  XCTAssertEqual(view.yoga.paddingStart.value, 15);
+  XCTAssertEqual(view.yoga.paddingStart.unit, YGUnitPoint);
+  view.yoga.paddingStart = YGPercentValue(16);
+  XCTAssertEqual(view.yoga.paddingStart.value, 16);
+  XCTAssertEqual(view.yoga.paddingStart.unit, YGUnitPercent);
+
+  view.yoga.paddingEnd = YGPointValue(17);
+  XCTAssertEqual(view.yoga.paddingEnd.value, 17);
+  XCTAssertEqual(view.yoga.paddingEnd.unit, YGUnitPoint);
+  view.yoga.paddingEnd = YGPercentValue(18);
+  XCTAssertEqual(view.yoga.paddingEnd.value, 18);
+  XCTAssertEqual(view.yoga.paddingEnd.unit, YGUnitPercent);
+}
+
+- (void)testBorderWidthPropertiesWork {
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.borderWidth = 1;
   XCTAssertEqual(view.yoga.borderWidth, 1);
-  XCTAssertTrue(isnan(view.yoga.borderLeftWidth));
-  XCTAssertTrue(isnan(view.yoga.borderRightWidth));
-  XCTAssertTrue(isnan(view.yoga.borderStartWidth));
-  XCTAssertTrue(isnan(view.yoga.borderEndWidth));
-  XCTAssertTrue(isnan(view.yoga.borderTopWidth));
-  XCTAssertTrue(isnan(view.yoga.borderBottomWidth));
 
   view.yoga.borderLeftWidth = 2;
   XCTAssertEqual(view.yoga.borderLeftWidth, 2);

YogaKit/YogaKitSample/Podfile.lock

@@ -4,9 +4,9 @@ PODS:
   - IGListKit/Default (2.1.0):
     - IGListKit/Diffing
   - IGListKit/Diffing (2.1.0)
-  - Yoga (1.1.0)
-  - YogaKit (1.1.0):
-    - Yoga (~> 1.1)
+  - Yoga (1.7.0)
+  - YogaKit (1.7.0):
+    - Yoga (~> 1.7)
 
 DEPENDENCIES:
   - IGListKit (~> 2.1.0)
@@ -18,9 +18,9 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   IGListKit: b826c68ef7a4ae1626c09d4d3e1ea7a169e6c36e
-  Yoga: 0bf083b7c485b20598020dbedcea869cbe53071e
-  YogaKit: 80df90de9ef2900baa111f2c93476a6f9e921385
+  Yoga: 2ed1d7accfef3610a67f58c0cf101a0662137f2c
+  YogaKit: 31576530e8fcae3175469719ec3212397403330b
 
 PODFILE CHECKSUM: 216f8e7127767709e0e43f3711208d238fa5c404
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.1.1

YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj

@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 // !$*UTF8*$!
 {
 	archiveVersion = 1;

YogaKit/YogaKitSample/YogaKitSample.xcodeproj/xcshareddata/xcschemes/YogaKitSample.xcscheme

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0820"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "13687D421DF8748300E7C260"
+               BuildableName = "YogaKitSample.app"
+               BlueprintName = "YogaKitSample"
+               ReferencedContainer = "container:YogaKitSample.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "638A944E1E215CC800A726AD"
+               BuildableName = "YogaKitSampleTests.xctest"
+               BlueprintName = "YogaKitSampleTests"
+               ReferencedContainer = "container:YogaKitSample.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13687D421DF8748300E7C260"
+            BuildableName = "YogaKitSample.app"
+            BlueprintName = "YogaKitSample"
+            ReferencedContainer = "container:YogaKitSample.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13687D421DF8748300E7C260"
+            BuildableName = "YogaKitSample.app"
+            BlueprintName = "YogaKitSample"
+            ReferencedContainer = "container:YogaKitSample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13687D421DF8748300E7C260"
+            BuildableName = "YogaKitSample.app"
+            BlueprintName = "YogaKitSample"
+            ReferencedContainer = "container:YogaKitSample.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift

@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 import Foundation

YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift

@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 import UIKit
@@ -12,6 +11,11 @@ import YogaKit
 
 struct DemoItem {
     let name: String
+    root.backgroundColor = .red
+    root.yoga.isEnabled = true
+    root.yoga.width = YGValue(self.view.bounds.size.width)
+    root.yoga.height = YGValue(self.view.bounds.size.height)
+    root.yoga.alignItems = .center
 }
 
 final class SwiftViewController: UIViewController, IGListAdapterDataSource {

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "ViewController.h"
@@ -12,45 +11,41 @@
 
 @implementation ViewController
 
-- (void)viewDidLoad
-{
-    UIView *root = self.view;
-    root.backgroundColor = [UIColor redColor];
-    root.yoga.isEnabled = YES;
-    root.yoga.width = self.view.bounds.size.width;
-    root.yoga.height = self.view.bounds.size.height;
-    root.yoga.alignItems = YGAlignCenter;
-    root.yoga.justifyContent = YGJustifyCenter;
+- (void)viewDidLoad {
+  UIView* root = self.view;
+  root.backgroundColor = [UIColor redColor];
+  root.yoga.isEnabled = YES;
+  root.yoga.width = YGPointValue(self.view.bounds.size.width);
+  root.yoga.height = YGPointValue(self.view.bounds.size.height);
+  root.yoga.alignItems = YGAlignCenter;
+  root.yoga.justifyContent = YGJustifyCenter;
 
-    UIView *child1 = [UIView new];
-    child1.backgroundColor = [UIColor blueColor];
-    child1.yoga.isEnabled = YES;
-    child1.yoga.width = 100;
-    child1.yoga.height = 100;
+  UIView* child1 = [UIView new];
+  child1.backgroundColor = [UIColor blueColor];
+  child1.yoga.isEnabled = YES;
+  child1.yoga.width = YGPointValue(100);
+  child1.yoga.height = YGPointValue(100);
 
-    UIView *child2 = [UIView new];
-    child2.backgroundColor = [UIColor greenColor];
-    child2.frame = (CGRect) {
-        .size = {
-            .width = 200,
-            .height = 100,
-        }
-    };
+  UIView* child2 = [UIView new];
+  child2.backgroundColor = [UIColor greenColor];
+  child2.frame = (CGRect){
+      .size = {
+          .width = 200,
+          .height = 100,
+      }};
 
-    UIView *child3 = [UIView new];
-    child3.backgroundColor = [UIColor yellowColor];
-    child3.frame = (CGRect) {
-        .size = {
-            .width = 100,
-            .height = 100,
-        }
-    };
+  UIView* child3 = [UIView new];
+  child3.backgroundColor = [UIColor yellowColor];
+  child3.frame = (CGRect){
+      .size = {
+          .width = 100,
+          .height = 100,
+      }};
 
-    [child2 addSubview:child3];
-    [root addSubview:child1];
-    [root addSubview:child2];
-    [root.yoga applyLayoutPreservingOrigin:NO];
+  [child2 addSubview:child3];
+  [root addSubview:child1];
+  [root addSubview:child2];
+  [root.yoga applyLayoutPreservingOrigin:NO];
 }
 
-
 @end

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift

@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 import UIKit
@@ -15,32 +14,38 @@ final class BasicViewController: UIViewController {
 
         let root = self.view!
         root.backgroundColor = .white
-        root.yoga.isEnabled = true
-        root.yoga.width = containerSize.width
-        root.yoga.height = containerSize.height
-        root.yoga.alignItems = .center
-        root.yoga.justifyContent = .center
+        root.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.width = YGValue(containerSize.width)
+            layout.height = YGValue(containerSize.height)
+            layout.alignItems = .center
+            layout.justifyContent = .center
+        }
 
         let child1 = UIView()
         child1.backgroundColor = .blue
-        child1.yoga.isEnabled = true
-        child1.yoga.width = 100
-        child1.yoga.height = 10
-        child1.yoga.marginBottom = 25
+        child1.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.width = 100
+            layout.height = 10
+            layout.marginBottom = 25
+        }
         root.addSubview(child1)
 
-        let child2 = UIView()
-        child2.yoga.isEnabled = true
-        child2.yoga.alignSelf = .flexEnd
+        let child2 = UIView(frame: CGRect(x: 0, y: 0, width: 200, height: 200))
         child2.backgroundColor = .green
-        child2.frame = CGRect(x: 0, y: 0, width: 200, height: 100)
+        child2.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.alignSelf = .flexEnd
+        }
         root.addSubview(child2)
 
-        let child3 = UIView()
-        child3.yoga.isEnabled = true
-        child3.yoga.alignSelf = .flexStart
+        let child3 = UIView(frame: CGRect(x: 0, y: 0, width: 100, height: 100))
         child3.backgroundColor = .yellow
-        child3.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
+        child3.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.alignSelf = .flexStart
+        }
         root.addSubview(child3)
 
         root.yoga.applyLayout(preservingOrigin: true)

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift

@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 import UIKit
@@ -17,40 +16,50 @@ final class LayoutInclusionViewController: UIViewController {
     override func viewDidLoad() {
         let root = self.view!
         root.backgroundColor = .white
-        root.yoga.isEnabled = true
-        root.yoga.flexDirection = .column
-        root.yoga.justifyContent = .spaceAround
+        root.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexDirection = .column
+            layout.justifyContent = .spaceAround
+        }
 
         contentView.backgroundColor = .clear
         contentView.layer.borderColor = UIColor.lightGray.cgColor
         contentView.layer.borderWidth = 1.0
-        contentView.yoga.isEnabled = true
-        contentView.yoga.height = 300
-        contentView.yoga.width = self.view.bounds.size.width
-        contentView.yoga.flexDirection = .row
-        contentView.yoga.justifyContent = .center
-        contentView.yoga.paddingHorizontal = 25
+        contentView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.height = 300
+            layout.width = YGValue(self.view.bounds.size.width)
+            layout.flexDirection = .row
+            layout.justifyContent = .center
+            layout.paddingHorizontal = 25
+        }
         self.view.addSubview(contentView)
 
         let redView = UIView(frame: .zero)
         redView.backgroundColor = .red
-        redView.yoga.isEnabled = true
-        redView.yoga.flexGrow = 1
-        redView.yoga.flexShrink = 1
+        redView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexGrow = 1
+            layout.flexShrink = 1
+        }
         contentView.addSubview(redView)
 
         disappearingView.backgroundColor = .blue
-        disappearingView.yoga.isEnabled = true
-        disappearingView.yoga.flexGrow = 1
+        disappearingView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexGrow = 1
+        }
         contentView.addSubview(disappearingView)
 
         button.setTitle("Add Blue View", for: UIControlState.selected)
         button.setTitle("Remove Blue View", for: UIControlState.normal)
         button.addTarget(self, action: #selector(buttonWasTapped), for: UIControlEvents.touchUpInside)
-        button.yoga.isEnabled = true
-        button.yoga.height = 300
-        button.yoga.width = 300
-        button.yoga.alignSelf = .center
+        button.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.height = 300
+            layout.width = 300
+            layout.alignSelf = .center
+        }
         root.addSubview(button)
 
         root.yoga.applyLayout(preservingOrigin: false)

YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift

@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 import UIKit
@@ -15,9 +14,11 @@ final class SingleLabelCollectionCell: UICollectionViewCell {
     override init(frame: CGRect) {
         super.init(frame: frame)
 
-        contentView.yoga.isEnabled = true
-        contentView.yoga.flexDirection = .column
-        contentView.yoga.justifyContent = .flexEnd
+        contentView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexDirection = .column
+            layout.justifyContent = .flexEnd
+        }
 
         label.textAlignment = .center
         label.numberOfLines = 1
@@ -26,9 +27,11 @@ final class SingleLabelCollectionCell: UICollectionViewCell {
 
         let border = UIView(frame: .zero)
         border.backgroundColor = .lightGray
-        border.yoga.isEnabled = true
-        border.yoga.height = 0.5
-        border.yoga.marginHorizontal = 25
+        border.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.height = 0.5
+            layout.marginHorizontal = 25
+        }
         contentView.addSubview(border)
     }
 

android/BUCK

@@ -1,36 +0,0 @@
-# Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
-include_defs('//YOGA_DEFS')
-
-android_aar(
-  name = 'android',
-  manifest_skeleton = 'src/main/AndroidManifest.xml',
-  deps = [
-    ANDROID_JAVA_TARGET,
-    ANDROID_RES_TARGET,
-    INFER_ANNOTATIONS_TARGET,
-    JAVA_TARGET,
-    PROGRUARD_ANNOTATIONS_TARGET,
-  ],
-  visibility = [
-    'PUBLIC',
-  ],
-)
-
-android_resource(
-  name = 'res',
-  res = 'src/main/res',
-  package = 'com.facebook.yoga.android',
-  visibility = [
-    'PUBLIC',
-  ],
-)
-
-project_config(
-  src_target = ':android',
-)

android/README.md

@@ -0,0 +1,21 @@
+# YogaLayout [![Platform](https://img.shields.io/badge/platforms-Android-orange.svg)](https://facebook.github.io/yoga/docs/api/android/) [![Languages](https://img.shields.io/badge/languages-Java-orange.svg)](https://facebook.github.io/yoga/docs/api/android/) [![Download](https://img.shields.io/bintray/v/facebook/maven/com.facebook.yoga.android:yoga-layout.svg)](https://bintray.com/facebook/maven/com.facebook.yoga.android%3Ayoga-layout/_latestVersion)
+
+## Installation
+
+YogaLayout is available via jcenter:
+
+    implementation 'com.facebook.yoga.android:yoga-layout:1.16.0'
+
+## Getting Started
+
+Check out the docs [here](https://yogalayout.com/getting-started/standalone/).
+
+We also have a sample project.  To try it, clone the repo and run (with a device attached)
+
+    buck install -r android/sample
+
+## Contributing
+
+We welcome all pull-requests! At Facebook we sync the open source version of YogaKit daily, so we're always testing the latest changes.
+
+See the CONTRIBUTING file for how to help out.

android/build.gradle

@@ -1,59 +1,38 @@
-apply plugin: "com.jfrog.bintray"
+/*
+ * 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.
+ */
+
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'maven-publish'
-
-targetCompatibility = '1.7'
-sourceCompatibility = '1.7'
-
-version = '1.0.0'
-group = 'com.facebook.yoga.android'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    namespace 'com.facebook.yoga.android'
+
+    compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 19
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    sourceSets.main {
-        jni.srcDirs = [] // disalbe NDK auto build (not sure why this is necessary)
-        // The alternative, fat-aar does an equivalent thing to this hack
-        // seehttps://github.com/adwiv/android-fat-aar/blob/master/fat-aar.gradle#L307
-        jniLibs.srcDirs = ['build/intermediates/exploded-aar/com.facebook.yoga/yoga/1.0.0/jni']
+        targetCompatibility rootProject.targetCompatibilityVersion
+        sourceCompatibility rootProject.sourceCompatibilityVersion
     }
 }
 
 dependencies {
-    compile project(':yoga')
+    api project(':yoga')
 }
 
-task sourcesJar(type: Jar) {
-    classifier = 'source'
-    from android.sourceSets.main.java.srcDirs
+// We don't build Javadoc at this time as we can't disable "BUCK" files
+// from mistakenly getting parsed as Java.
+tasks.withType(Javadoc).all {
+  enabled = false
 }
 
-task javadoc(type: Javadoc) {
-    failOnError false
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    classpath += configurations.compile
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-ext {
-    bintrayName = "com.facebook.yoga.android:yoga-layout"
-}
-
-apply from: rootProject.file('gradle/android-jcenter-install.gradle')
+apply plugin: 'com.vanniktech.maven.publish'

android/gradle.properties

@@ -0,0 +1,12 @@
+#
+#  Copyright (c) Facebook, Inc. and its affiliates.
+#
+#  This source code is licensed under the MIT license found in the LICENSE
+#  file in the root directory of this source tree.
+#
+
+GROUP=com.facebook.yoga.android
+POM_NAME=YogaLayout
+POM_DESCRIPTION=YogaLayout
+POM_ARTIFACT_ID=yoga-layout
+POM_PACKAGING=aar

android/sample/AndroidManifest.xml

@@ -9,7 +9,6 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.facebook.samples.yoga"
           android:versionCode="1"
           android:versionName="1.0"
           >
@@ -17,16 +16,14 @@
   <variable name="applicationId" value="com.facebook.yoga"/>
   <variable name="app_label" value="Yoga Sample App"/>
 
-  <uses-sdk
-    android:minSdkVersion="15"
-    android:targetSdkVersion="19"
-    />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
   <application
       android:label="@string/app_name"
       android:icon="@drawable/ic_launcher"
       android:allowBackup="false"
       android:theme="@style/NoTitleBarWhiteBG"
+      android:supportsRtl="true"
       >
 
     <activity
@@ -41,6 +38,11 @@
 
     </activity>
 
+    <activity
+        android:name=".BenchmarkActivity"
+        android:exported="false"
+        />
+
   </application>
 
 </manifest>

android/sample/BUCK

@@ -1,39 +0,0 @@
-# Copyright 2014-present, Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the license found in the
-# LICENSE-examples file in the root directory of this source tree.
-
-include_defs('//YOGA_DEFS')
-
-android_binary(
-  name = 'sample',
-  manifest = 'AndroidManifest.xml',
-  keystore = ':debug_keystore',
-  deps = [
-    ANDROID_SAMPLE_JAVA_TARGET,
-    ANDROID_SAMPLE_RES_TARGET,
-  ],
-)
-
-android_resource(
-  name = 'res',
-  res = 'res',
-  package = 'com.facebook.samples.yoga',
-  deps = [
-    ANDROID_RES_TARGET,
-  ],
-  visibility = [
-    'PUBLIC',
-  ],
-)
-
-keystore(
-    name='debug_keystore',
-    store='debug.keystore',
-    properties='debug.keystore.properties',
-)
-
-project_config(
-  src_target = ':sample',
-)

android/sample/java/com/facebook/samples/yoga/BUCK

@@ -1,23 +0,0 @@
-# Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
-include_defs('//YOGA_DEFS')
-
-android_library(
-  name = 'yoga',
-  srcs = glob(['**/*.java']),
-  deps = [
-    ANDROID_JAVA_TARGET,
-    ANDROID_SAMPLE_RES_TARGET,
-    ANDROID_SUPPORT_TARGET,
-    APPCOMPAT_TARGET,
-    SOLOADER_TARGET,
-  ],
-  visibility = [
-    'PUBLIC',
-  ]
-)

android/sample/java/com/facebook/samples/yoga/BenchmarkActivity.java

@@ -0,0 +1,118 @@
+/*
+ * 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.samples.yoga;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.Menu;
+import android.support.v7.app.ActionBar;
+
+import com.facebook.samples.yoga.R;
+import com.facebook.yoga.android.YogaViewLayoutFactory;
+
+public class BenchmarkActivity extends AppCompatActivity {
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    LayoutInflater.from(this).setFactory(YogaViewLayoutFactory.getInstance());
+    super.onCreate(savedInstanceState);
+
+    setContentView(R.layout.benchmark_select_layout);
+
+    ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
+    viewPager.setAdapter(new PagerAdapter(getSupportFragmentManager()));
+
+    final ActionBar actionBar = getSupportActionBar();
+    actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+
+    ActionBar.TabListener tabListener = new ActionBar.TabListener() {
+      public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
+        ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
+        viewPager.setCurrentItem(tab.getPosition());
+      }
+
+      public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
+      }
+
+      public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
+      }
+    };
+    actionBar.addTab(
+            actionBar.newTab()
+                    .setText("Inflate")
+                    .setTabListener(tabListener));
+    actionBar.addTab(
+            actionBar.newTab()
+                    .setText("Measure")
+                    .setTabListener(tabListener));
+    actionBar.addTab(
+            actionBar.newTab()
+                    .setText("Layout")
+                    .setTabListener(tabListener));
+
+    viewPager.setOnPageChangeListener(
+            new ViewPager.SimpleOnPageChangeListener() {
+              @Override
+              public void onPageSelected(int position) {
+                // When swiping between pages, select the
+                // corresponding tab.
+                actionBar.setSelectedNavigationItem(position);
+              }
+            });
+
+    viewPager.setOffscreenPageLimit(3);
+  }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    MenuInflater inflater = getMenuInflater();
+    inflater.inflate(R.menu.action_bar_benchmark, menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    // There is only one option
+    Intent intent = new Intent(this, MainActivity.class);
+    startActivity(intent);
+    this.finish();
+    return true;
+  }
+
+  public static class PagerAdapter extends FragmentPagerAdapter {
+    public PagerAdapter(FragmentManager fm) {
+      super(fm);
+    }
+
+    @Override
+    public Fragment getItem(int i) {
+      switch (i) {
+        case 0:
+          return new BenchmarkInflate();
+        case 1:
+          return new BenchmarkMeasure();
+        default:
+          return new BenchmarkLayout();
+      }
+    }
+
+    @Override
+    public int getCount() {
+      return 3;
+    }
+  }
+}

android/sample/java/com/facebook/samples/yoga/BenchmarkAggregator.java

@@ -0,0 +1,198 @@
+/*
+ * 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.samples.yoga;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.PrintWriter;
+import java.lang.Math;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.text.DateFormat;
+import java.util.Date;
+
+import android.content.Context;
+import android.util.Log;
+import android.os.Environment;
+
+import static java.util.Collections.sort;
+
+public class BenchmarkAggregator {
+
+  private final int GRAPH_WIDTH = 30;
+  private final int GRAPH_HEIGHT = 6;
+
+  private List<Long> times;
+  private boolean tracing;
+  private long lastTraceStart;
+
+  private boolean statsFresh;
+  private long mean;
+  private long variance;
+  private long stddev;
+  private long min;
+  private long max;
+  private long p10;
+  private long p50;
+  private long p90;
+
+  private String name;
+
+  public BenchmarkAggregator(String name) {
+    times = new ArrayList<>();
+    tracing = false;
+    this.name = name;
+  }
+
+  public void startTrace() {
+    if (tracing) {
+      throw new RuntimeException("Cannot start trace while running previous one");
+    }
+    tracing = true;
+    lastTraceStart = System.nanoTime();
+  }
+
+  public void endTrace() {
+    if (!tracing) {
+      throw new RuntimeException("Cannot stop trace if none are running!");
+    }
+    times.add(System.nanoTime() - lastTraceStart);
+    tracing = false;
+    statsFresh = false;
+  }
+
+  private void computeStats() {
+    if (statsFresh) {
+      return;
+    }
+
+    sort(times);
+
+    min = Long.MAX_VALUE;
+    max = -1;
+    mean = 0;
+    for (long f: times) {
+      mean += f;
+      if (f < min) {
+        min = f;
+      }
+      if (f > max) {
+        max = f;
+      }
+    }
+    mean /= times.size();
+
+    variance = 0;
+    for (long f: times) {
+      variance += (f-mean)*(f-mean);
+    }
+    variance /= times.size();
+    stddev = (long) Math.sqrt((double) variance);
+
+    p10 = times.get(times.size()*10/100);
+    p50 = times.get(times.size()*50/100);
+    p90 = times.get(times.size()*90/100);
+
+    statsFresh = true;
+  }
+
+  public String toString() {
+    computeStats();
+    return String.format(
+        "%s:\n" +
+            "| %d samples\n" +
+            "| Mean %.3f\u00B1%.3fms\n" + // plusminus
+            "| Min %.3fms ; Max %.3fms\n" +
+            "| p10 %.3fms ; p50 %.3fms ; p90 %.3fms\n" +
+            "%s",
+        name,
+        times.size(),
+        mean/10e6,
+        stddev/10e6,
+        min/10e6,
+        max/10e6,
+        p10/10e6,
+        p50/10e6,
+        p90/10e6,
+        makeGraph());
+  }
+
+  private String makeGraph() {
+    char canvas[][] = new char[GRAPH_HEIGHT][GRAPH_WIDTH];
+    for (int i = 0; i < GRAPH_HEIGHT; i++)
+      for (int j = 0; j < GRAPH_WIDTH; j++)
+        canvas[i][j] = ' ';
+
+    long bucketSize = (p90 - p10) / GRAPH_WIDTH+1;
+    int bucketCount[] = new int[GRAPH_WIDTH];
+    for (long time : times) {
+      if (time<p90 && time>p10) {
+        bucketCount[(int) ((time - p10) / bucketSize)]++;
+      }
+    }
+
+    int maxBucket = 0;
+    for (int i = 0; i < GRAPH_WIDTH; i++)
+      if (bucketCount[i] > maxBucket) {
+        maxBucket = bucketCount[i];
+      }
+
+    for (int i = 0; i < GRAPH_HEIGHT; i++)
+      for (int j = 0; j < GRAPH_WIDTH; j++)
+        if (i < bucketCount[j] * GRAPH_HEIGHT / maxBucket) {
+          canvas[i][j] = 'Z';
+        }
+
+    String graph = new String();
+    for (int i = 0; i < GRAPH_HEIGHT; i++)
+    {
+      int percentage = 100 * (GRAPH_HEIGHT - i - 1) * maxBucket / (times.size() * GRAPH_HEIGHT);
+      graph += String.format("| %2d%% ", percentage);
+      for (int j = 0; j < GRAPH_WIDTH; j++)
+        graph += canvas[GRAPH_HEIGHT-1-i][j];
+      graph += '\n';
+    }
+
+    graph += "|     p10";
+    for (int i = 0; i < GRAPH_WIDTH-6; i++)
+      graph += " ";
+    graph += "p90\n";
+    return graph;
+  }
+
+  /**
+   * Dumps the collected times to a file on the device.  This allows us to grab the raw data
+   * and perform more in-depth analysis.
+   */
+  public void dump(Context context) {
+    String state = Environment.getExternalStorageState();
+    if (!Environment.MEDIA_MOUNTED.equals(state)) {
+      Log.e("YogaLayoutBenchmark","No external file storage");
+      return;
+    }
+
+    SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmss");
+    String filename = format.format(new Date()) + "_" + name.replace(' ','_');
+    File file = new File(context.getExternalFilesDir(
+            Environment.DIRECTORY_DOCUMENTS), filename);
+
+    try {
+      PrintWriter printWriter = new PrintWriter(file);
+      for (long l : times) {
+        printWriter.println(l);
+      }
+      printWriter.close();
+
+      Log.i("YogaLayoutBenchmark","Benchmark data saved in "+file.getPath());
+    } catch (java.io.IOException e) {
+      Log.e("YogaLayoutBenchmark", "Could not save benchmark data", e);
+    }
+  }
+}

android/sample/java/com/facebook/samples/yoga/BenchmarkFragment.java

@@ -0,0 +1,115 @@
+/*
+ * 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.samples.yoga;
+
+
+import java.util.Random;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+import android.widget.ArrayAdapter;
+import android.widget.AdapterView;
+
+import com.facebook.samples.yoga.R;
+import com.facebook.yoga.android.YogaLayout;
+
+public class BenchmarkFragment extends Fragment implements AdapterView.OnItemSelectedListener {
+  private LayoutInflater mInflater;
+
+  protected com.facebook.yoga.android.YogaLayout rootLayout;
+  protected int yogaLayout;
+  protected int linearLayout;
+
+  static final Random random = new Random();
+
+  static void randomizeText(View root) {
+    if (root instanceof TextView) {
+      ((TextView) root).setText("" + random.nextInt(1000));
+      ((TextView) root).setTextSize(10 + random.nextInt(20));
+      ViewParent parent = root.getParent();
+      if (parent instanceof YogaLayout) {
+        ((YogaLayout) parent).invalidate(root);
+      }
+    } else if (root instanceof ViewGroup) {
+      for (int i = 0; i < ((ViewGroup) root).getChildCount(); i++) {
+        randomizeText(((ViewGroup) root).getChildAt(i));
+      }
+    }
+  }
+
+  public BenchmarkFragment() {
+  }
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+  }
+
+  @Override
+  public View onCreateView(
+      LayoutInflater inflater,
+      ViewGroup container,
+      Bundle savedInstanceState) {
+    mInflater = inflater;
+
+    rootLayout = (YogaLayout) inflater.inflate(
+        R.layout.benchmark_fragment,
+        container,
+        false);
+
+    Spinner benchmarkSelect = (Spinner) rootLayout.findViewById(R.id.benchmarkSelect);
+    String[] items = new String[]{"Basic", "Typical", "Nested"};
+    ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, items);
+    benchmarkSelect.setAdapter(adapter);
+    benchmarkSelect.setOnItemSelectedListener(this);
+    return rootLayout;
+  }
+
+  @Override
+  public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
+    switch (pos) {
+      case 0:
+        yogaLayout = R.layout.benchmark_layout_1;
+        linearLayout = R.layout.benchmark_layout_1_linear;
+        break;
+      case 1:
+        yogaLayout = R.layout.benchmark_layout_2;
+        linearLayout = R.layout.benchmark_layout_2_linear;
+        break;
+      case 2:
+      default:
+        yogaLayout = R.layout.benchmark_layout_3;
+        linearLayout = R.layout.benchmark_layout_3_linear;
+        break;
+    }
+    updatePreview();
+  }
+
+  @Override
+  public void onNothingSelected(AdapterView<?> parent) {
+    yogaLayout = R.layout.benchmark_layout_1;
+    linearLayout = R.layout.benchmark_layout_1_linear;
+    updatePreview();
+  }
+
+  private void updatePreview() {
+    LinearLayout previewLayout = (LinearLayout) rootLayout.findViewById(R.id.preview);
+    View v  = mInflater.inflate(yogaLayout, rootLayout, false);
+    v.setLayoutParams(new LinearLayout.LayoutParams(
+        LinearLayout.LayoutParams.MATCH_PARENT,
+        LinearLayout.LayoutParams.MATCH_PARENT));
+    previewLayout.removeAllViews();
+    previewLayout.addView(v);
+  }
+}

android/sample/java/com/facebook/samples/yoga/BenchmarkInflate.java

@@ -0,0 +1,70 @@
+/*
+ * 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.samples.yoga;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Button;
+import android.view.ViewGroup;
+import android.util.Log;
+import com.facebook.samples.yoga.R;
+
+public class BenchmarkInflate extends BenchmarkFragment {
+
+  @Override
+  public View onCreateView(
+    LayoutInflater inflater,
+    ViewGroup container,
+    Bundle savedInstanceState) {
+    super.onCreateView(inflater, container, savedInstanceState);
+
+    Button b = (Button) rootLayout.findViewById(R.id.btn);
+    b.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        startBenchmark();
+      }
+    });
+
+    return rootLayout;
+  }
+
+  protected void startBenchmark() {
+    LayoutInflater inflater = LayoutInflater.from(getActivity());
+    TextView textView = (TextView) rootLayout.findViewById(R.id.text);
+
+    final int ITERATIONS = 500;
+
+    inflater.inflate(yogaLayout, null);
+    inflater.inflate(linearLayout, null);
+
+    BenchmarkAggregator yogaInflationAggregator = new BenchmarkAggregator("Yoga Inflate");
+    BenchmarkAggregator linearInflationAggregator = new BenchmarkAggregator("Linear Inflate");
+    for (int i = 0; i < ITERATIONS; i++) {
+      yogaInflationAggregator.startTrace();
+      inflater.inflate(yogaLayout, null);
+      yogaInflationAggregator.endTrace();
+      linearInflationAggregator.startTrace();
+      inflater.inflate(linearLayout, null);
+      linearInflationAggregator.endTrace();
+    }
+
+    textView.setText(
+        yogaInflationAggregator.toString()+
+            "\n"+
+            linearInflationAggregator.toString());
+    Log.i(
+      "YogaLayoutBenchmark",
+      yogaInflationAggregator.toString()+
+        "\n"+
+        linearInflationAggregator.toString());
+    rootLayout.invalidate();
+  }
+}

android/sample/java/com/facebook/samples/yoga/BenchmarkLayout.java

@@ -0,0 +1,79 @@
+/*
+ * 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.samples.yoga;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import com.facebook.samples.yoga.R;
+
+import java.util.Random;
+
+public class BenchmarkLayout extends BenchmarkFragment {
+
+  @Override
+  public View onCreateView(
+    LayoutInflater inflater,
+    ViewGroup container,
+    Bundle savedInstanceState) {
+    super.onCreateView(inflater, container, savedInstanceState);
+
+    Button b = (Button) rootLayout.findViewById(R.id.btn);
+    b.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        startBenchmark();
+      }
+    });
+
+    return rootLayout;
+  }
+
+  protected void startBenchmark() {
+    LayoutInflater inflater = LayoutInflater.from(getActivity());
+    TextView textView = (TextView) rootLayout.findViewById(R.id.text);
+    Random random = new Random();
+
+    final int ITERATIONS = 500;
+
+    BenchmarkAggregator yogaInflationAggregator = new BenchmarkAggregator("Yoga Layout");
+    BenchmarkAggregator linearInflationAggregator = new BenchmarkAggregator("Linear Layout");
+    View yogaView = inflater.inflate(yogaLayout, null);
+    View linearView = inflater.inflate(linearLayout, null);
+    for (int i = 0; i < ITERATIONS; i++) {
+      randomizeText(yogaView);
+      randomizeText(linearView);
+      yogaView.measure(
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+      linearView.measure(
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+      yogaInflationAggregator.startTrace();
+      yogaView.layout(0, 0, yogaView.getMeasuredWidth(), yogaView.getMeasuredHeight());
+      yogaInflationAggregator.endTrace();
+      linearInflationAggregator.startTrace();
+      linearView.layout(0, 0, linearView.getMeasuredWidth(), linearView.getMeasuredHeight());
+      linearInflationAggregator.endTrace();
+    }
+
+    textView.setText(
+        yogaInflationAggregator.toString()+
+            "\n"+
+            linearInflationAggregator.toString());
+    Log.i(
+      "YogaLayoutBenchmark",
+      yogaInflationAggregator.toString()+
+        "\n"+
+        linearInflationAggregator.toString());
+  }
+}

android/sample/java/com/facebook/samples/yoga/BenchmarkMeasure.java

@@ -0,0 +1,80 @@
+/*
+ * 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.samples.yoga;
+
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+import com.facebook.samples.yoga.R;
+
+import java.util.Random;
+
+public class BenchmarkMeasure extends BenchmarkFragment {
+
+  @Override
+  public View onCreateView(
+    LayoutInflater inflater,
+    ViewGroup container,
+    Bundle savedInstanceState) {
+    super.onCreateView(inflater, container, savedInstanceState);
+
+    Button b = (Button) rootLayout.findViewById(R.id.btn);
+    b.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        startBenchmark();
+      }
+    });
+
+    return rootLayout;
+  }
+
+  protected void startBenchmark() {
+    LayoutInflater inflater = LayoutInflater.from(getActivity());
+    TextView textView = (TextView) rootLayout.findViewById(R.id.text);
+    Random random = new Random();
+
+    final int ITERATIONS = 500;
+
+    BenchmarkAggregator yogaMeasureAggregator = new BenchmarkAggregator("Yoga Measure");
+    BenchmarkAggregator linearMeasureAggregator = new BenchmarkAggregator("Linear Measure");
+    View yogaView = inflater.inflate(yogaLayout, null);
+    View linearView = inflater.inflate(linearLayout, null);
+    for (int i = 0; i < ITERATIONS; i++) {
+      randomizeText(yogaView);
+      randomizeText(linearView);
+      yogaMeasureAggregator.startTrace();
+      yogaView.measure(
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+      yogaMeasureAggregator.endTrace();
+      linearMeasureAggregator.startTrace();
+      linearView.measure(
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+      linearMeasureAggregator.endTrace();
+    }
+
+    textView.setText(
+        yogaMeasureAggregator.toString()+
+            "\n"+
+            linearMeasureAggregator.toString());
+    Log.i(
+      "YogaLayoutBenchmark",
+      yogaMeasureAggregator.toString()+
+        "\n"+
+        linearMeasureAggregator.toString());
+
+    yogaMeasureAggregator.dump(getActivity());
+    linearMeasureAggregator.dump(getActivity());
+  }
+}

android/sample/java/com/facebook/samples/yoga/MainActivity.java

@@ -1,16 +1,19 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * 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.samples.yoga;
 
+import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.Menu;
 
 import com.facebook.samples.yoga.R;
 import com.facebook.soloader.SoLoader;
@@ -21,7 +24,7 @@ import com.facebook.yoga.android.YogaViewLayoutFactory;
  * {@code main_layout.xml}) that shows off the awesome functionality of the Yoga layout engine
  * as well as some optimisations on layout systems that it facilitates.
  */
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -31,4 +34,20 @@ public class MainActivity extends ActionBarActivity {
 
     setContentView(R.layout.main_layout);
   }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    MenuInflater inflater = getMenuInflater();
+    inflater.inflate(R.menu.action_bar_home, menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    // There is only one option
+    Intent intent = new Intent(this, BenchmarkActivity.class);
+    startActivity(intent);
+    this.finish();
+    return true;
+  }
 }

android/sample/res/layout/benchmark_fragment.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<YogaLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yoga="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/rt"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    yoga:yg_flexDirection="column"
+    >
+  <VirtualYogaLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      yoga:yg_flexDirection="row"
+      yoga:yg_height="50dp"
+      >
+    <Button
+        android:id="@+id/btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="Run benchmark"
+        yoga:yg_flex="1"
+        />
+    <Spinner
+        android:id="@+id/benchmarkSelect"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:spinnerMode="dropdown"
+        />
+  </VirtualYogaLayout>
+  <TextView
+      android:id="@+id/text"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:textSize="10sp"
+      android:fontFamily="monospace"
+      yoga:yg_flex="1"
+      />
+  <View
+      android:layout_width="match_parent"
+      android:layout_height="2dp"
+      android:background="@color/yoga_grey"
+      />
+  <LinearLayout
+      android:id="@+id/preview"
+      android:layout_width="match_parent"
+      android:layout_height="60dp"
+      android:orientation="horizontal"
+      />
+</YogaLayout>

android/sample/res/layout/benchmark_layout_1.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<YogaLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yoga="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="60dp"
+    yoga:yg_flexDirection="row"
+    yoga:yg_alignItems="center"
+    >
+  <View
+      android:layout_width="50dp"
+      android:layout_height="50dp"
+      android:background="@color/yoga_blue"
+      yoga:yg_flex="0"
+      yoga:yg_marginAll="5dp"
+      />
+  <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/child_1_text"
+      yoga:yg_flex="0"
+      />
+  <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/child_2_text"
+      yoga:yg_flex="1"
+      yoga:yg_marginHorizontal="5dp"
+  />
+</YogaLayout>

android/sample/res/layout/benchmark_layout_1_linear.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:gravity="center"
+    >
+  <ImageView
+      android:layout_width="50dp"
+      android:layout_height="50dp"
+      android:layout_margin="5dp"
+      android:src="@drawable/ic_launcher"
+      />
+  <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/child_1_text"
+      />
+  <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:layout_marginLeft="5dp"
+      android:layout_marginRight="5dp"
+      android:text="@string/child_2_text"
+      />
+</LinearLayout>

android/sample/res/layout/benchmark_layout_2.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<YogaLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yoga="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="60dp"
+    yoga:yg_flexDirection="column"
+    yoga:yg_alignItems="stretch"
+    >
+  <View
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:background="@color/yoga_blue"
+      yoga:yg_flex="1"
+      />
+  <VirtualYogaLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      yoga:height="40dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="stretch"
+      >
+    <View
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/yoga_blue"
+        yoga:yg_marginAll="10dp"
+        yoga:yg_aspectRatio="1"
+        />
+    <VirtualYogaLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        yoga:height="40dp"
+        yoga:yg_flexDirection="column"
+        yoga:yg_alignItems="stretch"
+        yoga:yg_flex="1"
+        yoga:yg_justifyContent="space_around"
+        >
+      <VirtualYogaLayout
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           yoga:height="8dp"
+           yoga:yg_flexDirection="row"
+           yoga:yg_alignItems="stretch"
+           >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/child_1_text"
+            android:textSize="5sp"
+            yoga:yg_flex="1"
+            />
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/yoga_blue"
+            yoga:yg_aspectRatio="1"
+            />
+      </VirtualYogaLayout>
+      <VirtualYogaLayout
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           yoga:height="8dp"
+           yoga:yg_flexDirection="row"
+           yoga:yg_alignItems="stretch"
+           >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/child_1_text"
+            android:textSize="5sp"
+            yoga:yg_flex="1"
+            />
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/yoga_blue"
+            yoga:yg_aspectRatio="1"
+            />
+      </VirtualYogaLayout>
+      <VirtualYogaLayout
+           android:layout_width="wrap_content"
+           android:layout_height="wrap_content"
+           yoga:height="8dp"
+           yoga:yg_flexDirection="row"
+           yoga:yg_alignItems="stretch"
+           >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/child_1_text"
+            android:textSize="5sp"
+            yoga:yg_flex="1"
+            />
+        <View
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/yoga_blue"
+            yoga:yg_aspectRatio="1"
+            />
+      </VirtualYogaLayout>
+    </VirtualYogaLayout>
+  </VirtualYogaLayout>
+</YogaLayout>

android/sample/res/layout/benchmark_layout_2_linear.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yoga="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="60dp"
+    android:orientation="vertical"
+    >
+  <View
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:src="@drawable/ic_launcher"
+      android:background="@color/yoga_blue"
+      android:layout_weight="1"
+      />
+  <LinearLayout
+      android:layout_width="match_parent"
+      android:layout_height="40dp"
+      android:orientation="horizontal"
+      >
+      <View
+          android:layout_width="20dp"
+          android:layout_height="20dp"
+          android:src="@drawable/ic_launcher"
+          android:background="@color/yoga_blue"
+          android:layout_margin="10dp"
+          />
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="40dp"
+          android:layout_weight="1"
+          android:orientation="vertical"
+          >
+        <LinearLayout
+             android:layout_width="match_parent"
+             android:layout_height="8dp"
+             android:orientation="horizontal"
+             android:layout_marginTop="4dp"
+             >
+          <TextView
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="@string/child_1_text"
+              android:textSize="5sp"
+              android:layout_weight="1"
+              />
+          <View
+              android:layout_width="8dp"
+              android:layout_height="8dp"
+              android:src="@drawable/ic_launcher"
+              android:background="@color/yoga_blue"
+              />
+        </LinearLayout>
+        <LinearLayout
+             android:layout_width="match_parent"
+             android:layout_height="8dp"
+             android:orientation="horizontal"
+             android:layout_marginTop="4dp"
+             >
+          <TextView
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="@string/child_1_text"
+              android:textSize="5sp"
+              android:layout_weight="1"
+              />
+          <View
+              android:layout_width="8dp"
+              android:layout_height="8dp"
+              android:src="@drawable/ic_launcher"
+              android:background="@color/yoga_blue"
+              />
+        </LinearLayout>
+        <LinearLayout
+             android:layout_width="match_parent"
+             android:layout_height="8dp"
+             android:orientation="horizontal"
+             android:layout_marginTop="4dp"
+             >
+          <TextView
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="@string/child_1_text"
+              android:textSize="5sp"
+              android:layout_weight="1"
+              />
+          <View
+              android:layout_width="8dp"
+              android:layout_height="8dp"
+              android:src="@drawable/ic_launcher"
+              android:background="@color/yoga_blue"
+              />
+        </LinearLayout>
+      </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

android/sample/res/layout/benchmark_layout_3.xml

@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<YogaLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yoga="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    yoga:yg_alignItems="center"
+    yoga:yg_flexDirection="row"
+    yoga:yg_justifyContent="center"
+    >
+  <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:background="@color/yoga_blue"
+      yoga:yg_marginLeft="10dp"
+      />
+  <VirtualYogaLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      yoga:yg_flexDirection="column"
+      yoga:yg_flex="1"
+      >
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/yoga_grey"
+        yoga:yg_marginLeft="10dp"
+        />
+    <VirtualYogaLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        yoga:yg_flexDirection="row"
+        yoga:yg_flex="1"
+        >
+      <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:background="@color/yoga_grey"
+          yoga:yg_marginLeft="10dp"
+          />
+      <VirtualYogaLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          yoga:yg_flexDirection="row"
+          yoga:yg_flex="1"
+          >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/yoga_blue"
+            yoga:yg_marginLeft="10dp"
+            />
+        <VirtualYogaLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            yoga:yg_flexDirection="row"
+            yoga:yg_flex="1"
+            >
+          <TextView
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:background="@color/yoga_grey"
+              yoga:yg_marginLeft="10dp"
+              />
+          <VirtualYogaLayout
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              yoga:yg_flexDirection="row"
+              yoga:yg_flex="1"
+              >
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@color/yoga_grey"
+                yoga:yg_marginLeft="10dp"
+                />
+            <VirtualYogaLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                yoga:yg_flexDirection="column"
+                yoga:yg_flex="1"
+                >
+              <TextView
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:background="@color/yoga_blue"
+                  yoga:yg_marginLeft="10dp"
+                  />
+              <VirtualYogaLayout
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  yoga:yg_flexDirection="row"
+                  yoga:yg_flex="1"
+                  >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@color/yoga_grey"
+                    yoga:yg_marginLeft="10dp"
+                    />
+                <VirtualYogaLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    yoga:yg_flexDirection="row"
+                    yoga:yg_flex="1"
+                    >
+                  <TextView
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:background="@color/yoga_grey"
+                      yoga:yg_marginLeft="10dp"
+                      />
+                  <VirtualYogaLayout
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      yoga:yg_flexDirection="row"
+                      yoga:yg_flex="1"
+                      >
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@color/yoga_blue"
+                        yoga:yg_marginLeft="10dp"
+                        />
+                    <VirtualYogaLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        yoga:yg_flexDirection="row"
+                        yoga:yg_flex="1"
+                        >
+                      <TextView
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:background="@color/yoga_grey"
+                          yoga:yg_marginLeft="10dp"
+                          />
+                      <VirtualYogaLayout
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          yoga:yg_flexDirection="column"
+                          yoga:yg_flex="1"
+                          >
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:background="@color/yoga_grey"
+                            yoga:yg_marginLeft="10dp"
+                            />
+                        <VirtualYogaLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            yoga:yg_flexDirection="row"
+                            yoga:yg_flex="1"
+                            >
+                          <TextView
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:background="@color/yoga_blue"
+                              yoga:yg_marginLeft="10dp"
+                              />
+                          <VirtualYogaLayout
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              yoga:yg_flexDirection="row"
+                              yoga:yg_flex="1"
+                              >
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:background="@color/yoga_grey"
+                                yoga:yg_marginLeft="10dp"
+                                />
+                            <VirtualYogaLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                yoga:yg_flexDirection="row"
+                                yoga:yg_flex="1"
+                                >
+                              <TextView
+                                  android:layout_width="wrap_content"
+                                  android:layout_height="wrap_content"
+                                  android:background="@color/yoga_grey"
+                                  yoga:yg_marginLeft="10dp"
+                                  />
+                              <VirtualYogaLayout
+                                  android:layout_width="wrap_content"
+                                  android:layout_height="wrap_content"
+                                  yoga:yg_flexDirection="row"
+                                  yoga:yg_flex="1"
+                                  >
+                              </VirtualYogaLayout>
+                            </VirtualYogaLayout>
+                          </VirtualYogaLayout>
+                        </VirtualYogaLayout>
+                      </VirtualYogaLayout>
+                    </VirtualYogaLayout>
+                  </VirtualYogaLayout>
+                </VirtualYogaLayout>
+              </VirtualYogaLayout>
+            </VirtualYogaLayout>
+          </VirtualYogaLayout>
+        </VirtualYogaLayout>
+      </VirtualYogaLayout>
+    </VirtualYogaLayout>
+  </VirtualYogaLayout>
+</YogaLayout>

android/sample/res/layout/benchmark_layout_3_linear.xml

@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="horizontal"
+    >
+  <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginLeft="10dp"
+      android:background="@color/yoga_blue"
+      />
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:orientation="vertical"
+      >
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="10dp"
+        android:background="@color/yoga_grey"
+        />
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        >
+      <TextView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginLeft="10dp"
+          android:background="@color/yoga_grey"
+          />
+      <LinearLayout
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"
+          android:orientation="horizontal"
+          >
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:background="@color/yoga_blue"
+            />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal"
+            >
+          <TextView
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_marginLeft="10dp"
+              android:background="@color/yoga_grey"
+              />
+          <LinearLayout
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:orientation="horizontal"
+              >
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="10dp"
+                android:background="@color/yoga_grey"
+                />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:orientation="vertical"
+                >
+              <TextView
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_marginLeft="10dp"
+                  android:background="@color/yoga_blue"
+                  />
+              <LinearLayout
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_weight="1"
+                  android:orientation="horizontal"
+                  >
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="10dp"
+                    android:background="@color/yoga_grey"
+                    />
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="horizontal"
+                    >
+                  <TextView
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_marginLeft="10dp"
+                      android:background="@color/yoga_grey"
+                      />
+                  <LinearLayout
+                      android:layout_width="wrap_content"
+                      android:layout_height="wrap_content"
+                      android:layout_weight="1"
+                      android:orientation="horizontal"
+                      >
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="10dp"
+                        android:background="@color/yoga_blue"
+                        />
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="horizontal"
+                        >
+                      <TextView
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_marginLeft="10dp"
+                          android:background="@color/yoga_grey"
+                          />
+                      <LinearLayout
+                          android:layout_width="wrap_content"
+                          android:layout_height="wrap_content"
+                          android:layout_weight="1"
+                          android:orientation="vertical"
+                          >
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="10dp"
+                            android:background="@color/yoga_grey"
+                            />
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:orientation="horizontal"
+                            >
+                          <TextView
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:layout_marginLeft="10dp"
+                              android:background="@color/yoga_blue"
+                              />
+                          <LinearLayout
+                              android:layout_width="wrap_content"
+                              android:layout_height="wrap_content"
+                              android:layout_weight="1"
+                              android:orientation="horizontal"
+                              >
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginLeft="10dp"
+                                android:background="@color/yoga_grey"
+                                />
+                            <LinearLayout
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:orientation="horizontal"
+                                >
+                              <TextView
+                                  android:layout_width="wrap_content"
+                                  android:layout_height="wrap_content"
+                                  android:layout_marginLeft="10dp"
+                                  android:background="@color/yoga_grey"
+                                  />
+                              <LinearLayout
+                                  android:layout_width="wrap_content"
+                                  android:layout_height="wrap_content"
+                                  android:layout_weight="1"
+                                  android:orientation="horizontal"
+                                  >
+                              </LinearLayout>
+                            </LinearLayout>
+                          </LinearLayout>
+                        </LinearLayout>
+                      </LinearLayout>
+                    </LinearLayout>
+                  </LinearLayout>
+                </LinearLayout>
+              </LinearLayout>
+            </LinearLayout>
+          </LinearLayout>
+        </LinearLayout>
+      </LinearLayout>
+    </LinearLayout>
+  </LinearLayout>
+</LinearLayout>

android/sample/res/layout/benchmark_select_layout.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<android.support.v4.view.ViewPager
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />

android/sample/res/layout/main_layout.xml

@@ -10,7 +10,7 @@
 
 <YogaLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:yoga="http://schemas.android.com/apk/res-auto"
+    xmlns:yoga="http://schemas.android.com/apk/res/com.facebook.samples.yoga"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     >
@@ -18,120 +18,120 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/sample_children_background"
-      yoga:margin_horizontal="10dp"
-      yoga:margin_top="5dp"
-      yoga:flex_direction="row"
-      yoga:align_items="center"
+      yoga:yg_marginHorizontal="10dp"
+      yoga:yg_marginTop="5dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center"
       >
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:src="@drawable/ic_launcher"
-        yoga:flex="0"
+        yoga:yg_flex="0"
         />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/child_1_text"
         android:textColor="@color/children_text"
-        yoga:flex="1"
-        yoga:margin_start="8dp"
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="8dp"
         />
   </YogaLayout>
   <YogaLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/sample_children_background"
-      yoga:margin_horizontal="10dp"
-      yoga:margin_top="5dp"
-      yoga:flex_direction="row"
-      yoga:align_items="center"
+      yoga:yg_marginHorizontal="10dp"
+      yoga:yg_marginTop="5dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center"
       >
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:src="@drawable/ic_launcher"
-        yoga:flex="0"
+        yoga:yg_flex="0"
         />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/child_2_text"
         android:textColor="@color/children_text"
-        yoga:flex="1"
-        yoga:margin_start="8dp"
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="8dp"
         />
   </YogaLayout>
   <YogaLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/sample_children_background"
-      yoga:margin_horizontal="10dp"
-      yoga:margin_top="5dp"
-      yoga:flex_direction="row"
-      yoga:align_items="center"
+      yoga:yg_marginHorizontal="10dp"
+      yoga:yg_marginTop="5dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center"
       >
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:src="@drawable/ic_launcher"
-        yoga:flex="0"
+        yoga:yg_flex="0"
         />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/child_3_text"
         android:textColor="@color/children_text"
-        yoga:flex="1"
-        yoga:margin_start="8dp"
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="8dp"
         />
   </YogaLayout>
   <YogaLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/sample_children_background"
-      yoga:margin_horizontal="10dp"
-      yoga:margin_top="5dp"
-      yoga:flex_direction="row"
-      yoga:align_items="center"
+      yoga:yg_marginHorizontal="10dp"
+      yoga:yg_marginTop="5dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center"
       >
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:src="@drawable/ic_launcher"
-        yoga:flex="0"
+        yoga:yg_flex="0"
         />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/child_4_text"
         android:textColor="@color/children_text"
-        yoga:flex="1"
-        yoga:margin_start="8dp"
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="8dp"
         />
   </YogaLayout>
   <YogaLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/sample_children_background"
-      yoga:margin_horizontal="10dp"
-      yoga:margin_top="5dp"
-      yoga:flex_direction="row"
-      yoga:align_items="center"
+      yoga:yg_marginHorizontal="10dp"
+      yoga:yg_marginTop="5dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center"
       >
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:src="@drawable/ic_launcher"
-        yoga:flex="0"
+        yoga:yg_flex="0"
     />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/child_5_text"
         android:textColor="@color/children_text"
-        yoga:flex="1"
-        yoga:margin_start="10dp"
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="10dp"
         />
   </YogaLayout>
 </YogaLayout>

android/sample/res/menu/action_bar_benchmark.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2014-present, Facebook, Inc.
+  All rights reserved.
+
+  This source code is licensed under the license found in the
+  LICENSE-examples file in the root directory of this source tree.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+  <item
+      android:id="@+id/action_home"
+      android:title="Home"
+      android:showAsAction="always"
+      />
+</menu>

android/sample/res/menu/action_bar_home.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2014-present, Facebook, Inc.
+  All rights reserved.
+
+  This source code is licensed under the license found in the
+  LICENSE-examples file in the root directory of this source tree.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+  <item
+      android:id="@+id/action_benchmark"
+      android:title="Benchmark"
+      android:showAsAction="always"
+      />
+</menu>

android/src/main/AndroidManifest.xml

@@ -1,24 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright (c) 2014-present, Facebook, Inc.
-  All rights reserved.
+  Copyright (c) Facebook, Inc. and its affiliates.
 
-  This source code is licensed under the BSD-style license found in the
-  LICENSE file in the root directory of this source tree. An additional grant
-  of patent rights can be found in the PATENTS file in the same directory.
+  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"
-          android:versionCode="1"
-          android:versionName="1.0"
-          >
-
-  <uses-sdk
-    android:minSdkVersion="15"
-    android:targetSdkVersion="19"
-    />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application/>
 

android/src/main/java/com/facebook/yoga/android/BUCK

@@ -1,23 +0,0 @@
-# Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
-include_defs('//YOGA_DEFS')
-
-android_library(
-  name = 'android',
-  srcs = glob(['**/*.java']),
-  deps = [
-    ANDROID_RES_TARGET,
-    INFER_ANNOTATIONS_TARGET,
-    JAVA_TARGET,
-    JSR_305_TARGET,
-    SOLOADER_TARGET,
-  ],
-  visibility = [
-    'PUBLIC',
-  ]
-)

android/src/main/java/com/facebook/yoga/android/VirtualYogaLayout.java

@@ -1,10 +1,8 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * 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.android;
@@ -20,6 +18,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.facebook.yoga.YogaNode;
+import com.facebook.yoga.YogaNodeFactory;
 
 /**
  * Much like a {@link YogaLayout}, except this class does not render itself (the container) to the
@@ -35,7 +34,7 @@ public class VirtualYogaLayout extends ViewGroup {
 
   final private List<View> mChildren = new LinkedList<>();
   final private Map<View, YogaNode> mYogaNodes = new HashMap<>();
-  final private YogaNode mYogaNode = new YogaNode();
+  final private YogaNode mYogaNode = YogaNodeFactory.create();
 
   public VirtualYogaLayout(Context context) {
     super(context);
@@ -75,7 +74,7 @@ public class VirtualYogaLayout extends ViewGroup {
       return;
     }
 
-    YogaNode node = new YogaNode();
+    YogaNode node = YogaNodeFactory.create();
     YogaLayout.LayoutParams lp = new YogaLayout.LayoutParams(params);
     YogaLayout.applyLayoutParams(lp, node, child);
     node.setData(child);

android/src/main/java/com/facebook/yoga/android/YogaLayout.java

@@ -1,20 +1,14 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * 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.android;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import android.content.Context;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
@@ -24,11 +18,10 @@ import android.util.SparseArray;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
-
-import com.facebook.yoga.android.R;
 import com.facebook.yoga.YogaAlign;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaDirection;
+import com.facebook.yoga.YogaDisplay;
 import com.facebook.yoga.YogaEdge;
 import com.facebook.yoga.YogaFlexDirection;
 import com.facebook.yoga.YogaJustify;
@@ -36,10 +29,12 @@ import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
 import com.facebook.yoga.YogaNode;
-import com.facebook.yoga.YogaNodeAPI;
+import com.facebook.yoga.YogaNodeFactory;
 import com.facebook.yoga.YogaOverflow;
 import com.facebook.yoga.YogaPositionType;
 import com.facebook.yoga.YogaWrap;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A {@code ViewGroup} based on the Yoga layout engine.
@@ -51,15 +46,15 @@ import com.facebook.yoga.YogaWrap;
  * <pre>{@code
  * <YogaLayout
  *     xmlns:android="http://schemas.android.com/apk/res/android"
- *     xmlns:yoga="http://schemas.android.com/apk/res-auto"
- *     android:layout_width="match_parent"
- *     android:layout_height="match_parent"
+ *     xmlns:yoga="http://schemas.android.com/apk/com.facebook.yoga.android"
+ *     android:layout_width="match_owner"
+ *     android:layout_height="match_owner"
  *     yoga:flex_direction="row"
  *     yoga:padding_all="10dp"
  *     >
  *     <TextView
- *         android:layout_width="match_parent"
- *         android:layout_height="match_parent"
+ *         android:layout_width="match_owner"
+ *         android:layout_height="match_owner"
  *         android:text="Hello, World!"
  *         yoga:flex="1"
  *         />
@@ -84,21 +79,26 @@ public class YogaLayout extends ViewGroup {
   public YogaLayout(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
 
-    mYogaNode = new YogaNode();
+    mYogaNode = YogaNodeFactory.create();
     mYogaNodes = new HashMap<>();
 
     mYogaNode.setData(this);
     mYogaNode.setMeasureFunction(new ViewMeasureFunction());
 
-    final LayoutParams layoutParams = new LayoutParams(context, attrs);
+    LayoutParams layoutParams = null;
+    if (attrs != null) {
+      layoutParams = new LayoutParams(context, attrs);
+    } else {
+      layoutParams = (LayoutParams) generateDefaultLayoutParams();
+    }
     applyLayoutParams(layoutParams, mYogaNode, this);
   }
 
-  YogaNode getYogaNode() {
+  public YogaNode getYogaNode() {
     return mYogaNode;
   }
 
-  YogaNode getYogaNodeForView(View view) {
+  public YogaNode getYogaNodeForView(View view) {
     return mYogaNodes.get(view);
   }
 
@@ -106,7 +106,7 @@ public class YogaLayout extends ViewGroup {
    * Adds a child view with the specified layout parameters.
    *
    * In the typical View is added, this constructs a {@code YogaNode} for this child and applies all
-   * the {@code yoga:*} attributes.  The Toga node is added to the Yoga tree and the child is added
+   * the {@code yoga:*} attributes.  The Yoga node is added to the Yoga tree and the child is added
    * to this ViewGroup.
    *
    * If the child is a {@link YogaLayout} itself, we do not construct a new Yoga node for that
@@ -153,7 +153,11 @@ public class YogaLayout extends ViewGroup {
     if (child instanceof YogaLayout) {
       childNode = ((YogaLayout) child).getYogaNode();
     } else {
-      childNode = new YogaNode();
+      if(mYogaNodes.containsKey(child)) {
+        childNode = mYogaNodes.get(child);
+      } else {
+        childNode = YogaNodeFactory.create();
+      }
 
       childNode.setData(child);
       childNode.setMeasureFunction(new ViewMeasureFunction());
@@ -231,17 +235,39 @@ public class YogaLayout extends ViewGroup {
     super.removeAllViewsInLayout();
   }
 
+  /**
+   * Marks a particular view as "dirty" and to be relaid out.  If the view is not a child of this
+   * {@link YogaLayout}, the entire tree is traversed to find it.
+   *
+   * @param view the view to mark as dirty
+   */
+  public void invalidate(View view) {
+    if (mYogaNodes.containsKey(view)) {
+      mYogaNodes.get(view).dirty();
+      return;
+    }
+
+    final int childCount = mYogaNode.getChildCount();
+    for (int i = 0; i < childCount; i++) {
+      final YogaNode yogaNode = mYogaNode.getChildAt(i);
+      if (yogaNode.getData() instanceof YogaLayout) {
+        ((YogaLayout) yogaNode.getData()).invalidate(view);
+      }
+    }
+    invalidate();
+  }
+
   private void removeViewFromYogaTree(View view, boolean inLayout) {
     final YogaNode node = mYogaNodes.get(view);
     if (node == null) {
       return;
     }
 
-    final YogaNode parent = node.getParent();
+    final YogaNode owner = node.getOwner();
 
-    for (int i = 0; i < parent.getChildCount(); i++) {
-      if (parent.getChildAt(i).equals(node)) {
-        parent.removeChildAt(i);
+    for (int i = 0; i < owner.getChildCount(); i++) {
+      if (owner.getChildAt(i).equals(node)) {
+        owner.removeChildAt(i);
         break;
       }
     }
@@ -256,10 +282,13 @@ public class YogaLayout extends ViewGroup {
 
   private void applyLayoutRecursive(YogaNode node, float xOffset, float yOffset) {
     View view = (View) node.getData();
+
     if (view != null && view != this) {
       if (view.getVisibility() == GONE) {
         return;
       }
+      int left = Math.round(xOffset + node.getLayoutX());
+      int top = Math.round(yOffset + node.getLayoutY());
       view.measure(
           View.MeasureSpec.makeMeasureSpec(
               Math.round(node.getLayoutWidth()),
@@ -267,11 +296,7 @@ public class YogaLayout extends ViewGroup {
           View.MeasureSpec.makeMeasureSpec(
               Math.round(node.getLayoutHeight()),
               View.MeasureSpec.EXACTLY));
-      view.layout(
-          Math.round(xOffset + node.getLayoutX()),
-          Math.round(yOffset + node.getLayoutY()),
-          Math.round(xOffset + node.getLayoutX() + node.getLayoutWidth()),
-          Math.round(yOffset + node.getLayoutY() + node.getLayoutHeight()));
+      view.layout(left, top, left + view.getMeasuredWidth(), top + view.getMeasuredHeight());
     }
 
     final int childrenCount = node.getChildCount();
@@ -291,11 +316,9 @@ public class YogaLayout extends ViewGroup {
 
   @Override
   protected void onLayout(boolean changed, int l, int t, int r, int b) {
-    // Either we are a root of a tree, or this function is called by our parent's onLayout, in which
+    // Either we are a root of a tree, or this function is called by our owner's onLayout, in which
     // case our r-l and b-t are the size of our node.
-    if (!(getParent() instanceof YogaLayout) &&
-        Math.round(mYogaNode.getLayoutHeight()) != b-t &&
-        Math.round(mYogaNode.getLayoutWidth()) != r-l) {
+    if (!(getParent() instanceof YogaLayout)) {
         createLayout(
             MeasureSpec.makeMeasureSpec(r - l, MeasureSpec.EXACTLY),
             MeasureSpec.makeMeasureSpec(b - t, MeasureSpec.EXACTLY));
@@ -340,7 +363,6 @@ public class YogaLayout extends ViewGroup {
     if (widthMode == MeasureSpec.AT_MOST) {
       mYogaNode.setMaxWidth(widthSize);
     }
-
     mYogaNode.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
   }
 
@@ -379,192 +401,227 @@ public class YogaLayout extends ViewGroup {
       }
     }
 
-    for (int i = 0; i < layoutParameters.attributes.size(); i++) {
-      final int attribute = layoutParameters.attributes.keyAt(i);
-      final float value = layoutParameters.attributes.valueAt(i);
+    for (int i = 0; i < layoutParameters.numericAttributes.size(); i++) {
+      final int attribute = layoutParameters.numericAttributes.keyAt(i);
+      final float value = layoutParameters.numericAttributes.valueAt(i);
 
-      if (attribute == R.styleable.yoga_align_content) {
+      if (attribute == R.styleable.yoga_yg_alignContent) {
         node.setAlignContent(YogaAlign.fromInt(Math.round(value)));
-      } else if (attribute == R.styleable.yoga_align_items) {
+      } else if (attribute == R.styleable.yoga_yg_alignItems) {
         node.setAlignItems(YogaAlign.fromInt(Math.round(value)));
-      } else if (attribute == R.styleable.yoga_align_self) {
+      } else if (attribute == R.styleable.yoga_yg_alignSelf) {
         node.setAlignSelf(YogaAlign.fromInt(Math.round(value)));
-      } else if (attribute == R.styleable.yoga_aspect_ratio) {
+      } else if (attribute == R.styleable.yoga_yg_aspectRatio) {
         node.setAspectRatio(value);
-      } else if (attribute == R.styleable.yoga_border_left) {
+      } else if (attribute == R.styleable.yoga_yg_borderLeft) {
         node.setBorder(YogaEdge.LEFT, value);
-      } else if (attribute == R.styleable.yoga_border_top) {
+      } else if (attribute == R.styleable.yoga_yg_borderTop) {
         node.setBorder(YogaEdge.TOP, value);
-      } else if (attribute == R.styleable.yoga_border_right) {
+      } else if (attribute == R.styleable.yoga_yg_borderRight) {
         node.setBorder(YogaEdge.RIGHT, value);
-      } else if (attribute == R.styleable.yoga_border_bottom) {
+      } else if (attribute == R.styleable.yoga_yg_borderBottom) {
         node.setBorder(YogaEdge.BOTTOM, value);
-      } else if (attribute == R.styleable.yoga_border_start) {
+      } else if (attribute == R.styleable.yoga_yg_borderStart) {
         node.setBorder(YogaEdge.START, value);
-      } else if (attribute == R.styleable.yoga_border_end) {
+      } else if (attribute == R.styleable.yoga_yg_borderEnd) {
         node.setBorder(YogaEdge.END, value);
-      } else if (attribute == R.styleable.yoga_border_horizontal) {
+      } else if (attribute == R.styleable.yoga_yg_borderHorizontal) {
         node.setBorder(YogaEdge.HORIZONTAL, value);
-      } else if (attribute == R.styleable.yoga_border_vertical) {
+      } else if (attribute == R.styleable.yoga_yg_borderVertical) {
         node.setBorder(YogaEdge.VERTICAL, value);
-      } else if (attribute == R.styleable.yoga_border_all) {
+      } else if (attribute == R.styleable.yoga_yg_borderAll) {
         node.setBorder(YogaEdge.ALL, value);
-      } else if (attribute == R.styleable.yoga_direction) {
+      } else if (attribute == R.styleable.yoga_yg_direction) {
         node.setDirection(YogaDirection.fromInt(Math.round(value)));
-      } else if (attribute == R.styleable.yoga_flex) {
+      } else if (attribute == R.styleable.yoga_yg_display) {
+        node.setDisplay(YogaDisplay.fromInt(Math.round(value)));
+      } else if (attribute == R.styleable.yoga_yg_flex) {
         node.setFlex(value);
-      } else if (attribute == R.styleable.yoga_flex_basis) {
+      } else if (attribute == R.styleable.yoga_yg_flexBasis) {
         node.setFlexBasis(value);
-      } else if (attribute == R.styleable.yoga_flex_basis_percent) {
-        node.setFlexBasisPercent(value);
-      } else if (attribute == R.styleable.yoga_flex_direction) {
+      } else if (attribute == R.styleable.yoga_yg_flexDirection) {
         node.setFlexDirection(YogaFlexDirection.fromInt(Math.round(value)));
-      } else if (attribute == R.styleable.yoga_flex_grow) {
+      } else if (attribute == R.styleable.yoga_yg_flexGrow) {
         node.setFlexGrow(value);
-      } else if (attribute == R.styleable.yoga_flex_shrink) {
+      } else if (attribute == R.styleable.yoga_yg_flexShrink) {
         node.setFlexShrink(value);
-      } else if (attribute == R.styleable.yoga_height) {
+      } else if (attribute == R.styleable.yoga_yg_height) {
         node.setHeight(value);
-      } else if (attribute == R.styleable.yoga_height_percent) {
-        node.setHeightPercent(value);
-      } else if (attribute == R.styleable.yoga_margin_left) {
+      } else if (attribute == R.styleable.yoga_yg_marginLeft) {
         node.setMargin(YogaEdge.LEFT, value);
-      } else if (attribute == R.styleable.yoga_justify_content) {
+      } else if (attribute == R.styleable.yoga_yg_justifyContent) {
         node.setJustifyContent(YogaJustify.fromInt(Math.round(value)));
-      } else if (attribute == R.styleable.yoga_margin_top) {
+      } else if (attribute == R.styleable.yoga_yg_marginTop) {
         node.setMargin(YogaEdge.TOP, value);
-      } else if (attribute == R.styleable.yoga_margin_right) {
+      } else if (attribute == R.styleable.yoga_yg_marginRight) {
         node.setMargin(YogaEdge.RIGHT, value);
-      } else if (attribute == R.styleable.yoga_margin_bottom) {
+      } else if (attribute == R.styleable.yoga_yg_marginBottom) {
         node.setMargin(YogaEdge.BOTTOM, value);
-      } else if (attribute == R.styleable.yoga_margin_start) {
+      } else if (attribute == R.styleable.yoga_yg_marginStart) {
         node.setMargin(YogaEdge.START, value);
-      } else if (attribute == R.styleable.yoga_margin_end) {
+      } else if (attribute == R.styleable.yoga_yg_marginEnd) {
         node.setMargin(YogaEdge.END, value);
-      } else if (attribute == R.styleable.yoga_margin_horizontal) {
+      } else if (attribute == R.styleable.yoga_yg_marginHorizontal) {
         node.setMargin(YogaEdge.HORIZONTAL, value);
-      } else if (attribute == R.styleable.yoga_margin_vertical) {
+      } else if (attribute == R.styleable.yoga_yg_marginVertical) {
         node.setMargin(YogaEdge.VERTICAL, value);
-      } else if (attribute == R.styleable.yoga_margin_all) {
+      } else if (attribute == R.styleable.yoga_yg_marginAll) {
         node.setMargin(YogaEdge.ALL, value);
-      } else if (attribute == R.styleable.yoga_margin_percent_left) {
-        node.setMarginPercent(YogaEdge.LEFT, value);
-      } else if (attribute == R.styleable.yoga_margin_percent_top) {
-        node.setMarginPercent(YogaEdge.TOP, value);
-      } else if (attribute == R.styleable.yoga_margin_percent_right) {
-        node.setMarginPercent(YogaEdge.RIGHT, value);
-      } else if (attribute == R.styleable.yoga_margin_percent_bottom) {
-        node.setMarginPercent(YogaEdge.BOTTOM, value);
-      } else if (attribute == R.styleable.yoga_margin_percent_start) {
-        node.setMarginPercent(YogaEdge.START, value);
-      } else if (attribute == R.styleable.yoga_margin_percent_end) {
-        node.setMarginPercent(YogaEdge.END, value);
-      } else if (attribute == R.styleable.yoga_margin_percent_horizontal) {
-        node.setMarginPercent(YogaEdge.HORIZONTAL, value);
-      } else if (attribute == R.styleable.yoga_margin_percent_vertical) {
-        node.setMarginPercent(YogaEdge.VERTICAL, value);
-      } else if (attribute == R.styleable.yoga_margin_percent_all) {
-        node.setMarginPercent(YogaEdge.ALL, value);
-      } else if (attribute == R.styleable.yoga_max_height) {
+      } else if (attribute == R.styleable.yoga_yg_maxHeight) {
         node.setMaxHeight(value);
-      } else if (attribute == R.styleable.yoga_max_height_percent) {
-        node.setMaxHeightPercent(value);
-      } else if (attribute == R.styleable.yoga_max_width) {
+      } else if (attribute == R.styleable.yoga_yg_maxWidth) {
         node.setMaxWidth(value);
-      } else if (attribute == R.styleable.yoga_max_width_percent) {
-        node.setMaxWidthPercent(value);
-      } else if (attribute == R.styleable.yoga_min_height) {
+      } else if (attribute == R.styleable.yoga_yg_minHeight) {
         node.setMinHeight(value);
-      } else if (attribute == R.styleable.yoga_min_height_percent) {
-        node.setMinHeightPercent(value);
-      } else if (attribute == R.styleable.yoga_min_width) {
+      } else if (attribute == R.styleable.yoga_yg_minWidth) {
         node.setMinWidth(value);
-      } else if (attribute == R.styleable.yoga_min_width_percent) {
-        node.setMinWidthPercent(value);
-      } else if (attribute == R.styleable.yoga_overflow) {
+      } else if (attribute == R.styleable.yoga_yg_overflow) {
         node.setOverflow(YogaOverflow.fromInt(Math.round(value)));
-      } else if (attribute == R.styleable.yoga_padding_left) {
+      } else if (attribute == R.styleable.yoga_yg_paddingLeft) {
         node.setPadding(YogaEdge.LEFT, value);
-      } else if (attribute == R.styleable.yoga_padding_top) {
+      } else if (attribute == R.styleable.yoga_yg_paddingTop) {
         node.setPadding(YogaEdge.TOP, value);
-      } else if (attribute == R.styleable.yoga_padding_right) {
+      } else if (attribute == R.styleable.yoga_yg_paddingRight) {
         node.setPadding(YogaEdge.RIGHT, value);
-      } else if (attribute == R.styleable.yoga_padding_bottom) {
+      } else if (attribute == R.styleable.yoga_yg_paddingBottom) {
         node.setPadding(YogaEdge.BOTTOM, value);
-      } else if (attribute == R.styleable.yoga_padding_start) {
+      } else if (attribute == R.styleable.yoga_yg_paddingStart) {
         node.setPadding(YogaEdge.START, value);
-      } else if (attribute == R.styleable.yoga_padding_end) {
+      } else if (attribute == R.styleable.yoga_yg_paddingEnd) {
         node.setPadding(YogaEdge.END, value);
-      } else if (attribute == R.styleable.yoga_padding_horizontal) {
+      } else if (attribute == R.styleable.yoga_yg_paddingHorizontal) {
         node.setPadding(YogaEdge.HORIZONTAL, value);
-      } else if (attribute == R.styleable.yoga_padding_vertical) {
+      } else if (attribute == R.styleable.yoga_yg_paddingVertical) {
         node.setPadding(YogaEdge.VERTICAL, value);
-      } else if (attribute == R.styleable.yoga_padding_all) {
+      } else if (attribute == R.styleable.yoga_yg_paddingAll) {
         node.setPadding(YogaEdge.ALL, value);
-      } else if (attribute == R.styleable.yoga_padding_percent_left) {
-        node.setPaddingPercent(YogaEdge.LEFT, value);
-      } else if (attribute == R.styleable.yoga_padding_percent_top) {
-        node.setPaddingPercent(YogaEdge.TOP, value);
-      } else if (attribute == R.styleable.yoga_padding_percent_right) {
-        node.setPaddingPercent(YogaEdge.RIGHT, value);
-      } else if (attribute == R.styleable.yoga_padding_percent_bottom) {
-        node.setPaddingPercent(YogaEdge.BOTTOM, value);
-      } else if (attribute == R.styleable.yoga_padding_percent_start) {
-        node.setPaddingPercent(YogaEdge.START, value);
-      } else if (attribute == R.styleable.yoga_padding_percent_end) {
-        node.setPaddingPercent(YogaEdge.END, value);
-      } else if (attribute == R.styleable.yoga_padding_percent_horizontal) {
-        node.setPaddingPercent(YogaEdge.HORIZONTAL, value);
-      } else if (attribute == R.styleable.yoga_padding_percent_vertical) {
-        node.setPaddingPercent(YogaEdge.VERTICAL, value);
-      } else if (attribute == R.styleable.yoga_padding_percent_all) {
-        node.setPaddingPercent(YogaEdge.ALL, value);
-      } else if (attribute == R.styleable.yoga_position_left) {
+      } else if (attribute == R.styleable.yoga_yg_positionLeft) {
         node.setPosition(YogaEdge.LEFT, value);
-      } else if (attribute == R.styleable.yoga_position_top) {
+      } else if (attribute == R.styleable.yoga_yg_positionTop) {
         node.setPosition(YogaEdge.TOP, value);
-      } else if (attribute == R.styleable.yoga_position_right) {
+      } else if (attribute == R.styleable.yoga_yg_positionRight) {
         node.setPosition(YogaEdge.RIGHT, value);
-      } else if (attribute == R.styleable.yoga_position_bottom) {
+      } else if (attribute == R.styleable.yoga_yg_positionBottom) {
         node.setPosition(YogaEdge.BOTTOM, value);
-      } else if (attribute == R.styleable.yoga_position_start) {
+      } else if (attribute == R.styleable.yoga_yg_positionStart) {
         node.setPosition(YogaEdge.START, value);
-      } else if (attribute == R.styleable.yoga_position_end) {
+      } else if (attribute == R.styleable.yoga_yg_positionEnd) {
         node.setPosition(YogaEdge.END, value);
-      } else if (attribute == R.styleable.yoga_position_horizontal) {
+      } else if (attribute == R.styleable.yoga_yg_positionHorizontal) {
         node.setPosition(YogaEdge.HORIZONTAL, value);
-      } else if (attribute == R.styleable.yoga_position_vertical) {
+      } else if (attribute == R.styleable.yoga_yg_positionVertical) {
         node.setPosition(YogaEdge.VERTICAL, value);
-      } else if (attribute == R.styleable.yoga_position_all) {
+      } else if (attribute == R.styleable.yoga_yg_positionAll) {
         node.setPosition(YogaEdge.ALL, value);
-      } else if (attribute == R.styleable.yoga_position_percent_left) {
-        node.setPositionPercent(YogaEdge.LEFT, value);
-      } else if (attribute == R.styleable.yoga_position_percent_top) {
-        node.setPositionPercent(YogaEdge.TOP, value);
-      } else if (attribute == R.styleable.yoga_position_percent_right) {
-        node.setPositionPercent(YogaEdge.RIGHT, value);
-      } else if (attribute == R.styleable.yoga_position_percent_bottom) {
-        node.setPositionPercent(YogaEdge.BOTTOM, value);
-      } else if (attribute == R.styleable.yoga_position_percent_start) {
-        node.setPositionPercent(YogaEdge.START, value);
-      } else if (attribute == R.styleable.yoga_position_percent_end) {
-        node.setPositionPercent(YogaEdge.END, value);
-      } else if (attribute == R.styleable.yoga_position_percent_horizontal) {
-        node.setPositionPercent(YogaEdge.HORIZONTAL, value);
-      } else if (attribute == R.styleable.yoga_position_percent_vertical) {
-        node.setPositionPercent(YogaEdge.VERTICAL, value);
-      } else if (attribute == R.styleable.yoga_position_percent_all) {
-        node.setPositionPercent(YogaEdge.ALL, value);
-      } else if (attribute == R.styleable.yoga_position_type) {
+      } else if (attribute == R.styleable.yoga_yg_positionType) {
         node.setPositionType(YogaPositionType.fromInt(Math.round(value)));
-      } else if (attribute == R.styleable.yoga_width) {
+      } else if (attribute == R.styleable.yoga_yg_width) {
         node.setWidth(value);
-      } else if (attribute == R.styleable.yoga_width_percent) {
-        node.setWidthPercent(value);
-      } else if (attribute == R.styleable.yoga_wrap) {
+      } else if (attribute == R.styleable.yoga_yg_wrap) {
         node.setWrap(YogaWrap.fromInt(Math.round(value)));
       }
     }
+
+    for (int i = 0; i < layoutParameters.stringAttributes.size(); i++) {
+      final int attribute = layoutParameters.stringAttributes.keyAt(i);
+      final String value = layoutParameters.stringAttributes.valueAt(i);
+
+      if (value.equals("auto")) {
+        if (attribute == R.styleable.yoga_yg_marginLeft) {
+          node.setMarginAuto(YogaEdge.LEFT);
+        } else if (attribute == R.styleable.yoga_yg_marginTop) {
+          node.setMarginAuto(YogaEdge.TOP);
+        } else if (attribute == R.styleable.yoga_yg_marginRight) {
+          node.setMarginAuto(YogaEdge.RIGHT);
+        } else if (attribute == R.styleable.yoga_yg_marginBottom) {
+          node.setMarginAuto(YogaEdge.BOTTOM);
+        } else if (attribute == R.styleable.yoga_yg_marginStart) {
+          node.setMarginAuto(YogaEdge.START);
+        } else if (attribute == R.styleable.yoga_yg_marginEnd) {
+          node.setMarginAuto(YogaEdge.END);
+        } else if (attribute == R.styleable.yoga_yg_marginHorizontal) {
+          node.setMarginAuto(YogaEdge.HORIZONTAL);
+        } else if (attribute == R.styleable.yoga_yg_marginVertical) {
+          node.setMarginAuto(YogaEdge.VERTICAL);
+        } else if (attribute == R.styleable.yoga_yg_marginAll) {
+          node.setMarginAuto(YogaEdge.ALL);
+        }
+      }
+
+      if (value.endsWith("%")) {
+        final float numericValue = Float.parseFloat(value.substring(0, value.length()-1));
+
+        if (attribute == R.styleable.yoga_yg_flexBasis) {
+          node.setFlexBasisPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_height) {
+          node.setHeightPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_marginLeft) {
+          node.setMarginPercent(YogaEdge.LEFT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_marginTop) {
+          node.setMarginPercent(YogaEdge.TOP, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_marginRight) {
+          node.setMarginPercent(YogaEdge.RIGHT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_marginBottom) {
+          node.setMarginPercent(YogaEdge.BOTTOM, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_marginStart) {
+          node.setMarginPercent(YogaEdge.START, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_marginEnd) {
+          node.setMarginPercent(YogaEdge.END, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_marginHorizontal) {
+          node.setMarginPercent(YogaEdge.HORIZONTAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_marginVertical) {
+          node.setMarginPercent(YogaEdge.VERTICAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_marginAll) {
+          node.setMarginPercent(YogaEdge.ALL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_maxHeight) {
+          node.setMaxHeightPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_maxWidth) {
+          node.setMaxWidthPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_minHeight) {
+          node.setMinHeightPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_minWidth) {
+          node.setMinWidthPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_paddingLeft) {
+          node.setPaddingPercent(YogaEdge.LEFT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_paddingTop) {
+          node.setPaddingPercent(YogaEdge.TOP, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_paddingRight) {
+          node.setPaddingPercent(YogaEdge.RIGHT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_paddingBottom) {
+          node.setPaddingPercent(YogaEdge.BOTTOM, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_paddingStart) {
+          node.setPaddingPercent(YogaEdge.START, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_paddingEnd) {
+          node.setPaddingPercent(YogaEdge.END, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_paddingHorizontal) {
+          node.setPaddingPercent(YogaEdge.HORIZONTAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_paddingVertical) {
+          node.setPaddingPercent(YogaEdge.VERTICAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_paddingAll) {
+          node.setPaddingPercent(YogaEdge.ALL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_positionLeft) {
+          node.setPositionPercent(YogaEdge.LEFT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_positionTop) {
+          node.setPositionPercent(YogaEdge.TOP, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_positionRight) {
+          node.setPositionPercent(YogaEdge.RIGHT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_positionBottom) {
+          node.setPositionPercent(YogaEdge.BOTTOM, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_positionStart) {
+          node.setPositionPercent(YogaEdge.START, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_positionEnd) {
+          node.setPositionPercent(YogaEdge.END, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_positionHorizontal) {
+          node.setPositionPercent(YogaEdge.HORIZONTAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_positionVertical) {
+          node.setPositionPercent(YogaEdge.VERTICAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_positionAll) {
+          node.setPositionPercent(YogaEdge.ALL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_width) {
+          node.setWidthPercent(numericValue);
+        }
+      }
+    }
   }
 
   @Override
@@ -594,18 +651,25 @@ public class YogaLayout extends ViewGroup {
    *
    * <p>
    * This is actually mostly a wrapper around a {@code SparseArray} that holds a mapping between
-   * styleable id's ({@code R.styleable.yoga_*}) and the float of their values.  In cases where the
-   * value is an enum or an integer, they should first be cast to int (with rounding) before using.
+   * styleable id's ({@code R.styleable.yoga_yg_*}) and the float of their values.  In cases where
+   * the value is an enum or an integer, they should first be cast to int (with rounding) before
+   * using.
    */
   public static class LayoutParams extends ViewGroup.LayoutParams {
 
     /**
-     * A mapping from attribute keys ({@code R.styleable.yoga_*}) to the float of their values.
+     * A mapping from attribute keys ({@code R.styleable.yoga_yg_*}) to the float of their values.
      * For attributes like position_percent_left (float), this is the native type.  For attributes
      * like align_self (enums), the integer enum value is cast (rounding is used on the other side
      * to prevent precision errors).  Dimension attributes are stored as float pixels.
      */
-    SparseArray<Float> attributes;
+    SparseArray<Float> numericAttributes;
+
+    /**
+     * A mapping from attribute keys ({@code R.styleable.yoga_yg_*}) with string values to those
+     * strings.  This is used for values such as "auto".
+     */
+    SparseArray<String> stringAttributes;
 
     /**
      * Constructs a set of layout params from a source set.  In the case that the source set is
@@ -617,16 +681,18 @@ public class YogaLayout extends ViewGroup {
     public LayoutParams(ViewGroup.LayoutParams source) {
       super(source);
       if (source instanceof LayoutParams) {
-        attributes = ((LayoutParams) source).attributes.clone();
+        numericAttributes = ((LayoutParams) source).numericAttributes.clone();
+        stringAttributes = ((LayoutParams) source).stringAttributes.clone();
       } else {
-        attributes = new SparseArray<>();
+        numericAttributes = new SparseArray<>();
+        stringAttributes = new SparseArray<>();
 
         // Negative values include MATCH_PARENT and WRAP_CONTENT
         if (source.width >= 0) {
-          attributes.put(R.styleable.yoga_width, (float) width);
+          numericAttributes.put(R.styleable.yoga_yg_width, (float) width);
         }
         if (source.height >= 0) {
-          attributes.put(R.styleable.yoga_height, (float) height);
+          numericAttributes.put(R.styleable.yoga_yg_height, (float) height);
         }
       }
     }
@@ -634,7 +700,7 @@ public class YogaLayout extends ViewGroup {
     /**
      * Constructs a set of layout params, given width and height specs.  In this case, we can set
      * the {@code yoga:width} and {@code yoga:height} if we are given them explicitly.  If other
-     * options (such as {@code match_parent} or {@code wrap_content} are given, then the parent
+     * options (such as {@code match_owner} or {@code wrap_content} are given, then the owner
      * LayoutParams will store them, and we deal with them during layout. (see
      * {@link YogaLayout#createLayout})
      *
@@ -645,13 +711,14 @@ public class YogaLayout extends ViewGroup {
      */
     public LayoutParams(int width, int height) {
       super(width, height);
-      attributes = new SparseArray<>();
+      numericAttributes = new SparseArray<>();
+      stringAttributes = new SparseArray<>();
       // Negative values include MATCH_PARENT and WRAP_CONTENT
       if (width >= 0) {
-        attributes.put(R.styleable.yoga_width, (float) width);
+        numericAttributes.put(R.styleable.yoga_yg_width, (float) width);
       }
       if (height >= 0) {
-        attributes.put(R.styleable.yoga_height, (float) height);
+        numericAttributes.put(R.styleable.yoga_yg_height, (float) height);
       }
     }
 
@@ -664,15 +731,16 @@ public class YogaLayout extends ViewGroup {
      */
     public LayoutParams(Context context, AttributeSet attrs) {
       super(context, attrs);
-      attributes = new SparseArray<>();
+      numericAttributes = new SparseArray<>();
+      stringAttributes = new SparseArray<>();
       final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.yoga);
 
       // Negative values include MATCH_PARENT and WRAP_CONTENT
       if (width >= 0) {
-        attributes.put(R.styleable.yoga_width, (float) width);
+        numericAttributes.put(R.styleable.yoga_yg_width, (float) width);
       }
       if (height >= 0) {
-        attributes.put(R.styleable.yoga_height, (float) height);
+        numericAttributes.put(R.styleable.yoga_yg_height, (float) height);
       }
 
       final int attributeCount = a.getIndexCount();
@@ -682,11 +750,13 @@ public class YogaLayout extends ViewGroup {
         a.getValue(attribute, val);
 
         if (val.type == TypedValue.TYPE_DIMENSION) {
-          attributes.put(
+          numericAttributes.put(
               attribute,
               (float) a.getDimensionPixelSize(attribute, 0));
+        } else if (val.type == TypedValue.TYPE_STRING) {
+          stringAttributes.put(attribute, a.getString(attribute));
         } else {
-          attributes.put(attribute, a.getFloat(attribute, 0));
+          numericAttributes.put(attribute, a.getFloat(attribute, 0));
         }
       }
       a.recycle();
@@ -704,14 +774,14 @@ public class YogaLayout extends ViewGroup {
      * {@code View}'s measure function.
      *
      * @param node The yoga node to measure
-     * @param width The suggested width from the parent
+     * @param width The suggested width from the owner
      * @param widthMode The type of suggestion for the width
-     * @param height The suggested height from the parent
+     * @param height The suggested height from the owner
      * @param heightMode The type of suggestion for the height
      * @return A measurement output ({@code YogaMeasureOutput}) for the node
      */
     public long measure(
-        YogaNodeAPI node,
+        YogaNode node,
         float width,
         YogaMeasureMode widthMode,
         float height,

android/src/main/java/com/facebook/yoga/android/YogaViewLayoutFactory.java

@@ -1,10 +1,8 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * 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.android;

android/src/main/res/values/attrs.xml

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <!--
-  Copyright (c) 2014-present, Facebook, Inc.
-  All rights reserved.
+  Copyright (c) Facebook, Inc. and its affiliates.
 
-  This source code is licensed under the BSD-style license found in the
-  LICENSE file in the root directory of this source tree. An additional grant
-  of patent rights can be found in the PATENTS file in the same directory.
+  This source code is licensed under the MIT license found in the
+  LICENSE file in the root directory of this source tree.
 -->
 
 <resources>
   <declare-styleable name="yoga">
 
-    <attr name="align_content" format="enum">
+    <attr name="yg_alignContent" format="enum">
       <enum name="auto" value="0"/>
       <enum name="flex_start" value="1"/>
       <enum name="center" value="2"/>
@@ -21,7 +19,7 @@
       <enum name="baseline" value="5"/>
     </attr>
 
-    <attr name="align_items" format="enum">
+    <attr name="yg_alignItems" format="enum">
       <enum name="auto" value="0"/>
       <enum name="flex_start" value="1"/>
       <enum name="center" value="2"/>
@@ -30,7 +28,7 @@
       <enum name="baseline" value="5"/>
     </attr>
 
-    <attr name="align_self" format="enum">
+    <attr name="yg_alignSelf" format="enum">
       <enum name="auto" value="0"/>
       <enum name="flex_start" value="1"/>
       <enum name="center" value="2"/>
@@ -39,46 +37,47 @@
       <enum name="baseline" value="5"/>
     </attr>
 
-    <attr name="aspect_ratio" format="float"/>
+    <attr name="yg_aspectRatio" format="float"/>
 
-    <attr name="border_left" format="dimension"/>
-    <attr name="border_top" format="dimension"/>
-    <attr name="border_right" format="dimension"/>
-    <attr name="border_bottom" format="dimension"/>
-    <attr name="border_start" format="dimension"/>
-    <attr name="border_end" format="dimension"/>
-    <attr name="border_horizontal" format="dimension"/>
-    <attr name="border_vertical" format="dimension"/>
-    <attr name="border_all" format="dimension"/>
+    <attr name="yg_borderLeft" format="dimension"/>
+    <attr name="yg_borderTop" format="dimension"/>
+    <attr name="yg_borderRight" format="dimension"/>
+    <attr name="yg_borderBottom" format="dimension"/>
+    <attr name="yg_borderStart" format="dimension"/>
+    <attr name="yg_borderEnd" format="dimension"/>
+    <attr name="yg_borderHorizontal" format="dimension"/>
+    <attr name="yg_borderVertical" format="dimension"/>
+    <attr name="yg_borderAll" format="dimension"/>
 
-    <attr name="direction" format="enum">
+    <attr name="yg_direction" format="enum">
       <enum name="inherit" value="0"/>
       <enum name="ltr" value="1"/>
       <enum name="rtl" value="2"/>
     </attr>
 
-    <attr name="flex" format="float"/>
+    <attr name="yg_display" format="enum">
+      <enum name="flex" value="0"/>
+      <enum name="none" value="1"/>
+    </attr>
 
-    <attr name="flex_basis" format="float"/>
+    <attr name="yg_flex" format="float"/>
 
-    <attr name="flex_basis_percent" format="float"/>
+    <attr name="yg_flexBasis" format="float|string"/>
 
-    <attr name="flex_direction" format="enum">
+    <attr name="yg_flexDirection" format="enum">
       <enum name="column" value="0"/>
       <enum name="column_reverse" value="1"/>
       <enum name="row" value="2"/>
       <enum name="row_reverse" value="3"/>
     </attr>
 
-    <attr name="flex_grow" format="float"/>
+    <attr name="yg_flexGrow" format="float"/>
 
-    <attr name="flex_shrink" format="float"/>
+    <attr name="yg_flexShrink" format="float"/>
 
-    <attr name="height" format="dimension"/>
+    <attr name="yg_height" format="dimension|string"/>
 
-    <attr name="height_percent" format="float"/>
-
-    <attr name="justify_content" format="enum">
+    <attr name="yg_justifyContent" format="enum">
       <enum name="flex_start" value="0"/>
       <enum name="center" value="1"/>
       <enum name="flex_end" value="2"/>
@@ -86,98 +85,64 @@
       <enum name="space_around" value="4"/>
     </attr>
 
-    <attr name="margin_left" format="dimension"/>
-    <attr name="margin_top" format="dimension"/>
-    <attr name="margin_right" format="dimension"/>
-    <attr name="margin_bottom" format="dimension"/>
-    <attr name="margin_start" format="dimension"/>
-    <attr name="margin_end" format="dimension"/>
-    <attr name="margin_horizontal" format="dimension"/>
-    <attr name="margin_vertical" format="dimension"/>
-    <attr name="margin_all" format="dimension"/>
+    <attr name="yg_marginLeft" format="dimension|string"/>
+    <attr name="yg_marginTop" format="dimension|string"/>
+    <attr name="yg_marginRight" format="dimension|string"/>
+    <attr name="yg_marginBottom" format="dimension|string"/>
+    <attr name="yg_marginStart" format="dimension|string"/>
+    <attr name="yg_marginEnd" format="dimension|string"/>
+    <attr name="yg_marginHorizontal" format="dimension|string"/>
+    <attr name="yg_marginVertical" format="dimension|string"/>
+    <attr name="yg_marginAll" format="dimension|string"/>
 
-    <attr name="margin_percent_left" format="dimension"/>
-    <attr name="margin_percent_top" format="dimension"/>
-    <attr name="margin_percent_right" format="dimension"/>
-    <attr name="margin_percent_bottom" format="dimension"/>
-    <attr name="margin_percent_start" format="dimension"/>
-    <attr name="margin_percent_end" format="dimension"/>
-    <attr name="margin_percent_horizontal" format="dimension"/>
-    <attr name="margin_percent_vertical" format="dimension"/>
-    <attr name="margin_percent_all" format="dimension"/>
+    <attr name="yg_maxHeight" format="dimension|string"/>
 
-    <attr name="max_height" format="dimension"/>
+    <attr name="yg_maxWidth" format="dimension|string"/>
 
-    <attr name="max_height_percent" format="float"/>
+    <attr name="yg_minHeight" format="dimension|string"/>
 
-    <attr name="max_width" format="dimension"/>
+    <attr name="yg_minWidth" format="dimension|string"/>
 
-    <attr name="max_width_percent" format="float"/>
-
-    <attr name="min_height" format="dimension"/>
-
-    <attr name="min_height_percent" format="float"/>
-
-    <attr name="min_width" format="dimension"/>
-
-    <attr name="min_width_percent" format="float"/>
-
-    <attr name="overflow" format="enum">
+    <attr name="yg_overflow" format="enum">
       <enum name="visible" value="0"/>
       <enum name="hidden" value="1"/>
       <enum name="scroll" value="2"/>
     </attr>
 
-    <attr name="padding_left" format="dimension"/>
-    <attr name="padding_top" format="dimension"/>
-    <attr name="padding_right" format="dimension"/>
-    <attr name="padding_bottom" format="dimension"/>
-    <attr name="padding_start" format="dimension"/>
-    <attr name="padding_end" format="dimension"/>
-    <attr name="padding_horizontal" format="dimension"/>
-    <attr name="padding_vertical" format="dimension"/>
-    <attr name="padding_all" format="dimension"/>
+    <attr name="yg_paddingLeft" format="dimension|string"/>
+    <attr name="yg_paddingTop" format="dimension|string"/>
+    <attr name="yg_paddingRight" format="dimension|string"/>
+    <attr name="yg_paddingBottom" format="dimension|string"/>
+    <attr name="yg_paddingStart" format="dimension|string"/>
+    <attr name="yg_paddingEnd" format="dimension|string"/>
+    <attr name="yg_paddingHorizontal" format="dimension|string"/>
+    <attr name="yg_paddingVertical" format="dimension|string"/>
+    <attr name="yg_paddingAll" format="dimension|string"/>
 
-    <attr name="padding_percent_left" format="float"/>
-    <attr name="padding_percent_top" format="float"/>
-    <attr name="padding_percent_right" format="float"/>
-    <attr name="padding_percent_bottom" format="float"/>
-    <attr name="padding_percent_start" format="float"/>
-    <attr name="padding_percent_end" format="float"/>
-    <attr name="padding_percent_horizontal" format="float"/>
-    <attr name="padding_percent_vertical" format="float"/>
-    <attr name="padding_percent_all" format="float"/>
+    <attr name="yg_positionLeft" format="dimension|string"/>
+    <attr name="yg_positionTop" format="dimension|string"/>
+    <attr name="yg_positionRight" format="dimension|string"/>
+    <attr name="yg_positionBottom" format="dimension|string"/>
+    <attr name="yg_positionStart" format="dimension|string"/>
+    <attr name="yg_positionEnd" format="dimension|string"/>
+    <attr name="yg_positionHorizontal" format="dimension|string"/>
+    <attr name="yg_positionVertical" format="dimension|string"/>
+    <attr name="yg_positionAll" format="dimension|string"/>
 
-    <attr name="position_left" format="dimension"/>
-    <attr name="position_top" format="dimension"/>
-    <attr name="position_right" format="dimension"/>
-    <attr name="position_bottom" format="dimension"/>
-    <attr name="position_start" format="dimension"/>
-    <attr name="position_end" format="dimension"/>
-    <attr name="position_horizontal" format="dimension"/>
-    <attr name="position_vertical" format="dimension"/>
-    <attr name="position_all" format="dimension"/>
-
-    <attr name="position_percent_left" format="float"/>
-    <attr name="position_percent_top" format="float"/>
-    <attr name="position_percent_right" format="float"/>
-    <attr name="position_percent_bottom" format="float"/>
-    <attr name="position_percent_start" format="float"/>
-    <attr name="position_percent_end" format="float"/>
-    <attr name="position_percent_horizontal" format="float"/>
-    <attr name="position_percent_vertical" format="float"/>
-    <attr name="position_percent_all" format="float"/>
-
-    <attr name="position_type" format="enum">
-      <enum name="relative" value="0"/>
-      <enum name="absolute" value="1"/>
+    <attr name="yg_positionType" format="enum">
+      <!-- "static" is a reserved keyword
+      <enum name="static" value="0"/>
+      -->
+      <enum name="relative" value="1"/>
+      <enum name="absolute" value="2"/>
+      <enum name="position_static" value="0"/>
+      <enum name="position_relative" value="1"/>
+      <enum name="position_absolute" value="2"/>
     </attr>
 
-    <attr name="width" format="dimension"/>
+    <attr name="yg_width" format="dimension|string"/>
 
-    <attr name="width_percent" format="float"/>
-
-    <attr name="wrap" format="enum">
+    <attr name="yg_wrap" format="enum">
       <enum name="no_wrap" value="0"/>
       <enum name="wrap" value="1"/>
     </attr>

benchmark/BUCK

@@ -1,27 +0,0 @@
-# Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
-include_defs('//YOGA_DEFS')
-
-cxx_binary(
-  name = 'benchmark',
-  srcs = glob(['*.c']),
-  headers = subdir_glob([('', '*.h')]),
-  header_namespace = '',
-  compiler_flags = [
-    '-fno-omit-frame-pointer',
-    '-fexceptions',
-    '-Wall',
-    '-Werror',
-    '-O3',
-    '-std=c11',
-  ],
-  deps = [
-    yoga_dep(':yoga'),
-  ],
-  visibility = ['PUBLIC'],
-)

benchmark/CMakeLists.txt

@@ -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.
+
+
+cmake_minimum_required(VERSION 3.13)
+project(benchmark)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+set(YOGA_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
+include(${YOGA_ROOT}/cmake/project-defaults.cmake)
+
+add_subdirectory(${YOGA_ROOT}/yoga ${CMAKE_CURRENT_BINARY_DIR}/yoga)
+
+file(GLOB SOURCES CONFIGURE_DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
+add_executable(benchmark ${SOURCES})
+target_link_libraries(benchmark yogacore)

benchmark/YGBenchmark.c

@@ -1,21 +1,83 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
-#include "YGBenchmark.h"
+#include <math.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
 
 #include <yoga/Yoga.h>
 
-static YGSize _measure(YGNodeRef node,
-                       float width,
-                       YGMeasureMode widthMode,
-                       float height,
-                       YGMeasureMode heightMode) {
+#define NUM_REPETITIONS 1000
+
+#define YGBENCHMARKS(BLOCK)                \
+  int main(int argc, char const* argv[]) { \
+    clock_t __start;                       \
+    clock_t __endTimes[NUM_REPETITIONS];   \
+    { BLOCK }                              \
+    return 0;                              \
+  }
+
+#define YGBENCHMARK(NAME, BLOCK)                         \
+  __start = clock();                                     \
+  for (uint32_t __i = 0; __i < NUM_REPETITIONS; __i++) { \
+    {BLOCK} __endTimes[__i] = clock();                   \
+  }                                                      \
+  __printBenchmarkResult(NAME, __start, __endTimes);
+
+static int __compareDoubles(const void* a, const void* b) {
+  double arg1 = *(const double*) a;
+  double arg2 = *(const double*) b;
+
+  if (arg1 < arg2) {
+    return -1;
+  }
+
+  if (arg1 > arg2) {
+    return 1;
+  }
+
+  return 0;
+}
+
+static void __printBenchmarkResult(
+    char* name,
+    clock_t start,
+    clock_t* endTimes) {
+  double timesInMs[NUM_REPETITIONS];
+  double mean = 0;
+  clock_t lastEnd = start;
+  for (uint32_t i = 0; i < NUM_REPETITIONS; i++) {
+    timesInMs[i] = (endTimes[i] - lastEnd) / (double) CLOCKS_PER_SEC * 1000;
+    lastEnd = endTimes[i];
+    mean += timesInMs[i];
+  }
+  mean /= NUM_REPETITIONS;
+
+  qsort(timesInMs, NUM_REPETITIONS, sizeof(double), __compareDoubles);
+  double median = timesInMs[NUM_REPETITIONS / 2];
+
+  double variance = 0;
+  for (uint32_t i = 0; i < NUM_REPETITIONS; i++) {
+    variance += pow(timesInMs[i] - mean, 2);
+  }
+  variance /= NUM_REPETITIONS;
+  double stddev = sqrt(variance);
+
+  printf("%s: median: %lf ms, stddev: %lf ms\n", name, median, stddev);
+}
+
+static YGSize _measure(
+    YGNodeRef node,
+    float width,
+    YGMeasureMode widthMode,
+    float height,
+    YGMeasureMode heightMode) {
   return (YGSize){
       .width = widthMode == YGMeasureModeUndefined ? 10 : width,
       .height = heightMode == YGMeasureModeUndefined ? 10 : width,
@@ -23,7 +85,6 @@ static YGSize _measure(YGNodeRef node,
 }
 
 YGBENCHMARKS({
-
   YGBENCHMARK("Stack with flex", {
     const YGNodeRef root = YGNodeNew();
     YGNodeStyleSetWidth(root, 100);
@@ -99,9 +160,10 @@ YGBENCHMARKS({
           YGNodeStyleSetHeight(grandGrandChild, 10);
           YGNodeInsertChild(grandChild, grandGrandChild, 0);
 
-          for (uint32_t iii = 0; iii < 10; iii++) {
+          for (uint32_t iiii = 0; iiii < 10; iiii++) {
             const YGNodeRef grandGrandGrandChild = YGNodeNew();
-            YGNodeStyleSetFlexDirection(grandGrandGrandChild, YGFlexDirectionRow);
+            YGNodeStyleSetFlexDirection(
+                grandGrandGrandChild, YGFlexDirectionRow);
             YGNodeStyleSetFlexGrow(grandGrandGrandChild, 1);
             YGNodeStyleSetWidth(grandGrandGrandChild, 10);
             YGNodeStyleSetHeight(grandGrandGrandChild, 10);
@@ -114,5 +176,4 @@ YGBENCHMARKS({
     YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
     YGNodeFreeRecursive(root);
   });
-
 });

benchmark/YGBenchmark.h

@@ -1,73 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#pragma once
-
-#include <math.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-#define NUM_REPETITIONS 1000
-
-#define YGBENCHMARKS(BLOCK)                \
-  int main(int argc, char const *argv[]) { \
-    clock_t __start;                       \
-    clock_t __endTimes[NUM_REPETITIONS];   \
-    { BLOCK }                              \
-    return 0;                              \
-  }
-
-#define YGBENCHMARK(NAME, BLOCK)                         \
-  __start = clock();                                     \
-  for (uint32_t __i = 0; __i < NUM_REPETITIONS; __i++) { \
-    { BLOCK }                                            \
-    __endTimes[__i] = clock();                           \
-  }                                                      \
-  __printBenchmarkResult(NAME, __start, __endTimes);
-
-int __compareDoubles(const void *a, const void *b) {
-  double arg1 = *(const double *) a;
-  double arg2 = *(const double *) b;
-
-  if (arg1 < arg2) {
-    return -1;
-  }
-
-  if (arg1 > arg2) {
-    return 1;
-  }
-
-  return 0;
-}
-
-void __printBenchmarkResult(char *name, clock_t start, clock_t *endTimes) {
-  double timesInMs[NUM_REPETITIONS];
-  double mean = 0;
-  clock_t lastEnd = start;
-  for (uint32_t i = 0; i < NUM_REPETITIONS; i++) {
-    timesInMs[i] = (endTimes[i] - lastEnd) / (double) CLOCKS_PER_SEC * 1000;
-    lastEnd = endTimes[i];
-    mean += timesInMs[i];
-  }
-  mean /= NUM_REPETITIONS;
-
-  qsort(timesInMs, NUM_REPETITIONS, sizeof(double), __compareDoubles);
-  double median = timesInMs[NUM_REPETITIONS / 2];
-
-  double variance = 0;
-  for (uint32_t i = 0; i < NUM_REPETITIONS; i++) {
-    variance += pow(timesInMs[i] - mean, 2);
-  }
-  variance /= NUM_REPETITIONS;
-  double stddev = sqrt(variance);
-
-  printf("%s: median: %lf ms, stddev: %lf ms\n", name, median, stddev);
-}

build.gradle

@@ -1,15 +1,20 @@
+/*
+ * 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.
+ */
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
-        classpath 'com.nabilhachicha:android-native-dependencies:0.1'
-
+        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -17,15 +22,22 @@ buildscript {
 
 allprojects {
   repositories {
-    flatDir {
-      dirs "${rootDir}/lib/jsr-305"
-      dirs "${rootDir}/lib/soloader"
-      dirs "${rootDir}/lib/appcompat"
-      dirs "${rootDir}/lib/android-support"
-    }
+    google()
+    mavenCentral()
   }
 }
 
+ext {
+    buildToolsVersion = "33.0.0"
+    ndkVersion = "23.1.7779620" // Corresponds to AGP 7.3
+    cmakeVersion = "3.18.1+"
+    minSdkVersion = 21
+    compileSdkVersion = 33
+    targetSdkVersion = 33
+    sourceCompatibilityVersion = JavaVersion.VERSION_1_7
+    targetCompatibilityVersion = JavaVersion.VERSION_1_7
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

cmake/project-defaults.cmake

@@ -0,0 +1,50 @@
+# 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.
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+add_compile_definitions($<$<CONFIG:DEBUG>:DEBUG>)
+
+if(MSVC)
+
+add_compile_options(
+    # Don't omit frame pointers (e.g. for crash dumps)
+    /Oy-
+    # "Standard C++ exception handling" (C++ stack unwinding including extern c)
+    /EHsc
+    # Enable warnings and warnings as errors
+    /W3
+    /WX
+    # Disable RTTI
+    $<$<COMPILE_LANGUAGE:CXX>:/GR->
+    # Use /O2 (Maximize Speed)
+    $<$<CONFIG:RELEASE>:/O2>)
+
+else()
+
+add_compile_options(
+    # Don't omit frame pointers (e.g. for crash dumps)
+    -fno-omit-frame-pointer
+    # Enable exception handling
+    -fexceptions
+    # Enable warnings and warnings as errors
+    -Wall
+    -Werror
+    # Disable RTTI
+    $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
+    # Use -O2 (prioritize speed)
+    $<$<CONFIG:RELEASE>:-O2>
+    # Enable separate sections per function/data item
+    $<$<CONFIG:RELEASE>:-ffunction-sections>
+    $<$<CONFIG:RELEASE>:-fdata-sections>)
+
+add_link_options(
+    # Discard unused sections
+    $<$<CONFIG:RELEASE>:$<$<CXX_COMPILER_ID:Clang,GNU>:-Wl,--gc-sections>>
+    $<$<CONFIG:RELEASE>:$<$<CXX_COMPILER_ID:AppleClang>:-Wl,-dead_strip>>)
+
+endif()

cmake/yoga-config.cmake.in

@@ -0,0 +1,10 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/yogaTargets.cmake")
+
+check_required_components(yoga)

csharp/.gitignore

@@ -267,3 +267,6 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
+
+# local buck build
+lib/

csharp/.hgignore

@@ -1,269 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-tests/Facebook.Yoga/NUnit-[0-9\.]*/
-tests/Facebook.Yoga/YogaTest.dll
-tests/Facebook.Yoga/YogaTest.dll.mdb
-tests/Facebook.Yoga/libyoga.dylib
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc

csharp/Android/Facebook.Yoga.Android.Tests/MainActivity.cs

@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System.Reflection;