Release GitHub actions workflow (#1088)

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

Reviewed By: mweststrate

Differential Revision: D28604872

Pulled By: passy

fbshipit-source-id: e77578d44557420be9b782dc90f047af697b7cb9

.github/workflows/ci.yml

@@ -0,0 +1,58 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  website:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 8.x
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile --ignore-scripts
+        working-directory: website
+      - name: Build
+        run: yarn build
+        working-directory: website
+      - name: Deploy
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        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'
+  android:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Install NDK 21
+        run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
+      - name: Install dependencies
+        run: |
+          if [[ -n "${{ secrets.encrypted_d27e803291ff_iv }}" ]]; then
+            openssl aes-256-cbc -K ${{ secrets.encrypted_d27e803291ff_key }} -iv {{ secrets.encrypted_d27e803291ff_iv }} -in scripts/setup-keys.enc -d >> gradle.properties;
+          fi
+          sudo apt-get update
+          sudo apt-get install -y ninja-build
+          pushd $HOME
+          git clone --depth 1 https://github.com/facebook/buck.git
+          cd buck
+          ant
+          popd
+          echo "$HOME/buck/bin" >> $GITHUB_PATH
+          export PATH=$PATH:$HOME/buck/bin/
+          buck --version
+      - name: Build
+        # TODO: Run the tests here again. They're currently crashing the JVM in GitHub Actions for some reason.
+        run: ./gradlew :yoga-layout:assembleDebug && scripts/publish-snapshot.sh

.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: Publish
+
+on:
+  release:
+    types:
+      - created
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Install dependencies
+      run: source scripts/android-setup.sh && installAndroidSDK
+    - name: Write GPG Sec Ring
+      run: echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > /tmp/secring.gpg
+    - name: Update gradle.properties
+      run: echo -e "signing.secretKeyRingFile=/tmp/secring.gpg\nsigning.keyId=${{ secrets.SIGNING_KEY_ID }}\nsigning.password=${{ secrets.SIGNING_PASSWORD }}\nmavenCentralPassword=${{ secrets.SONATYPE_NEXUS_PASSWORD }}\nmavenCentralUsername=${{ secrets.SONATYPE_NEXUS_USERNAME }}" >> gradle.properties
+    - name: Upload Android Archives
+      run: ./gradlew :yoga:assembleRelease publish --info
+    - name: Release and close
+      run: ./gradlew closeAndReleaseRepository
+    - name: Clean secrets
+      if: always()
+      run: rm /tmp/secring.gpg

.gitignore

@@ -6,6 +6,9 @@
 /.buckd
 /gentest/test.html
 .buckversion
+.cxx
+.idea
+/local.properties
 
 # Jekyll
 /.sass-cache/

.swift-version

@@ -1 +0,0 @@
-4.0

.travis.yml

@@ -1,77 +0,0 @@
-language: java
-os: linux
-dist: trusty
-addons:
-  apt:
-    sources:
-      - llvm-toolchain-trusty-6.0
-      - ubuntu-toolchain-r-test
-    packages:
-      - clang-6.0
-
-env:
-  - TARGET: website
-  - TARGET: android
-
-install:
-- cd website
-- yarn --ignore-scripts
-- cd ..
-
-cache:
-  directories:
-    - $HOME/buck
-    - $HOME/.gradle
-
-before_install:
-  - |
-    if [[ -n "$encrypted_d27e803291ff_iv" ]]; then
-      openssl aes-256-cbc -K $encrypted_d27e803291ff_key -iv $encrypted_d27e803291ff_iv -in scripts/setup-keys.enc -d >> gradle.properties;
-    fi
-  # Android
-  - |
-    if [[ $TARGET = "android" ]]; then
-      pushd $HOME
-      git clone --depth 1 https://github.com/facebook/buck.git
-      cd buck
-      ant
-      popd
-      export PATH=$PATH:$HOME/buck/bin/
-      buck --version
-      export TERMINAL=dumb
-      source scripts/android-setup.sh && installAndroidSDK
-      export ANDROID_SDK=$ANDROID_HOME
-      export ANDROID_NDK_REPOSITORY=$HOME/android-ndk
-      export ANDROID_NDK_HOME=$ANDROID_NDK_REPOSITORY/android-ndk-r15c
-    fi
-  # Website
-  - |
-    if [[ $TARGET = "website" ]]; then
-      nvm install 8
-      nvm use 8
-    fi
-
-script:
-  - |
-    if [[ $TARGET = "android" ]]; then
-      ./gradlew testDebugUnit && scripts/publish-snapshot.sh
-    fi
-  - |
-    if [[ $TARGET = "website" ]]; then
-      pushd website
-      yarn build
-      popd
-    fi
-
-deploy:
-  provider: pages
-  skip-cleanup: true
-  github-token: $GITHUB_TOKEN
-  fqdn: yogalayout.com
-  local-dir: website/public
-  email: yogabot@fb.com
-  name: Yoga-bot
-  keep-history: true
-  on:
-    branch: master
-    condition: $TARGET = website

BUCK

@@ -2,7 +2,7 @@
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-load("//tools/build_defs/oss:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "GTEST_TARGET", "LIBRARY_COMPILER_FLAGS", "subdir_glob", "yoga_cxx_library", "yoga_cxx_test", "yoga_dep")
+load("//tools/build_defs/oss:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "GTEST_TARGET", "LIBRARY_COMPILER_FLAGS", "YOGA_ROOTS", "subdir_glob", "yoga_cxx_library", "yoga_cxx_test", "yoga_dep", "yoga_prebuilt_cxx_library")
 
 GMOCK_OVERRIDE_FLAGS = [
     # gmock does not mark mocked methods as override, ignore the warnings in tests
@@ -14,6 +14,18 @@ TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + [
     "-DYG_ENABLE_EVENTS",
 ]
 
+yoga_prebuilt_cxx_library(
+    name = "ndklog",
+    exported_platform_linker_flags = [
+        (
+            "^android.*",
+            ["-llog"],
+        ),
+    ],
+    header_only = True,
+    visibility = YOGA_ROOTS,
+)
+
 yoga_cxx_library(
     name = "yoga",
     srcs = glob(["yoga/**/*.cpp"]),
@@ -24,7 +36,21 @@ yoga_cxx_library(
     tests = [":YogaTests"],
     visibility = ["PUBLIC"],
     deps = [
-        yoga_dep("lib/fb:ndklog"),
+        ":ndklog",
+    ],
+)
+
+yoga_cxx_library(
+    name = "yoga-static",
+    srcs = glob(["yoga/**/*.cpp"]),
+    compiler_flags = LIBRARY_COMPILER_FLAGS,
+    preferred_linkage = "static",
+    public_include_directories = ["."],
+    raw_headers = glob(["yoga/**/*.h"]),
+    tests = [":YogaTests"],
+    visibility = ["PUBLIC"],
+    deps = [
+        ":ndklog",
     ],
 )
 
@@ -39,7 +65,6 @@ yoga_cxx_library(
     visibility = ["PUBLIC"],
     deps = [
         ":yoga",
-        yoga_dep("lib/fb:ndklog"),
     ],
 )
 

README.md

@@ -46,3 +46,29 @@ This will now only run the standalone webpack build upon install.
 | node           | Builds node js version.                         |
 | standalone     | Runs webpack.                                   |
 | none           | Does nothing. You can use the prepackaged libs. |
+
+## Maintainer Release Guide
+
+To publish a new release, follow these steps:
+
+1. Ensure you have your GPG key set up and your [OSS Sonatype](https://oss.sonatype.org/) credentials handy.
+2. Add the follow entries to either your local `gradle.properties` (don't forget to revert) or your global `~/.gradle/gradle.properties`:
+
+```
+# You get these from https://oss.sonatype.org/#profile;User%20Token
+mavenCentralRepositoryUsername=<username>
+mavenCentralRepositoryPassword=<password>
+
+# You can get the keyId (in GPG 1.4 format) by running `gpg1 --list-keys`.
+signing.secretKeyRingFile=</path/to/secring.gpg>
+signing.keyId=<key_id>
+signing.password=<key_password>
+```
+
+3. Change the `VERSION_NAME` in `gradle.properties` to a non-SNAPSHOT release.
+4. Commit and land the version change.
+5. Run `./gradlew publishToMaven`.
+6. Run `./gradlew closeAndReleaseRepository`.
+7. Change the `VERSION_NAME` in `gradle.properties` back to a new SNAPSHOT release.
+8. Commit and land the version change.
+9. Celebrate! You've made a release!

ReactYoga.xcodeproj/project.pbxproj

@@ -191,7 +191,6 @@
 		27595AD71E575C7800CCE2B1 /* SampleCxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D41E03699D0018521A /* SampleCxxModule.h */; };
 		27595AD81E575C7800CCE2B1 /* SystraceSection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D51E03699D0018521A /* SystraceSection.h */; };
 		2D0EB9F32021067800CAF88A /* RCTUIUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = F1EFDA4E201F660F00EE6E4C /* RCTUIUtils.m */; };
-		2D16E68E1FA4FD3900B85C8A /* RCTTVNavigationEventEmitter.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */; };
 		2D1D83CE1F74E2DA00615550 /* libdouble-conversion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D383D621EBD27B9005632C8 /* libdouble-conversion.a */; };
 		2D3B5E931D9B087300451313 /* RCTErrorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */; };
 		2D3B5E941D9B087900451313 /* RCTBundleURLProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 68EFE4ED1CF6EB3900A1DE13 /* RCTBundleURLProvider.m */; };
@@ -269,8 +268,6 @@
 		3D0B842A1EC0B49400B2BD8E /* RCTTVRemoteHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0B84281EC0B49400B2BD8E /* RCTTVRemoteHandler.h */; };
 		3D0B842B1EC0B49400B2BD8E /* RCTTVRemoteHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D0B84291EC0B49400B2BD8E /* RCTTVRemoteHandler.m */; };
 		3D0B842C1EC0B4EA00B2BD8E /* RCTTVView.m in Sources */ = {isa = PBXBuildFile; fileRef = 130443D71E401AD800D93A67 /* RCTTVView.m */; };
-		3D0B842F1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */; };
-		3D0B84301EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D0B842E1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m */; };
 		3D0E378A1F1CC40000DCAC9F /* RCTWebSocketModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
 		3D0E378E1F1CC59100DCAC9F /* RCTWebSocketModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
 		3D0E378F1F1CC5CF00DCAC9F /* RCTWebSocketModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
@@ -1275,7 +1272,6 @@
 				594F0A471FD233BD007FBE96 /* RCTSurfaceView.h in Copy Headers */,
 				594F0A481FD233BD007FBE96 /* RCTSurfaceHostingView.h in Copy Headers */,
 				594F0A491FD233BD007FBE96 /* RCTSurfaceSizeMeasureMode.h in Copy Headers */,
-				2D16E68E1FA4FD3900B85C8A /* RCTTVNavigationEventEmitter.h in Copy Headers */,
 				59500D481F71C67600B122B7 /* RCTUIManagerUtils.h in Copy Headers */,
 				3D0E37901F1CC5E100DCAC9F /* RCTWebSocketModule.h in Copy Headers */,
 				5960C1BF1F0804F50066FD5B /* RCTLayoutAnimation.h in Copy Headers */,
@@ -1876,8 +1872,6 @@
 		39C50FFA2046EE3500CEE534 /* RCTVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTVersion.m; sourceTree = "<group>"; };
 		3D0B84281EC0B49400B2BD8E /* RCTTVRemoteHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVRemoteHandler.h; sourceTree = "<group>"; };
 		3D0B84291EC0B49400B2BD8E /* RCTTVRemoteHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTVRemoteHandler.m; sourceTree = "<group>"; };
-		3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVNavigationEventEmitter.h; sourceTree = "<group>"; };
-		3D0B842E1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTVNavigationEventEmitter.m; sourceTree = "<group>"; };
 		3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTWebSocketModule.h; path = WebSocket/RCTWebSocketModule.h; sourceTree = "<group>"; };
 		3D1E68D81CABD13900DD7465 /* RCTDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDisplayLink.h; sourceTree = "<group>"; };
 		3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDisplayLink.m; sourceTree = "<group>"; };
@@ -2346,8 +2340,6 @@
 				0EEEA8DE2239002200A8C82D /* RCTSurfacePresenterStub.m */,
 				13B07FED1A69327A00A75B9A /* RCTTiming.h */,
 				13B07FEE1A69327A00A75B9A /* RCTTiming.m */,
-				3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */,
-				3D0B842E1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m */,
 				13E067481A70F434002CDEE1 /* RCTUIManager.h */,
 				13E067491A70F434002CDEE1 /* RCTUIManager.m */,
 				59EB6DB91EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h */,
@@ -2945,7 +2937,6 @@
 				3D302F311DF828F800D6DDAE /* RCTBundleURLProvider.h in Headers */,
 				3D302F321DF828F800D6DDAE /* RCTConvert.h in Headers */,
 				3D302F331DF828F800D6DDAE /* RCTDefines.h in Headers */,
-				3D0B842F1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h in Headers */,
 				3D302F341DF828F800D6DDAE /* RCTDisplayLink.h in Headers */,
 				3D302F351DF828F800D6DDAE /* RCTErrorCustomizer.h in Headers */,
 				3D302F361DF828F800D6DDAE /* RCTErrorInfo.h in Headers */,
@@ -3994,7 +3985,6 @@
 				2D3B5EC81D9B095800451313 /* RCTActivityIndicatorViewManager.m in Sources */,
 				3DCD185D1DF978E7007FE5A1 /* RCTReloadCommand.m in Sources */,
 				130443DB1E401ADD00D93A67 /* RCTConvert+Transform.m in Sources */,
-				3D0B84301EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m in Sources */,
 				2D3B5EC61D9B095000451313 /* RCTProfileTrampoline-x86_64.S in Sources */,
 				2D3B5EA61D9B08CA00451313 /* RCTTouchEvent.m in Sources */,
 				2D8C2E331DA40441000EE098 /* RCTMultipartStreamReader.m in Sources */,

Yoga.podspec

@@ -33,6 +33,6 @@ Pod::Spec.new do |spec|
       '-fPIC'
   ]
   spec.source_files = 'yoga/**/*.{c,h,cpp}'
-  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
+  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGNode,YGStyle,YGValue}.h'
 
 end

YogaKit.podspec

@@ -5,7 +5,7 @@
 
 podspec = Pod::Spec.new do |spec|
   spec.name = 'YogaKit'
-  spec.version = '1.17.0'
+  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/'
@@ -16,26 +16,22 @@ podspec = Pod::Spec.new do |spec|
   spec.authors = 'Facebook'
   spec.source = {
     :git => 'https://github.com/facebook/yoga.git',
-    :tag => spec.version.to_s,
+    :tag => "1.18.0",
   }
 
   spec.platform = :ios
   spec.ios.deployment_target = '8.0'
   spec.ios.frameworks = 'UIKit'
-  spec.default_subspec = "Core"
-  spec.dependency 'Yoga', '~> 1.14'
   spec.module_name = 'YogaKit'
-
+  spec.dependency 'Yoga', '~> 1.14'
-  spec.subspec "Core" do |ss|
+  # Fixes the bug related the xcode 11 not able to find swift related frameworks.
-    ss.source_files = 'YogaKit/Source/*.{h,m}'
+  # https://github.com/Carthage/Carthage/issues/2825
-    ss.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h'
+  # https://twitter.com/krzyzanowskim/status/1151549874653081601?s=21
-    ss.private_header_files = 'YogaKit/Source/YGLayout+Private.h'
+  spec.pod_target_xcconfig = {"LD_VERIFY_BITCODE": "NO"}
-  end
+  spec.source_files = 'YogaKit/Source/*.{h,m,swift}'
-
+  spec.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h'
-  spec.subspec 'SwiftExtension' do |ss|
+  spec.private_header_files = 'YogaKit/Source/YGLayout+Private.h'
-    ss.source_files = 'YogaKit/Source/*.{swift}'
+  spec.swift_version = '5.1'
-  end
-
 end
 
 # See https://github.com/facebook/yoga/pull/366

YogaKit/BUCK

@@ -37,11 +37,14 @@ yoga_apple_library(
     ),
     compiler_flags = COMPILER_FLAGS,
     frameworks = [
+        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
         "$SDKROOT/System/Library/Frameworks/UIKit.framework",
     ],
     header_path_prefix = "",
     link_whole = True,
+    modular = True,
+    module_name = "YogaKit",
     visibility = ["PUBLIC"],
     deps = [
         yoga_dep(":yoga"),

YogaKit/Source/UIView+Yoga.h

@@ -5,28 +5,29 @@
  * 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 *layout);
+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;
+@property(nonatomic, readonly, assign) BOOL isYogaEnabled;
 
 /**
- In ObjC land, every time you access `view.yoga.*` you are adding another `objc_msgSend`
+ In ObjC land, every time you access `view.yoga.*` you are adding another
- to your code. If you plan on making multiple changes to YGLayout, it's more performant
+ `objc_msgSend` to your code. If you plan on making multiple changes to
- to use this method, which uses a single objc_msgSend call.
+ 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

@@ -5,32 +5,30 @@
  * 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 {
-{
+  YGLayout* yoga = objc_getAssociatedObject(self, kYGYogaAssociatedKey);
-  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;
 }
 
-- (BOOL)isYogaEnabled
+- (BOOL)isYogaEnabled {
-{
   return objc_getAssociatedObject(self, kYGYogaAssociatedKey) != nil;
 }
 
-- (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block
+- (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block {
-{
   if (block != nil) {
     block(self.yoga);
   }

YogaKit/Source/YGLayout+Private.h

@@ -5,13 +5,13 @@
  * 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

@@ -7,15 +7,15 @@
 
 #import <UIKit/UIKit.h>
 #import <yoga/YGEnums.h>
-#import <yoga/Yoga.h>
 #import <yoga/YGMacros.h>
+#import <yoga/Yoga.h>
 
 YG_EXTERN_C_BEGIN
 
-extern YGValue YGPointValue(CGFloat value)
+extern YGValue YGPointValue(CGFloat value) NS_SWIFT_UNAVAILABLE(
-    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
+    "Use the swift Int and FloatingPoint extensions instead");
-extern YGValue YGPercentValue(CGFloat value)
+extern YGValue YGPercentValue(CGFloat value) NS_SWIFT_UNAVAILABLE(
-    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
+    "Use the swift Int and FloatingPoint extensions instead");
 
 YG_EXTERN_C_END
 
@@ -44,103 +44,107 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
   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, setter=setIncludedInLayout:)
+    BOOL isIncludedInLayout;
 
 /**
- The property that decides during layout/sizing whether or not styling properties should be applied.
+ The property that decides during layout/sizing whether or not styling
- Defaults to NO.
+ properties should be applied. Defaults to NO.
  */
-@property (nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;
+@property(nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;
 
-@property (nonatomic, readwrite, assign) YGDirection direction;
+@property(nonatomic, readwrite, assign) YGDirection direction;
-@property (nonatomic, readwrite, assign) YGFlexDirection flexDirection;
+@property(nonatomic, readwrite, assign) YGFlexDirection flexDirection;
-@property (nonatomic, readwrite, assign) YGJustify justifyContent;
+@property(nonatomic, readwrite, assign) YGJustify justifyContent;
-@property (nonatomic, readwrite, assign) YGAlign alignContent;
+@property(nonatomic, readwrite, assign) YGAlign alignContent;
-@property (nonatomic, readwrite, assign) YGAlign alignItems;
+@property(nonatomic, readwrite, assign) YGAlign alignItems;
-@property (nonatomic, readwrite, assign) YGAlign alignSelf;
+@property(nonatomic, readwrite, assign) YGAlign alignSelf;
-@property (nonatomic, readwrite, assign) YGPositionType position;
+@property(nonatomic, readwrite, assign) YGPositionType position;
-@property (nonatomic, readwrite, assign) YGWrap flexWrap;
+@property(nonatomic, readwrite, assign) YGWrap flexWrap;
-@property (nonatomic, readwrite, assign) YGOverflow overflow;
+@property(nonatomic, readwrite, assign) YGOverflow overflow;
-@property (nonatomic, readwrite, assign) YGDisplay display;
+@property(nonatomic, readwrite, assign) YGDisplay display;
 
-@property (nonatomic, readwrite, assign) CGFloat flex;
+@property(nonatomic, readwrite, assign) CGFloat flex;
-@property (nonatomic, readwrite, assign) CGFloat flexGrow;
+@property(nonatomic, readwrite, assign) CGFloat flexGrow;
-@property (nonatomic, readwrite, assign) CGFloat flexShrink;
+@property(nonatomic, readwrite, assign) CGFloat flexShrink;
-@property (nonatomic, readwrite, assign) YGValue flexBasis;
+@property(nonatomic, readwrite, assign) YGValue flexBasis;
 
-@property (nonatomic, readwrite, assign) YGValue left;
+@property(nonatomic, readwrite, assign) YGValue left;
-@property (nonatomic, readwrite, assign) YGValue top;
+@property(nonatomic, readwrite, assign) YGValue top;
-@property (nonatomic, readwrite, assign) YGValue right;
+@property(nonatomic, readwrite, assign) YGValue right;
-@property (nonatomic, readwrite, assign) YGValue bottom;
+@property(nonatomic, readwrite, assign) YGValue bottom;
-@property (nonatomic, readwrite, assign) YGValue start;
+@property(nonatomic, readwrite, assign) YGValue start;
-@property (nonatomic, readwrite, assign) YGValue end;
+@property(nonatomic, readwrite, assign) YGValue end;
 
-@property (nonatomic, readwrite, assign) YGValue marginLeft;
+@property(nonatomic, readwrite, assign) YGValue marginLeft;
-@property (nonatomic, readwrite, assign) YGValue marginTop;
+@property(nonatomic, readwrite, assign) YGValue marginTop;
-@property (nonatomic, readwrite, assign) YGValue marginRight;
+@property(nonatomic, readwrite, assign) YGValue marginRight;
-@property (nonatomic, readwrite, assign) YGValue marginBottom;
+@property(nonatomic, readwrite, assign) YGValue marginBottom;
-@property (nonatomic, readwrite, assign) YGValue marginStart;
+@property(nonatomic, readwrite, assign) YGValue marginStart;
-@property (nonatomic, readwrite, assign) YGValue marginEnd;
+@property(nonatomic, readwrite, assign) YGValue marginEnd;
-@property (nonatomic, readwrite, assign) YGValue marginHorizontal;
+@property(nonatomic, readwrite, assign) YGValue marginHorizontal;
-@property (nonatomic, readwrite, assign) YGValue marginVertical;
+@property(nonatomic, readwrite, assign) YGValue marginVertical;
-@property (nonatomic, readwrite, assign) YGValue margin;
+@property(nonatomic, readwrite, assign) YGValue margin;
 
-@property (nonatomic, readwrite, assign) YGValue paddingLeft;
+@property(nonatomic, readwrite, assign) YGValue paddingLeft;
-@property (nonatomic, readwrite, assign) YGValue paddingTop;
+@property(nonatomic, readwrite, assign) YGValue paddingTop;
-@property (nonatomic, readwrite, assign) YGValue paddingRight;
+@property(nonatomic, readwrite, assign) YGValue paddingRight;
-@property (nonatomic, readwrite, assign) YGValue paddingBottom;
+@property(nonatomic, readwrite, assign) YGValue paddingBottom;
-@property (nonatomic, readwrite, assign) YGValue paddingStart;
+@property(nonatomic, readwrite, assign) YGValue paddingStart;
-@property (nonatomic, readwrite, assign) YGValue paddingEnd;
+@property(nonatomic, readwrite, assign) YGValue paddingEnd;
-@property (nonatomic, readwrite, assign) YGValue paddingHorizontal;
+@property(nonatomic, readwrite, assign) YGValue paddingHorizontal;
-@property (nonatomic, readwrite, assign) YGValue paddingVertical;
+@property(nonatomic, readwrite, assign) YGValue paddingVertical;
-@property (nonatomic, readwrite, assign) YGValue padding;
+@property(nonatomic, readwrite, assign) YGValue padding;
 
-@property (nonatomic, readwrite, assign) CGFloat borderLeftWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderLeftWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderTopWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderTopWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderRightWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderRightWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderBottomWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderBottomWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderStartWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderStartWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderEndWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderEndWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderWidth;
 
-@property (nonatomic, readwrite, assign) YGValue width;
+@property(nonatomic, readwrite, assign) YGValue width;
-@property (nonatomic, readwrite, assign) YGValue height;
+@property(nonatomic, readwrite, assign) YGValue height;
-@property (nonatomic, readwrite, assign) YGValue minWidth;
+@property(nonatomic, readwrite, assign) YGValue minWidth;
-@property (nonatomic, readwrite, assign) YGValue minHeight;
+@property(nonatomic, readwrite, assign) YGValue minHeight;
-@property (nonatomic, readwrite, assign) YGValue maxWidth;
+@property(nonatomic, readwrite, assign) YGValue maxWidth;
-@property (nonatomic, readwrite, assign) YGValue maxHeight;
+@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.
+ Perform a layout calculation and update the frames of the views in the
- If the origin is not preserved, the root view's layout results will applied from {0,0}.
+ 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:));
 
 /**
- Perform a layout calculation and update the frames of the views in the hierarchy with the results.
+ Perform a layout calculation and update the frames of the views in the
- If the origin is not preserved, the root view's layout results will applied from {0,0}.
+ 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
                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
+ Returns the size of the view if no constraints were given. This could
- sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
+ equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
  */
-@property (nonatomic, readonly, assign) CGSize intrinsicSize;
+@property(nonatomic, readonly, assign) CGSize intrinsicSize;
 
 /**
-  Returns the size of the view based on provided constraints. Pass NaN for an unconstrained dimension.
+  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:));
@@ -148,19 +152,19 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
 /**
  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
+ Return a BOOL indiciating whether or not we this node contains any subviews
- Yoga's layout.
+ 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

@@ -5,153 +5,184 @@
  * 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)    \
+#define YG_PROPERTY(type, lowercased_name, capitalized_name)      \
-- (type)lowercased_name                                         \
+  -(type)lowercased_name {                                        \
-{                                                               \
+    return YGNodeStyleGet##capitalized_name(self.node);           \
-  return YGNodeStyleGet##capitalized_name(self.node);           \
+  }                                                               \
-}                                                               \
+                                                                  \
-                                                                \
+  -(void)set##capitalized_name : (type)lowercased_name {          \
-- (void)set##capitalized_name:(type)lowercased_name             \
+    YGNodeStyleSet##capitalized_name(self.node, 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_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_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(                                                  \
+      CGFloat, lowercased_name, capitalized_name, property, edge)           \
+  YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
+
+#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_PROPERTY(lowercased_name, capitalized_name)                       \
+YGValue YGPercentValue(CGFloat value) {
-- (YGValue)lowercased_name                                                         \
+  return (YGValue){.value = value, .unit = YGUnitPercent};
-{                                                                                  \
-  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_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_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(CGFloat, lowercased_name, capitalized_name, property, edge) \
-YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
-
-#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 };
-}
-
-YGValue YGPercentValue(CGFloat value)
-{
-  return (YGValue) { .value = value, .unit = YGUnitPercent };
 }
 
 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 isEnabled = _isEnabled;
-@synthesize isIncludedInLayout=_isIncludedInLayout;
+@synthesize isIncludedInLayout = _isIncludedInLayout;
-@synthesize node=_node;
+@synthesize node = _node;
 
-+ (void)initialize
++ (void)initialize {
-{
   globalConfig = YGConfigNew();
-  YGConfigSetExperimentalFeatureEnabled(globalConfig, YGExperimentalFeatureWebFlexBasis, true);
+  YGConfigSetExperimentalFeatureEnabled(
+      globalConfig, YGExperimentalFeatureWebFlexBasis, true);
   YGConfigSetPointScaleFactor(globalConfig, [UIScreen mainScreen].scale);
 }
 
-- (instancetype)initWithView:(UIView*)view
+- (instancetype)initWithView:(UIView*)view {
-{
   if (self = [super init]) {
     _view = view;
     _node = YGNodeNewWithConfig(globalConfig);
-    YGNodeSetContext(_node, (__bridge void *) view);
+    YGNodeSetContext(_node, (__bridge void*)view);
     _isEnabled = NO;
     _isIncludedInLayout = YES;
     _isUIView = [view isMemberOfClass:[UIView class]];
@@ -160,18 +191,15 @@ static YGConfigRef globalConfig;
   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;
   }
@@ -187,17 +215,17 @@ static YGConfigRef globalConfig;
   YGNodeMarkDirty(node);
 }
 
-- (NSUInteger)numberOfChildren
+- (NSUInteger)numberOfChildren {
-{
   return YGNodeGetChildCount(self.node);
 }
 
-- (BOOL)isLeaf
+- (BOOL)isLeaf {
-{
+  NSAssert(
-  NSAssert([NSThread isMainThread], @"This method must be called on the main thread.");
+      [NSThread isMainThread],
+      @"This method must be called on the main thread.");
   if (self.isEnabled) {
-    for (UIView *subview in self.view.subviews) {
+    for (UIView* subview in self.view.subviews) {
-      YGLayout *const yoga = subview.yoga;
+      YGLayout* const yoga = subview.yoga;
       if (yoga.isEnabled && yoga.isIncludedInLayout) {
         return NO;
       }
@@ -209,13 +237,11 @@ static YGConfigRef globalConfig;
 
 #pragma mark - Style
 
-- (YGPositionType)position
+- (YGPositionType)position {
-{
   return YGNodeStyleGetPositionType(self.node);
 }
 
-- (void)setPosition:(YGPositionType)position
+- (void)setPosition:(YGPositionType)position {
-{
   YGNodeStyleSetPositionType(self.node, position);
 }
 
@@ -261,25 +287,23 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
 
 #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);
 }
 
-- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin dimensionFlexibility:(YGDimensionFlexibility)dimensionFlexibility
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
-{
+               dimensionFlexibility:
+                   (YGDimensionFlexibility)dimensionFlexibility {
   CGSize size = self.view.bounds.size;
   if (dimensionFlexibility & YGDimensionFlexibilityFlexibleWidth) {
     size.width = YGUndefined;
@@ -291,18 +315,15 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
   YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
 }
 
-
+- (CGSize)intrinsicSize {
-- (CGSize)intrinsicSize
-{
   const CGSize constrainedSize = {
-    .width = YGUndefined,
+      .width = YGUndefined,
-    .height = YGUndefined,
+      .height = YGUndefined,
   };
   return [self calculateLayoutWithSize:constrainedSize];
 }
 
-- (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.");
 
@@ -310,30 +331,28 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
 
   const YGNodeRef node = self.node;
   YGNodeCalculateLayout(
-    node,
+      node, size.width, size.height, YGNodeStyleGetDirection(node));
-    size.width,
-    size.height,
-    YGNodeStyleGetDirection(node));
 
-  return (CGSize) {
+  return (CGSize){
-    .width = YGNodeLayoutGetWidth(node),
+      .width = YGNodeLayoutGetWidth(node),
-    .height = YGNodeLayoutGetHeight(node),
+      .height = YGNodeLayoutGetHeight(node),
   };
 }
 
 #pragma mark - Private
 
 static YGSize YGMeasureView(
-  YGNodeRef node,
+    YGNodeRef node,
-  float width,
+    float width,
-  YGMeasureMode widthMode,
+    YGMeasureMode widthMode,
-  float height,
+    float height,
-  YGMeasureMode heightMode)
+    YGMeasureMode heightMode) {
-{
+  const CGFloat constrainedWidth =
-  const CGFloat constrainedWidth = (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
+      (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
-  const CGFloat constrainedHeight = (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX: height;
+  const CGFloat constrainedHeight =
+      (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : height;
 
-  UIView *view = (__bridge UIView*) YGNodeGetContext(node);
+  UIView* view = (__bridge UIView*)YGNodeGetContext(node);
   CGSize sizeThatFits = CGSizeZero;
 
   // The default implementation of sizeThatFits: returns the existing size of
@@ -349,17 +368,18 @@ static YGSize YGMeasureView(
                                       }];
   }
 
-  return (YGSize) {
+  return (YGSize){
-    .width = YGSanitizeMeasurement(constrainedWidth, sizeThatFits.width, widthMode),
+      .width = YGSanitizeMeasurement(
-    .height = YGSanitizeMeasurement(constrainedHeight, sizeThatFits.height, heightMode),
+          constrainedWidth, sizeThatFits.width, widthMode),
+      .height = YGSanitizeMeasurement(
+          constrainedHeight, sizeThatFits.height, heightMode),
   };
 }
 
 static CGFloat YGSanitizeMeasurement(
-  CGFloat constrainedSize,
+    CGFloat constrainedSize,
-  CGFloat measuredSize,
+    CGFloat measuredSize,
-  YGMeasureMode measureMode)
+    YGMeasureMode measureMode) {
-{
   CGFloat result;
   if (measureMode == YGMeasureModeExactly) {
     result = constrainedSize;
@@ -372,13 +392,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;
     }
@@ -387,9 +408,8 @@ static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *
   return YES;
 }
 
-static void YGAttachNodesFromViewHierachy(UIView *const view)
+static void YGAttachNodesFromViewHierachy(UIView* const view) {
-{
+  YGLayout* const yoga = view.yoga;
-  YGLayout *const yoga = view.yoga;
   const YGNodeRef node = yoga.node;
 
   // Only leaf nodes should have a measure function
@@ -399,8 +419,9 @@ static void YGAttachNodesFromViewHierachy(UIView *const view)
   } else {
     YGNodeSetMeasureFunc(node, NULL);
 
-    NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
+    NSMutableArray<UIView*>* subviewsToInclude =
-    for (UIView *subview in view.subviews) {
+        [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
+    for (UIView* subview in view.subviews) {
       if (subview.yoga.isEnabled && subview.yoga.isIncludedInLayout) {
         [subviewsToInclude addObject:subview];
       }
@@ -408,19 +429,18 @@ static void YGAttachNodesFromViewHierachy(UIView *const view)
 
     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;
   }
@@ -428,52 +448,56 @@ static void YGRemoveAllChildren(const YGNodeRef node)
   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)
+static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
-{
+  NSCAssert(
-  NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
+      [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),
+      YGNodeLayoutGetLeft(node),
-    YGNodeLayoutGetTop(node),
+      YGNodeLayoutGetTop(node),
   };
 
   const CGPoint bottomRight = {
-    topLeft.x + YGNodeLayoutGetWidth(node),
+      topLeft.x + YGNodeLayoutGetWidth(node),
-    topLeft.y + YGNodeLayoutGetHeight(node),
+      topLeft.y + YGNodeLayoutGetHeight(node),
   };
 
   const CGPoint origin = preserveOrigin ? view.frame.origin : CGPointZero;
-  view.frame = (CGRect) {
+  view.frame = (CGRect){
-    .origin = {
+      .origin =
-      .x = YGRoundPixelValue(topLeft.x + origin.x),
+          {
-      .y = YGRoundPixelValue(topLeft.y + origin.y),
+              .x = YGRoundPixelValue(topLeft.x + origin.x),
-    },
+              .y = YGRoundPixelValue(topLeft.y + origin.y),
-    .size = {
+          },
-      .width = YGRoundPixelValue(bottomRight.x) - YGRoundPixelValue(topLeft.x),
+      .size =
-      .height = YGRoundPixelValue(bottomRight.y) - YGRoundPixelValue(topLeft.y),
+          {
-    },
+              .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

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import yoga;
 postfix operator %
 
 extension Int {
@@ -29,15 +30,15 @@ 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

@@ -16,17 +16,15 @@
 
 @implementation YogaKitTests
 
-- (void)testConfigureLayoutIsNoOpWithNilBlock
+- (void)testConfigureLayoutIsNoOpWithNilBlock {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   id block = nil;
   XCTAssertNoThrow([view configureLayoutWithBlock:block]);
 }
 
-- (void)testConfigureLayoutBlockWorksWithValidBlock
+- (void)testConfigureLayoutBlockWorksWithValidBlock {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  [view configureLayoutWithBlock:^(YGLayout* layout) {
-  [view configureLayoutWithBlock:^(YGLayout *layout){
     XCTAssertNotNil(layout);
     layout.isEnabled = YES;
     layout.width = YGPointValue(25);
@@ -36,12 +34,11 @@
   XCTAssertEqual(view.yoga.width.value, 25);
 }
 
-- (void)testNodesAreDeallocedWithSingleView
+- (void)testNodesAreDeallocedWithSingleView {
-{
+  __weak YGLayout* layoutRef = nil;
-  __weak YGLayout *layoutRef = nil;
 
   @autoreleasepool {
-    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
     view.yoga.flexBasis = YGPointValue(1);
 
     layoutRef = view.yoga;
@@ -53,17 +50,16 @@
   XCTAssertNil(layoutRef);
 }
 
-- (void)testNodesAreDeallocedCascade
+- (void)testNodesAreDeallocedCascade {
-{
+  __weak YGLayout* topLayout = nil;
-  __weak YGLayout *topLayout = nil;
+  __weak YGLayout* subviewLayout = nil;
-  __weak YGLayout *subviewLayout = nil;
 
   @autoreleasepool {
-    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
     topLayout = view.yoga;
     topLayout.flexBasis = YGPointValue(1);
 
-    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
     subviewLayout = subview.yoga;
     subviewLayout.flexBasis = YGPointValue(1);
 
@@ -74,9 +70,8 @@
   XCTAssertNil(subviewLayout);
 }
 
-- (void)testIsEnabled
+- (void)testIsEnabled {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   XCTAssertFalse(view.yoga.isEnabled);
 
   view.yoga.isEnabled = YES;
@@ -86,30 +81,31 @@
   XCTAssertFalse(view.yoga.isEnabled);
 }
 
-- (void)testSizeThatFitsAsserts
+- (void)testSizeThatFitsAsserts {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  dispatch_sync(
-  dispatch_sync(dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL), ^(void){
+      dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL),
-    XCTAssertThrows(view.yoga.intrinsicSize);
+      ^(void) {
-  });
+        XCTAssertThrows(view.yoga.intrinsicSize);
+      });
 }
 
-- (void)testSizeThatFitsSmoke
+- (void)testSizeThatFitsSmoke {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
   container.yoga.alignItems = YGAlignFlexStart;
 
-  UILabel *longTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+  UILabel* longTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
-  longTextLabel.text = @"This is a very very very very very very very very long piece of text.";
+  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 = YGPointValue(0);
   textBadgeView.yoga.width = YGPointValue(10);
@@ -124,7 +120,9 @@
   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)testSizeThatFitsEmptyView {
@@ -136,18 +134,17 @@
   XCTAssertEqual(viewSize.width, 0);
 }
 
-- (void)testPreservingOrigin
+- (void)testPreservingOrigin {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 50, 75)];
-  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 = 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 = YGPointValue(25);
   view2.yoga.flexBasis = YGPointValue(0);
@@ -161,28 +158,28 @@
   XCTAssertEqual(25, view2.frame.origin.y);
 }
 
-- (void)testContainerWithFlexibleWidthGetsCorrectlySized
+- (void)testContainerWithFlexibleWidthGetsCorrectlySized {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
   container.yoga.isEnabled = YES;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  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];
+  [container.yoga
+      applyLayoutPreservingOrigin:YES
+             dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth];
   XCTAssertEqual(100, container.frame.size.width);
   XCTAssertEqual(200, container.frame.size.height);
 }
 
-- (void)testContainerWithFlexibleHeightGetsCorrectlySized
+- (void)testContainerWithFlexibleHeightGetsCorrectlySized {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
   container.yoga.isEnabled = YES;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
   view.yoga.isEnabled = YES;
   view.yoga.width = YGPointValue(100);
   view.yoga.height = YGPointValue(100);
@@ -195,12 +192,11 @@
   XCTAssertEqual(100, container.frame.size.height);
 }
 
-- (void)testContainerWithFlexibleWidthAndHeightGetsCorrectlySized
+- (void)testContainerWithFlexibleWidthAndHeightGetsCorrectlySized {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
   container.yoga.isEnabled = YES;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
   view.yoga.isEnabled = YES;
   view.yoga.width = YGPointValue(100);
   view.yoga.height = YGPointValue(100);
@@ -214,12 +210,11 @@
   XCTAssertEqual(100, container.frame.size.height);
 }
 
-- (void)testMarkingDirtyOnlyWorksOnLeafNodes
+- (void)testMarkingDirtyOnlyWorksOnLeafNodes {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
   container.yoga.isEnabled = YES;
 
-  UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
   subview.yoga.isEnabled = YES;
   [container addSubview:subview];
 
@@ -232,14 +227,13 @@
   XCTAssertTrue(subview.yoga.isDirty);
 }
 
-- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation
+- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 50)];
-  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;
@@ -257,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(
-  XCTAssertEqualWithAccuracy(subview3.frame.origin.x, CGRectGetMaxX(subview2.frame), FLT_EPSILON);
+      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];
@@ -333,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);
   }
 
@@ -368,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
+- (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
-  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];
@@ -401,23 +405,22 @@
   XCTAssertEqual(container.yoga.numberOfChildren, 2);
 }
 
-- (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond
+- (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-  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;
@@ -437,13 +440,12 @@
   XCTAssertEqual(subview3.bounds.size.width, 100);
 }
 
-- (void)testIsLeafFlag
+- (void)testIsLeafFlag {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   XCTAssertTrue(view.yoga.isLeaf);
 
-  for (int i=0; i<10; i++) {
+  for (int i = 0; i < 10; i++) {
-    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
     [view addSubview:subview];
   }
   XCTAssertTrue(view.yoga.isLeaf);
@@ -452,99 +454,95 @@
   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 = YGPointValue(50);
   XCTAssertFalse(view.yoga.isLeaf);
 }
 
-- (void)testThatWeCorrectlyAttachNestedViews
+- (void)testThatWeCorrectlyAttachNestedViews {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+  container.yoga.isEnabled = YES;
-    container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionColumn;
-    container.yoga.flexDirection = YGFlexDirectionColumn;
 
-    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview1.yoga.isEnabled = YES;
+  subview1.yoga.isEnabled = YES;
-    subview1.yoga.width = YGPointValue(100);
+  subview1.yoga.width = YGPointValue(100);
-    subview1.yoga.flexGrow = 1;
+  subview1.yoga.flexGrow = 1;
-    subview1.yoga.flexDirection = YGFlexDirectionColumn;
+  subview1.yoga.flexDirection = YGFlexDirectionColumn;
-    [container addSubview:subview1];
+  [container addSubview:subview1];
 
-    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview2.yoga.isEnabled = YES;
+  subview2.yoga.isEnabled = YES;
-    subview2.yoga.width = YGPointValue(150);
+  subview2.yoga.width = YGPointValue(150);
-    subview2.yoga.flexGrow = 1;
+  subview2.yoga.flexGrow = 1;
-    subview2.yoga.flexDirection = YGFlexDirectionColumn;
+  subview2.yoga.flexDirection = YGFlexDirectionColumn;
-    [container addSubview:subview2];
+  [container addSubview:subview2];
 
-    for (UIView *view in @[subview1, subview2]) {
+  for (UIView* view in @[ subview1, subview2 ]) {
-        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* someView = [[UIView alloc] initWithFrame:CGRectZero];
-        someView.yoga.isEnabled = YES;
+    someView.yoga.isEnabled = YES;
-        someView.yoga.flexGrow = 1;
+    someView.yoga.flexGrow = 1;
-        [view addSubview:someView];
+    [view addSubview:someView];
-    }
+  }
-    [container.yoga applyLayoutPreservingOrigin:YES];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 
-    // Add the same amount of new views, reapply layout.
+  // Add the same amount of new views, reapply layout.
-    for (UIView *view in @[subview1, subview2]) {
+  for (UIView* view in @[ subview1, subview2 ]) {
-        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* someView = [[UIView alloc] initWithFrame:CGRectZero];
-        someView.yoga.isEnabled = YES;
+    someView.yoga.isEnabled = YES;
-        someView.yoga.flexGrow = 1;
+    someView.yoga.flexGrow = 1;
-        [view addSubview:someView];
+    [view addSubview:someView];
-    }
+  }
-    [container.yoga applyLayoutPreservingOrigin:YES];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 
-    XCTAssertEqual(subview1.bounds.size.width, 100);
+  XCTAssertEqual(subview1.bounds.size.width, 100);
-    XCTAssertEqual(subview1.bounds.size.height, 25);
+  XCTAssertEqual(subview1.bounds.size.height, 25);
-    for (UIView *subview in subview1.subviews) {
+  for (UIView* subview in subview1.subviews) {
-        const CGSize subviewSize = subview.bounds.size;
+    const CGSize subviewSize = subview.bounds.size;
-        XCTAssertNotEqual(subviewSize.width, 0);
+    XCTAssertNotEqual(subviewSize.width, 0);
-        XCTAssertNotEqual(subviewSize.height, 0);
+    XCTAssertNotEqual(subviewSize.height, 0);
-        XCTAssertFalse(isnan(subviewSize.height));
+    XCTAssertFalse(isnan(subviewSize.height));
-        XCTAssertFalse(isnan(subviewSize.width));
+    XCTAssertFalse(isnan(subviewSize.width));
-    }
+  }
 
-    XCTAssertEqual(subview2.bounds.size.width, 150);
+  XCTAssertEqual(subview2.bounds.size.width, 150);
-    XCTAssertEqual(subview2.bounds.size.height, 25);
+  XCTAssertEqual(subview2.bounds.size.height, 25);
-    for (UIView *subview in subview2.subviews) {
+  for (UIView* subview in subview2.subviews) {
-        const CGSize subviewSize = subview.bounds.size;
+    const CGSize subviewSize = subview.bounds.size;
-        XCTAssertNotEqual(subviewSize.width, 0);
+    XCTAssertNotEqual(subviewSize.width, 0);
-        XCTAssertNotEqual(subviewSize.height, 0);
+    XCTAssertNotEqual(subviewSize.height, 0);
-        XCTAssertFalse(isnan(subviewSize.height));
+    XCTAssertFalse(isnan(subviewSize.height));
-        XCTAssertFalse(isnan(subviewSize.width));
+    XCTAssertFalse(isnan(subviewSize.width));
-    }
+  }
 }
 
-- (void)testThatANonLeafNodeCanBecomeALeafNode
+- (void)testThatANonLeafNodeCanBecomeALeafNode {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+  container.yoga.isEnabled = YES;
-    container.yoga.isEnabled = YES;
 
-    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview1.yoga.isEnabled = YES;
+  subview1.yoga.isEnabled = YES;
-    [container addSubview:subview1];
+  [container addSubview:subview1];
 
-    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview2.yoga.isEnabled = YES;
+  subview2.yoga.isEnabled = YES;
-    [subview1 addSubview:subview2];
+  [subview1 addSubview:subview2];
 
-    [container.yoga applyLayoutPreservingOrigin:YES];
+  [container.yoga applyLayoutPreservingOrigin:YES];
-    [subview2 removeFromSuperview];
+  [subview2 removeFromSuperview];
-    [container.yoga applyLayoutPreservingOrigin:YES];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 }
 
-- (void)testPointPercent
+- (void)testPointPercent {
-{
   XCTAssertEqual(YGPointValue(1).value, 1);
   XCTAssertEqual(YGPointValue(1).unit, YGUnitPoint);
   XCTAssertEqual(YGPercentValue(2).value, 2);
   XCTAssertEqual(YGPercentValue(2).unit, YGUnitPercent);
 }
 
-- (void)testPositionalPropertiesWork
+- (void)testPositionalPropertiesWork {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.left = YGPointValue(1);
   XCTAssertEqual(view.yoga.left.value, 1);
@@ -589,9 +587,8 @@
   XCTAssertEqual(view.yoga.end.unit, YGUnitPercent);
 }
 
-- (void)testMarginPropertiesWork
+- (void)testMarginPropertiesWork {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.margin = YGPointValue(1);
   XCTAssertEqual(view.yoga.margin.value, 1);
@@ -657,9 +654,8 @@
   XCTAssertEqual(view.yoga.marginEnd.unit, YGUnitPercent);
 }
 
-- (void)testPaddingPropertiesWork
+- (void)testPaddingPropertiesWork {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.padding = YGPointValue(1);
   XCTAssertEqual(view.yoga.padding.value, 1);
@@ -725,9 +721,8 @@
   XCTAssertEqual(view.yoga.paddingEnd.unit, YGUnitPercent);
 }
 
-- (void)testBorderWidthPropertiesWork
+- (void)testBorderWidthPropertiesWork {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.borderWidth = 1;
   XCTAssertEqual(view.yoga.borderWidth, 1);

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -11,45 +11,41 @@
 
 @implementation ViewController
 
-- (void)viewDidLoad
+- (void)viewDidLoad {
-{
+  UIView* root = self.view;
-    UIView *root = self.view;
+  root.backgroundColor = [UIColor redColor];
-    root.backgroundColor = [UIColor redColor];
+  root.yoga.isEnabled = YES;
-    root.yoga.isEnabled = YES;
+  root.yoga.width = YGPointValue(self.view.bounds.size.width);
-    root.yoga.width = YGPointValue(self.view.bounds.size.width);
+  root.yoga.height = YGPointValue(self.view.bounds.size.height);
-    root.yoga.height = YGPointValue(self.view.bounds.size.height);
+  root.yoga.alignItems = YGAlignCenter;
-    root.yoga.alignItems = YGAlignCenter;
+  root.yoga.justifyContent = YGJustifyCenter;
-    root.yoga.justifyContent = YGJustifyCenter;
 
-    UIView *child1 = [UIView new];
+  UIView* child1 = [UIView new];
-    child1.backgroundColor = [UIColor blueColor];
+  child1.backgroundColor = [UIColor blueColor];
-    child1.yoga.isEnabled = YES;
+  child1.yoga.isEnabled = YES;
-    child1.yoga.width = YGPointValue(100);
+  child1.yoga.width = YGPointValue(100);
-    child1.yoga.height = YGPointValue(100);
+  child1.yoga.height = YGPointValue(100);
 
-    UIView *child2 = [UIView new];
+  UIView* child2 = [UIView new];
-    child2.backgroundColor = [UIColor greenColor];
+  child2.backgroundColor = [UIColor greenColor];
-    child2.frame = (CGRect) {
+  child2.frame = (CGRect){
-        .size = {
+      .size = {
-            .width = 200,
+          .width = 200,
-            .height = 100,
+          .height = 100,
-        }
+      }};
-    };
 
-    UIView *child3 = [UIView new];
+  UIView* child3 = [UIView new];
-    child3.backgroundColor = [UIColor yellowColor];
+  child3.backgroundColor = [UIColor yellowColor];
-    child3.frame = (CGRect) {
+  child3.frame = (CGRect){
-        .size = {
+      .size = {
-            .width = 100,
+          .width = 100,
-            .height = 100,
+          .height = 100,
-        }
+      }};
-    };
 
-    [child2 addSubview:child3];
+  [child2 addSubview:child3];
-    [root addSubview:child1];
+  [root addSubview:child1];
-    [root addSubview:child2];
+  [root addSubview:child2];
-    [root.yoga applyLayoutPreservingOrigin:NO];
+  [root.yoga applyLayoutPreservingOrigin:NO];
 }
 
-
 @end

android/BUCK

@@ -3,10 +3,11 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "JAVA_TARGET", "PROGUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")
 
 yoga_android_aar(
     name = "android",
+    enable_relinker = True,
     manifest_skeleton = "src/main/AndroidManifest.xml",
     visibility = [
         "PUBLIC",
@@ -15,7 +16,7 @@ yoga_android_aar(
         ANDROID_JAVA_TARGET,
         ANDROID_RES_TARGET,
         JAVA_TARGET,
-        PROGRUARD_ANNOTATIONS_TARGET,
+        PROGUARD_ANNOTATIONS_TARGET,
     ],
 )
 

android/build.gradle

@@ -5,17 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'maven-publish'
-
-version = VERSION_NAME
-group = GROUP
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -32,21 +27,10 @@ dependencies {
     api project(':yoga')
 }
 
-task sourcesJar(type: Jar) {
+// We don't build Javadoc at this time as we can't disable "BUCK" files
-    classifier = 'source'
+// from mistakenly getting parsed as Java.
-    from android.sourceSets.main.java.srcDirs
+tasks.withType(Javadoc).all {
+  enabled = false
 }
 
-task javadoc(type: Javadoc) {
+apply plugin: 'com.vanniktech.maven.publish'
-    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
-}
-
-apply from: rootProject.file('gradle/release.gradle')

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

@@ -8,6 +8,7 @@ load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_SAM
 yoga_android_library(
     name = "yoga",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],

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

@@ -8,6 +8,7 @@ load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_RES_TARGET", "INFER_ANNOTA
 yoga_android_library(
     name = "android",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],

build.gradle

@@ -10,14 +10,11 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
-        maven { url 'https://maven.google.com/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:4.2.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -26,15 +23,16 @@ buildscript {
 allprojects {
   repositories {
     google()
-    jcenter()
+    mavenCentral()
   }
 }
 
 ext {
     minSdkVersion = 14
-    targetSdkVersion = 25
+    targetSdkVersion = 29
-    compileSdkVersion = 26
+    compileSdkVersion = 29
-    buildToolsVersion = '28.0.3'
+    buildToolsVersion = '30.0.2'
+    ndkVersion = '21.3.6528147'
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 }

csharp/Yoga/YGInterop.cpp

@@ -9,11 +9,12 @@
 
 static YGInteropLogger gManagedLogger;
 
-static int unmanagedLogger(const YGConfigRef config,
+static int unmanagedLogger(
-                           const YGNodeRef node,
+    const YGConfigRef config,
-                           YGLogLevel level,
+    const YGNodeRef node,
-                           const char *format,
+    YGLogLevel level,
-                           va_list args) {
+    const char* format,
+    va_list args) {
   int result = 0;
   if (gManagedLogger) {
     char message[8192];

csharp/Yoga/YGInterop.h

@@ -11,10 +11,11 @@
 
 YG_EXTERN_C_BEGIN
 
-typedef int (*YGInteropLogger)(const void *unmanagedConfigPtr,
+typedef int (*YGInteropLogger)(
-                               const void *unmanagedNodePtr,
+    const void* unmanagedConfigPtr,
-                               YGLogLevel level,
+    const void* unmanagedNodePtr,
-                               const char *message);
+    YGLogLevel level,
+    const char* message);
 
 WIN_EXPORT YGConfigRef YGConfigGetDefault();
 

csharp/Yoga/Yoga.vcxproj

@@ -36,7 +36,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
@@ -48,7 +48,7 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -62,13 +62,13 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -227,6 +227,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\yoga\event\event.h" />
+    <ClInclude Include="..\..\yoga\log.h" />
     <ClInclude Include="..\..\yoga\Utils.h" />
     <ClInclude Include="..\..\yoga\YGConfig.h" />
     <ClInclude Include="..\..\yoga\YGEnums.h" />
@@ -236,6 +238,7 @@
     <ClInclude Include="..\..\yoga\YGNode.h" />
     <ClInclude Include="..\..\yoga\YGNodePrint.h" />
     <ClInclude Include="..\..\yoga\YGStyle.h" />
+    <ClInclude Include="..\..\yoga\YGValue.h" />
     <ClInclude Include="..\..\yoga\Yoga-internal.h" />
     <ClInclude Include="..\..\yoga\Yoga.h" />
     <ClInclude Include="resource.h" />
@@ -243,14 +246,16 @@
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\yoga\event\event.cpp" />
+    <ClCompile Include="..\..\yoga\log.cpp" />
     <ClCompile Include="..\..\yoga\Utils.cpp" />
     <ClCompile Include="..\..\yoga\YGConfig.cpp" />
     <ClCompile Include="..\..\yoga\YGEnums.cpp" />
-    <ClCompile Include="..\..\yoga\YGFloatOptional.cpp" />
     <ClCompile Include="..\..\yoga\YGLayout.cpp" />
     <ClCompile Include="..\..\yoga\YGNode.cpp" />
     <ClCompile Include="..\..\yoga\YGNodePrint.cpp" />
     <ClCompile Include="..\..\yoga\YGStyle.cpp" />
+    <ClCompile Include="..\..\yoga\YGValue.cpp" />
     <ClCompile Include="..\..\yoga\Yoga.cpp" />
     <ClCompile Include="YGInterop.cpp" />
     <ClCompile Include="dllmain.cpp">

csharp/Yoga/Yoga.vcxproj.filters

@@ -1,104 +1,119 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
+  <ItemGroup>
-    <Filter Include="Source Files">
+    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Header Files">
+    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Resource Files">
+    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
+    </Filter>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="targetver.h">
+    <ClInclude Include="targetver.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\Utils.h">
+    <ClInclude Include="..\..\yoga\Utils.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGEnums.h">
+    <ClInclude Include="..\..\yoga\YGEnums.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGFloatOptional.h">
+    <ClInclude Include="..\..\yoga\YGFloatOptional.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGLayout.h">
+    <ClInclude Include="..\..\yoga\YGLayout.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGMacros.h">
+    <ClInclude Include="..\..\yoga\YGMacros.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGNode.h">
+    <ClInclude Include="..\..\yoga\YGNode.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGNodePrint.h">
+    <ClInclude Include="..\..\yoga\YGNodePrint.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGStyle.h">
+    <ClInclude Include="..\..\yoga\YGStyle.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\Yoga.h">
+    <ClInclude Include="..\..\yoga\Yoga.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\Yoga-internal.h">
+    <ClInclude Include="..\..\yoga\Yoga-internal.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGConfig.h">
+    <ClInclude Include="..\..\yoga\YGConfig.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-  </ItemGroup>
+    <ClInclude Include="..\..\yoga\YGValue.h">
-  <ItemGroup>
+      <Filter>Header Files</Filter>
-    <ClCompile Include="stdafx.cpp">
+    </ClInclude>
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\..\yoga\log.h">
-    </ClCompile>
+      <Filter>Header Files</Filter>
-    <ClCompile Include="dllmain.cpp">
+    </ClInclude>
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\..\yoga\event\event.h">
-    </ClCompile>
+      <Filter>Header Files</Filter>
-    <ClCompile Include="YGInterop.cpp">
+    </ClInclude>
-      <Filter>Source Files</Filter>
+  </ItemGroup>
-    </ClCompile>
+  <ItemGroup>
-    <ClCompile Include="..\..\yoga\Utils.cpp">
+    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGEnums.cpp">
+    <ClCompile Include="dllmain.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGFloatOptional.cpp">
+    <ClCompile Include="YGInterop.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGLayout.cpp">
+    <ClCompile Include="..\..\yoga\Utils.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGNode.cpp">
+    <ClCompile Include="..\..\yoga\YGEnums.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGNodePrint.cpp">
+    <ClCompile Include="..\..\yoga\YGLayout.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGStyle.cpp">
+    <ClCompile Include="..\..\yoga\YGNode.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\Yoga.cpp">
+    <ClCompile Include="..\..\yoga\YGNodePrint.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGConfig.cpp">
+    <ClCompile Include="..\..\yoga\YGStyle.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-  </ItemGroup>
+    <ClCompile Include="..\..\yoga\Yoga.cpp">
-  <ItemGroup>
+      <Filter>Source Files</Filter>
-    <ResourceCompile Include="Yoga.rc">
+    </ClCompile>
-      <Filter>Resource Files</Filter>
+    <ClCompile Include="..\..\yoga\YGConfig.cpp">
-    </ResourceCompile>
+      <Filter>Source Files</Filter>
-  </ItemGroup>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\YGValue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\event\event.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\log.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Yoga.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>

csharp/Yoga/dllmain.cpp

@@ -8,7 +8,8 @@
 // dllmain.cpp : Defines the entry point for the DLL application.
 #include "stdafx.h"
 
-BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
+BOOL APIENTRY
+DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
   switch (ul_reason_for_call) {
     case DLL_PROCESS_ATTACH:
     case DLL_THREAD_ATTACH:

csharp/Yoga/targetver.h

@@ -9,7 +9,8 @@
 
 // Including SDKDDKVer.h defines the highest available Windows platform.
 
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// If you wish to build your application for a previous Windows platform,
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+// include WinSDKVer.h and set the _WIN32_WINNT macro to the platform you wish
+// to support before including SDKDDKVer.h.
 
 #include <SDKDDKVer.h>

csharp/tests/Facebook.Yoga/YGDisplayTest.cs

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGDisplayTest.html
 
 using System;
@@ -333,5 +334,47 @@ namespace Facebook.Yoga
             Assert.AreEqual(0f, root_child1.LayoutHeight);
         }
 
+        [Test]
+        public void Test_display_none_with_position_absolute()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Width = 100;
+            root_child0.Height = 100;
+            root_child0.Display = YogaDisplay.None;
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+        }
+
     }
 }

gentest/fixtures/YGDisplayTest.html

@@ -25,3 +25,7 @@
  <div style="flex-grow: 1;"></div>
  <div style="flex-grow: 1; display:none; top: 10px;"></div>
 </div>
+
+<div id="display_none_with_position_absolute" style="width: 100px; height: 100px;">
+  <div style="display:none; position: absolute; width: 100px; height: 100px"></div>
+</div>

gentest/gentest-cs.js

@@ -120,8 +120,9 @@ CSEmitter.prototype = Object.create(Emitter.prototype, {
   YGOverflowHidden:{value:'YogaOverflow.Hidden'},
   YGOverflowVisible:{value:'YogaOverflow.Visible'},
 
-  YGPositionTypeAbsolute:{value:'YogaPositionType.Absolute'},
+  YGPositionTypeAbsolute:{value:'YogaPositionType.Static'},
   YGPositionTypeRelative:{value:'YogaPositionType.Relative'},
+  YGPositionTypeAbsolute:{value:'YogaPositionType.Absolute'},
 
   YGUndefined:{value:'YogaConstants.Undefined'},
 

gentest/gentest.js

@@ -41,11 +41,11 @@ function assert(condition, message) {
 
 function printTest(e, LTRContainer, RTLContainer, genericContainer) {
   e.push([
-    '/**',
+    '/*',
     ' * Copyright (c) Facebook, Inc. and its affiliates.',
     ' *',
-    ' * This source code is licensed under the MIT license found in the LICENSE',
+    ' * This source code is licensed under the MIT license found in the',
-    ' * file in the root directory of this source tree.',
+    ' * LICENSE file in the root directory of this source tree.',
     ' */',
     '// @Generated by gentest/gentest.rb from gentest/fixtures/' + document.title + '.html',
     '',

gentest/gentest.rb

@@ -7,13 +7,14 @@
 require 'watir'
 require 'fileutils'
 
-caps = Selenium::WebDriver::Remote::Capabilities.chrome(
+browser = Watir::Browser.new(:chrome, "goog:loggingPrefs" => {
-  "loggingPrefs"=>{
+    "browser" => "ALL",
-    "browser"=>"ALL",
+    "performance" => "ALL"
-    "performance"=>"ALL"
+  },
-  }
+  "chromeOptions" => {
-)
+    "w3c" => "false"
-browser = Watir::Browser.new(:chrome, :desired_capabilities => caps, :switches => ['--force-device-scale-factor=1', '--window-position=0,0'])
+  },
+  :switches => ['--force-device-scale-factor=1', '--window-position=0,0'])
 
 Dir.chdir(File.dirname($0))
 

gradle.properties

@@ -9,7 +9,7 @@
 
 org.gradle.jvmargs=-Xmx1536M
 
-VERSION_NAME=1.16.0-SNAPSHOT
+VERSION_NAME=1.19.0
 POM_URL=https://github.com/facebook/yoga
 POM_SCM_URL=https://github.com/facebook/yoga.git
 POM_SCM_CONNECTION=scm:git:https://github.com/facebook/yoga.git
@@ -17,5 +17,8 @@ POM_SCM_DEV_CONNECTION=scm:git:git@github.com:facebook/yoga.git
 POM_LICENSE_NAME=MIT License
 POM_LICENSE_URL=https://github.com/facebook/yoga/blob/master/LICENSE
 POM_LICENSE_DIST=repo
+POM_LICENCE_NAME=MIT License
+POM_LICENCE_URL=https://github.com/facebook/yoga/blob/master/LICENSE
+POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=facebook
 POM_DEVELOPER_NAME=facebook

gradle/android-maven-install.gradle

@@ -1,44 +0,0 @@
-/*
- * 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.
- */
-
-// Configure the Android maven publication
-
-apply plugin: 'com.github.dcendents.android-maven'
-
-version = VERSION_NAME
-group = GROUP
-// Set the .aar / .jar base file name to match the artifact ID
-// in case the module has a different name
-project.archivesBaseName = POM_ARTIFACT_ID
-
-install {
-    repositories.mavenInstaller {
-        // This generates POM.xml with proper parameters
-        pom.project {
-            name POM_NAME
-            artifactId POM_ARTIFACT_ID
-            packaging POM_PACKAGING
-            description POM_DESCRIPTION
-            url projectUrl
-
-            scm {
-                url scmUrl
-                connection scmConnection
-                developerConnection scmDeveloperConnection
-            }
-
-            licenses projectLicenses
-
-            developers {
-                developer {
-                    id developerId
-                    name developerName
-                }
-            }
-        }
-    }
-}

gradle/android-tasks.gradle

@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-
-// Android tasks for Javadoc and sources.jar generation
-
-afterEvaluate { project ->
-    if (POM_PACKAGING == 'aar') {
-        task androidJavadoc(type: Javadoc) {
-            source = android.sourceSets.main.java.srcDirs
-            exclude '**/pom.xml'
-            exclude '**/proguard_annotations.pro'
-            classpath += files(android.bootClasspath)
-        }
-
-        task androidJavadocJar(type: Jar) {
-            classifier = 'javadoc'
-            from androidJavadoc.destinationDir
-        }
-
-        task androidSourcesJar(type: Jar) {
-            classifier = 'sources'
-            from android.sourceSets.main.java.srcDirs
-        }
-
-        android.libraryVariants.all { variant ->
-            def name = variant.name.capitalize()
-            task "jar${name}"(type: Jar, dependsOn: variant.javaCompile) {
-                from variant.javaCompile.destinationDir
-            }
-        }
-
-        artifacts.add('archives', androidJavadocJar)
-        artifacts.add('archives', androidSourcesJar)
-    }
-
-    if (POM_PACKAGING == 'jar') {
-        task javadocJar(type: Jar, dependsOn: javadoc) {
-            classifier = 'javadoc'
-            from javadoc.destinationDir
-        }
-
-        task sourcesJar(type: Jar, dependsOn: classes) {
-            classifier = 'sources'
-            from sourceSets.main.allSource
-        }
-
-        artifacts.add('archives', javadocJar)
-        artifacts.add('archives', sourcesJar)
-    }
-}

gradle/bintray.gradle

@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-
-// Upload to Bintray
-apply plugin: 'com.jfrog.bintray'
-
-def getBintrayUsername() {
-    return project.hasProperty('bintrayUsername') ? property('bintrayUsername') : System.getenv('BINTRAY_USERNAME')
-}
-
-def getBintrayApiKey() {
-    return project.hasProperty('bintrayApiKey') ? property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
-}
-
-def getBintrayGpgPassword() {
-    return project.hasProperty('bintrayGpgPassword') ? property('bintrayGpgPassword') : System.getenv('BINTRAY_GPG_PASSWORD')
-}
-
-def getMavenCentralUsername() {
-    return project.hasProperty('mavenCentralUsername') ? property('mavenCentralUsername') : System.getenv('MAVEN_CENTRAL_USERNAME')
-}
-
-def getMavenCentralPassword() {
-    return project.hasProperty('mavenCentralPassword') ? property('mavenCentralPassword') : System.getenv('MAVEN_CENTRAL_PASSWORD')
-}
-
-def shouldSyncWithMavenCentral() {
-    return project.hasProperty('syncWithMavenCentral') ? property('syncWithMavenCentral').toBoolean() : false
-}
-
-def dryRunOnly() {
-    return project.hasProperty('dryRun') ? property('dryRun').toBoolean() : false
-}
-
-bintray {
-    user = getBintrayUsername()
-    key = getBintrayApiKey()
-    configurations = ['archives']
-    pkg {
-        repo = bintrayRepo
-        userOrg =  bintrayUserOrg
-        name = bintrayName
-        desc = bintrayDescription
-        websiteUrl = projectUrl
-        issueTrackerUrl = issuesUrl
-        vcsUrl = scmUrl
-        licenses = projectLicenses
-        dryRun = dryRunOnly()
-        override = true
-        publish = true
-        publicDownloadNumbers = true
-        version {
-            desc = bintrayDescription
-            gpg {
-                sign = true
-                passphrase = getBintrayGpgPassword()
-            }
-            mavenCentralSync {
-                sync = shouldSyncWithMavenCentral()
-                user = getMavenCentralUsername()
-                password = getMavenCentralPassword()
-                close = '1' // If set to 0, you have to manually click release
-            }
-        }
-    }
-}

gradle/gradle-mvn-push.gradle

@@ -1,96 +0,0 @@
-/*
- * Copyright 2013 Chris Banes
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-apply plugin: 'signing'
-
-version = VERSION_NAME
-group = GROUP
-
-def isReleaseBuild() {
-  return VERSION_NAME.contains('SNAPSHOT') == false
-}
-
-def getReleaseRepositoryUrl() {
-  return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
-      : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-}
-
-def getSnapshotRepositoryUrl() {
-  return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
-      : "https://oss.sonatype.org/content/repositories/snapshots/"
-}
-
-def getRepositoryUsername() {
-  return hasProperty('SONATYPE_NEXUS_USERNAME') ? SONATYPE_NEXUS_USERNAME : ""
-}
-
-def getRepositoryPassword() {
-  return hasProperty('SONATYPE_NEXUS_PASSWORD') ? SONATYPE_NEXUS_PASSWORD : ""
-}
-
-afterEvaluate { project ->
-  uploadArchives {
-    repositories {
-      mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        pom.groupId = GROUP
-        pom.artifactId = POM_ARTIFACT_ID
-        pom.version = VERSION_NAME
-
-        repository(url: getReleaseRepositoryUrl()) {
-          authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-        }
-        snapshotRepository(url: getSnapshotRepositoryUrl()) {
-          authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-        }
-
-        pom.project {
-          name POM_NAME
-          packaging POM_PACKAGING
-          description POM_DESCRIPTION
-          url POM_URL
-
-          scm {
-            url POM_SCM_URL
-            connection POM_SCM_CONNECTION
-            developerConnection POM_SCM_DEV_CONNECTION
-          }
-
-          licenses {
-            license {
-              name POM_LICENSE_NAME
-              url POM_LICENSE_URL
-              distribution POM_LICENSE_DIST
-            }
-          }
-
-          developers {
-            developer {
-              id POM_DEVELOPER_ID
-              name POM_DEVELOPER_NAME
-            }
-          }
-        }
-      }
-    }
-  }
-
-  signing {
-    required { isReleaseBuild() && gradle.taskGraph.hasTask('uploadArchives') }
-    sign configurations.archives
-  }
-}

gradle/release-bintray.gradle

@@ -1,40 +0,0 @@
-/*
- * 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.
- */
-
-// Set up everything required for releasing on Bintray
-ext {
-    bintrayRepo = 'maven'
-    bintrayUserOrg = 'facebook'
-    bintrayName = "${GROUP}:${POM_ARTIFACT_ID}"
-    bintrayDescription = POM_DESCRIPTION
-    projectUrl = POM_URL
-    issuesUrl = 'https://github.com/facebook/yoga/issues'
-    scmUrl = POM_SCM_URL
-    scmConnection = POM_SCM_CONNECTION
-    scmDeveloperConnection = POM_SCM_DEV_CONNECTION
-
-    publishedGroupId = GROUP
-    libraryName = 'yoga'
-    artifact = 'yoga'
-
-    developerId = POM_DEVELOPER_ID
-    developerName = POM_DEVELOPER_NAME
-
-    projectLicenses = {
-        license {
-            name = POM_LICENSE_NAME
-            url = POM_LICENSE_URL
-            distribution = POM_LICENSE_DIST
-        }
-    }
-}
-
-// Set up the Android Maven publication (POM etc.)
-apply from: rootProject.file('gradle/android-maven-install.gradle')
-
-// Upload to Bintray
-apply from: rootProject.file('gradle/bintray.gradle')

gradle/release.gradle

@@ -1,15 +0,0 @@
-/*
- * 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.
- */
-
-// Common Android tasks for all releases that generate Javadocs, sources, etc.
-apply from: rootProject.file('gradle/android-tasks.gradle')
-
-// Upload to Bintray
-apply from: rootProject.file('gradle/release-bintray.gradle')
-
-// Upload directly to standard Maven Central (for SNAPSHOTs)
-apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

java/BUCK

@@ -3,11 +3,11 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "FBJNI_JAVA_TARGET", "FBJNI_TARGET", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "yoga_cxx_lib", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "YOGA_ROOTS", "yoga_cxx_lib", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test", "yoga_prebuilt_cxx_library")
 
 CXX_LIBRARY_WHITELIST_FOR_TESTS = CXX_LIBRARY_WHITELIST + [
     yoga_cxx_lib("testutil:jni"),
-    yoga_cxx_lib("testutil:testutil"),
+    yoga_cxx_lib("testutil:testutil-jni"),
 ]
 
 YOGA_JAVA_IMPLEMENTATION_FILES = [
@@ -16,6 +16,18 @@ YOGA_JAVA_IMPLEMENTATION_FILES = [
     "com/facebook/yoga/YogaNative.java",
 ]
 
+yoga_prebuilt_cxx_library(
+    name = "ndklog",
+    exported_platform_linker_flags = [
+        (
+            "^android.*",
+            ["-llog"],
+        ),
+    ],
+    header_only = True,
+    visibility = YOGA_ROOTS,
+)
+
 yoga_cxx_library(
     name = "jni",
     srcs = glob(["jni/*.cpp"]),
@@ -41,9 +53,9 @@ yoga_cxx_library(
     soname = "libyoga.$(ext)",
     visibility = ["PUBLIC"],
     deps = [
-        FBJNI_TARGET,
         JNI_TARGET,
-        yoga_dep(":yoga"),
+        yoga_dep(":yoga-static"),
+        ":ndklog",
     ],
 )
 
@@ -59,7 +71,7 @@ yoga_java_library(
     visibility = ["PUBLIC"],
     deps = [
         JSR_305_TARGET,
-        PROGRUARD_ANNOTATIONS_TARGET,
+        PROGUARD_ANNOTATIONS_TARGET,
     ],
 )
 
@@ -72,9 +84,8 @@ yoga_java_library(
     deps = [
         ":java-interface",
         ":jni",
-        FBJNI_JAVA_TARGET,
         JSR_305_TARGET,
-        PROGRUARD_ANNOTATIONS_TARGET,
+        PROGUARD_ANNOTATIONS_TARGET,
         SOLOADER_TARGET,
     ],
 )
@@ -97,6 +108,7 @@ yoga_java_library(
 yoga_java_test(
     name = "tests",
     srcs = glob(["tests/**/*.java"]),
+    contacts = ["oncall+yoga@xmail.facebook.com"],
     cxx_library_whitelist = CXX_LIBRARY_WHITELIST_FOR_TESTS,
     use_cxx_libraries = True,
     visibility = ["PUBLIC"],
@@ -111,6 +123,5 @@ yoga_java_binary(
     name = "yoga",
     deps = [
         ":java",
-        FBJNI_JAVA_TARGET,
     ],
 )

java/CMakeLists.txt

@@ -8,17 +8,13 @@ cmake_minimum_required(VERSION 3.4.1)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
 # configure import libs
-set(libfb_DIR ${CMAKE_SOURCE_DIR}/../lib/fb/src/main/cpp)
 set(yogacore_DIR ${CMAKE_SOURCE_DIR}/..)
-
 set(build_DIR ${CMAKE_SOURCE_DIR}/build)
 
-set(libfb_build_DIR ${build_DIR}/libfb/${ANDROID_ABI})
 set(yogacore_build_DIR ${build_DIR}/yogacore/${ANDROID_ABI})
 
 file(MAKE_DIRECTORY ${build_DIR})
 
-add_subdirectory(${libfb_DIR} ${libfb_build_DIR})
 add_subdirectory(${yogacore_DIR} ${yogacore_build_DIR})
 
 add_compile_options(
@@ -33,10 +29,12 @@ add_compile_options(
 file(GLOB jni_SRC
         jni/*.cpp)
 
+file(GLOB yogajni_version_script
+        yogajni.version)
+
 add_library(yoga SHARED ${jni_SRC})
 
 target_include_directories(yoga PRIVATE
-    ${libfb_DIR}/include
     ${yogacore_DIR})
 
-target_link_libraries(yoga -Wl,--gc-sections yogacore fb)
+target_link_libraries(yoga -Wl,--gc-sections,--version-script=${yogajni_version_script} yogacore)

java/build.gradle

@@ -5,17 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'maven-publish'
-
-group = GROUP
-version = VERSION_NAME
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -35,7 +30,6 @@ android {
     externalNativeBuild {
         cmake {
             path 'CMakeLists.txt'
-            version '3.6.0-rc2'
         }
     }
 
@@ -58,32 +52,11 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.code.findbugs:jsr305:3.0.1'
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
     implementation project(':yoga:proguard-annotations')
-    implementation 'com.facebook.soloader:soloader:0.5.1'
+    implementation 'com.facebook.soloader:soloader:0.10.1'
     testImplementation 'junit:junit:4.12'
     testImplementation project(':testutil')
 }
 
-task sourcesJar(type: Jar) {
+apply plugin: 'com.vanniktech.maven.publish'
-    classifier = 'source'
-    from android.sourceSets.main.java.srcDirs
-}
-
-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:yoga'
-}
-
-apply from: rootProject.file('gradle/release.gradle')

java/com/facebook/yoga/YogaAlign.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaAlign {
   AUTO(0),
   FLEX_START(1),

java/com/facebook/yoga/YogaBaselineFunction.java

@@ -7,14 +7,10 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public interface YogaBaselineFunction {
   /**
    * Return the baseline of the node in points. When no baseline function is set the baseline
    * default to the computed height of the node.
    */
-  @DoNotStrip
   float baseline(YogaNode node, float width, float height);
 }

java/com/facebook/yoga/YogaConfig.java

@@ -38,8 +38,4 @@ public abstract class YogaConfig {
   public abstract YogaLogger getLogger();
 
   abstract long getNativePointer();
-
-  public abstract void setUseVanillaJNI(boolean useVanillaJNI);
-
-  public abstract boolean useVanillaJNI();
 }

java/com/facebook/yoga/YogaConfigFactory.java

@@ -11,8 +11,4 @@ public abstract class YogaConfigFactory {
   public static YogaConfig create() {
     return new YogaConfigJNIFinalizer();
   }
-
-  public static YogaConfig create(boolean useVanillaJNI) {
-    return new YogaConfigJNIFinalizer(useVanillaJNI);
-  }
 }

java/com/facebook/yoga/YogaConfigJNIBase.java

@@ -11,7 +11,6 @@ public abstract class YogaConfigJNIBase extends YogaConfig {
 
   long mNativePointer;
   private YogaLogger mLogger;
-  protected boolean useVanillaJNI = false;
 
   private YogaConfigJNIBase(long nativePointer) {
     if (nativePointer == 0) {
@@ -21,40 +20,27 @@ public abstract class YogaConfigJNIBase extends YogaConfig {
   }
 
   YogaConfigJNIBase() {
-    this(YogaNative.jni_YGConfigNew());
+    this(YogaNative.jni_YGConfigNewJNI());
   }
 
   YogaConfigJNIBase(boolean useVanillaJNI) {
-    this(useVanillaJNI ? YogaNative.jni_YGConfigNewJNI() : YogaNative.jni_YGConfigNew());
+    this(YogaNative.jni_YGConfigNewJNI());
-    this.useVanillaJNI = useVanillaJNI;
   }
 
   public void setExperimentalFeatureEnabled(YogaExperimentalFeature feature, boolean enabled) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGConfigSetExperimentalFeatureEnabledJNI(mNativePointer, feature.intValue(), enabled);
-      YogaNative.jni_YGConfigSetExperimentalFeatureEnabledJNI(mNativePointer, feature.intValue(), enabled);
-    else
-      YogaNative.jni_YGConfigSetExperimentalFeatureEnabled(mNativePointer, feature.intValue(), enabled);
   }
 
   public void setUseWebDefaults(boolean useWebDefaults) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGConfigSetUseWebDefaultsJNI(mNativePointer, useWebDefaults);
-      YogaNative.jni_YGConfigSetUseWebDefaultsJNI(mNativePointer, useWebDefaults);
-    else
-      YogaNative.jni_YGConfigSetUseWebDefaults(mNativePointer, useWebDefaults);
   }
 
   public void setPrintTreeFlag(boolean enable) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGConfigSetPrintTreeFlagJNI(mNativePointer, enable);
-      YogaNative.jni_YGConfigSetPrintTreeFlagJNI(mNativePointer, enable);
-    else
-      YogaNative.jni_YGConfigSetPrintTreeFlag(mNativePointer, enable);
   }
 
   public void setPointScaleFactor(float pixelsInPoint) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGConfigSetPointScaleFactorJNI(mNativePointer, pixelsInPoint);
-      YogaNative.jni_YGConfigSetPointScaleFactorJNI(mNativePointer, pixelsInPoint);
-    else
-      YogaNative.jni_YGConfigSetPointScaleFactor(mNativePointer, pixelsInPoint);
   }
 
   /**
@@ -63,10 +49,7 @@ public abstract class YogaConfigJNIBase extends YogaConfig {
    * Because this was such a long-standing bug we must allow legacy users to switch back to this behaviour.
    */
   public void setUseLegacyStretchBehaviour(boolean useLegacyStretchBehaviour) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGConfigSetUseLegacyStretchBehaviourJNI(mNativePointer, useLegacyStretchBehaviour);
-      YogaNative.jni_YGConfigSetUseLegacyStretchBehaviourJNI(mNativePointer, useLegacyStretchBehaviour);
-    else
-      YogaNative.jni_YGConfigSetUseLegacyStretchBehaviour(mNativePointer, useLegacyStretchBehaviour);
   }
 
   /**
@@ -76,20 +59,13 @@ public abstract class YogaConfigJNIBase extends YogaConfig {
    */
   public void setShouldDiffLayoutWithoutLegacyStretchBehaviour(
       boolean shouldDiffLayoutWithoutLegacyStretchBehaviour) {
-    if (useVanillaJNI)
       YogaNative.jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviourJNI(
           mNativePointer, shouldDiffLayoutWithoutLegacyStretchBehaviour);
-    else
-      YogaNative.jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(
-          mNativePointer, shouldDiffLayoutWithoutLegacyStretchBehaviour);
   }
 
   public void setLogger(YogaLogger logger) {
     mLogger = logger;
-    if (useVanillaJNI)
+    YogaNative.jni_YGConfigSetLoggerJNI(mNativePointer, logger);
-      YogaNative.jni_YGConfigSetLoggerJNI(mNativePointer, logger);
-    else
-      YogaNative.jni_YGConfigSetLogger(mNativePointer, logger);
   }
 
   public YogaLogger getLogger() {
@@ -99,14 +75,4 @@ public abstract class YogaConfigJNIBase extends YogaConfig {
   long getNativePointer() {
     return mNativePointer;
   }
-
-  @Override
-  public void setUseVanillaJNI(boolean useVanillaJNI) {
-    this.useVanillaJNI = useVanillaJNI;
-  }
-
-  @Override
-  public boolean useVanillaJNI() {
-    return this.useVanillaJNI;
-  }
 }

java/com/facebook/yoga/YogaConfigJNIFinalizer.java

@@ -12,10 +12,6 @@ public class YogaConfigJNIFinalizer extends YogaConfigJNIBase {
     super();
   }
 
-  public YogaConfigJNIFinalizer(boolean useVanillaJNI) {
-    super(useVanillaJNI);
-  }
-
   @Override
   protected void finalize() throws Throwable {
     try {
@@ -29,10 +25,7 @@ public class YogaConfigJNIFinalizer extends YogaConfigJNIBase {
     if (mNativePointer != 0) {
       long nativePointer = mNativePointer;
       mNativePointer = 0;
-      if (useVanillaJNI)
+      YogaNative.jni_YGConfigFreeJNI(nativePointer);
-        YogaNative.jni_YGConfigFreeJNI(nativePointer);
-      else
-        YogaNative.jni_YGConfigFree(nativePointer);
     }
   }
 }

java/com/facebook/yoga/YogaDimension.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaDimension {
   WIDTH(0),
   HEIGHT(1);

java/com/facebook/yoga/YogaDirection.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaDirection {
   INHERIT(0),
   LTR(1),

java/com/facebook/yoga/YogaDisplay.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaDisplay {
   FLEX(0),
   NONE(1);

java/com/facebook/yoga/YogaEdge.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaEdge {
   LEFT(0),
   TOP(1),

java/com/facebook/yoga/YogaExperimentalFeature.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaExperimentalFeature {
   WEB_FLEX_BASIS(0);
 

java/com/facebook/yoga/YogaFlexDirection.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaFlexDirection {
   COLUMN(0),
   COLUMN_REVERSE(1),

java/com/facebook/yoga/YogaJustify.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaJustify {
   FLEX_START(0),
   CENTER(1),

java/com/facebook/yoga/YogaLogLevel.java

@@ -28,6 +28,7 @@ public enum YogaLogLevel {
     return mIntValue;
   }
 
+  @DoNotStrip
   public static YogaLogLevel fromInt(int value) {
     switch (value) {
       case 0: return ERROR;

java/com/facebook/yoga/YogaMeasureFunction.java

@@ -7,14 +7,10 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public interface YogaMeasureFunction {
   /**
    * Return a value created by YogaMeasureOutput.make(width, height);
    */
-  @DoNotStrip
   long measure(
       YogaNode node,
       float width,

java/com/facebook/yoga/YogaMeasureMode.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaMeasureMode {
   UNDEFINED(0),
   EXACTLY(1),

java/com/facebook/yoga/YogaNative.java

@@ -15,105 +15,7 @@ public class YogaNative {
   static {
     SoLoader.loadLibrary("yoga");
   }
-
+  
-  // YGConfig related
-  static native long jni_YGConfigNew();
-  static native void jni_YGConfigFree(long nativePointer);
-  static native void jni_YGConfigSetExperimentalFeatureEnabled(long nativePointer, int feature, boolean enabled);
-  static native void jni_YGConfigSetUseWebDefaults(long nativePointer, boolean useWebDefaults);
-  static native void jni_YGConfigSetPrintTreeFlag(long nativePointer, boolean enable);
-  static native void jni_YGConfigSetPointScaleFactor(long nativePointer, float pixelsInPoint);
-  static native void jni_YGConfigSetUseLegacyStretchBehaviour(long nativePointer, boolean useLegacyStretchBehaviour);
-  static native void jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(long nativePointer, boolean shouldDiffLayoutWithoutLegacyStretchBehaviour);
-  static native void jni_YGConfigSetLogger(long nativePointer, Object logger);
-
-
-  // YGNode related
-  static native long jni_YGNodeNew();
-  static native long jni_YGNodeNewWithConfig(long configPointer);
-  static native void jni_YGNodeFree(long nativePointer);
-  static native void jni_YGNodeReset(long nativePointer);
-  static native void jni_YGNodeInsertChild(long nativePointer, long childPointer, int index);
-  static native void jni_YGNodeSetIsReferenceBaseline(long nativePointer, boolean isReferenceBaseline);
-  static native boolean jni_YGNodeIsReferenceBaseline(long nativePointer);
-  static native void jni_YGNodeClearChildren(long nativePointer);
-  static native void jni_YGNodeRemoveChild(long nativePointer, long childPointer);
-  static native void jni_YGNodeCalculateLayout(long nativePointer, float width, float height, long[] nativePointers, YogaNodeJNIBase[] nodes);
-  static native void jni_YGNodeMarkDirty(long nativePointer);
-  static native void jni_YGNodeMarkDirtyAndPropogateToDescendants(long nativePointer);
-  static native boolean jni_YGNodeIsDirty(long nativePointer);
-  static native void jni_YGNodeCopyStyle(long dstNativePointer, long srcNativePointer);
-  static native int jni_YGNodeStyleGetDirection(long nativePointer);
-  static native void jni_YGNodeStyleSetDirection(long nativePointer, int direction);
-  static native int jni_YGNodeStyleGetFlexDirection(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexDirection(long nativePointer, int flexDirection);
-  static native int jni_YGNodeStyleGetJustifyContent(long nativePointer);
-  static native void jni_YGNodeStyleSetJustifyContent(long nativePointer, int justifyContent);
-  static native int jni_YGNodeStyleGetAlignItems(long nativePointer);
-  static native void jni_YGNodeStyleSetAlignItems(long nativePointer, int alignItems);
-  static native int jni_YGNodeStyleGetAlignSelf(long nativePointer);
-  static native void jni_YGNodeStyleSetAlignSelf(long nativePointer, int alignSelf);
-  static native int jni_YGNodeStyleGetAlignContent(long nativePointer);
-  static native void jni_YGNodeStyleSetAlignContent(long nativePointer, int alignContent);
-  static native int jni_YGNodeStyleGetPositionType(long nativePointer);
-  static native void jni_YGNodeStyleSetPositionType(long nativePointer, int positionType);
-  static native int jni_YGNodeStyleGetFlexWrap(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexWrap(long nativePointer, int wrapType);
-  static native int jni_YGNodeStyleGetOverflow(long nativePointer);
-  static native void jni_YGNodeStyleSetOverflow(long nativePointer, int overflow);
-  static native int jni_YGNodeStyleGetDisplay(long nativePointer);
-  static native void jni_YGNodeStyleSetDisplay(long nativePointer, int display);
-  static native float jni_YGNodeStyleGetFlex(long nativePointer);
-  static native void jni_YGNodeStyleSetFlex(long nativePointer, float flex);
-  static native float jni_YGNodeStyleGetFlexGrow(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexGrow(long nativePointer, float flexGrow);
-  static native float jni_YGNodeStyleGetFlexShrink(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexShrink(long nativePointer, float flexShrink);
-  static native long jni_YGNodeStyleGetFlexBasis(long nativePointer);
-  static native void jni_YGNodeStyleSetFlexBasis(long nativePointer, float flexBasis);
-  static native void jni_YGNodeStyleSetFlexBasisPercent(long nativePointer, float percent);
-  static native void jni_YGNodeStyleSetFlexBasisAuto(long nativePointer);
-  static native long jni_YGNodeStyleGetMargin(long nativePointer, int edge);
-  static native void jni_YGNodeStyleSetMargin(long nativePointer, int edge, float margin);
-  static native void jni_YGNodeStyleSetMarginPercent(long nativePointer, int edge, float percent);
-  static native void jni_YGNodeStyleSetMarginAuto(long nativePointer, int edge);
-  static native long jni_YGNodeStyleGetPadding(long nativePointer, int edge);
-  static native void jni_YGNodeStyleSetPadding(long nativePointer, int edge, float padding);
-  static native void jni_YGNodeStyleSetPaddingPercent(long nativePointer, int edge, float percent);
-  static native float jni_YGNodeStyleGetBorder(long nativePointer, int edge);
-  static native void jni_YGNodeStyleSetBorder(long nativePointer, int edge, float border);
-  static native long jni_YGNodeStyleGetPosition(long nativePointer, int edge);
-  static native void jni_YGNodeStyleSetPosition(long nativePointer, int edge, float position);
-  static native void jni_YGNodeStyleSetPositionPercent(long nativePointer, int edge, float percent);
-  static native long jni_YGNodeStyleGetWidth(long nativePointer);
-  static native void jni_YGNodeStyleSetWidth(long nativePointer, float width);
-  static native void jni_YGNodeStyleSetWidthPercent(long nativePointer, float percent);
-  static native void jni_YGNodeStyleSetWidthAuto(long nativePointer);
-  static native long jni_YGNodeStyleGetHeight(long nativePointer);
-  static native void jni_YGNodeStyleSetHeight(long nativePointer, float height);
-  static native void jni_YGNodeStyleSetHeightPercent(long nativePointer, float percent);
-  static native void jni_YGNodeStyleSetHeightAuto(long nativePointer);
-  static native long jni_YGNodeStyleGetMinWidth(long nativePointer);
-  static native void jni_YGNodeStyleSetMinWidth(long nativePointer, float minWidth);
-  static native void jni_YGNodeStyleSetMinWidthPercent(long nativePointer, float percent);
-  static native long jni_YGNodeStyleGetMinHeight(long nativePointer);
-  static native void jni_YGNodeStyleSetMinHeight(long nativePointer, float minHeight);
-  static native void jni_YGNodeStyleSetMinHeightPercent(long nativePointer, float percent);
-  static native long jni_YGNodeStyleGetMaxWidth(long nativePointer);
-  static native void jni_YGNodeStyleSetMaxWidth(long nativePointer, float maxWidth);
-  static native void jni_YGNodeStyleSetMaxWidthPercent(long nativePointer, float percent);
-  static native long jni_YGNodeStyleGetMaxHeight(long nativePointer);
-  static native void jni_YGNodeStyleSetMaxHeight(long nativePointer, float maxheight);
-  static native void jni_YGNodeStyleSetMaxHeightPercent(long nativePointer, float percent);
-  static native float jni_YGNodeStyleGetAspectRatio(long nativePointer);
-  static native void jni_YGNodeStyleSetAspectRatio(long nativePointer, float aspectRatio);
-  static native void jni_YGNodeSetHasMeasureFunc(long nativePointer, boolean hasMeasureFunc);
-  static native void jni_YGNodeSetHasBaselineFunc(long nativePointer, boolean hasMeasureFunc);
-  static native void jni_YGNodePrint(long nativePointer);
-  static native void jni_YGNodeSetStyleInputs(long nativePointer, float[] styleInputsArray, int size);
-  static native long jni_YGNodeClone(long nativePointer);
-
-
   // JNI methods that use Vanilla JNI
   // YGConfig related
   static native long jni_YGConfigNewJNI();
@@ -132,6 +34,7 @@ public class YogaNative {
   static native void jni_YGNodeFreeJNI(long nativePointer);
   static native void jni_YGNodeResetJNI(long nativePointer);
   static native void jni_YGNodeInsertChildJNI(long nativePointer, long childPointer, int index);
+  static native void jni_YGNodeSwapChildJNI(long nativePointer, long childPointer, int index);
   static native void jni_YGNodeSetIsReferenceBaselineJNI(long nativePointer, boolean isReferenceBaseline);
   static native boolean jni_YGNodeIsReferenceBaselineJNI(long nativePointer);
   static native void jni_YGNodeClearChildrenJNI(long nativePointer);

java/com/facebook/yoga/YogaNode.java

@@ -9,7 +9,15 @@ package com.facebook.yoga;
 
 import javax.annotation.Nullable;
 
-public abstract class YogaNode {
+public abstract class YogaNode implements YogaProps {
+
+  /** The interface the {@link #getData()} object can optionally implement. */
+  public interface Inputs {
+
+    /** Requests the data object to disable mutations of its inputs. */
+    void freeze(final YogaNode node, final @Nullable YogaNode parent);
+  }
+
   public abstract void reset();
 
   public abstract int getChildCount();
@@ -25,12 +33,10 @@ public abstract class YogaNode {
   public abstract YogaNode removeChildAt(int i);
 
   /**
-   * @returns the {@link YogaNode} that owns this {@link YogaNode}.
+   * @returns the {@link YogaNode} that owns this {@link YogaNode}. The owner is used to identify
-   * The owner is used to identify the YogaTree that a {@link YogaNode} belongs
+   *     the YogaTree that a {@link YogaNode} belongs to. This method will return the parent of the
-   * to.
+   *     {@link YogaNode} when the {@link YogaNode} only belongs to one YogaTree or null when the
-   * This method will return the parent of the {@link YogaNode} when the
+   *     {@link YogaNode} is shared between two or more YogaTrees.
-   * {@link YogaNode} only belongs to one YogaTree or null when the
-   * {@link YogaNode} is shared between two or more YogaTrees.
    */
   @Nullable
   public abstract YogaNode getOwner();
@@ -214,4 +220,6 @@ public abstract class YogaNode {
   public abstract void print();
 
   public abstract YogaNode cloneWithoutChildren();
+
+  public abstract YogaNode cloneWithChildren();
 }

java/com/facebook/yoga/YogaNodeFactory.java

@@ -12,10 +12,6 @@ public abstract class YogaNodeFactory {
     return new YogaNodeJNIFinalizer();
   }
 
-  public static YogaNode create(boolean useVanillaJNI) {
-    return new YogaNodeJNIFinalizer(useVanillaJNI);
-  }
-
   public static YogaNode create(YogaConfig config) {
     return new YogaNodeJNIFinalizer(config);
   }

java/com/facebook/yoga/YogaNodeJNIBase.java

@@ -15,7 +15,7 @@ import javax.annotation.Nullable;
 @DoNotStrip
 public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
 
-  /* Those flags needs be in sync with YGJNI.cpp */
+  /* Those flags needs be in sync with YGJNI.h */
   private static final byte MARGIN = 1;
   private static final byte PADDING = 2;
   private static final byte BORDER = 4;
@@ -39,16 +39,12 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   protected long mNativePointer;
   @Nullable private Object mData;
 
-  @DoNotStrip
+  @DoNotStrip private @Nullable float[] arr = null;
-  private @Nullable float[] arr = null;
 
-  @DoNotStrip
+  @DoNotStrip private int mLayoutDirection = 0;
-  private int mLayoutDirection = 0;
 
   private boolean mHasNewLayout = true;
 
-  protected boolean useVanillaJNI = false;
-
   private YogaNodeJNIBase(long nativePointer) {
     if (nativePointer == 0) {
       throw new IllegalStateException("Failed to allocate native memory");
@@ -57,17 +53,11 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   }
 
   YogaNodeJNIBase() {
-    this(YogaNative.jni_YGNodeNew());
+    this(YogaNative.jni_YGNodeNewJNI());
-  }
-
-  YogaNodeJNIBase(boolean useVanillaJNI) {
-    this(useVanillaJNI ? YogaNative.jni_YGNodeNewJNI() : YogaNative.jni_YGNodeNew());
-    this.useVanillaJNI = useVanillaJNI;
   }
 
   YogaNodeJNIBase(YogaConfig config) {
-    this(config.useVanillaJNI() ? YogaNative.jni_YGNodeNewWithConfigJNI(((YogaConfigJNIBase)config).mNativePointer) : YogaNative.jni_YGNodeNewWithConfig(((YogaConfigJNIBase)config).mNativePointer));
+    this(YogaNative.jni_YGNodeNewWithConfigJNI(((YogaConfigJNIBase) config).mNativePointer));
-    this.useVanillaJNI = config.useVanillaJNI();
   }
 
   public void reset() {
@@ -78,10 +68,7 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
     mHasNewLayout = true;
     mLayoutDirection = 0;
 
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeResetJNI(mNativePointer);
-      YogaNative.jni_YGNodeResetJNI(mNativePointer);
-    else
-      YogaNative.jni_YGNodeReset(mNativePointer);
   }
 
   public int getChildCount() {
@@ -96,6 +83,9 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   }
 
   public void addChildAt(YogaNode c, int i) {
+    if (!(c instanceof YogaNodeJNIBase)) {
+      return;
+    }
     YogaNodeJNIBase child = (YogaNodeJNIBase) c;
     if (child.mOwner != null) {
       throw new IllegalStateException("Child already has a parent, it must be removed first.");
@@ -106,28 +96,54 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
     }
     mChildren.add(i, child);
     child.mOwner = this;
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeInsertChildJNI(mNativePointer, child.mNativePointer, i);
-      YogaNative.jni_YGNodeInsertChildJNI(mNativePointer, child.mNativePointer, i);
-    else
-      YogaNative.jni_YGNodeInsertChild(mNativePointer, child.mNativePointer, i);
   }
 
   public void setIsReferenceBaseline(boolean isReferenceBaseline) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeSetIsReferenceBaselineJNI(mNativePointer, isReferenceBaseline);
-      YogaNative.jni_YGNodeSetIsReferenceBaselineJNI(mNativePointer, isReferenceBaseline);
-    else
-      YogaNative.jni_YGNodeSetIsReferenceBaseline(mNativePointer, isReferenceBaseline);
   }
 
   public boolean isReferenceBaseline() {
-    return useVanillaJNI ? YogaNative.jni_YGNodeIsReferenceBaselineJNI(mNativePointer) : YogaNative.jni_YGNodeIsReferenceBaseline(mNativePointer);
+    return YogaNative.jni_YGNodeIsReferenceBaselineJNI(mNativePointer);
+  }
+
+  public void swapChildAt(YogaNode newChild, int position) {
+    if (!(newChild instanceof YogaNodeJNIBase)) {
+      return;
+    }
+    YogaNodeJNIBase child = (YogaNodeJNIBase) newChild;
+    mChildren.remove(position);
+    mChildren.add(position, child);
+    child.mOwner = this;
+    YogaNative.jni_YGNodeSwapChildJNI(mNativePointer, child.mNativePointer, position);
+  }
+
+  @Override
+  public YogaNodeJNIBase cloneWithChildren() {
+    try {
+      YogaNodeJNIBase clonedYogaNode = (YogaNodeJNIBase) super.clone();
+      if (clonedYogaNode.mChildren != null) {
+        clonedYogaNode.mChildren = new ArrayList<>(clonedYogaNode.mChildren);
+      }
+      long clonedNativePointer = YogaNative.jni_YGNodeCloneJNI(mNativePointer);
+      clonedYogaNode.mOwner = null;
+      clonedYogaNode.mNativePointer = clonedNativePointer;
+      for (int i = 0; i < clonedYogaNode.getChildCount(); i++) {
+        clonedYogaNode.swapChildAt(clonedYogaNode.getChildAt(i).cloneWithChildren(), i);
+      }
+
+      return clonedYogaNode;
+    } catch (CloneNotSupportedException ex) {
+      // This class implements Cloneable, this should not happen
+      throw new RuntimeException(ex);
+    }
   }
 
   @Override
   public YogaNodeJNIBase cloneWithoutChildren() {
     try {
       YogaNodeJNIBase clonedYogaNode = (YogaNodeJNIBase) super.clone();
-      long clonedNativePointer = useVanillaJNI ? YogaNative.jni_YGNodeCloneJNI(mNativePointer) : YogaNative.jni_YGNodeClone(mNativePointer);;
+      long clonedNativePointer = YogaNative.jni_YGNodeCloneJNI(mNativePointer);
       clonedYogaNode.mOwner = null;
       clonedYogaNode.mNativePointer = clonedNativePointer;
       clonedYogaNode.clearChildren();
@@ -140,10 +156,7 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
 
   private void clearChildren() {
     mChildren = null;
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeClearChildrenJNI(mNativePointer);
-      YogaNative.jni_YGNodeClearChildrenJNI(mNativePointer);
-    else
-      YogaNative.jni_YGNodeClearChildren(mNativePointer);
   }
 
   public YogaNodeJNIBase removeChildAt(int i) {
@@ -153,20 +166,16 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
     }
     final YogaNodeJNIBase child = mChildren.remove(i);
     child.mOwner = null;
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeRemoveChildJNI(mNativePointer, child.mNativePointer);
-      YogaNative.jni_YGNodeRemoveChildJNI(mNativePointer, child.mNativePointer);
-    else
-      YogaNative.jni_YGNodeRemoveChild(mNativePointer, child.mNativePointer);
     return child;
   }
 
   /**
-   * @returns the {@link YogaNode} that owns this {@link YogaNode}.
+   * The owner is used to identify the YogaTree that a {@link YogaNode} belongs to. This method will
-   * The owner is used to identify the YogaTree that a {@link YogaNode} belongs
+   * return the parent of the {@link YogaNode} when the {@link YogaNode} only belongs to one
-   * to.
+   * YogaTree or null when the {@link YogaNode} is shared between two or more YogaTrees.
-   * This method will return the parent of the {@link YogaNode} when the
+   *
-   * {@link YogaNode} only belongs to one YogaTree or null when the
+   * @return the {@link YogaNode} that owns this {@link YogaNode}.
-   * {@link YogaNode} is shared between two or more YogaTrees.
    */
   @Nullable
   public YogaNodeJNIBase getOwner() {
@@ -188,12 +197,18 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
     long[] nativePointers = null;
     YogaNodeJNIBase[] nodes = null;
 
+    freeze(null);
+
     ArrayList<YogaNodeJNIBase> n = new ArrayList<>();
     n.add(this);
     for (int i = 0; i < n.size(); ++i) {
-      List<YogaNodeJNIBase> children  = n.get(i).mChildren;
+      final YogaNodeJNIBase parent = n.get(i);
+      List<YogaNodeJNIBase> children = parent.mChildren;
       if (children != null) {
-        n.addAll(children);
+        for (YogaNodeJNIBase child : children) {
+          child.freeze(parent);
+          n.add(child);
+        }
       }
     }
 
@@ -203,418 +218,295 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
       nativePointers[i] = nodes[i].mNativePointer;
     }
 
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeCalculateLayoutJNI(mNativePointer, width, height, nativePointers, nodes);
-      YogaNative.jni_YGNodeCalculateLayoutJNI(mNativePointer, width, height, nativePointers, nodes);
+  }
-    else
+
-      YogaNative.jni_YGNodeCalculateLayout(mNativePointer, width, height, nativePointers, nodes);
+  private void freeze(YogaNode parent) {
+    Object data = getData();
+    if (data instanceof Inputs) {
+      ((Inputs) data).freeze(this, parent);
+    }
   }
 
   public void dirty() {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeMarkDirtyJNI(mNativePointer);
-      YogaNative.jni_YGNodeMarkDirtyJNI(mNativePointer);
-    else
-      YogaNative.jni_YGNodeMarkDirty(mNativePointer);
   }
 
   public void dirtyAllDescendants() {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeMarkDirtyAndPropogateToDescendantsJNI(mNativePointer);
-      YogaNative.jni_YGNodeMarkDirtyAndPropogateToDescendantsJNI(mNativePointer);
-    else
-      YogaNative.jni_YGNodeMarkDirtyAndPropogateToDescendants(mNativePointer);
   }
 
   public boolean isDirty() {
-    return useVanillaJNI ? YogaNative.jni_YGNodeIsDirtyJNI(mNativePointer) : YogaNative.jni_YGNodeIsDirty(mNativePointer);
+    return YogaNative.jni_YGNodeIsDirtyJNI(mNativePointer);
   }
 
   @Override
   public void copyStyle(YogaNode srcNode) {
-    if (useVanillaJNI)
+    if (!(srcNode instanceof YogaNodeJNIBase)) {
-      YogaNative.jni_YGNodeCopyStyleJNI(mNativePointer, ((YogaNodeJNIBase) srcNode).mNativePointer);
+      return;
-    else
+    }
-      YogaNative.jni_YGNodeCopyStyle(mNativePointer, ((YogaNodeJNIBase) srcNode).mNativePointer);
+    YogaNative.jni_YGNodeCopyStyleJNI(mNativePointer, ((YogaNodeJNIBase) srcNode).mNativePointer);
   }
 
   public YogaDirection getStyleDirection() {
-    return YogaDirection.fromInt(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetDirectionJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetDirection(mNativePointer));
+    return YogaDirection.fromInt(YogaNative.jni_YGNodeStyleGetDirectionJNI(mNativePointer));
   }
 
   public void setDirection(YogaDirection direction) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetDirectionJNI(mNativePointer, direction.intValue());
-      YogaNative.jni_YGNodeStyleSetDirectionJNI(mNativePointer, direction.intValue());
-    else
-      YogaNative.jni_YGNodeStyleSetDirection(mNativePointer, direction.intValue());
   }
 
   public YogaFlexDirection getFlexDirection() {
-    return YogaFlexDirection.fromInt(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetFlexDirectionJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetFlexDirection(mNativePointer));
+    return YogaFlexDirection.fromInt(YogaNative.jni_YGNodeStyleGetFlexDirectionJNI(mNativePointer));
   }
 
   public void setFlexDirection(YogaFlexDirection flexDirection) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetFlexDirectionJNI(mNativePointer, flexDirection.intValue());
-      YogaNative.jni_YGNodeStyleSetFlexDirectionJNI(mNativePointer, flexDirection.intValue());
-    else
-      YogaNative.jni_YGNodeStyleSetFlexDirection(mNativePointer, flexDirection.intValue());
   }
 
   public YogaJustify getJustifyContent() {
-    return YogaJustify.fromInt(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetJustifyContentJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetJustifyContent(mNativePointer));
+    return YogaJustify.fromInt(YogaNative.jni_YGNodeStyleGetJustifyContentJNI(mNativePointer));
   }
 
   public void setJustifyContent(YogaJustify justifyContent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetJustifyContentJNI(mNativePointer, justifyContent.intValue());
-      YogaNative.jni_YGNodeStyleSetJustifyContentJNI(mNativePointer, justifyContent.intValue());
-    else
-      YogaNative.jni_YGNodeStyleSetJustifyContent(mNativePointer, justifyContent.intValue());
   }
 
   public YogaAlign getAlignItems() {
-    return YogaAlign.fromInt(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetAlignItemsJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetAlignItems(mNativePointer));
+    return YogaAlign.fromInt(YogaNative.jni_YGNodeStyleGetAlignItemsJNI(mNativePointer));
   }
 
   public void setAlignItems(YogaAlign alignItems) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetAlignItemsJNI(mNativePointer, alignItems.intValue());
-      YogaNative.jni_YGNodeStyleSetAlignItemsJNI(mNativePointer, alignItems.intValue());
-    else
-      YogaNative.jni_YGNodeStyleSetAlignItems(mNativePointer, alignItems.intValue());
   }
 
   public YogaAlign getAlignSelf() {
-    return YogaAlign.fromInt(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetAlignSelfJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetAlignSelf(mNativePointer));
+    return YogaAlign.fromInt(YogaNative.jni_YGNodeStyleGetAlignSelfJNI(mNativePointer));
   }
 
   public void setAlignSelf(YogaAlign alignSelf) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetAlignSelfJNI(mNativePointer, alignSelf.intValue());
-      YogaNative.jni_YGNodeStyleSetAlignSelfJNI(mNativePointer, alignSelf.intValue());
-    else
-      YogaNative.jni_YGNodeStyleSetAlignSelf(mNativePointer, alignSelf.intValue());
   }
 
   public YogaAlign getAlignContent() {
-    return YogaAlign.fromInt(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetAlignContentJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetAlignContent(mNativePointer));
+    return YogaAlign.fromInt(YogaNative.jni_YGNodeStyleGetAlignContentJNI(mNativePointer));
   }
 
   public void setAlignContent(YogaAlign alignContent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetAlignContentJNI(mNativePointer, alignContent.intValue());
-      YogaNative.jni_YGNodeStyleSetAlignContentJNI(mNativePointer, alignContent.intValue());
-    else
-      YogaNative.jni_YGNodeStyleSetAlignContent(mNativePointer, alignContent.intValue());
   }
 
   public YogaPositionType getPositionType() {
-    return YogaPositionType.fromInt(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetPositionTypeJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetPositionType(mNativePointer));
+    return YogaPositionType.fromInt(YogaNative.jni_YGNodeStyleGetPositionTypeJNI(mNativePointer));
   }
 
   public void setPositionType(YogaPositionType positionType) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetPositionTypeJNI(mNativePointer, positionType.intValue());
-      YogaNative.jni_YGNodeStyleSetPositionTypeJNI(mNativePointer, positionType.intValue());
-    else
-      YogaNative.jni_YGNodeStyleSetPositionType(mNativePointer, positionType.intValue());
   }
 
   public YogaWrap getWrap() {
-    return YogaWrap.fromInt(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetFlexWrapJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetFlexWrap(mNativePointer));
+    return YogaWrap.fromInt(YogaNative.jni_YGNodeStyleGetFlexWrapJNI(mNativePointer));
   }
 
   public void setWrap(YogaWrap flexWrap) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetFlexWrapJNI(mNativePointer, flexWrap.intValue());
-      YogaNative.jni_YGNodeStyleSetFlexWrapJNI(mNativePointer, flexWrap.intValue());
-    else
-      YogaNative.jni_YGNodeStyleSetFlexWrap(mNativePointer, flexWrap.intValue());
   }
 
   public YogaOverflow getOverflow() {
-    return YogaOverflow.fromInt(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetOverflowJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetOverflow(mNativePointer));
+    return YogaOverflow.fromInt(YogaNative.jni_YGNodeStyleGetOverflowJNI(mNativePointer));
   }
 
   public void setOverflow(YogaOverflow overflow) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetOverflowJNI(mNativePointer, overflow.intValue());
-      YogaNative.jni_YGNodeStyleSetOverflowJNI(mNativePointer, overflow.intValue());
-    else
-      YogaNative.jni_YGNodeStyleSetOverflow(mNativePointer, overflow.intValue());
   }
 
   public YogaDisplay getDisplay() {
-    return YogaDisplay.fromInt(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetDisplayJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetDisplay(mNativePointer));
+    return YogaDisplay.fromInt(YogaNative.jni_YGNodeStyleGetDisplayJNI(mNativePointer));
   }
 
   public void setDisplay(YogaDisplay display) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetDisplayJNI(mNativePointer, display.intValue());
-      YogaNative.jni_YGNodeStyleSetDisplayJNI(mNativePointer, display.intValue());
-    else
-      YogaNative.jni_YGNodeStyleSetDisplay(mNativePointer, display.intValue());
   }
 
   public float getFlex() {
-    return useVanillaJNI ? YogaNative.jni_YGNodeStyleGetFlexJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetFlex(mNativePointer);
+    return YogaNative.jni_YGNodeStyleGetFlexJNI(mNativePointer);
   }
 
   public void setFlex(float flex) {
-    if (useVanillaJNI) {
+    YogaNative.jni_YGNodeStyleSetFlexJNI(mNativePointer, flex);
-      YogaNative.jni_YGNodeStyleSetFlexJNI(mNativePointer, flex);
-    } else {
-      YogaNative.jni_YGNodeStyleSetFlex(mNativePointer, flex);
-    }
   }
 
   public float getFlexGrow() {
-    return useVanillaJNI ? YogaNative.jni_YGNodeStyleGetFlexGrowJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetFlexGrow(mNativePointer);
+    return YogaNative.jni_YGNodeStyleGetFlexGrowJNI(mNativePointer);
   }
 
   public void setFlexGrow(float flexGrow) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetFlexGrowJNI(mNativePointer, flexGrow);
-      YogaNative.jni_YGNodeStyleSetFlexGrowJNI(mNativePointer, flexGrow);
-    else
-      YogaNative.jni_YGNodeStyleSetFlexGrow(mNativePointer, flexGrow);
   }
 
   public float getFlexShrink() {
-    return useVanillaJNI ? YogaNative.jni_YGNodeStyleGetFlexShrinkJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetFlexShrink(mNativePointer);
+    return YogaNative.jni_YGNodeStyleGetFlexShrinkJNI(mNativePointer);
   }
 
   public void setFlexShrink(float flexShrink) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetFlexShrinkJNI(mNativePointer, flexShrink);
-      YogaNative.jni_YGNodeStyleSetFlexShrinkJNI(mNativePointer, flexShrink);
-    else
-      YogaNative.jni_YGNodeStyleSetFlexShrink(mNativePointer, flexShrink);
   }
 
   public YogaValue getFlexBasis() {
-    return valueFromLong(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetFlexBasisJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetFlexBasis(mNativePointer));
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetFlexBasisJNI(mNativePointer));
   }
 
   public void setFlexBasis(float flexBasis) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetFlexBasisJNI(mNativePointer, flexBasis);
-      YogaNative.jni_YGNodeStyleSetFlexBasisJNI(mNativePointer, flexBasis);
-    else
-      YogaNative.jni_YGNodeStyleSetFlexBasis(mNativePointer, flexBasis);
   }
 
   public void setFlexBasisPercent(float percent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetFlexBasisPercentJNI(mNativePointer, percent);
-      YogaNative.jni_YGNodeStyleSetFlexBasisPercentJNI(mNativePointer, percent);
-    else
-      YogaNative.jni_YGNodeStyleSetFlexBasisPercent(mNativePointer, percent);
   }
 
   public void setFlexBasisAuto() {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetFlexBasisAutoJNI(mNativePointer);
-      YogaNative.jni_YGNodeStyleSetFlexBasisAutoJNI(mNativePointer);
-    else
-      YogaNative.jni_YGNodeStyleSetFlexBasisAuto(mNativePointer);
   }
 
   public YogaValue getMargin(YogaEdge edge) {
-    return valueFromLong(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetMarginJNI(mNativePointer, edge.intValue()) : YogaNative.jni_YGNodeStyleGetMargin(mNativePointer, edge.intValue()));
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetMarginJNI(mNativePointer, edge.intValue()));
   }
 
   public void setMargin(YogaEdge edge, float margin) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetMarginJNI(mNativePointer, edge.intValue(), margin);
-      YogaNative.jni_YGNodeStyleSetMarginJNI(mNativePointer, edge.intValue(), margin);
-    else
-      YogaNative.jni_YGNodeStyleSetMargin(mNativePointer, edge.intValue(), margin);
   }
 
   public void setMarginPercent(YogaEdge edge, float percent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetMarginPercentJNI(mNativePointer, edge.intValue(), percent);
-      YogaNative.jni_YGNodeStyleSetMarginPercentJNI(mNativePointer, edge.intValue(), percent);
-    else
-      YogaNative.jni_YGNodeStyleSetMarginPercent(mNativePointer, edge.intValue(), percent);
   }
 
   public void setMarginAuto(YogaEdge edge) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetMarginAutoJNI(mNativePointer, edge.intValue());
-      YogaNative.jni_YGNodeStyleSetMarginAutoJNI(mNativePointer, edge.intValue());
-    else
-      YogaNative.jni_YGNodeStyleSetMarginAuto(mNativePointer, edge.intValue());
   }
 
   public YogaValue getPadding(YogaEdge edge) {
-    return valueFromLong(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetPaddingJNI(mNativePointer, edge.intValue()) : YogaNative.jni_YGNodeStyleGetPadding(mNativePointer, edge.intValue()));
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetPaddingJNI(mNativePointer, edge.intValue()));
   }
 
   public void setPadding(YogaEdge edge, float padding) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetPaddingJNI(mNativePointer, edge.intValue(), padding);
-      YogaNative.jni_YGNodeStyleSetPaddingJNI(mNativePointer, edge.intValue(), padding);
-    else
-      YogaNative.jni_YGNodeStyleSetPadding(mNativePointer, edge.intValue(), padding);
   }
 
   public void setPaddingPercent(YogaEdge edge, float percent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetPaddingPercentJNI(mNativePointer, edge.intValue(), percent);
-      YogaNative.jni_YGNodeStyleSetPaddingPercentJNI(mNativePointer, edge.intValue(), percent);
-    else
-      YogaNative.jni_YGNodeStyleSetPaddingPercent(mNativePointer, edge.intValue(), percent);
   }
 
   public float getBorder(YogaEdge edge) {
-    return useVanillaJNI ? YogaNative.jni_YGNodeStyleGetBorderJNI(mNativePointer, edge.intValue()) : YogaNative.jni_YGNodeStyleGetBorder(mNativePointer, edge.intValue());
+    return YogaNative.jni_YGNodeStyleGetBorderJNI(mNativePointer, edge.intValue());
   }
 
   public void setBorder(YogaEdge edge, float border) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetBorderJNI(mNativePointer, edge.intValue(), border);
-      YogaNative.jni_YGNodeStyleSetBorderJNI(mNativePointer, edge.intValue(), border);
-    else
-      YogaNative.jni_YGNodeStyleSetBorder(mNativePointer, edge.intValue(), border);
   }
 
   public YogaValue getPosition(YogaEdge edge) {
-    return valueFromLong(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetPositionJNI(mNativePointer, edge.intValue()) : YogaNative.jni_YGNodeStyleGetPosition(mNativePointer, edge.intValue()));
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetPositionJNI(mNativePointer, edge.intValue()));
   }
 
   public void setPosition(YogaEdge edge, float position) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetPositionJNI(mNativePointer, edge.intValue(), position);
-      YogaNative.jni_YGNodeStyleSetPositionJNI(mNativePointer, edge.intValue(), position);
-    else
-      YogaNative.jni_YGNodeStyleSetPosition(mNativePointer, edge.intValue(), position);
   }
 
   public void setPositionPercent(YogaEdge edge, float percent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetPositionPercentJNI(mNativePointer, edge.intValue(), percent);
-      YogaNative.jni_YGNodeStyleSetPositionPercentJNI(mNativePointer, edge.intValue(), percent);
-    else
-      YogaNative.jni_YGNodeStyleSetPositionPercent(mNativePointer, edge.intValue(), percent);
   }
 
   public YogaValue getWidth() {
-    return valueFromLong(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetWidthJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetWidth(mNativePointer));
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetWidthJNI(mNativePointer));
   }
 
   public void setWidth(float width) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetWidthJNI(mNativePointer, width);
-      YogaNative.jni_YGNodeStyleSetWidthJNI(mNativePointer, width);
-    else
-      YogaNative.jni_YGNodeStyleSetWidth(mNativePointer, width);
   }
 
   public void setWidthPercent(float percent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetWidthPercentJNI(mNativePointer, percent);
-      YogaNative.jni_YGNodeStyleSetWidthPercentJNI(mNativePointer, percent);
-    else
-      YogaNative.jni_YGNodeStyleSetWidthPercent(mNativePointer, percent);
   }
 
   public void setWidthAuto() {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetWidthAutoJNI(mNativePointer);
-      YogaNative.jni_YGNodeStyleSetWidthAutoJNI(mNativePointer);
-    else
-      YogaNative.jni_YGNodeStyleSetWidthAuto(mNativePointer);
   }
 
   public YogaValue getHeight() {
-    return valueFromLong(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetHeightJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetHeight(mNativePointer));
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetHeightJNI(mNativePointer));
   }
 
   public void setHeight(float height) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetHeightJNI(mNativePointer, height);
-      YogaNative.jni_YGNodeStyleSetHeightJNI(mNativePointer, height);
-    else
-      YogaNative.jni_YGNodeStyleSetHeight(mNativePointer, height);
   }
 
   public void setHeightPercent(float percent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetHeightPercentJNI(mNativePointer, percent);
-      YogaNative.jni_YGNodeStyleSetHeightPercentJNI(mNativePointer, percent);
-    else
-      YogaNative.jni_YGNodeStyleSetHeightPercent(mNativePointer, percent);
   }
 
   public void setHeightAuto() {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetHeightAutoJNI(mNativePointer);
-      YogaNative.jni_YGNodeStyleSetHeightAutoJNI(mNativePointer);
-    else
-      YogaNative.jni_YGNodeStyleSetHeightAuto(mNativePointer);
   }
 
   public YogaValue getMinWidth() {
-    return valueFromLong(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetMinWidthJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetMinWidth(mNativePointer));
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetMinWidthJNI(mNativePointer));
   }
 
   public void setMinWidth(float minWidth) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetMinWidthJNI(mNativePointer, minWidth);
-      YogaNative.jni_YGNodeStyleSetMinWidthJNI(mNativePointer, minWidth);
-    else
-      YogaNative.jni_YGNodeStyleSetMinWidth(mNativePointer, minWidth);
   }
 
   public void setMinWidthPercent(float percent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetMinWidthPercentJNI(mNativePointer, percent);
-      YogaNative.jni_YGNodeStyleSetMinWidthPercentJNI(mNativePointer, percent);
-    else
-      YogaNative.jni_YGNodeStyleSetMinWidthPercent(mNativePointer, percent);
   }
 
   public YogaValue getMinHeight() {
-    return valueFromLong(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetMinHeightJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetMinHeight(mNativePointer));
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetMinHeightJNI(mNativePointer));
   }
 
   public void setMinHeight(float minHeight) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetMinHeightJNI(mNativePointer, minHeight);
-      YogaNative.jni_YGNodeStyleSetMinHeightJNI(mNativePointer, minHeight);
-    else
-      YogaNative.jni_YGNodeStyleSetMinHeight(mNativePointer, minHeight);
   }
 
   public void setMinHeightPercent(float percent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetMinHeightPercentJNI(mNativePointer, percent);
-      YogaNative.jni_YGNodeStyleSetMinHeightPercentJNI(mNativePointer, percent);
-    else
-      YogaNative.jni_YGNodeStyleSetMinHeightPercent(mNativePointer, percent);
   }
 
   public YogaValue getMaxWidth() {
-    return valueFromLong(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetMaxWidthJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetMaxWidth(mNativePointer));
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetMaxWidthJNI(mNativePointer));
   }
 
   public void setMaxWidth(float maxWidth) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetMaxWidthJNI(mNativePointer, maxWidth);
-      YogaNative.jni_YGNodeStyleSetMaxWidthJNI(mNativePointer, maxWidth);
-    else
-      YogaNative.jni_YGNodeStyleSetMaxWidth(mNativePointer, maxWidth);
   }
 
   public void setMaxWidthPercent(float percent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetMaxWidthPercentJNI(mNativePointer, percent);
-      YogaNative.jni_YGNodeStyleSetMaxWidthPercentJNI(mNativePointer, percent);
-    else
-      YogaNative.jni_YGNodeStyleSetMaxWidthPercent(mNativePointer, percent);
   }
 
   public YogaValue getMaxHeight() {
-    return valueFromLong(useVanillaJNI ? YogaNative.jni_YGNodeStyleGetMaxHeightJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetMaxHeight(mNativePointer));
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetMaxHeightJNI(mNativePointer));
   }
 
   public void setMaxHeight(float maxheight) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetMaxHeightJNI(mNativePointer, maxheight);
-      YogaNative.jni_YGNodeStyleSetMaxHeightJNI(mNativePointer, maxheight);
-    else
-      YogaNative.jni_YGNodeStyleSetMaxHeight(mNativePointer, maxheight);
   }
 
   public void setMaxHeightPercent(float percent) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetMaxHeightPercentJNI(mNativePointer, percent);
-      YogaNative.jni_YGNodeStyleSetMaxHeightPercentJNI(mNativePointer, percent);
-    else
-      YogaNative.jni_YGNodeStyleSetMaxHeightPercent(mNativePointer, percent);
   }
 
   public float getAspectRatio() {
-    return useVanillaJNI ? YogaNative.jni_YGNodeStyleGetAspectRatioJNI(mNativePointer) : YogaNative.jni_YGNodeStyleGetAspectRatio(mNativePointer);
+    return YogaNative.jni_YGNodeStyleGetAspectRatioJNI(mNativePointer);
   }
 
   public void setAspectRatio(float aspectRatio) {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeStyleSetAspectRatioJNI(mNativePointer, aspectRatio);
-      YogaNative.jni_YGNodeStyleSetAspectRatioJNI(mNativePointer, aspectRatio);
-    else
-      YogaNative.jni_YGNodeStyleSetAspectRatio(mNativePointer, aspectRatio);
   }
 
   public void setMeasureFunction(YogaMeasureFunction measureFunction) {
     mMeasureFunction = measureFunction;
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeSetHasMeasureFuncJNI(mNativePointer, measureFunction != null);
-      YogaNative.jni_YGNodeSetHasMeasureFuncJNI(mNativePointer, measureFunction != null);
-    else
-      YogaNative.jni_YGNodeSetHasMeasureFunc(mNativePointer, measureFunction != null);
   }
 
   // Implementation Note: Why this method needs to stay final
@@ -638,10 +530,7 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
 
   public void setBaselineFunction(YogaBaselineFunction baselineFunction) {
     mBaselineFunction = baselineFunction;
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodeSetHasBaselineFuncJNI(mNativePointer, baselineFunction != null);
-      YogaNative.jni_YGNodeSetHasBaselineFuncJNI(mNativePointer, baselineFunction != null);
-    else
-      YogaNative.jni_YGNodeSetHasBaselineFunc(mNativePointer, baselineFunction != null);
   }
 
   @DoNotStrip
@@ -668,14 +557,11 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   }
 
   /**
-   * Use the set logger (defaults to adb log) to print out the styles, children, and computed
+   * Use the set logger (defaults to adb log) to print out the styles, children, and computed layout
-   * layout of the tree rooted at this node.
+   * of the tree rooted at this node.
    */
   public void print() {
-    if (useVanillaJNI)
+    YogaNative.jni_YGNodePrintJNI(mNativePointer);
-      YogaNative.jni_YGNodePrintJNI(mNativePointer);
-    else
-      YogaNative.jni_YGNodePrint(mNativePointer);
   }
 
   /**
@@ -683,7 +569,7 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
    * This is different than calling removeChildAt and addChildAt because this method ONLY replaces
    * the child in the mChildren datastructure. @DoNotStrip: called from JNI
    *
-   * @return the nativePointer of the newNode {@linl YogaNode}
+   * @return the nativePointer of the newNode {@link YogaNode}
    */
   @DoNotStrip
   private final long replaceChild(YogaNodeJNIBase newNode, int childIndex) {
@@ -721,7 +607,9 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   }
 
   public boolean getDoesLegacyStretchFlagAffectsLayout() {
-    return arr != null && (((int) arr[LAYOUT_EDGE_SET_FLAG_INDEX] & DOES_LEGACY_STRETCH_BEHAVIOUR) == DOES_LEGACY_STRETCH_BEHAVIOUR);
+    return arr != null
+        && (((int) arr[LAYOUT_EDGE_SET_FLAG_INDEX] & DOES_LEGACY_STRETCH_BEHAVIOUR)
+            == DOES_LEGACY_STRETCH_BEHAVIOUR);
   }
 
   @Override
@@ -737,9 +625,13 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
         case BOTTOM:
           return arr[LAYOUT_MARGIN_START_INDEX + 3];
         case START:
-          return getLayoutDirection() == YogaDirection.RTL ? arr[LAYOUT_MARGIN_START_INDEX + 2] : arr[LAYOUT_MARGIN_START_INDEX];
+          return getLayoutDirection() == YogaDirection.RTL
+              ? arr[LAYOUT_MARGIN_START_INDEX + 2]
+              : arr[LAYOUT_MARGIN_START_INDEX];
         case END:
-          return getLayoutDirection() == YogaDirection.RTL ? arr[LAYOUT_MARGIN_START_INDEX] : arr[LAYOUT_MARGIN_START_INDEX + 2];
+          return getLayoutDirection() == YogaDirection.RTL
+              ? arr[LAYOUT_MARGIN_START_INDEX]
+              : arr[LAYOUT_MARGIN_START_INDEX + 2];
         default:
           throw new IllegalArgumentException("Cannot get layout margins of multi-edge shorthands");
       }
@@ -751,7 +643,9 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   @Override
   public float getLayoutPadding(YogaEdge edge) {
     if (arr != null && ((int) arr[LAYOUT_EDGE_SET_FLAG_INDEX] & PADDING) == PADDING) {
-      int paddingStartIndex = LAYOUT_PADDING_START_INDEX - ((((int)arr[LAYOUT_EDGE_SET_FLAG_INDEX] & MARGIN) == MARGIN) ? 0 : 4);
+      int paddingStartIndex =
+          LAYOUT_PADDING_START_INDEX
+              - ((((int) arr[LAYOUT_EDGE_SET_FLAG_INDEX] & MARGIN) == MARGIN) ? 0 : 4);
       switch (edge) {
         case LEFT:
           return arr[paddingStartIndex];
@@ -762,9 +656,13 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
         case BOTTOM:
           return arr[paddingStartIndex + 3];
         case START:
-          return getLayoutDirection() == YogaDirection.RTL ? arr[paddingStartIndex + 2] : arr[paddingStartIndex];
+          return getLayoutDirection() == YogaDirection.RTL
+              ? arr[paddingStartIndex + 2]
+              : arr[paddingStartIndex];
         case END:
-          return getLayoutDirection() == YogaDirection.RTL ? arr[paddingStartIndex] : arr[paddingStartIndex + 2];
+          return getLayoutDirection() == YogaDirection.RTL
+              ? arr[paddingStartIndex]
+              : arr[paddingStartIndex + 2];
         default:
           throw new IllegalArgumentException("Cannot get layout paddings of multi-edge shorthands");
       }
@@ -776,7 +674,10 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
   @Override
   public float getLayoutBorder(YogaEdge edge) {
     if (arr != null && ((int) arr[LAYOUT_EDGE_SET_FLAG_INDEX] & BORDER) == BORDER) {
-      int borderStartIndex = LAYOUT_BORDER_START_INDEX - ((((int) arr[LAYOUT_EDGE_SET_FLAG_INDEX] & MARGIN) == MARGIN) ? 0 : 4) - ((((int) arr[LAYOUT_EDGE_SET_FLAG_INDEX] & PADDING) == PADDING) ? 0 : 4);
+      int borderStartIndex =
+          LAYOUT_BORDER_START_INDEX
+              - ((((int) arr[LAYOUT_EDGE_SET_FLAG_INDEX] & MARGIN) == MARGIN) ? 0 : 4)
+              - ((((int) arr[LAYOUT_EDGE_SET_FLAG_INDEX] & PADDING) == PADDING) ? 0 : 4);
       switch (edge) {
         case LEFT:
           return arr[borderStartIndex];
@@ -787,9 +688,13 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
         case BOTTOM:
           return arr[borderStartIndex + 3];
         case START:
-          return getLayoutDirection() == YogaDirection.RTL ? arr[borderStartIndex + 2] : arr[borderStartIndex];
+          return getLayoutDirection() == YogaDirection.RTL
+              ? arr[borderStartIndex + 2]
+              : arr[borderStartIndex];
         case END:
-          return getLayoutDirection() == YogaDirection.RTL ? arr[borderStartIndex] : arr[borderStartIndex + 2];
+          return getLayoutDirection() == YogaDirection.RTL
+              ? arr[borderStartIndex]
+              : arr[borderStartIndex + 2];
         default:
           throw new IllegalArgumentException("Cannot get layout border of multi-edge shorthands");
       }
@@ -800,7 +705,8 @@ public abstract class YogaNodeJNIBase extends YogaNode implements Cloneable {
 
   @Override
   public YogaDirection getLayoutDirection() {
-    return YogaDirection.fromInt(arr != null ? (int) arr[LAYOUT_DIRECTION_INDEX] : mLayoutDirection);
+    return YogaDirection.fromInt(
+        arr != null ? (int) arr[LAYOUT_DIRECTION_INDEX] : mLayoutDirection);
   }
 
   @Override

java/com/facebook/yoga/YogaNodeJNIFinalizer.java

@@ -12,10 +12,6 @@ public class YogaNodeJNIFinalizer extends YogaNodeJNIBase {
     super();
   }
 
-  public YogaNodeJNIFinalizer(boolean useVanillaJNI) {
-    super(useVanillaJNI);
-  }
-
   public YogaNodeJNIFinalizer(YogaConfig config) {
     super(config);
   }
@@ -33,10 +29,7 @@ public class YogaNodeJNIFinalizer extends YogaNodeJNIBase {
     if (mNativePointer != 0) {
       long nativePointer = mNativePointer;
       mNativePointer = 0;
-      if (useVanillaJNI)
+      YogaNative.jni_YGNodeFreeJNI(nativePointer);
-        YogaNative.jni_YGNodeFreeJNI(nativePointer);
-      else
-        YogaNative.jni_YGNodeFree(nativePointer);
     }
   }
 }

java/com/facebook/yoga/YogaNodeType.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaNodeType {
   DEFAULT(0),
   TEXT(1);

java/com/facebook/yoga/YogaOverflow.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaOverflow {
   VISIBLE(0),
   HIDDEN(1),

java/com/facebook/yoga/YogaPositionType.java

@@ -7,12 +7,10 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaPositionType {
-  RELATIVE(0),
+  STATIC(0),
-  ABSOLUTE(1);
+  RELATIVE(1),
+  ABSOLUTE(2);
 
   private final int mIntValue;
 
@@ -26,8 +24,9 @@ public enum YogaPositionType {
 
   public static YogaPositionType fromInt(int value) {
     switch (value) {
-      case 0: return RELATIVE;
+      case 0: return STATIC;
-      case 1: return ABSOLUTE;
+      case 1: return RELATIVE;
+      case 2: return ABSOLUTE;
       default: throw new IllegalArgumentException("Unknown enum value: " + value);
     }
   }

java/com/facebook/yoga/YogaPrintOptions.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaPrintOptions {
   LAYOUT(1),
   STYLE(2),

java/com/facebook/yoga/YogaProps.java

@@ -0,0 +1,151 @@
+/*
+ * 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 com.facebook.yoga;
+
+public interface YogaProps {
+
+  /* Width properties */
+
+  void setWidth(float width);
+
+  void setWidthPercent(float percent);
+
+  void setMinWidth(float minWidth);
+
+  void setMinWidthPercent(float percent);
+
+  void setMaxWidth(float maxWidth);
+
+  void setMaxWidthPercent(float percent);
+
+  void setWidthAuto();
+
+  /* Height properties */
+
+  void setHeight(float height);
+
+  void setHeightPercent(float percent);
+
+  void setMinHeight(float minHeight);
+
+  void setMinHeightPercent(float percent);
+
+  void setMaxHeight(float maxHeight);
+
+  void setMaxHeightPercent(float percent);
+
+  void setHeightAuto();
+
+  /* Margin properties */
+
+  void setMargin(YogaEdge edge, float margin);
+
+  void setMarginPercent(YogaEdge edge, float percent);
+
+  void setMarginAuto(YogaEdge edge);
+
+  /* Padding properties */
+
+  void setPadding(YogaEdge edge, float padding);
+
+  void setPaddingPercent(YogaEdge edge, float percent);
+
+  /* Position properties */
+
+  void setPositionType(YogaPositionType positionType);
+
+  void setPosition(YogaEdge edge, float position);
+
+  void setPositionPercent(YogaEdge edge, float percent);
+
+  /* Alignment properties */
+
+  void setAlignContent(YogaAlign alignContent);
+
+  void setAlignItems(YogaAlign alignItems);
+
+  void setAlignSelf(YogaAlign alignSelf);
+
+  /* Flex properties */
+
+  void setFlex(float flex);
+
+  void setFlexBasisAuto();
+
+  void setFlexBasisPercent(float percent);
+
+  void setFlexBasis(float flexBasis);
+
+  void setFlexDirection(YogaFlexDirection direction);
+
+  void setFlexGrow(float flexGrow);
+
+  void setFlexShrink(float flexShrink);
+
+  /* Other properties */
+
+  void setJustifyContent(YogaJustify justifyContent);
+
+  void setDirection(YogaDirection direction);
+
+  void setBorder(YogaEdge edge, float value);
+
+  void setWrap(YogaWrap wrap);
+
+  void setAspectRatio(float aspectRatio);
+
+  void setIsReferenceBaseline(boolean isReferenceBaseline);
+
+  void setMeasureFunction(YogaMeasureFunction measureFunction);
+
+  void setBaselineFunction(YogaBaselineFunction yogaBaselineFunction);
+
+  /* Getters */
+
+  YogaValue getWidth();
+
+  YogaValue getMinWidth();
+
+  YogaValue getMaxWidth();
+
+  YogaValue getHeight();
+
+  YogaValue getMinHeight();
+
+  YogaValue getMaxHeight();
+
+  YogaDirection getStyleDirection();
+
+  YogaFlexDirection getFlexDirection();
+
+  YogaJustify getJustifyContent();
+
+  YogaAlign getAlignItems();
+
+  YogaAlign getAlignSelf();
+
+  YogaAlign getAlignContent();
+
+  YogaPositionType getPositionType();
+
+  float getFlexGrow();
+
+  float getFlexShrink();
+
+  YogaValue getFlexBasis();
+
+  float getAspectRatio();
+
+  YogaValue getMargin(YogaEdge edge);
+
+  YogaValue getPadding(YogaEdge edge);
+
+  YogaValue getPosition(YogaEdge edge);
+
+  float getBorder(YogaEdge edge);
+}

java/com/facebook/yoga/YogaStyleInputs.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public class YogaStyleInputs {
   public static final short LAYOUT_DIRECTION = 0;
   public static final short FLEX_DIRECTION = 1;

java/com/facebook/yoga/YogaUnit.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaUnit {
   UNDEFINED(0),
   POINT(1),

java/com/facebook/yoga/YogaWrap.java

@@ -7,9 +7,6 @@
 
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaWrap {
   NO_WRAP(0),
   WRAP(1),

java/jni/ScopedGlobalRef.h

@@ -84,9 +84,7 @@ public:
     return *this;
   }
 
-  ~ScopedGlobalRef() {
+  ~ScopedGlobalRef() { reset(); }
-    reset();
-  }
 
   /**
    * Deletes the currently held reference and reassigns a new one to the
@@ -120,9 +118,7 @@ public:
   /**
    * Returns true if the underlying JNI reference is not NULL.
    */
-  operator bool() const {
+  operator bool() const { return mGlobalRef != NULL; }
-    return mGlobalRef != NULL;
-  }
 
   ScopedGlobalRef(const ScopedGlobalRef& ref) = delete;
   ScopedGlobalRef& operator=(const ScopedGlobalRef& other) = delete;

java/jni/ScopedLocalRef.h

@@ -83,9 +83,7 @@ public:
     return *this;
   }
 
-  ~ScopedLocalRef() {
+  ~ScopedLocalRef() { reset(); }
-    reset();
-  }
 
   /**
    * Deletes the currently held reference and reassigns a new one to the
@@ -119,9 +117,7 @@ public:
   /**
    * Returns true if the underlying JNI reference is not NULL.
    */
-  operator bool() const {
+  operator bool() const { return mLocalRef != NULL; }
-    return mLocalRef != NULL;
-  }
 
   ScopedLocalRef(const ScopedLocalRef& ref) = delete;
   ScopedLocalRef& operator=(const ScopedLocalRef& other) = delete;

java/jni/YGJNI.cpp

@@ -1,712 +0,0 @@
-/*
- * 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.
- */
-
-#include <fbjni/fbjni.h>
-#include <yoga/YGNode.h>
-#include <yoga/Yoga.h>
-#include <yoga/Yoga-internal.h>
-#include <yoga/log.h>
-#include <cstdint>
-#include <cstring>
-#include <iostream>
-#include <map>
-
-#include "YGJTypes.h"
-#include "YGJNIVanilla.h"
-#include "YGJNI.h"
-#include "yogajni.h"
-
-using namespace facebook::jni;
-using namespace std;
-using facebook::yoga::detail::Log;
-
-static inline local_ref<JYogaNode> YGNodeJobject(
-    YGNodeRef node,
-    void* layoutContext) {
-  return reinterpret_cast<PtrJNodeMap*>(layoutContext)->ref(node);
-}
-
-static void YGTransferLayoutDirection(
-    YGNodeRef node,
-    alias_ref<jobject> javaNode) {
-  static auto layoutDirectionField =
-      javaNode->getClass()->getField<jint>("mLayoutDirection");
-  javaNode->setFieldValue(
-      layoutDirectionField, static_cast<jint>(YGNodeLayoutGetDirection(node)));
-}
-
-static void YGTransferLayoutOutputsRecursive(
-    YGNodeRef root,
-    void* layoutContext) {
-  if (!root->getHasNewLayout()) {
-    return;
-  }
-  auto obj = YGNodeJobject(root, layoutContext);
-  if (!obj) {
-    Log::log(
-        root,
-        YGLogLevelError,
-        nullptr,
-        "Java YGNode was GCed during layout calculation\n");
-    return;
-  }
-
-  auto edgesSet = YGNodeEdges{root};
-
-  bool marginFieldSet = edgesSet.has(YGNodeEdges::MARGIN);
-  bool paddingFieldSet = edgesSet.has(YGNodeEdges::PADDING);
-  bool borderFieldSet = edgesSet.has(YGNodeEdges::BORDER);
-
-  int fieldFlags = edgesSet.get();
-  fieldFlags |= HAS_NEW_LAYOUT;
-  if (YGNodeLayoutGetDidLegacyStretchFlagAffectLayout(root)) {
-    fieldFlags |= DOES_LEGACY_STRETCH_BEHAVIOUR;
-  }
-
-  const int arrSize = 6 + (marginFieldSet ? 4 : 0) + (paddingFieldSet ? 4 : 0) +
-      (borderFieldSet ? 4 : 0);
-  float arr[18];
-  arr[LAYOUT_EDGE_SET_FLAG_INDEX] = fieldFlags;
-  arr[LAYOUT_WIDTH_INDEX] = YGNodeLayoutGetWidth(root);
-  arr[LAYOUT_HEIGHT_INDEX] = YGNodeLayoutGetHeight(root);
-  arr[LAYOUT_LEFT_INDEX] = YGNodeLayoutGetLeft(root);
-  arr[LAYOUT_TOP_INDEX] = YGNodeLayoutGetTop(root);
-  arr[LAYOUT_DIRECTION_INDEX] =
-      static_cast<jint>(YGNodeLayoutGetDirection(root));
-  if (marginFieldSet) {
-    arr[LAYOUT_MARGIN_START_INDEX] = YGNodeLayoutGetMargin(root, YGEdgeLeft);
-    arr[LAYOUT_MARGIN_START_INDEX + 1] = YGNodeLayoutGetMargin(root, YGEdgeTop);
-    arr[LAYOUT_MARGIN_START_INDEX + 2] =
-        YGNodeLayoutGetMargin(root, YGEdgeRight);
-    arr[LAYOUT_MARGIN_START_INDEX + 3] =
-        YGNodeLayoutGetMargin(root, YGEdgeBottom);
-  }
-  if (paddingFieldSet) {
-    int paddingStartIndex =
-        LAYOUT_PADDING_START_INDEX - (marginFieldSet ? 0 : 4);
-    arr[paddingStartIndex] = YGNodeLayoutGetPadding(root, YGEdgeLeft);
-    arr[paddingStartIndex + 1] = YGNodeLayoutGetPadding(root, YGEdgeTop);
-    arr[paddingStartIndex + 2] = YGNodeLayoutGetPadding(root, YGEdgeRight);
-    arr[paddingStartIndex + 3] = YGNodeLayoutGetPadding(root, YGEdgeBottom);
-  }
-
-  if (borderFieldSet) {
-    int borderStartIndex = LAYOUT_BORDER_START_INDEX -
-        (marginFieldSet ? 0 : 4) - (paddingFieldSet ? 0 : 4);
-    arr[borderStartIndex] = YGNodeLayoutGetBorder(root, YGEdgeLeft);
-    arr[borderStartIndex + 1] = YGNodeLayoutGetBorder(root, YGEdgeTop);
-    arr[borderStartIndex + 2] = YGNodeLayoutGetBorder(root, YGEdgeRight);
-    arr[borderStartIndex + 3] = YGNodeLayoutGetBorder(root, YGEdgeBottom);
-  }
-
-  static auto arrField = obj->getClass()->getField<jfloatArray>("arr");
-  local_ref<jfloatArray> arrFinal = make_float_array(arrSize);
-  arrFinal->setRegion(0, arrSize, arr);
-  obj->setFieldValue<jfloatArray>(arrField, arrFinal.get());
-
-  root->setHasNewLayout(false);
-
-  for (uint32_t i = 0; i < YGNodeGetChildCount(root); i++) {
-    YGTransferLayoutOutputsRecursive(YGNodeGetChild(root, i), layoutContext);
-  }
-}
-
-static void YGPrint(YGNodeRef node, void* layoutContext) {
-  if (auto obj = YGNodeJobject(node, layoutContext)) {
-    cout << obj->toString() << endl;
-  } else {
-    Log::log(
-        node,
-        YGLogLevelError,
-        nullptr,
-        "Java YGNode was GCed during layout calculation\n");
-  }
-}
-
-static float YGJNIBaselineFunc(
-    YGNodeRef node,
-    float width,
-    float height,
-    void* layoutContext) {
-  if (auto obj = YGNodeJobject(node, layoutContext)) {
-    return obj->baseline(width, height);
-  } else {
-    return height;
-  }
-}
-
-static inline YGNodeRef _jlong2YGNodeRef(jlong addr) {
-  return reinterpret_cast<YGNodeRef>(static_cast<intptr_t>(addr));
-}
-
-static inline YGConfigRef _jlong2YGConfigRef(jlong addr) {
-  return reinterpret_cast<YGConfigRef>(static_cast<intptr_t>(addr));
-}
-
-jlong jni_YGNodeClone(alias_ref<jobject> thiz, jlong nativePointer) {
-  auto node = _jlong2YGNodeRef(nativePointer);
-  const YGNodeRef clonedYogaNode = YGNodeClone(node);
-  clonedYogaNode->setContext(node->getContext());
-
-  return reinterpret_cast<jlong>(clonedYogaNode);
-}
-
-static YGSize YGJNIMeasureFunc(
-    YGNodeRef node,
-    float width,
-    YGMeasureMode widthMode,
-    float height,
-    YGMeasureMode heightMode,
-    void* layoutContext) {
-  if (auto obj = YGNodeJobject(node, layoutContext)) {
-    YGTransferLayoutDirection(node, obj);
-    const auto measureResult =
-        obj->measure(width, widthMode, height, heightMode);
-
-    static_assert(
-        sizeof(measureResult) == 8,
-        "Expected measureResult to be 8 bytes, or two 32 bit ints");
-
-    int32_t wBits = 0xFFFFFFFF & (measureResult >> 32);
-    int32_t hBits = 0xFFFFFFFF & measureResult;
-
-    const float* measuredWidth = reinterpret_cast<float*>(&wBits);
-    const float* measuredHeight = reinterpret_cast<float*>(&hBits);
-
-    return YGSize{*measuredWidth, *measuredHeight};
-  } else {
-    Log::log(
-        node,
-        YGLogLevelError,
-        nullptr,
-        "Java YGNode was GCed during layout calculation\n");
-    return YGSize{
-        widthMode == YGMeasureModeUndefined ? 0 : width,
-        heightMode == YGMeasureModeUndefined ? 0 : height,
-    };
-  }
-}
-
-static int YGJNILogFunc(
-    const YGConfigRef config,
-    const YGNodeRef node,
-    YGLogLevel level,
-    void* layoutContext,
-    const char* format,
-    va_list args) {
-  int result = vsnprintf(NULL, 0, format, args);
-  std::vector<char> buffer(1 + result);
-  vsnprintf(buffer.data(), buffer.size(), format, args);
-
-  auto jloggerPtr =
-      static_cast<global_ref<JYogaLogger>*>(YGConfigGetContext(config));
-  if (jloggerPtr != nullptr) {
-    (*jloggerPtr)
-        ->log(
-            JYogaLogLevel::fromInt(level),
-            Environment::current()->NewStringUTF(buffer.data()));
-  }
-
-  return result;
-}
-
-jlong jni_YGNodeNew(alias_ref<jobject> thiz) {
-  const YGNodeRef node = YGNodeNew();
-  node->setContext(YGNodeContext{}.asVoidPtr);
-  node->setPrintFunc(YGPrint);
-  return reinterpret_cast<jlong>(node);
-}
-
-jlong jni_YGNodeNewWithConfig(alias_ref<jclass>, jlong configPointer) {
-  const YGNodeRef node = YGNodeNewWithConfig(_jlong2YGConfigRef(configPointer));
-  node->setContext(YGNodeContext{}.asVoidPtr);
-  return reinterpret_cast<jlong>(node);
-}
-
-void jni_YGNodeFree(alias_ref<jclass>, jlong nativePointer) {
-  if (nativePointer == 0) {
-    return;
-  }
-  const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
-  YGNodeFree(node);
-}
-
-void jni_YGNodeClearChildren(jlong nativePointer) {
-  const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
-  node->clearChildren();
-}
-
-void jni_YGNodeReset(jlong nativePointer) {
-  const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
-  void* context = node->getContext();
-  YGNodeReset(node);
-  node->setContext(context);
-}
-
-void jni_YGNodePrint(jlong nativePointer) {
-#ifdef DEBUG
-  const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
-  YGNodePrint(
-      node,
-      (YGPrintOptions)(
-          YGPrintOptionsStyle | YGPrintOptionsLayout | YGPrintOptionsChildren));
-#endif
-}
-
-void jni_YGNodeInsertChild(
-    jlong nativePointer,
-    jlong childPointer,
-    jint index) {
-  YGNodeInsertChild(
-      _jlong2YGNodeRef(nativePointer), _jlong2YGNodeRef(childPointer), index);
-}
-
-void jni_YGNodeRemoveChild(jlong nativePointer, jlong childPointer) {
-  YGNodeRemoveChild(
-      _jlong2YGNodeRef(nativePointer), _jlong2YGNodeRef(childPointer));
-}
-
-void jni_YGNodeSetIsReferenceBaseline(
-    jlong nativePointer,
-    jboolean isReferenceBaseline) {
-  YGNodeSetIsReferenceBaseline(
-      _jlong2YGNodeRef(nativePointer), isReferenceBaseline);
-}
-
-jboolean jni_YGNodeIsReferenceBaseline(jlong nativePointer) {
-  return YGNodeIsReferenceBaseline(_jlong2YGNodeRef(nativePointer));
-}
-
-void jni_YGNodeCalculateLayout(
-    alias_ref<jclass>,
-    jlong nativePointer,
-    jfloat width,
-    jfloat height,
-    alias_ref<JArrayLong> nativePointers,
-    alias_ref<JArrayClass<JYogaNode::javaobject>> javaNodes) {
-
-  void* layoutContext = nullptr;
-  auto map = PtrJNodeMap{};
-  if (nativePointers) {
-    map = PtrJNodeMap{nativePointers, javaNodes};
-    layoutContext = &map;
-  }
-
-  const YGNodeRef root = _jlong2YGNodeRef(nativePointer);
-  YGNodeCalculateLayoutWithContext(
-      root,
-      static_cast<float>(width),
-      static_cast<float>(height),
-      YGNodeStyleGetDirection(_jlong2YGNodeRef(nativePointer)),
-      layoutContext);
-  YGTransferLayoutOutputsRecursive(root, layoutContext);
-}
-
-void jni_YGNodeMarkDirty(jlong nativePointer) {
-  YGNodeMarkDirty(_jlong2YGNodeRef(nativePointer));
-}
-
-void jni_YGNodeMarkDirtyAndPropogateToDescendants(jlong nativePointer) {
-  YGNodeMarkDirtyAndPropogateToDescendants(_jlong2YGNodeRef(nativePointer));
-}
-
-jboolean jni_YGNodeIsDirty(jlong nativePointer) {
-  return (jboolean) _jlong2YGNodeRef(nativePointer)->isDirty();
-}
-
-void jni_YGNodeSetHasMeasureFunc(jlong nativePointer, jboolean hasMeasureFunc) {
-  _jlong2YGNodeRef(nativePointer)
-      ->setMeasureFunc(hasMeasureFunc ? YGJNIMeasureFunc : nullptr);
-}
-
-void jni_YGNodeSetHasBaselineFunc(
-    jlong nativePointer,
-    jboolean hasBaselineFunc) {
-  _jlong2YGNodeRef(nativePointer)
-      ->setBaselineFunc(hasBaselineFunc ? YGJNIBaselineFunc : nullptr);
-}
-
-void jni_YGNodeCopyStyle(jlong dstNativePointer, jlong srcNativePointer) {
-  YGNodeCopyStyle(
-      _jlong2YGNodeRef(dstNativePointer), _jlong2YGNodeRef(srcNativePointer));
-}
-
-#define YG_NODE_JNI_STYLE_PROP(javatype, type, name)                         \
-  javatype jni_YGNodeStyleGet##name(jlong nativePointer) {                   \
-    return (javatype) YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer)); \
-  }                                                                          \
-                                                                             \
-  void jni_YGNodeStyleSet##name(jlong nativePointer, javatype value) {       \
-    YGNodeStyleSet##name(                                                    \
-        _jlong2YGNodeRef(nativePointer), static_cast<type>(value));          \
-  }
-
-#define YG_NODE_JNI_STYLE_UNIT_PROP(name)                                     \
-  jlong jni_YGNodeStyleGet##name(jlong nativePointer) {                       \
-    return YogaValue::asJavaLong(                                             \
-        YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer)));               \
-  }                                                                           \
-                                                                              \
-  void jni_YGNodeStyleSet##name(jlong nativePointer, jfloat value) {          \
-    YGNodeStyleSet##name(                                                     \
-        _jlong2YGNodeRef(nativePointer), static_cast<float>(value));          \
-  }                                                                           \
-                                                                              \
-  void jni_YGNodeStyleSet##name##Percent(jlong nativePointer, jfloat value) { \
-    YGNodeStyleSet##name##Percent(                                            \
-        _jlong2YGNodeRef(nativePointer), static_cast<float>(value));          \
-  }
-
-#define YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(name)                   \
-  YG_NODE_JNI_STYLE_UNIT_PROP(name)                              \
-  void jni_YGNodeStyleSet##name##Auto(jlong nativePointer) {     \
-    YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer)); \
-  }
-
-#define YG_NODE_JNI_STYLE_EDGE_PROP(javatype, type, name)             \
-  javatype jni_YGNodeStyleGet##name(jlong nativePointer, jint edge) { \
-    return (javatype) YGNodeStyleGet##name(                           \
-        _jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge));  \
-  }                                                                   \
-                                                                      \
-  void jni_YGNodeStyleSet##name(                                      \
-      jlong nativePointer, jint edge, javatype value) {               \
-    YGNodeStyleSet##name(                                             \
-        _jlong2YGNodeRef(nativePointer),                              \
-        static_cast<YGEdge>(edge),                                    \
-        static_cast<type>(value));                                    \
-  }
-
-#define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name)                        \
-  jlong jni_YGNodeStyleGet##name(jlong nativePointer, jint edge) {    \
-    return YogaValue::asJavaLong(YGNodeStyleGet##name(                \
-        _jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge))); \
-  }                                                                   \
-                                                                      \
-  void jni_YGNodeStyleSet##name(                                      \
-      jlong nativePointer, jint edge, jfloat value) {                 \
-    YGNodeStyleSet##name(                                             \
-        _jlong2YGNodeRef(nativePointer),                              \
-        static_cast<YGEdge>(edge),                                    \
-        static_cast<float>(value));                                   \
-  }                                                                   \
-                                                                      \
-  void jni_YGNodeStyleSet##name##Percent(                             \
-      jlong nativePointer, jint edge, jfloat value) {                 \
-    YGNodeStyleSet##name##Percent(                                    \
-        _jlong2YGNodeRef(nativePointer),                              \
-        static_cast<YGEdge>(edge),                                    \
-        static_cast<float>(value));                                   \
-  }
-
-#define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP_AUTO(name)                     \
-  YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name)                                \
-  void jni_YGNodeStyleSet##name##Auto(jlong nativePointer, jint edge) { \
-    YGNodeStyleSet##name##Auto(                                         \
-        _jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge));    \
-  }
-
-YG_NODE_JNI_STYLE_PROP(jint, YGDirection, Direction);
-YG_NODE_JNI_STYLE_PROP(jint, YGFlexDirection, FlexDirection);
-YG_NODE_JNI_STYLE_PROP(jint, YGJustify, JustifyContent);
-YG_NODE_JNI_STYLE_PROP(jint, YGAlign, AlignItems);
-YG_NODE_JNI_STYLE_PROP(jint, YGAlign, AlignSelf);
-YG_NODE_JNI_STYLE_PROP(jint, YGAlign, AlignContent);
-YG_NODE_JNI_STYLE_PROP(jint, YGPositionType, PositionType);
-YG_NODE_JNI_STYLE_PROP(jint, YGWrap, FlexWrap);
-YG_NODE_JNI_STYLE_PROP(jint, YGOverflow, Overflow);
-YG_NODE_JNI_STYLE_PROP(jint, YGDisplay, Display);
-
-jfloat jni_YGNodeStyleGetFlex(jlong nativePointer) {
-  return YGNodeStyleGetFlex(_jlong2YGNodeRef(nativePointer));
-}
-void jni_YGNodeStyleSetFlex(jlong nativePointer, jfloat value) {
-  YGNodeStyleSetFlex(
-      _jlong2YGNodeRef(nativePointer), static_cast<float>(value));
-}
-YG_NODE_JNI_STYLE_PROP(jfloat, float, FlexGrow);
-YG_NODE_JNI_STYLE_PROP(jfloat, float, FlexShrink);
-YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(FlexBasis);
-
-YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(Position);
-
-YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(Width);
-YG_NODE_JNI_STYLE_UNIT_PROP(MinWidth);
-YG_NODE_JNI_STYLE_UNIT_PROP(MaxWidth);
-YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(Height);
-YG_NODE_JNI_STYLE_UNIT_PROP(MinHeight);
-YG_NODE_JNI_STYLE_UNIT_PROP(MaxHeight);
-
-// Yoga specific properties, not compatible with flexbox specification
-YG_NODE_JNI_STYLE_PROP(jfloat, float, AspectRatio);
-
-jlong jni_YGConfigNew(alias_ref<jclass>) {
-  return reinterpret_cast<jlong>(YGConfigNew());
-}
-
-void jni_YGConfigFree(alias_ref<jclass>, jlong nativePointer) {
-  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
-  // unique_ptr will destruct the underlying global_ref, if present.
-  auto context = std::unique_ptr<global_ref<JYogaLogger>>{
-      static_cast<global_ref<JYogaLogger>*>(YGConfigGetContext(config))};
-  YGConfigFree(config);
-}
-
-void jni_YGConfigSetExperimentalFeatureEnabled(
-    alias_ref<jclass>,
-    jlong nativePointer,
-    jint feature,
-    jboolean enabled) {
-  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
-  YGConfigSetExperimentalFeatureEnabled(
-      config, static_cast<YGExperimentalFeature>(feature), enabled);
-}
-
-void jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(
-    alias_ref<jclass>,
-    jlong nativePointer,
-    jboolean enabled) {
-  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
-  YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(config, enabled);
-}
-
-void jni_YGConfigSetUseWebDefaults(
-    alias_ref<jclass>,
-    jlong nativePointer,
-    jboolean useWebDefaults) {
-  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
-  YGConfigSetUseWebDefaults(config, useWebDefaults);
-}
-
-void jni_YGConfigSetPrintTreeFlag(
-    alias_ref<jclass>,
-    jlong nativePointer,
-    jboolean enable) {
-  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
-  YGConfigSetPrintTreeFlag(config, enable);
-}
-
-void jni_YGConfigSetPointScaleFactor(
-    alias_ref<jclass>,
-    jlong nativePointer,
-    jfloat pixelsInPoint) {
-  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
-  YGConfigSetPointScaleFactor(config, pixelsInPoint);
-}
-
-void jni_YGConfigSetUseLegacyStretchBehaviour(
-    alias_ref<jclass>,
-    jlong nativePointer,
-    jboolean useLegacyStretchBehaviour) {
-  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
-  YGConfigSetUseLegacyStretchBehaviour(config, useLegacyStretchBehaviour);
-}
-
-void jni_YGConfigSetLogger(
-    alias_ref<jclass>,
-    jlong nativePointer,
-    alias_ref<jobject> logger) {
-  const YGConfigRef config = _jlong2YGConfigRef(nativePointer);
-  auto context =
-      reinterpret_cast<global_ref<JYogaLogger>*>(YGConfigGetContext(config));
-
-  if (logger) {
-    if (context == nullptr) {
-      context = new global_ref<JYogaLogger>{};
-      YGConfigSetContext(config, context);
-    }
-
-    *context = make_global(static_ref_cast<JYogaLogger::javaobject>(logger));
-    config->setLogger(YGJNILogFunc);
-  } else {
-    if (context != nullptr) {
-      delete context;
-      YGConfigSetContext(config, nullptr);
-    }
-    config->setLogger(nullptr);
-  }
-}
-
-jlong jni_YGNodeStyleGetMargin(jlong nativePointer, jint edge) {
-  YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer);
-  if (!YGNodeEdges{yogaNodeRef}.has(YGNodeEdges::MARGIN)) {
-    return YogaValue::undefinedAsJavaLong();
-  }
-  return YogaValue::asJavaLong(
-      YGNodeStyleGetMargin(yogaNodeRef, static_cast<YGEdge>(edge)));
-}
-
-void jni_YGNodeStyleSetMargin(jlong nativePointer, jint edge, jfloat margin) {
-  YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer);
-  YGNodeEdges{yogaNodeRef}.add(YGNodeEdges::MARGIN).setOn(yogaNodeRef);
-  YGNodeStyleSetMargin(
-      yogaNodeRef, static_cast<YGEdge>(edge), static_cast<float>(margin));
-}
-
-void jni_YGNodeStyleSetMarginPercent(
-    jlong nativePointer,
-    jint edge,
-    jfloat percent) {
-  YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer);
-  YGNodeEdges{yogaNodeRef}.add(YGNodeEdges::MARGIN).setOn(yogaNodeRef);
-  YGNodeStyleSetMarginPercent(
-      yogaNodeRef, static_cast<YGEdge>(edge), static_cast<float>(percent));
-}
-
-void jni_YGNodeStyleSetMarginAuto(jlong nativePointer, jint edge) {
-  YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer);
-  YGNodeEdges{yogaNodeRef}.add(YGNodeEdges::MARGIN).setOn(yogaNodeRef);
-  YGNodeStyleSetMarginAuto(yogaNodeRef, static_cast<YGEdge>(edge));
-}
-
-jlong jni_YGNodeStyleGetPadding(jlong nativePointer, jint edge) {
-  YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer);
-  if (!YGNodeEdges{yogaNodeRef}.has(YGNodeEdges::PADDING)) {
-    return YogaValue::undefinedAsJavaLong();
-  }
-  return YogaValue::asJavaLong(
-      YGNodeStyleGetPadding(yogaNodeRef, static_cast<YGEdge>(edge)));
-}
-
-void jni_YGNodeStyleSetPadding(jlong nativePointer, jint edge, jfloat padding) {
-  YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer);
-  YGNodeEdges{yogaNodeRef}.add(YGNodeEdges::PADDING).setOn(yogaNodeRef);
-  YGNodeStyleSetPadding(
-      yogaNodeRef, static_cast<YGEdge>(edge), static_cast<float>(padding));
-}
-
-void jni_YGNodeStyleSetPaddingPercent(
-    jlong nativePointer,
-    jint edge,
-    jfloat percent) {
-  YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer);
-  YGNodeEdges{yogaNodeRef}.add(YGNodeEdges::PADDING).setOn(yogaNodeRef);
-  YGNodeStyleSetPaddingPercent(
-      yogaNodeRef, static_cast<YGEdge>(edge), static_cast<float>(percent));
-}
-
-jfloat jni_YGNodeStyleGetBorder(jlong nativePointer, jint edge) {
-  YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer);
-  if (!YGNodeEdges{yogaNodeRef}.has(YGNodeEdges::BORDER)) {
-    return (jfloat) YGUndefined;
-  }
-  return (jfloat) YGNodeStyleGetBorder(yogaNodeRef, static_cast<YGEdge>(edge));
-}
-
-void jni_YGNodeStyleSetBorder(jlong nativePointer, jint edge, jfloat border) {
-  YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer);
-  YGNodeEdges{yogaNodeRef}.add(YGNodeEdges::BORDER).setOn(yogaNodeRef);
-  YGNodeStyleSetBorder(
-      yogaNodeRef, static_cast<YGEdge>(edge), static_cast<float>(border));
-}
-
-#define YGMakeNativeMethod(name) makeNativeMethod(#name, name)
-#define YGMakeCriticalNativeMethod(name) \
-  makeCriticalNativeMethod_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(#name, name)
-
-jint YGJNI::registerNativeMethods(JavaVM* vm) {
-  jint ret = initialize(vm, [] {
-    registerNatives(
-        "com/facebook/yoga/YogaNative",
-        {
-            YGMakeNativeMethod(jni_YGNodeNew),
-            YGMakeNativeMethod(jni_YGNodeNewWithConfig),
-            YGMakeNativeMethod(jni_YGNodeFree),
-            YGMakeCriticalNativeMethod(jni_YGNodeReset),
-            YGMakeCriticalNativeMethod(jni_YGNodeClearChildren),
-            YGMakeCriticalNativeMethod(jni_YGNodeInsertChild),
-            YGMakeCriticalNativeMethod(jni_YGNodeRemoveChild),
-            YGMakeCriticalNativeMethod(jni_YGNodeSetIsReferenceBaseline),
-            YGMakeCriticalNativeMethod(jni_YGNodeIsReferenceBaseline),
-            YGMakeNativeMethod(jni_YGNodeCalculateLayout),
-            YGMakeCriticalNativeMethod(jni_YGNodeMarkDirty),
-            YGMakeCriticalNativeMethod(
-                jni_YGNodeMarkDirtyAndPropogateToDescendants),
-            YGMakeCriticalNativeMethod(jni_YGNodeIsDirty),
-            YGMakeCriticalNativeMethod(jni_YGNodeSetHasMeasureFunc),
-            YGMakeCriticalNativeMethod(jni_YGNodeSetHasBaselineFunc),
-            YGMakeCriticalNativeMethod(jni_YGNodeCopyStyle),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetDirection),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetDirection),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexDirection),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexDirection),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetJustifyContent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetJustifyContent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetAlignItems),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetAlignItems),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetAlignSelf),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetAlignSelf),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetAlignContent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetAlignContent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetPositionType),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPositionType),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexWrap),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexWrap),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetOverflow),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetOverflow),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetDisplay),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetDisplay),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlex),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlex),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexGrow),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexGrow),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexShrink),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexShrink),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexBasis),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexBasis),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexBasisPercent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexBasisAuto),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetMargin),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMargin),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMarginPercent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMarginAuto),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetPadding),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPadding),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPaddingPercent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetBorder),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetBorder),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetPosition),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPosition),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPositionPercent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetWidth),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetWidth),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetWidthPercent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetWidthAuto),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetHeight),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetHeight),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetHeightPercent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetHeightAuto),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetMinWidth),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinWidth),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinWidthPercent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetMinHeight),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinHeight),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinHeightPercent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetMaxWidth),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxWidth),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxWidthPercent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetMaxHeight),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxHeight),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxHeightPercent),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetAspectRatio),
-            YGMakeCriticalNativeMethod(jni_YGNodeStyleSetAspectRatio),
-            YGMakeCriticalNativeMethod(jni_YGNodePrint),
-            YGMakeNativeMethod(jni_YGNodeClone),
-            YGMakeNativeMethod(jni_YGConfigNew),
-            YGMakeNativeMethod(jni_YGConfigFree),
-            YGMakeNativeMethod(jni_YGConfigSetExperimentalFeatureEnabled),
-            YGMakeNativeMethod(jni_YGConfigSetUseWebDefaults),
-            YGMakeNativeMethod(jni_YGConfigSetPrintTreeFlag),
-            YGMakeNativeMethod(jni_YGConfigSetPointScaleFactor),
-            YGMakeNativeMethod(jni_YGConfigSetUseLegacyStretchBehaviour),
-            YGMakeNativeMethod(jni_YGConfigSetLogger),
-            YGMakeNativeMethod(
-                jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour),
-        });
-  });
-  return ret;
-}

java/jni/YGJNIVanilla.cpp

@@ -15,6 +15,7 @@
 #include <yoga/log.h>
 #include <iostream>
 #include <memory>
+#include "YogaJniException.h"
 
 using namespace facebook::yoga::vanillajni;
 using facebook::yoga::detail::Log;
@@ -195,7 +196,7 @@ static void jni_YGConfigSetLoggerJNI(
       delete context;
       YGConfigSetContext(config, nullptr);
     }
-    config->setLogger(nullptr);
+    YGConfigSetLogger(config, nullptr);
   }
 }
 
@@ -224,6 +225,16 @@ static void jni_YGNodeInsertChildJNI(
       _jlong2YGNodeRef(nativePointer), _jlong2YGNodeRef(childPointer), index);
 }
 
+static void jni_YGNodeSwapChildJNI(
+    JNIEnv* env,
+    jobject obj,
+    jlong nativePointer,
+    jlong childPointer,
+    jint index) {
+  YGNodeSwapChild(
+      _jlong2YGNodeRef(nativePointer), _jlong2YGNodeRef(childPointer), index);
+}
+
 static void jni_YGNodeSetIsReferenceBaselineJNI(
     JNIEnv* env,
     jobject obj,
@@ -372,8 +383,18 @@ static void jni_YGNodeCalculateLayoutJNI(
         YGNodeStyleGetDirection(_jlong2YGNodeRef(nativePointer)),
         layoutContext);
     YGTransferLayoutOutputsRecursive(env, obj, root, layoutContext);
-  } catch (jthrowable throwable) {
+  } catch (const YogaJniException& jniException) {
-    env->Throw(throwable);
+    ScopedLocalRef<jthrowable> throwable = jniException.getThrowable();
+    if (throwable.get()) {
+      env->Throw(throwable.get());
+    }
+  } catch (const std::logic_error& ex) {
+    env->ExceptionClear();
+    jclass cl = env->FindClass("Ljava/lang/IllegalStateException;");
+    static const jmethodID methodId = facebook::yoga::vanillajni::getMethodId(
+        env, cl, "<init>", "(Ljava/lang/String;)V");
+    auto throwable = env->NewObject(cl, methodId, env->NewStringUTF(ex.what()));
+    env->Throw(static_cast<jthrowable>(throwable));
   }
 }
 
@@ -705,8 +726,7 @@ static void jni_YGNodePrintJNI(JNIEnv* env, jobject obj, jlong nativePointer) {
   const YGNodeRef node = _jlong2YGNodeRef(nativePointer);
   YGNodePrint(
       node,
-      (YGPrintOptions)(
+      (YGPrintOptions) (YGPrintOptionsStyle | YGPrintOptionsLayout | YGPrintOptionsChildren));
-          YGPrintOptionsStyle | YGPrintOptionsLayout | YGPrintOptionsChildren));
 #endif
 }
 
@@ -750,6 +770,7 @@ static JNINativeMethod methods[] = {
     {"jni_YGNodeFreeJNI", "(J)V", (void*) jni_YGNodeFreeJNI},
     {"jni_YGNodeResetJNI", "(J)V", (void*) jni_YGNodeResetJNI},
     {"jni_YGNodeInsertChildJNI", "(JJI)V", (void*) jni_YGNodeInsertChildJNI},
+    {"jni_YGNodeSwapChildJNI", "(JJI)V", (void*) jni_YGNodeSwapChildJNI},
     {"jni_YGNodeSetIsReferenceBaselineJNI",
      "(JZ)V",
      (void*) jni_YGNodeSetIsReferenceBaselineJNI},

java/jni/YGJNIVanilla.h

@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include "jni.h"
+
 namespace YGJNIVanilla {
 void registerNatives(JNIEnv* env);
 };

java/jni/YGJTypes.cpp

@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-
-#include "YGJTypes.h"
-
-using facebook::jni::alias_ref;
-using facebook::jni::local_ref;
-
-jfloat JYogaNode::baseline(jfloat width, jfloat height) {
-  static auto javaMethod =
-      javaClassLocal()->getMethod<jfloat(jfloat, jfloat)>("baseline");
-  return javaMethod(self(), width, height);
-}
-
-jlong JYogaNode::measure(
-    jfloat width,
-    jint widthMode,
-    jfloat height,
-    jint heightMode) {
-  static auto javaMethod =
-      javaClassLocal()->getMethod<jlong(jfloat, jint, jfloat, jint)>("measure");
-  return javaMethod(self(), width, widthMode, height, heightMode);
-}
-
-facebook::jni::local_ref<JYogaLogLevel> JYogaLogLevel::fromInt(jint logLevel) {
-  static auto javaMethod =
-      javaClassStatic()->getStaticMethod<alias_ref<JYogaLogLevel>(jint)>(
-          "fromInt");
-  return javaMethod(javaClassStatic(), logLevel);
-}
-
-void JYogaLogger::log(
-    facebook::jni::alias_ref<JYogaLogLevel> logLevel,
-    jstring message) {
-  static auto javaMethod =
-      javaClassLocal()->getMethod<void(alias_ref<JYogaLogLevel>, jstring)>(
-          "log");
-  javaMethod(self(), logLevel, message);
-}

java/jni/YGJTypes.h

@@ -1,61 +0,0 @@
-/*
- * 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.
- */
-
-#include <fbjni/fbjni.h>
-#include <yoga/YGValue.h>
-#include <yoga/Yoga.h>
-#include <map>
-
-using namespace facebook::jni;
-using namespace std;
-
-struct JYogaNode : public facebook::jni::JavaClass<JYogaNode> {
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaNodeJNIBase;";
-
-  jfloat baseline(jfloat width, jfloat height);
-  jlong measure(jfloat width, jint widthMode, jfloat height, jint heightMode);
-};
-
-struct JYogaLogLevel : public facebook::jni::JavaClass<JYogaLogLevel> {
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaLogLevel;";
-
-  static facebook::jni::local_ref<JYogaLogLevel> fromInt(jint);
-};
-
-struct JYogaLogger : public facebook::jni::JavaClass<JYogaLogger> {
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaLogger;";
-
-  void log(facebook::jni::alias_ref<JYogaLogLevel>, jstring);
-};
-
-class PtrJNodeMap {
-  using JNodeArray = JArrayClass<JYogaNode::javaobject>;
-  std::map<YGNodeRef, size_t> ptrsToIdxs_;
-  alias_ref<JNodeArray> javaNodes_;
-
-public:
-  PtrJNodeMap() : ptrsToIdxs_{}, javaNodes_{} {}
-  PtrJNodeMap(
-      alias_ref<JArrayLong> nativePointers,
-      alias_ref<JNodeArray> javaNodes)
-      : javaNodes_{javaNodes} {
-    auto pin = nativePointers->pinCritical();
-    auto ptrs = pin.get();
-    for (size_t i = 0, n = pin.size(); i < n; ++i) {
-      ptrsToIdxs_[(YGNodeRef) ptrs[i]] = i;
-    }
-  }
-
-  local_ref<JYogaNode> ref(YGNodeRef node) {
-    auto idx = ptrsToIdxs_.find(node);
-    if (idx == ptrsToIdxs_.end()) {
-      return local_ref<JYogaNode>{};
-    } else {
-      return javaNodes_->getElement(idx->second);
-    }
-  }
-};

java/jni/YogaJniException.cpp

@@ -0,0 +1,52 @@
+/*
+ * 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.
+ */
+
+#include <stdexcept>
+#include <string>
+#include "YogaJniException.h"
+#include "common.h"
+
+namespace facebook {
+namespace yoga {
+namespace vanillajni {
+
+YogaJniException::YogaJniException() {
+  jclass cl = getCurrentEnv()->FindClass("Ljava/lang/RuntimeException;");
+  static const jmethodID methodId = facebook::yoga::vanillajni::getMethodId(
+      getCurrentEnv(), cl, "<init>", "()V");
+  auto throwable = getCurrentEnv()->NewObject(cl, methodId);
+  throwable_ =
+      newGlobalRef(getCurrentEnv(), static_cast<jthrowable>(throwable));
+}
+
+YogaJniException::YogaJniException(jthrowable throwable) {
+  throwable_ = newGlobalRef(getCurrentEnv(), throwable);
+}
+
+YogaJniException::YogaJniException(YogaJniException&& rhs)
+    : throwable_(std::move(rhs.throwable_)) {}
+
+YogaJniException::YogaJniException(const YogaJniException& rhs) {
+  throwable_ = newGlobalRef(getCurrentEnv(), rhs.throwable_.get());
+}
+
+YogaJniException::~YogaJniException() {
+  try {
+    throwable_.reset();
+  } catch (...) {
+    std::terminate();
+  }
+}
+
+ScopedLocalRef<jthrowable> YogaJniException::getThrowable() const noexcept {
+  return make_local_ref(
+      getCurrentEnv(),
+      static_cast<jthrowable>(getCurrentEnv()->NewLocalRef(throwable_.get())));
+}
+} // namespace vanillajni
+} // namespace yoga
+} // namespace facebook

java/jni/YogaJniException.h

@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+#include <stdexcept>
+#include <string>
+#include "common.h"
+
+namespace facebook {
+namespace yoga {
+namespace vanillajni {
+/**
+ * This class wraps a Java exception (jthrowable) into a C++ exception; A global
+ * reference to Java exception (jthrowable) is made so that the exception object
+ * does not gets cleared before jni call completion
+ */
+class YogaJniException : public std::exception {
+public:
+  YogaJniException();
+  ~YogaJniException() override;
+
+  explicit YogaJniException(jthrowable throwable);
+
+  YogaJniException(YogaJniException&& rhs);
+
+  YogaJniException(const YogaJniException& other);
+
+  ScopedLocalRef<jthrowable> getThrowable() const noexcept;
+
+private:
+  ScopedGlobalRef<jthrowable> throwable_;
+};
+} // namespace vanillajni
+} // namespace yoga
+} // namespace facebook

java/jni/common.cpp

@@ -18,11 +18,11 @@ void registerNatives(
     size_t numMethods) {
   jclass clazz = env->FindClass(className);
 
-  assertNoPendingJniException(env);
+  assertNoPendingJniExceptionIf(env, !clazz);
 
-  env->RegisterNatives(clazz, methods, numMethods);
+  auto result = env->RegisterNatives(clazz, methods, numMethods);
 
-  assertNoPendingJniException(env);
+  assertNoPendingJniExceptionIf(env, result != JNI_OK);
 }
 
 jmethodID getStaticMethodId(
@@ -32,7 +32,7 @@ jmethodID getStaticMethodId(
     const char* methodDescriptor) {
   jmethodID methodId =
       env->GetStaticMethodID(clazz, methodName, methodDescriptor);
-  assertNoPendingJniException(env);
+  assertNoPendingJniExceptionIf(env, !methodId);
   return methodId;
 }
 
@@ -42,7 +42,7 @@ jmethodID getMethodId(
     const char* methodName,
     const char* methodDescriptor) {
   jmethodID methodId = env->GetMethodID(clazz, methodName, methodDescriptor);
-  assertNoPendingJniException(env);
+  assertNoPendingJniExceptionIf(env, !methodId);
   return methodId;
 }
 
@@ -52,7 +52,7 @@ jfieldID getFieldId(
     const char* fieldName,
     const char* fieldSignature) {
   jfieldID fieldId = env->GetFieldID(clazz, fieldName, fieldSignature);
-  assertNoPendingJniException(env);
+  assertNoPendingJniExceptionIf(env, !fieldId);
   return fieldId;
 }
 
@@ -77,13 +77,16 @@ DEFINE_CALL_METHOD_FOR_PRIMITIVE_INTERFACE(void, Void) {
   assertNoPendingJniException(env);
 }
 
-ScopedLocalRef<jobject>
+ScopedLocalRef<jobject> callStaticObjectMethod(
-callStaticObjectMethod(JNIEnv* env, jclass clazz, jmethodID methodId, ...) {
+    JNIEnv* env,
+    jclass clazz,
+    jmethodID methodId,
+    ...) {
   va_list args;
   va_start(args, methodId);
   jobject result = env->CallStaticObjectMethodV(clazz, methodId, args);
   va_end(args);
-  assertNoPendingJniException(env);
+  assertNoPendingJniExceptionIf(env, !result);
   return make_local_ref(env, result);
 }
 
@@ -96,6 +99,16 @@ ScopedGlobalRef<jobject> newGlobalRef(JNIEnv* env, jobject obj) {
 
   return make_global_ref(result);
 }
+
+ScopedGlobalRef<jthrowable> newGlobalRef(JNIEnv* env, jthrowable obj) {
+  jthrowable result = static_cast<jthrowable>(env->NewGlobalRef(obj));
+
+  if (!result) {
+    logErrorMessageAndDie("Could not obtain global reference from object");
+  }
+
+  return make_global_ref(result);
+}
 } // namespace vanillajni
 } // namespace yoga
 } // namespace facebook

java/jni/common.h

@@ -61,14 +61,19 @@ DEFINE_CALL_METHOD_FOR_PRIMITIVE_INTERFACE(void, Void);
 DEFINE_CALL_METHOD_FOR_PRIMITIVE_INTERFACE(jlong, Long);
 DEFINE_CALL_METHOD_FOR_PRIMITIVE_INTERFACE(jfloat, Float);
 
-ScopedLocalRef<jobject>
+ScopedLocalRef<jobject> callStaticObjectMethod(
-callStaticObjectMethod(JNIEnv* env, jclass clazz, jmethodID methodId, ...);
+    JNIEnv* env,
+    jclass clazz,
+    jmethodID methodId,
+    ...);
 
 /**
  * Given a local or a global reference, this method creates a new global
  * reference out of it. If any error happens, aborts the process.
  */
 ScopedGlobalRef<jobject> newGlobalRef(JNIEnv* env, jobject obj);
+
+ScopedGlobalRef<jthrowable> newGlobalRef(JNIEnv* env, jthrowable obj);
 } // namespace vanillajni
 } // namespace yoga
 } // namespace facebook

java/jni/corefunctions.cpp

@@ -7,6 +7,7 @@
 
 #include "corefunctions.h"
 #include "macros.h"
+#include "YogaJniException.h"
 
 namespace facebook {
 namespace yoga {
@@ -72,7 +73,20 @@ void assertNoPendingJniException(JNIEnv* env) {
     logErrorMessageAndDie("Unable to get pending JNI exception.");
   }
   env->ExceptionClear();
-  throw throwable;
+  throw YogaJniException(throwable);
+}
+
+void assertNoPendingJniExceptionIf(JNIEnv* env, bool condition) {
+  if (!condition) {
+    return;
+  }
+
+  if (env->ExceptionCheck() == JNI_TRUE) {
+    assertNoPendingJniException(env);
+    return;
+  }
+
+  throw YogaJniException();
 }
 
 } // namespace vanillajni

java/jni/corefunctions.h

@@ -47,6 +47,8 @@ void logErrorMessageAndDie(const char* message);
  */
 void assertNoPendingJniException(JNIEnv* env);
 
+void assertNoPendingJniExceptionIf(JNIEnv* env, bool condition);
+
 } // namespace vanillajni
 } // namespace yoga
 } // namespace facebook

java/jni/yogajni.cpp

@@ -4,20 +4,14 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-
-#include "yogajni.h"
 #include "YGJNIVanilla.h"
-#include <fbjni/fbjni.h>
 #include "common.h"
 
-using namespace facebook::jni;
 using namespace facebook::yoga;
 
 jint JNI_OnLoad(JavaVM* vm, void*) {
-  jint ret = YGJNI::registerNativeMethods(vm);
-
   JNIEnv* env;
-  vanillajni::ensureInitialized(&env, vm);
+  jint ret = vanillajni::ensureInitialized(&env, vm);
   YGJNIVanilla::registerNatives(env);
   return ret;
 }

java/jni/yogajni.h

@@ -1,12 +0,0 @@
-/*
- * 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.
- */
-
-#include <fbjni/fbjni.h>
-
-namespace YGJNI {
-jint registerNativeMethods(JavaVM* vm);
-};

java/proguard-annotations/build.gradle

@@ -10,4 +10,4 @@ apply plugin: 'java'
 sourceCompatibility = '1.7'
 targetCompatibility = '1.7'
 
-apply from: rootProject.file('gradle/release.gradle')
+apply plugin: 'com.vanniktech.maven.publish'

java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/DoNotStripAny.java

@@ -0,0 +1,24 @@
+/*
+ * 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 com.facebook.proguard.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.RetentionPolicy.CLASS;
+
+/**
+ * Add this annotation to a class to instruct Proguard to not strip it or any of its fields or
+ * methods out.
+ *
+ * <p>This is useful for methods called via reflection that could appear as unused to Proguard.
+ */
+@Target({ElementType.TYPE})
+@Retention(CLASS)
+public @interface DoNotStripAny {}

java/tests/com/facebook/yoga/TestParametrization.java

@@ -28,25 +28,7 @@ public class TestParametrization {
         return "JNI";
       }
     };
-
+    return Arrays.asList(nodeFactory);
-    NodeFactory nodeFactoryUsingVanillaJNI = new NodeFactory() {
-      @Override
-      public YogaNode create() {
-        return YogaNodeFactory.create(true);
-      }
-
-      @Override
-      public YogaNode create(YogaConfig config) {
-        config.setUseVanillaJNI(true);
-        return YogaNodeFactory.create(config);
-      }
-
-      @Override
-      public String toString() {
-        return "VanillaJNI";
-      }
-    };
-    return Arrays.asList(nodeFactory, nodeFactoryUsingVanillaJNI);
   }
 
 

java/tests/com/facebook/yoga/YGDisplayTest.java

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGDisplayTest.html
 
 package com.facebook.yoga;
@@ -337,6 +338,47 @@ public class YGDisplayTest {
     assertEquals(0f, root_child1.getLayoutHeight(), 0.0f);
   }
 
+  @Test
+  public void test_display_none_with_position_absolute() {
+    YogaConfig config = YogaConfigFactory.create();
+
+    final YogaNode root = createNode(config);
+    root.setWidth(100f);
+    root.setHeight(100f);
+
+    final YogaNode root_child0 = createNode(config);
+    root_child0.setPositionType(YogaPositionType.ABSOLUTE);
+    root_child0.setWidth(100f);
+    root_child0.setHeight(100f);
+    root_child0.setDisplay(YogaDisplay.NONE);
+    root.addChildAt(root_child0, 0);
+    root.setDirection(YogaDirection.LTR);
+    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(100f, root.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutHeight(), 0.0f);
+
+    root.setDirection(YogaDirection.RTL);
+    root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(100f, root.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutHeight(), 0.0f);
+  }
+
   private YogaNode createNode(YogaConfig config) {
     return mNodeFactory.create(config);
   }

java/tests/com/facebook/yoga/YogaLoggerTest.java

@@ -9,10 +9,62 @@ package com.facebook.yoga;
 
 import org.junit.Test;
 import java.lang.ref.WeakReference;
+import java.util.List;
+import java.util.ArrayList;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 public class YogaLoggerTest {
+
+  @Test
+  public void testRemovingLoggerFromConfig() throws Exception {
+    final List<String> logs = new ArrayList<>();
+
+    final YogaConfig config = YogaConfigFactory.create();
+    YogaLogger logger = new YogaLogger() {
+      @Override
+      public void log(YogaLogLevel level, String message) {
+        logs.add(message);
+      }
+    };
+    config.setLogger(logger);
+
+    final YogaNode root = YogaNodeFactory.create(config);
+    root.setFlexDirection(YogaFlexDirection.ROW);
+    root.setAlignItems(YogaAlign.BASELINE);
+
+    final YogaNode child1 = YogaNodeFactory.create(config);
+    root.addChildAt(child1, 0);
+
+    final YogaNode child2 = YogaNodeFactory.create(config);
+    child2.setBaselineFunction(new YogaBaselineFunction() {
+        public float baseline(YogaNode node, float width, float height) {
+          return Float.NaN;
+        }
+    });
+    root.addChildAt(child2, 1);
+
+    assertEquals(logs.size(), 0);
+    try {
+      root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
+      fail("Expected calculateLayout to throw");
+    } catch (IllegalStateException e) {
+    }
+
+    assertEquals(logs.size(), 1);
+
+    config.setLogger(null);
+
+    try {
+      root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
+      fail("Expected calculateLayout to throw again");
+    } catch (IllegalStateException e) {
+    }
+
+    assertEquals(logs.size(), 1);
+  }
+
   @Test
   public void testLoggerLeak() throws Exception {
     final YogaConfig config = YogaConfigFactory.create();

java/tests/com/facebook/yoga/YogaNodeStylePropertiesTest.java

@@ -191,7 +191,7 @@ public class YogaNodeStylePropertiesTest {
   public void testPositionTypeDefault() {
     final YogaNode node = createNode();
 
-    assertEquals(YogaPositionType.RELATIVE, node.getPositionType());
+    assertEquals(YogaPositionType.STATIC, node.getPositionType());
   }
 
   @Test

java/yogajni.version

@@ -0,0 +1,6 @@
+{
+  global:
+    JNI_OnLoad;
+  local:
+    *;
+};

javascript/.flowconfig

@@ -7,5 +7,9 @@
 [lints]
 
 [options]
+types_first=false
 
 [strict]
+
+[version]
+^0.140.0

javascript/sources/Node.cc

@@ -23,8 +23,8 @@ static YGSize globalMeasureFunc(
   Node const& node = *reinterpret_cast<Node const*>(YGNodeGetContext(nodeRef));
 
   Size size = node.callMeasureFunc(width, widthMode, height, heightMode);
-  YGSize ygSize = {static_cast<float>(size.width),
+  YGSize ygSize = {
-                   static_cast<float>(size.height)};
+      static_cast<float>(size.width), static_cast<float>(size.height)};
 
   return ygSize;
 }

javascript/sources/Size.hh

@@ -18,7 +18,5 @@ struct Size {
 
   Size(double width, double height) : width(width), height(height) {}
 
-  void toJS(nbind::cbOutput expose) const {
+  void toJS(nbind::cbOutput expose) const { expose(width, height); }
-    expose(width, height);
-  }
 };