Fix confusing variable name

Summary: Variable name suggest it does not constrain to min dimension but it did indeed. Changing that to match variable name. This required updating code to use fully constraint value again. gkassabli this seems wrong, do you know what is going on?

Reviewed By: gkassabli

Differential Revision: D5144146

fbshipit-source-id: a5d711f8ad7049b0d96ee0f0f3eef1165ab3b4e8

.buckconfig

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

.editorconfig

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

.gitignore

@@ -63,3 +63,5 @@ Carthage/Build
 
 # Gradle
 .gradle
+# NDK/CMake
+.externalNativeBuild

.travis.yml

@@ -9,6 +9,9 @@ os: osx
 osx_image: xcode8.2
 language: cpp
 compiler: clang
+cache:
+  directories:
+    - $HOME/Library/Caches/Homebrew
 
 env:
   - TARGET=c
@@ -19,9 +22,13 @@ env:
   - TARGET=android
 
 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
+
   - brew update > /dev/null
-  - brew tap facebook/fb
-  - brew install buck
+  - brew install --HEAD facebook/fb/buck
 
   # Java
   - |
@@ -40,7 +47,11 @@ before_install:
   # iOS
   - |
     if [[ $TARGET = "ios" ]]; then
-      brew outdated xctool || brew upgrade xctool
+      brew outdated xctool || brew upgrade xctool;
+      gem install xcpretty --no-document --quiet;
+      gem install cocoapods --pre --no-document --quiet;
+      pod repo update --silent;
+      pod install --project-directory=YogaKit/YogaKitSample/;
     fi
 
   # Emscripten (used for js tests)
@@ -49,20 +60,19 @@ before_install:
     if [[ $TARGET = "js" ]]; then
       wget -O /tmp/emsdk-portable.tar.gz https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz &&
       tar xf /tmp/emsdk-portable.tar.gz -C /tmp/ &&
-      /tmp/emsdk_portable/emsdk install latest >& /dev/null &&
-      /tmp/emsdk_portable/emsdk activate latest
+      /tmp/emsdk-portable/emsdk install latest 2>&1 | grep -v '^x ' &&
+      /tmp/emsdk-portable/emsdk activate latest
     fi
 
   # Android
   - |
     if [[ $TARGET = "android" ]]; then
-      brew cask install java &&
-      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) &&
-      export PATH=$JAVA_HOME/bin:$PATH &&
-      brew install android-sdk &&
-      export ANDROID_SDK=/usr/local/opt/android-sdk &&
-      export ANDROID_HOME=/usr/local/opt/android-sdk
-      $ANDROID_SDK/tools/android update sdk --filter android-19,addon-google_apis-google-19
+      brew cask install java;
+      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8);
+      export PATH=$JAVA_HOME/bin:$PATH;
+      export TERMINAL=dumb;
+      source scripts/android-setup.sh && installAndroidSDK
+      export ANDROID_SDK=$ANDROID_HOME
     fi
 
   # JavaScript
@@ -71,7 +81,7 @@ before_install:
       cd javascript &&
       npm install &&
       unset CC && unset CXX && unset LINK &&
-      source /tmp/emsdk_portable/emsdk_env.sh &&
+      source /tmp/emsdk-portable/emsdk_env.sh &&
       npm run build:browser
     ) fi
 
@@ -100,13 +110,17 @@ script:
   # iOS
   - |
     if [[ $TARGET = "ios" ]]; then
-      buck test --verbose 0 //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64
+      buck test --verbose 0 //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64 &&
+      set -o pipefail &&
+      xcodebuild build -workspace YogaKit/YogaKitSample/YogaKitSample.xcworkspace -scheme YogaKitSample -sdk iphonesimulator | xcpretty -c
     fi
 
   # Android
   - |
     if [[ $TARGET = "android" ]]; then
-      buck build --verbose 0 //android/sample:sample
+      buck build --verbose 0 //android/sample:sample &&
+      ./gradlew testDebugUnit &&
+      scripts/publish-snapshot.sh
     fi
 
   # JavaScript

BUCK

@@ -5,38 +5,41 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs('//YOGA_DEFS')
+include_defs("//YOGA_DEFS")
 
 GMOCK_OVERRIDE_FLAGS = [
-  # gmock does not mark mocked methods as override, ignore the warnings in tests
-  '-Wno-inconsistent-missing-override',
+    # gmock does not mark mocked methods as override, ignore the warnings in tests
+    "-Wno-inconsistent-missing-override",
 ]
 
-COMPILER_FLAGS = BASE_COMPILER_FLAGS + ['-std=c11', '-fPIC']
-TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + ['-std=c++11']
+COMPILER_FLAGS = LIBRARY_COMPILER_FLAGS + [
+    "-std=c11",
+]
+
+TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + ["-std=c++11"]
 
 cxx_library(
-  name = 'yoga',
-  soname = 'libyogacore.$(ext)',
-  srcs = glob(['yoga/*.c']),
-  tests=[':YogaTests'],
-  exported_headers = subdir_glob([('', 'yoga/*.h')]),
-  header_namespace = '',
-  compiler_flags = COMPILER_FLAGS,
-  deps = [] if THIS_IS_FBOBJC else [
-    yoga_dep('lib/fb:ndklog'),
-  ],
-  visibility = ['PUBLIC'],
+    name = "yoga",
+    srcs = glob(["yoga/*.c"]),
+    compiler_flags = COMPILER_FLAGS,
+    exported_headers = subdir_glob([("", "yoga/*.h")]),
+    header_namespace = "",
+    soname = "libyogacore.$(ext)",
+    tests = [":YogaTests"],
+    visibility = ["PUBLIC"],
+    deps = [] if THIS_IS_FBOBJC else [
+        yoga_dep("lib/fb:ndklog"),
+    ],
 )
 
 cxx_test(
-  name = 'YogaTests',
-  contacts = ['emilsj@fb.com'],
-  srcs = glob(['tests/*.cpp']),
-  compiler_flags = TEST_COMPILER_FLAGS,
-  deps = [
-    ':yoga',
-    GTEST_TARGET,
-  ],
-  visibility = ['PUBLIC'],
+    name = "YogaTests",
+    srcs = glob(["tests/*.cpp"]),
+    compiler_flags = TEST_COMPILER_FLAGS,
+    contacts = ["emilsj@fb.com"],
+    visibility = ["PUBLIC"],
+    deps = [
+        ":yoga",
+        GTEST_TARGET,
+    ],
 )

CMakeLists.txt

@@ -0,0 +1,17 @@
+#
+# Copyright (c) 2014-present, Facebook, Inc.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree. An additional grant
+# of patent rights can be found in the PATENTS file in the same directory.
+#
+
+cmake_minimum_required(VERSION 3.4.1)
+
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+file(GLOB yogacore_SRC yoga/*.c)
+add_library(yogacore STATIC ${yogacore_SRC})
+
+target_link_libraries(yogacore android log)

README.md

@@ -1,4 +1,4 @@
-# Yoga [![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout)
+# Yoga [![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![bintray](https://img.shields.io/bintray/v/facebook/maven/com.facebook.yoga:yoga.svg)](https://bintray.com/facebook/maven/com.facebook.yoga%3Ayoga/_latestVersion) [![NuGet](https://img.shields.io/nuget/v/Facebook.Yoga.svg)](https://www.nuget.org/packages/Facebook.Yoga)
 
 [![C Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=c&label=C)](https://travis-ci.org/facebook/yoga)
 [![Java Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=java&label=Java)](https://travis-ci.org/facebook/yoga)
@@ -7,6 +7,9 @@
 [![JavaScript Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=js&label=JavaScript)](https://travis-ci.org/facebook/yoga)
 [![Android Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=android&label=Android)](https://travis-ci.org/facebook/yoga)
 
+[![Visual Studio Team services](https://img.shields.io/vso/build/rumar/fe6d27b5-e424-4f61-b8f6-e2ec2f8755fb/1.svg?label=vsts-windows)]()
+[![Visual Studio Team services](https://img.shields.io/vso/build/rumar/fe6d27b5-e424-4f61-b8f6-e2ec2f8755fb/2.svg?label=vsts-osx)]()
+
 ## Building
 Yoga builds with [buck](https://buckbuild.com). Make sure you install buck before contributing to Yoga. Yoga's main implementation is in C, with bindings to supported languages and frameworks. When making changes to Yoga please ensure the changes are also propagated to these bindings when applicable.
 
@@ -35,3 +38,26 @@ For the main C implementation of Yoga clang-format is used to ensure a consisten
 
 ## Benchmarks
 Benchmarks are located in `benchmark/YGBenchmark.c` and can be run with `buck run //benchmark:benchmark`. If you think your change has affected performance please run this before and after your change to validate that nothing has regressed. Benchmarks are run on every commit in CI.
+
+### Javascript
+Installing through NPM
+```sh
+npm install yoga-layout
+```
+By default this will install the library and try to build for all platforms (node, browser asm, and standalone webpack). You may receive errors if you do not have the required platform development tools already installed. To preset the platform you'd like to build for you can set a .npmrc property first.
+```sh
+npm config set yoga-layout:platform standalone
+```
+This will now only run the standalone webpack build upon install.
+
+## Build Platforms
+
+| name           | description                                     |
+|----------------|-------------------------------------------------|
+| all (default)  | Builds all of these platforms.                  |
+| browser        | Builds asm js browser version.                  |
+| node           | Builds node js version.                         |
+| standalone     | Runs webpack.                                   |
+| none           | Does nothing. You can use the prepackaged libs. |
+
+

YOGA_DEFS

@@ -1,14 +1,15 @@
 
-YOGA_ROOT = '//...'
+YOGA_ROOTS = ['//...']
 JAVA_TARGET = '//java:java'
 INFER_ANNOTATIONS_TARGET = '//lib/infer-annotations:infer-annotations'
 JSR_305_TARGET = '//lib/jsr-305:jsr-305'
 JUNIT_TARGET = '//lib/junit:junit'
-PROGRUARD_ANNOTATIONS_TARGET = '//java/com/facebook/proguard/annotations:annotations'
+PROGRUARD_ANNOTATIONS_TARGET = '//java/proguard-annotations/src/main/java/com/facebook/proguard/annotations:annotations'
 SOLOADER_TARGET = '//lib/soloader:soloader'
 GTEST_TARGET = '//lib/gtest:gtest'
 JNI_TARGET = '//lib/jni:jni'
 FBJNI_TARGET = '//lib/fb:fbjni'
+FBJNI_JAVA_TARGET = '//lib/fb/src/main/java/com/facebook/jni:jni'
 APPCOMPAT_TARGET = '//lib/appcompat:appcompat'
 ANDROID_SUPPORT_TARGET = '//lib/android-support:android-support'
 ANDROID_TARGET = '//android:android'
@@ -33,6 +34,10 @@ BASE_COMPILER_FLAGS = [
   '-O3',
 ]
 
+LIBRARY_COMPILER_FLAGS = BASE_COMPILER_FLAGS + [
+  '-fPIC',
+]
+
 def yoga_dep(dep):
   return '//' + dep
 

Yoga.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name = 'Yoga'
-  spec.version = '1.1.0'
+  spec.version = '1.5.0'
   spec.license =  { :type => 'BSD', :file => "LICENSE" }
   spec.homepage = 'https://facebook.github.io/yoga/'
   spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/c/'
@@ -11,7 +11,7 @@ Pod::Spec.new do |spec|
   spec.authors = 'Facebook'
   spec.source = {
     :git => 'https://github.com/facebook/yoga.git',
-    :tag => 'v2017.02.07.00',
+    :tag => '1.5.0',
   }
 
   spec.module_name = 'yoga'

YogaKit.podspec

@@ -1,6 +1,6 @@
 podspec = Pod::Spec.new do |spec|
   spec.name = 'YogaKit'
-  spec.version = '1.1.0'
+  spec.version = '1.5.0'
   spec.license =  { :type => 'BSD', :file => "LICENSE" }
   spec.homepage = 'https://facebook.github.io/yoga/'
   spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/yogakit/'
@@ -11,15 +11,15 @@ podspec = Pod::Spec.new do |spec|
   spec.authors = 'Facebook'
   spec.source = {
     :git => 'https://github.com/facebook/yoga.git',
-    :tag => 'v2017.02.07.00',
+    :tag => '1.5.0',
   }
 
   spec.platform = :ios
   spec.ios.deployment_target = '8.0'
   spec.ios.frameworks = 'UIKit'
 
-  spec.dependency 'Yoga', '~> 1.1'
-  spec.source_files = 'YogaKit/Source/*.{h,m}'
+  spec.dependency 'Yoga', '~> 1.5'
+  spec.source_files = 'YogaKit/Source/*.{h,m,swift}'
   spec.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h'
   spec.private_header_files = 'YogaKit/Source/YGLayout+Private.h'
 end

YogaKit/BUCK

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

YogaKit/CHANGELOG.md

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

YogaKit/README.md

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

YogaKit/Source/YGLayout.h

@@ -9,6 +9,17 @@
 
 #import <UIKit/UIKit.h>
 #import <yoga/YGEnums.h>
+#import <yoga/Yoga.h>
+
+extern YGValue YGPointValue(CGFloat value)
+    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
+extern YGValue YGPercentValue(CGFloat value)
+    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
+
+typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
+  YGDimensionFlexibilityFlexibleWidth = 1 << 0,
+  YGDimensionFlexibilityFlexibleHeigth = 1 << 1,
+};
 
 @interface YGLayout : NSObject
 
@@ -36,34 +47,34 @@
 
 @property (nonatomic, readwrite, assign) CGFloat flexGrow;
 @property (nonatomic, readwrite, assign) CGFloat flexShrink;
-@property (nonatomic, readwrite, assign) CGFloat flexBasis;
+@property (nonatomic, readwrite, assign) YGValue flexBasis;
 
-@property (nonatomic, readwrite, assign) CGFloat left;
-@property (nonatomic, readwrite, assign) CGFloat top;
-@property (nonatomic, readwrite, assign) CGFloat right;
-@property (nonatomic, readwrite, assign) CGFloat bottom;
-@property (nonatomic, readwrite, assign) CGFloat start;
-@property (nonatomic, readwrite, assign) CGFloat end;
+@property (nonatomic, readwrite, assign) YGValue left;
+@property (nonatomic, readwrite, assign) YGValue top;
+@property (nonatomic, readwrite, assign) YGValue right;
+@property (nonatomic, readwrite, assign) YGValue bottom;
+@property (nonatomic, readwrite, assign) YGValue start;
+@property (nonatomic, readwrite, assign) YGValue end;
 
-@property (nonatomic, readwrite, assign) CGFloat marginLeft;
-@property (nonatomic, readwrite, assign) CGFloat marginTop;
-@property (nonatomic, readwrite, assign) CGFloat marginRight;
-@property (nonatomic, readwrite, assign) CGFloat marginBottom;
-@property (nonatomic, readwrite, assign) CGFloat marginStart;
-@property (nonatomic, readwrite, assign) CGFloat marginEnd;
-@property (nonatomic, readwrite, assign) CGFloat marginHorizontal;
-@property (nonatomic, readwrite, assign) CGFloat marginVertical;
-@property (nonatomic, readwrite, assign) CGFloat margin;
+@property (nonatomic, readwrite, assign) YGValue marginLeft;
+@property (nonatomic, readwrite, assign) YGValue marginTop;
+@property (nonatomic, readwrite, assign) YGValue marginRight;
+@property (nonatomic, readwrite, assign) YGValue marginBottom;
+@property (nonatomic, readwrite, assign) YGValue marginStart;
+@property (nonatomic, readwrite, assign) YGValue marginEnd;
+@property (nonatomic, readwrite, assign) YGValue marginHorizontal;
+@property (nonatomic, readwrite, assign) YGValue marginVertical;
+@property (nonatomic, readwrite, assign) YGValue margin;
 
-@property (nonatomic, readwrite, assign) CGFloat paddingLeft;
-@property (nonatomic, readwrite, assign) CGFloat paddingTop;
-@property (nonatomic, readwrite, assign) CGFloat paddingRight;
-@property (nonatomic, readwrite, assign) CGFloat paddingBottom;
-@property (nonatomic, readwrite, assign) CGFloat paddingStart;
-@property (nonatomic, readwrite, assign) CGFloat paddingEnd;
-@property (nonatomic, readwrite, assign) CGFloat paddingHorizontal;
-@property (nonatomic, readwrite, assign) CGFloat paddingVertical;
-@property (nonatomic, readwrite, assign) CGFloat padding;
+@property (nonatomic, readwrite, assign) YGValue paddingLeft;
+@property (nonatomic, readwrite, assign) YGValue paddingTop;
+@property (nonatomic, readwrite, assign) YGValue paddingRight;
+@property (nonatomic, readwrite, assign) YGValue paddingBottom;
+@property (nonatomic, readwrite, assign) YGValue paddingStart;
+@property (nonatomic, readwrite, assign) YGValue paddingEnd;
+@property (nonatomic, readwrite, assign) YGValue paddingHorizontal;
+@property (nonatomic, readwrite, assign) YGValue paddingVertical;
+@property (nonatomic, readwrite, assign) YGValue padding;
 
 @property (nonatomic, readwrite, assign) CGFloat borderLeftWidth;
 @property (nonatomic, readwrite, assign) CGFloat borderTopWidth;
@@ -73,12 +84,12 @@
 @property (nonatomic, readwrite, assign) CGFloat borderEndWidth;
 @property (nonatomic, readwrite, assign) CGFloat borderWidth;
 
-@property (nonatomic, readwrite, assign) CGFloat width;
-@property (nonatomic, readwrite, assign) CGFloat height;
-@property (nonatomic, readwrite, assign) CGFloat minWidth;
-@property (nonatomic, readwrite, assign) CGFloat minHeight;
-@property (nonatomic, readwrite, assign) CGFloat maxWidth;
-@property (nonatomic, readwrite, assign) CGFloat maxHeight;
+@property (nonatomic, readwrite, assign) YGValue width;
+@property (nonatomic, readwrite, assign) YGValue height;
+@property (nonatomic, readwrite, assign) YGValue minWidth;
+@property (nonatomic, readwrite, assign) YGValue minHeight;
+@property (nonatomic, readwrite, assign) YGValue maxWidth;
+@property (nonatomic, readwrite, assign) YGValue maxHeight;
 
 // Yoga specific properties, not compatible with flexbox specification
 @property (nonatomic, readwrite, assign) CGFloat aspectRatio;
@@ -95,12 +106,26 @@
 - (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.
+ 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
  sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
  */
 @property (nonatomic, readonly, assign) CGSize intrinsicSize;
 
+/**
+  Returns the size of the view based on provided constraints. Pass NaN for an unconstrained dimension.
+ */
+- (CGSize)calculateLayoutWithSize:(CGSize)size
+    NS_SWIFT_NAME(calculateLayout(with:));
+
 /**
  Returns the number of children that are using Flexbox.
  */

YogaKit/Source/YGLayout.m

@@ -21,26 +21,30 @@
   YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
 }
 
-#define YG_VALUE_PROPERTY(lowercased_name, capitalized_name)    \
-- (CGFloat)lowercased_name                                      \
-{                                                               \
-  YGValue value = YGNodeStyleGet##capitalized_name(self.node);  \
-  if (value.unit == YGUnitPoint) {                              \
-    return value.value;                                         \
-  } else {                                                      \
-    return YGUndefined;                                         \
-  }                                                             \
-}                                                               \
-                                                                \
-- (void)set##capitalized_name:(CGFloat)lowercased_name          \
-{                                                               \
-  YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
+#define YG_VALUE_PROPERTY(lowercased_name, capitalized_name)                       \
+- (YGValue)lowercased_name                                                         \
+{                                                                                  \
+  return YGNodeStyleGet##capitalized_name(self.node);                              \
+}                                                                                  \
+                                                                                   \
+- (void)set##capitalized_name:(YGValue)lowercased_name                             \
+{                                                                                  \
+  switch (lowercased_name.unit) {                                                  \
+    case YGUnitPoint:                                                              \
+      YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value);          \
+      break;                                                                       \
+    case YGUnitPercent:                                                            \
+      YGNodeStyleSet##capitalized_name##Percent(self.node, lowercased_name.value); \
+      break;                                                                       \
+    default:                                                                       \
+      NSAssert(NO, @"Not implemented");                                            \
+  }                                                                                \
 }
 
-#define YG_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge) \
-- (CGFloat)lowercased_name                                                         \
-{                                                                                  \
-  return YGNodeStyleGet##property(self.node, edge);                                \
+#define YG_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) \
@@ -49,42 +53,52 @@
   YGNodeStyleSet##property(self.node, edge, lowercased_name);                      \
 }
 
-#define YG_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
-YG_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge)  \
+#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_GETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
-- (CGFloat)objc_lowercased_name                                                                  \
+#define YG_VALUE_EDGE_PROPERTY_SETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
+- (void)set##objc_capitalized_name:(YGValue)objc_lowercased_name                                 \
 {                                                                                                \
-  YGValue value = YGNodeStyleGet##c_name(self.node, edge);                                       \
-  if (value.unit == YGUnitPoint) {                                                               \
-    return value.value;                                                                          \
-  } else {                                                                                       \
-    return YGUndefined;                                                                          \
+  switch (objc_lowercased_name.unit) {                                                           \
+    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_SETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
-- (void)set##objc_capitalized_name:(CGFloat)objc_lowercased_name                                 \
-{                                                                                                \
-  YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name);                                 \
-}
-
-#define YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
-YG_VALUE_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge)  \
+#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)                                \
+#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;
@@ -99,14 +113,16 @@ YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, capitalized_name, YGEd
 
 + (void)initialize
 {
-  YGSetExperimentalFeatureEnabled(YGExperimentalFeatureWebFlexBasis, true);
+  globalConfig = YGConfigNew();
+  YGConfigSetExperimentalFeatureEnabled(globalConfig, YGExperimentalFeatureWebFlexBasis, true);
+  YGConfigSetPointScaleFactor(globalConfig, [UIScreen mainScreen].scale);
 }
 
 - (instancetype)initWithView:(UIView*)view
 {
   if (self = [super init]) {
     _view = view;
-    _node = YGNodeNew();
+    _node = YGNodeNewWithConfig(globalConfig);
     YGNodeSetContext(_node, (__bridge void *) view);
     _isEnabled = NO;
     _isIncludedInLayout = YES;
@@ -232,6 +248,20 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
   YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
 }
 
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin dimensionFlexibility:(YGDimensionFlexibility)dimensionFlexibility
+{
+  CGSize size = self.view.bounds.size;
+  if (dimensionFlexibility & YGDimensionFlexibilityFlexibleWidth) {
+    size.width = YGUndefined;
+  }
+  if (dimensionFlexibility & YGDimensionFlexibilityFlexibleHeigth) {
+    size.height = YGUndefined;
+  }
+  [self calculateLayoutWithSize:size];
+  YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
+}
+
+
 - (CGSize)intrinsicSize
 {
   const CGSize constrainedSize = {
@@ -241,8 +271,6 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
   return [self calculateLayoutWithSize:constrainedSize];
 }
 
-#pragma mark - Private
-
 - (CGSize)calculateLayoutWithSize:(CGSize)size
 {
   NSAssert([NSThread isMainThread], @"Yoga calculation must be done on main.");
@@ -263,6 +291,8 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
   };
 }
 
+#pragma mark - Private
+
 static YGSize YGMeasureView(
   YGNodeRef node,
   float width,

YogaKit/Source/YGLayoutExtensions.swift

@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+postfix operator %
+
+extension Int {
+    public static postfix func %(value: Int) -> YGValue {
+        return YGValue(value: Float(value), unit: .percent)
+    }
+}
+
+extension Float {
+    public static postfix func %(value: Float) -> YGValue {
+        return YGValue(value: value, unit: .percent)
+    }
+}
+
+extension CGFloat {
+    public static postfix func %(value: CGFloat) -> YGValue {
+        return YGValue(value: Float(value), unit: .percent)
+    }
+}
+
+extension YGValue : ExpressibleByIntegerLiteral, ExpressibleByFloatLiteral {
+    public init(integerLiteral value: Int) {
+        self = YGValue(value: Float(value), unit: .point)
+    }
+	
+    public init(floatLiteral value: Float) {
+        self = YGValue(value: value, unit: .point)
+    }
+  
+    public init(_ value: Float) {
+        self = YGValue(value: value, unit: .point)
+    }
+  
+    public init(_ value: CGFloat) {
+        self = YGValue(value: Float(value), unit: .point)
+    }
+}

YogaKit/Tests/YogaKitTests.m

@@ -21,7 +21,8 @@
 - (void)testConfigureLayoutIsNoOpWithNilBlock
 {
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  XCTAssertNoThrow([view configureLayoutWithBlock:nil]);
+  id block = nil;
+  XCTAssertNoThrow([view configureLayoutWithBlock:block]);
 }
 
 - (void)testConfigureLayoutBlockWorksWithValidBlock
@@ -30,11 +31,11 @@
   [view configureLayoutWithBlock:^(YGLayout *layout){
     XCTAssertNotNil(layout);
     layout.isEnabled = YES;
-    layout.width = 25;
+    layout.width = YGPointValue(25);
   }];
 
   XCTAssertTrue(view.yoga.isEnabled);
-  XCTAssertEqual(view.yoga.width, 25);
+  XCTAssertEqual(view.yoga.width.value, 25);
 }
 
 - (void)testNodesAreDeallocedWithSingleView
@@ -43,7 +44,7 @@
 
   @autoreleasepool {
     UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-    view.yoga.flexBasis = 1;
+    view.yoga.flexBasis = YGPointValue(1);
 
     layoutRef = view.yoga;
     XCTAssertNotNil(layoutRef);
@@ -62,11 +63,11 @@
   @autoreleasepool {
     UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
     topLayout = view.yoga;
-    topLayout.flexBasis = 1;
+    topLayout.flexBasis = YGPointValue(1);
 
     UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
     subviewLayout = subview.yoga;
-    subviewLayout.flexBasis = 1;
+    subviewLayout.flexBasis = YGPointValue(1);
 
     view = nil;
   }
@@ -112,9 +113,9 @@
 
   UIView *textBadgeView = [[UIView alloc] initWithFrame:CGRectZero];
   textBadgeView.yoga.isEnabled = YES;
-  textBadgeView.yoga.margin = 0;
-  textBadgeView.yoga.width = 10;
-  textBadgeView.yoga.height = 10;
+  textBadgeView.yoga.margin = YGPointValue(0);
+  textBadgeView.yoga.width = YGPointValue(10);
+  textBadgeView.yoga.height = YGPointValue(10);
   [container addSubview:textBadgeView];
 
   const CGSize textBadgeViewSize = textBadgeView.yoga.intrinsicSize;
@@ -135,14 +136,14 @@
 
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   view.yoga.isEnabled = YES;
-  view.yoga.flexBasis = 0;
+  view.yoga.flexBasis = YGPointValue(0);
   view.yoga.flexGrow = 1;
   [container addSubview:view];
 
   UIView *view2 = [[UIView alloc] initWithFrame:CGRectZero];
   view2.yoga.isEnabled = YES;
-  view2.yoga.marginTop = 25;
-  view2.yoga.flexBasis = 0;
+  view2.yoga.marginTop = YGPointValue(25);
+  view2.yoga.flexBasis = YGPointValue(0);
   view2.yoga.flexGrow = 1;
   [container addSubview:view2];
 
@@ -153,6 +154,54 @@
   XCTAssertEqual(25, view2.frame.origin.y);
 }
 
+- (void)testContainerWithFlexibleWidthGetsCorrectlySized
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
+  container.yoga.isEnabled = YES;
+
+  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  view.yoga.isEnabled = YES;
+  view.yoga.width = YGPointValue(100);
+  view.yoga.height = YGPointValue(100);
+  [container addSubview:view];
+
+  [container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth];
+  XCTAssertEqual(100, container.frame.size.width);
+  XCTAssertEqual(200, container.frame.size.height);
+}
+
+- (void)testContainerWithFlexibleHeightGetsCorrectlySized
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
+  container.yoga.isEnabled = YES;
+
+  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  view.yoga.isEnabled = YES;
+  view.yoga.width = YGPointValue(100);
+  view.yoga.height = YGPointValue(100);
+  [container addSubview:view];
+
+  [container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleHeigth];
+  XCTAssertEqual(200, container.frame.size.width);
+  XCTAssertEqual(100, container.frame.size.height);
+}
+
+- (void)testContainerWithFlexibleWidthAndHeightGetsCorrectlySized
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
+  container.yoga.isEnabled = YES;
+
+  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  view.yoga.isEnabled = YES;
+  view.yoga.width = YGPointValue(100);
+  view.yoga.height = YGPointValue(100);
+  [container addSubview:view];
+
+  [container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth | YGDimensionFlexibilityFlexibleHeigth];
+  XCTAssertEqual(100, container.frame.size.width);
+  XCTAssertEqual(100, container.frame.size.height);
+}
+
 - (void)testMarkingDirtyOnlyWorksOnLeafNodes
 {
   UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
@@ -388,12 +437,12 @@
   XCTAssertTrue(view.yoga.isLeaf);
 
   view.yoga.isEnabled = YES;
-  view.yoga.width = 50.0;
+  view.yoga.width = YGPointValue(50);
   XCTAssertTrue(view.yoga.isLeaf);
 
   UIView *const subview = view.subviews[0];
   subview.yoga.isEnabled = YES;
-  subview.yoga.width = 50.0;
+  subview.yoga.width = YGPointValue(50);
   XCTAssertFalse(view.yoga.isLeaf);
 }
 
@@ -405,14 +454,14 @@
 
     UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
     subview1.yoga.isEnabled = YES;
-    subview1.yoga.width = 100;
+    subview1.yoga.width = YGPointValue(100);
     subview1.yoga.flexGrow = 1;
     subview1.yoga.flexDirection = YGFlexDirectionColumn;
     [container addSubview:subview1];
 
     UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
     subview2.yoga.isEnabled = YES;
-    subview2.yoga.width = 150;
+    subview2.yoga.width = YGPointValue(150);
     subview2.yoga.flexGrow = 1;
     subview2.yoga.flexDirection = YGFlexDirectionColumn;
     [container addSubview:subview2];
@@ -473,155 +522,195 @@
     [container.yoga applyLayoutPreservingOrigin:YES];
 }
 
+- (void)testPointPercent
+{
+  XCTAssertEqual(YGPointValue(1).value, 1);
+  XCTAssertEqual(YGPointValue(1).unit, YGUnitPoint);
+  XCTAssertEqual(YGPercentValue(2).value, 2);
+  XCTAssertEqual(YGPercentValue(2).unit, YGUnitPercent);
+}
+
 - (void)testPositionalPropertiesWork
 {
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
-  view.yoga.left = 1;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeLeft).value, 1);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeLeft).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.left, 1);
+  view.yoga.left = YGPointValue(1);
+  XCTAssertEqual(view.yoga.left.value, 1);
+  XCTAssertEqual(view.yoga.left.unit, YGUnitPoint);
+  view.yoga.left = YGPercentValue(2);
+  XCTAssertEqual(view.yoga.left.value, 2);
+  XCTAssertEqual(view.yoga.left.unit, YGUnitPercent);
 
-  view.yoga.right = 2;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeRight).value, 2);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeRight).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.right, 2);
+  view.yoga.right = YGPointValue(3);
+  XCTAssertEqual(view.yoga.right.value, 3);
+  XCTAssertEqual(view.yoga.right.unit, YGUnitPoint);
+  view.yoga.right = YGPercentValue(4);
+  XCTAssertEqual(view.yoga.right.value, 4);
+  XCTAssertEqual(view.yoga.right.unit, YGUnitPercent);
 
-  view.yoga.top = 3;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeTop).value, 3);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeTop).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.top, 3);
+  view.yoga.top = YGPointValue(5);
+  XCTAssertEqual(view.yoga.top.value, 5);
+  XCTAssertEqual(view.yoga.top.unit, YGUnitPoint);
+  view.yoga.top = YGPercentValue(6);
+  XCTAssertEqual(view.yoga.top.value, 6);
+  XCTAssertEqual(view.yoga.top.unit, YGUnitPercent);
 
-  view.yoga.bottom = 4;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeBottom).value, 4);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeBottom).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.bottom, 4);
+  view.yoga.bottom = YGPointValue(7);
+  XCTAssertEqual(view.yoga.bottom.value, 7);
+  XCTAssertEqual(view.yoga.bottom.unit, YGUnitPoint);
+  view.yoga.bottom = YGPercentValue(8);
+  XCTAssertEqual(view.yoga.bottom.value, 8);
+  XCTAssertEqual(view.yoga.bottom.unit, YGUnitPercent);
 
-  view.yoga.start = 5;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeStart).value, 5);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeStart).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.start, 5);
+  view.yoga.start = YGPointValue(9);
+  XCTAssertEqual(view.yoga.start.value, 9);
+  XCTAssertEqual(view.yoga.start.unit, YGUnitPoint);
+  view.yoga.start = YGPercentValue(10);
+  XCTAssertEqual(view.yoga.start.value, 10);
+  XCTAssertEqual(view.yoga.start.unit, YGUnitPercent);
 
-  view.yoga.end = 6;
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeEnd).value, 6);
-  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeEnd).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.end, 6);
+  view.yoga.end = YGPointValue(11);
+  XCTAssertEqual(view.yoga.end.value, 11);
+  XCTAssertEqual(view.yoga.end.unit, YGUnitPoint);
+  view.yoga.end = YGPercentValue(12);
+  XCTAssertEqual(view.yoga.end.value, 12);
+  XCTAssertEqual(view.yoga.end.unit, YGUnitPercent);
 }
 
 - (void)testMarginPropertiesWork
 {
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
-  view.yoga.margin = 1;
-  XCTAssertEqual(view.yoga.margin, 1);
-  XCTAssertTrue(isnan(view.yoga.marginLeft));
-  XCTAssertTrue(isnan(view.yoga.marginRight));
-  XCTAssertTrue(isnan(view.yoga.marginStart));
-  XCTAssertTrue(isnan(view.yoga.marginEnd));
-  XCTAssertTrue(isnan(view.yoga.marginTop));
-  XCTAssertTrue(isnan(view.yoga.marginBottom));
-  XCTAssertTrue(isnan(view.yoga.marginHorizontal));
-  XCTAssertTrue(isnan(view.yoga.marginVertical));
+  view.yoga.margin = YGPointValue(1);
+  XCTAssertEqual(view.yoga.margin.value, 1);
+  XCTAssertEqual(view.yoga.margin.unit, YGUnitPoint);
+  view.yoga.margin = YGPercentValue(2);
+  XCTAssertEqual(view.yoga.margin.value, 2);
+  XCTAssertEqual(view.yoga.margin.unit, YGUnitPercent);
 
-  view.yoga.marginHorizontal = 2;
-  XCTAssertEqual(view.yoga.marginHorizontal, 2);
-  XCTAssertTrue(isnan(view.yoga.marginLeft));
-  XCTAssertTrue(isnan(view.yoga.marginRight));
-  XCTAssertTrue(isnan(view.yoga.marginStart));
-  XCTAssertTrue(isnan(view.yoga.marginEnd));
+  view.yoga.marginHorizontal = YGPointValue(3);
+  XCTAssertEqual(view.yoga.marginHorizontal.value, 3);
+  XCTAssertEqual(view.yoga.marginHorizontal.unit, YGUnitPoint);
+  view.yoga.marginHorizontal = YGPercentValue(4);
+  XCTAssertEqual(view.yoga.marginHorizontal.value, 4);
+  XCTAssertEqual(view.yoga.marginHorizontal.unit, YGUnitPercent);
 
-  view.yoga.marginVertical = 3;
-  XCTAssertEqual(view.yoga.marginVertical, 3);
-  XCTAssertTrue(isnan(view.yoga.marginTop));
-  XCTAssertTrue(isnan(view.yoga.marginBottom));
+  view.yoga.marginVertical = YGPointValue(5);
+  XCTAssertEqual(view.yoga.marginVertical.value, 5);
+  XCTAssertEqual(view.yoga.marginVertical.unit, YGUnitPoint);
+  view.yoga.marginVertical = YGPercentValue(6);
+  XCTAssertEqual(view.yoga.marginVertical.value, 6);
+  XCTAssertEqual(view.yoga.marginVertical.unit, YGUnitPercent);
 
-  view.yoga.marginLeft = 4;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeLeft).value, 4);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeLeft).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginLeft, 4);
+  view.yoga.marginLeft = YGPointValue(7);
+  XCTAssertEqual(view.yoga.marginLeft.value, 7);
+  XCTAssertEqual(view.yoga.marginLeft.unit, YGUnitPoint);
+  view.yoga.marginLeft = YGPercentValue(8);
+  XCTAssertEqual(view.yoga.marginLeft.value, 8);
+  XCTAssertEqual(view.yoga.marginLeft.unit, YGUnitPercent);
 
-  view.yoga.marginRight = 5;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeRight).value, 5);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeRight).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginRight, 5);
+  view.yoga.marginRight = YGPointValue(9);
+  XCTAssertEqual(view.yoga.marginRight.value, 9);
+  XCTAssertEqual(view.yoga.marginRight.unit, YGUnitPoint);
+  view.yoga.marginRight = YGPercentValue(10);
+  XCTAssertEqual(view.yoga.marginRight.value, 10);
+  XCTAssertEqual(view.yoga.marginRight.unit, YGUnitPercent);
 
-  view.yoga.marginTop = 6;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeTop).value, 6);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeTop).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginTop, 6);
+  view.yoga.marginTop = YGPointValue(11);
+  XCTAssertEqual(view.yoga.marginTop.value, 11);
+  XCTAssertEqual(view.yoga.marginTop.unit, YGUnitPoint);
+  view.yoga.marginTop = YGPercentValue(12);
+  XCTAssertEqual(view.yoga.marginTop.value, 12);
+  XCTAssertEqual(view.yoga.marginTop.unit, YGUnitPercent);
 
-  view.yoga.marginBottom = 7;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeBottom).value, 7);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeBottom).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginBottom, 7);
+  view.yoga.marginBottom = YGPointValue(13);
+  XCTAssertEqual(view.yoga.marginBottom.value, 13);
+  XCTAssertEqual(view.yoga.marginBottom.unit, YGUnitPoint);
+  view.yoga.marginBottom = YGPercentValue(14);
+  XCTAssertEqual(view.yoga.marginBottom.value, 14);
+  XCTAssertEqual(view.yoga.marginBottom.unit, YGUnitPercent);
 
-  view.yoga.marginStart = 8;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeStart).value, 8);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeStart).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginStart, 8);
+  view.yoga.marginStart = YGPointValue(15);
+  XCTAssertEqual(view.yoga.marginStart.value, 15);
+  XCTAssertEqual(view.yoga.marginStart.unit, YGUnitPoint);
+  view.yoga.marginStart = YGPercentValue(16);
+  XCTAssertEqual(view.yoga.marginStart.value, 16);
+  XCTAssertEqual(view.yoga.marginStart.unit, YGUnitPercent);
 
-  view.yoga.marginEnd = 9;
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeEnd).value, 9);
-  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeEnd).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.marginEnd, 9);
+  view.yoga.marginEnd = YGPointValue(17);
+  XCTAssertEqual(view.yoga.marginEnd.value, 17);
+  XCTAssertEqual(view.yoga.marginEnd.unit, YGUnitPoint);
+  view.yoga.marginEnd = YGPercentValue(18);
+  XCTAssertEqual(view.yoga.marginEnd.value, 18);
+  XCTAssertEqual(view.yoga.marginEnd.unit, YGUnitPercent);
 }
 
 - (void)testPaddingPropertiesWork
 {
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
-  view.yoga.padding = 1;
-  XCTAssertEqual(view.yoga.padding, 1);
-  XCTAssertTrue(isnan(view.yoga.paddingLeft));
-  XCTAssertTrue(isnan(view.yoga.paddingRight));
-  XCTAssertTrue(isnan(view.yoga.paddingStart));
-  XCTAssertTrue(isnan(view.yoga.paddingEnd));
-  XCTAssertTrue(isnan(view.yoga.paddingTop));
-  XCTAssertTrue(isnan(view.yoga.paddingBottom));
-  XCTAssertTrue(isnan(view.yoga.paddingHorizontal));
-  XCTAssertTrue(isnan(view.yoga.paddingVertical));
+  view.yoga.padding = YGPointValue(1);
+  XCTAssertEqual(view.yoga.padding.value, 1);
+  XCTAssertEqual(view.yoga.padding.unit, YGUnitPoint);
+  view.yoga.padding = YGPercentValue(2);
+  XCTAssertEqual(view.yoga.padding.value, 2);
+  XCTAssertEqual(view.yoga.padding.unit, YGUnitPercent);
 
-  view.yoga.paddingHorizontal = 2;
-  XCTAssertEqual(view.yoga.paddingHorizontal, 2);
-  XCTAssertTrue(isnan(view.yoga.paddingLeft));
-  XCTAssertTrue(isnan(view.yoga.paddingRight));
-  XCTAssertTrue(isnan(view.yoga.paddingStart));
-  XCTAssertTrue(isnan(view.yoga.paddingEnd));
+  view.yoga.paddingHorizontal = YGPointValue(3);
+  XCTAssertEqual(view.yoga.paddingHorizontal.value, 3);
+  XCTAssertEqual(view.yoga.paddingHorizontal.unit, YGUnitPoint);
+  view.yoga.paddingHorizontal = YGPercentValue(4);
+  XCTAssertEqual(view.yoga.paddingHorizontal.value, 4);
+  XCTAssertEqual(view.yoga.paddingHorizontal.unit, YGUnitPercent);
 
-  view.yoga.paddingVertical = 3;
-  XCTAssertEqual(view.yoga.paddingVertical, 3);
-  XCTAssertTrue(isnan(view.yoga.paddingTop));
-  XCTAssertTrue(isnan(view.yoga.paddingBottom));
+  view.yoga.paddingVertical = YGPointValue(5);
+  XCTAssertEqual(view.yoga.paddingVertical.value, 5);
+  XCTAssertEqual(view.yoga.paddingVertical.unit, YGUnitPoint);
+  view.yoga.paddingVertical = YGPercentValue(6);
+  XCTAssertEqual(view.yoga.paddingVertical.value, 6);
+  XCTAssertEqual(view.yoga.paddingVertical.unit, YGUnitPercent);
 
-  view.yoga.paddingLeft = 4;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeLeft).value, 4);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeLeft).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingLeft, 4);
+  view.yoga.paddingLeft = YGPointValue(7);
+  XCTAssertEqual(view.yoga.paddingLeft.value, 7);
+  XCTAssertEqual(view.yoga.paddingLeft.unit, YGUnitPoint);
+  view.yoga.paddingLeft = YGPercentValue(8);
+  XCTAssertEqual(view.yoga.paddingLeft.value, 8);
+  XCTAssertEqual(view.yoga.paddingLeft.unit, YGUnitPercent);
 
-  view.yoga.paddingRight = 5;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeRight).value, 5);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeRight).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingRight, 5);
+  view.yoga.paddingRight = YGPointValue(9);
+  XCTAssertEqual(view.yoga.paddingRight.value, 9);
+  XCTAssertEqual(view.yoga.paddingRight.unit, YGUnitPoint);
+  view.yoga.paddingRight = YGPercentValue(10);
+  XCTAssertEqual(view.yoga.paddingRight.value, 10);
+  XCTAssertEqual(view.yoga.paddingRight.unit, YGUnitPercent);
 
-  view.yoga.paddingTop = 6;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeTop).value, 6);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeTop).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingTop, 6);
+  view.yoga.paddingTop = YGPointValue(11);
+  XCTAssertEqual(view.yoga.paddingTop.value, 11);
+  XCTAssertEqual(view.yoga.paddingTop.unit, YGUnitPoint);
+  view.yoga.paddingTop = YGPercentValue(12);
+  XCTAssertEqual(view.yoga.paddingTop.value, 12);
+  XCTAssertEqual(view.yoga.paddingTop.unit, YGUnitPercent);
 
-  view.yoga.paddingBottom = 7;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeBottom).value, 7);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeBottom).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingBottom, 7);
+  view.yoga.paddingBottom = YGPointValue(13);
+  XCTAssertEqual(view.yoga.paddingBottom.value, 13);
+  XCTAssertEqual(view.yoga.paddingBottom.unit, YGUnitPoint);
+  view.yoga.paddingBottom = YGPercentValue(14);
+  XCTAssertEqual(view.yoga.paddingBottom.value, 14);
+  XCTAssertEqual(view.yoga.paddingBottom.unit, YGUnitPercent);
 
-  view.yoga.paddingStart = 8;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeStart).value, 8);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeStart).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingStart, 8);
+  view.yoga.paddingStart = YGPointValue(15);
+  XCTAssertEqual(view.yoga.paddingStart.value, 15);
+  XCTAssertEqual(view.yoga.paddingStart.unit, YGUnitPoint);
+  view.yoga.paddingStart = YGPercentValue(16);
+  XCTAssertEqual(view.yoga.paddingStart.value, 16);
+  XCTAssertEqual(view.yoga.paddingStart.unit, YGUnitPercent);
 
-  view.yoga.paddingEnd = 9;
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeEnd).value, 9);
-  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeEnd).unit, YGUnitPoint);
-  XCTAssertEqual(view.yoga.paddingEnd, 9);
+  view.yoga.paddingEnd = YGPointValue(17);
+  XCTAssertEqual(view.yoga.paddingEnd.value, 17);
+  XCTAssertEqual(view.yoga.paddingEnd.unit, YGUnitPoint);
+  view.yoga.paddingEnd = YGPercentValue(18);
+  XCTAssertEqual(view.yoga.paddingEnd.value, 18);
+  XCTAssertEqual(view.yoga.paddingEnd.unit, YGUnitPercent);
 }
 
 - (void)testBorderWidthPropertiesWork
@@ -630,12 +719,6 @@
 
   view.yoga.borderWidth = 1;
   XCTAssertEqual(view.yoga.borderWidth, 1);
-  XCTAssertTrue(isnan(view.yoga.borderLeftWidth));
-  XCTAssertTrue(isnan(view.yoga.borderRightWidth));
-  XCTAssertTrue(isnan(view.yoga.borderStartWidth));
-  XCTAssertTrue(isnan(view.yoga.borderEndWidth));
-  XCTAssertTrue(isnan(view.yoga.borderTopWidth));
-  XCTAssertTrue(isnan(view.yoga.borderBottomWidth));
 
   view.yoga.borderLeftWidth = 2;
   XCTAssertEqual(view.yoga.borderLeftWidth, 2);

YogaKit/YogaKitSample/Podfile.lock

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

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

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

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

@@ -12,6 +12,11 @@ import YogaKit
 
 struct DemoItem {
     let name: String
+    root.backgroundColor = .red
+    root.yoga.isEnabled = true
+    root.yoga.width = YGValue(self.view.bounds.size.width)
+    root.yoga.height = YGValue(self.view.bounds.size.height)
+    root.yoga.alignItems = .center
 }
 
 final class SwiftViewController: UIViewController, IGListAdapterDataSource {

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -17,16 +17,16 @@
     UIView *root = self.view;
     root.backgroundColor = [UIColor redColor];
     root.yoga.isEnabled = YES;
-    root.yoga.width = self.view.bounds.size.width;
-    root.yoga.height = self.view.bounds.size.height;
+    root.yoga.width = YGPointValue(self.view.bounds.size.width);
+    root.yoga.height = YGPointValue(self.view.bounds.size.height);
     root.yoga.alignItems = YGAlignCenter;
     root.yoga.justifyContent = YGJustifyCenter;
 
     UIView *child1 = [UIView new];
     child1.backgroundColor = [UIColor blueColor];
     child1.yoga.isEnabled = YES;
-    child1.yoga.width = 100;
-    child1.yoga.height = 100;
+    child1.yoga.width = YGPointValue(100);
+    child1.yoga.height = YGPointValue(100);
 
     UIView *child2 = [UIView new];
     child2.backgroundColor = [UIColor greenColor];

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift

@@ -15,32 +15,38 @@ final class BasicViewController: UIViewController {
 
         let root = self.view!
         root.backgroundColor = .white
-        root.yoga.isEnabled = true
-        root.yoga.width = containerSize.width
-        root.yoga.height = containerSize.height
-        root.yoga.alignItems = .center
-        root.yoga.justifyContent = .center
+        root.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.width = YGValue(containerSize.width)
+            layout.height = YGValue(containerSize.height)
+            layout.alignItems = .center
+            layout.justifyContent = .center
+        }
 
         let child1 = UIView()
         child1.backgroundColor = .blue
-        child1.yoga.isEnabled = true
-        child1.yoga.width = 100
-        child1.yoga.height = 10
-        child1.yoga.marginBottom = 25
+        child1.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.width = 100
+            layout.height = 10
+            layout.marginBottom = 25
+        }
         root.addSubview(child1)
 
-        let child2 = UIView()
-        child2.yoga.isEnabled = true
-        child2.yoga.alignSelf = .flexEnd
+        let child2 = UIView(frame: CGRect(x: 0, y: 0, width: 200, height: 200))
         child2.backgroundColor = .green
-        child2.frame = CGRect(x: 0, y: 0, width: 200, height: 100)
+        child2.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.alignSelf = .flexEnd
+        }
         root.addSubview(child2)
 
-        let child3 = UIView()
-        child3.yoga.isEnabled = true
-        child3.yoga.alignSelf = .flexStart
+        let child3 = UIView(frame: CGRect(x: 0, y: 0, width: 100, height: 100))
         child3.backgroundColor = .yellow
-        child3.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
+        child3.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.alignSelf = .flexStart
+        }
         root.addSubview(child3)
 
         root.yoga.applyLayout(preservingOrigin: true)

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift

@@ -17,40 +17,50 @@ final class LayoutInclusionViewController: UIViewController {
     override func viewDidLoad() {
         let root = self.view!
         root.backgroundColor = .white
-        root.yoga.isEnabled = true
-        root.yoga.flexDirection = .column
-        root.yoga.justifyContent = .spaceAround
+        root.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexDirection = .column
+            layout.justifyContent = .spaceAround
+        }
 
         contentView.backgroundColor = .clear
         contentView.layer.borderColor = UIColor.lightGray.cgColor
         contentView.layer.borderWidth = 1.0
-        contentView.yoga.isEnabled = true
-        contentView.yoga.height = 300
-        contentView.yoga.width = self.view.bounds.size.width
-        contentView.yoga.flexDirection = .row
-        contentView.yoga.justifyContent = .center
-        contentView.yoga.paddingHorizontal = 25
+        contentView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.height = 300
+            layout.width = YGValue(self.view.bounds.size.width)
+            layout.flexDirection = .row
+            layout.justifyContent = .center
+            layout.paddingHorizontal = 25
+        }
         self.view.addSubview(contentView)
 
         let redView = UIView(frame: .zero)
         redView.backgroundColor = .red
-        redView.yoga.isEnabled = true
-        redView.yoga.flexGrow = 1
-        redView.yoga.flexShrink = 1
+        redView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexGrow = 1
+            layout.flexShrink = 1
+        }
         contentView.addSubview(redView)
 
         disappearingView.backgroundColor = .blue
-        disappearingView.yoga.isEnabled = true
-        disappearingView.yoga.flexGrow = 1
+        disappearingView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexGrow = 1
+        }
         contentView.addSubview(disappearingView)
 
         button.setTitle("Add Blue View", for: UIControlState.selected)
         button.setTitle("Remove Blue View", for: UIControlState.normal)
         button.addTarget(self, action: #selector(buttonWasTapped), for: UIControlEvents.touchUpInside)
-        button.yoga.isEnabled = true
-        button.yoga.height = 300
-        button.yoga.width = 300
-        button.yoga.alignSelf = .center
+        button.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.height = 300
+            layout.width = 300
+            layout.alignSelf = .center
+        }
         root.addSubview(button)
 
         root.yoga.applyLayout(preservingOrigin: false)

YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift

@@ -15,9 +15,11 @@ final class SingleLabelCollectionCell: UICollectionViewCell {
     override init(frame: CGRect) {
         super.init(frame: frame)
 
-        contentView.yoga.isEnabled = true
-        contentView.yoga.flexDirection = .column
-        contentView.yoga.justifyContent = .flexEnd
+        contentView.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.flexDirection = .column
+            layout.justifyContent = .flexEnd
+        }
 
         label.textAlignment = .center
         label.numberOfLines = 1
@@ -26,9 +28,11 @@ final class SingleLabelCollectionCell: UICollectionViewCell {
 
         let border = UIView(frame: .zero)
         border.backgroundColor = .lightGray
-        border.yoga.isEnabled = true
-        border.yoga.height = 0.5
-        border.yoga.marginHorizontal = 25
+        border.configureLayout { (layout) in
+            layout.isEnabled = true
+            layout.height = 0.5
+            layout.marginHorizontal = 25
+        }
         contentView.addSubview(border)
     }
 

android/BUCK

@@ -5,32 +5,28 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs('//YOGA_DEFS')
+include_defs("//YOGA_DEFS")
 
 android_aar(
-  name = 'android',
-  manifest_skeleton = 'src/main/AndroidManifest.xml',
-  deps = [
-    ANDROID_JAVA_TARGET,
-    ANDROID_RES_TARGET,
-    INFER_ANNOTATIONS_TARGET,
-    JAVA_TARGET,
-    PROGRUARD_ANNOTATIONS_TARGET,
-  ],
-  visibility = [
-    'PUBLIC',
-  ],
+    name = "android",
+    manifest_skeleton = "src/main/AndroidManifest.xml",
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        ANDROID_JAVA_TARGET,
+        ANDROID_RES_TARGET,
+        INFER_ANNOTATIONS_TARGET,
+        JAVA_TARGET,
+        PROGRUARD_ANNOTATIONS_TARGET,
+    ],
 )
 
 android_resource(
-  name = 'res',
-  res = 'src/main/res',
-  package = 'com.facebook.yoga.android',
-  visibility = [
-    'PUBLIC',
-  ],
-)
-
-project_config(
-  src_target = ':android',
+    name = "res",
+    package = "com.facebook.yoga.android",
+    res = "src/main/res",
+    visibility = [
+        "PUBLIC",
+    ],
 )

android/README.md

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

android/build.gradle

@@ -1,33 +1,23 @@
-apply plugin: "com.jfrog.bintray"
+apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'maven-publish'
 
-targetCompatibility = '1.7'
-sourceCompatibility = '1.7'
-
-version = '1.0.0'
-group = 'com.facebook.yoga.android'
+version = VERSION_NAME
+group = GROUP
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion "19.1.0"
+    compileSdkVersion rootProject.compileSdkVersion
+    buildToolsVersion rootProject.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 19
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
-
-    sourceSets.main {
-        jni.srcDirs = [] // disalbe NDK auto build (not sure why this is necessary)
-        // The alternative, fat-aar does an equivalent thing to this hack
-        // seehttps://github.com/adwiv/android-fat-aar/blob/master/fat-aar.gradle#L307
-        jniLibs.srcDirs = ['build/intermediates/exploded-aar/com.facebook.yoga/yoga/1.0.0/jni']
+        targetCompatibility rootProject.targetCompatibilityVersion
+        sourceCompatibility rootProject.sourceCompatibilityVersion
     }
 }
 
@@ -52,8 +42,4 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     from javadoc.destinationDir
 }
 
-ext {
-    bintrayName = "com.facebook.yoga.android:yoga-layout"
-}
-
-apply from: rootProject.file('gradle/android-jcenter-install.gradle')
+apply from: rootProject.file('gradle/release.gradle')

android/gradle.properties

@@ -0,0 +1,5 @@
+GROUP=com.facebook.yoga.android
+POM_NAME=YogaLayout
+POM_DESCRIPTION=YogaLayout
+POM_ARTIFACT_ID=yoga-layout
+POM_PACKAGING=aar

android/sample/AndroidManifest.xml

@@ -22,11 +22,14 @@
     android:targetSdkVersion="19"
     />
 
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
   <application
       android:label="@string/app_name"
       android:icon="@drawable/ic_launcher"
       android:allowBackup="false"
       android:theme="@style/NoTitleBarWhiteBG"
+      android:supportsRtl="true"
       >
 
     <activity
@@ -41,6 +44,11 @@
 
     </activity>
 
+    <activity
+        android:name=".BenchmarkActivity"
+        android:exported="false"
+        />
+
   </application>
 
 </manifest>

android/sample/BUCK

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

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

@@ -5,19 +5,19 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs('//YOGA_DEFS')
+include_defs("//YOGA_DEFS")
 
 android_library(
-  name = 'yoga',
-  srcs = glob(['**/*.java']),
-  deps = [
-    ANDROID_JAVA_TARGET,
-    ANDROID_SAMPLE_RES_TARGET,
-    ANDROID_SUPPORT_TARGET,
-    APPCOMPAT_TARGET,
-    SOLOADER_TARGET,
-  ],
-  visibility = [
-    'PUBLIC',
-  ]
+    name = "yoga",
+    srcs = glob(["**/*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        ANDROID_JAVA_TARGET,
+        ANDROID_SAMPLE_RES_TARGET,
+        ANDROID_SUPPORT_TARGET,
+        APPCOMPAT_TARGET,
+        SOLOADER_TARGET,
+    ],
 )

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -8,9 +8,13 @@
 
 package com.facebook.samples.yoga;
 
+import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.Menu;
 
 import com.facebook.samples.yoga.R;
 import com.facebook.soloader.SoLoader;
@@ -21,7 +25,7 @@ import com.facebook.yoga.android.YogaViewLayoutFactory;
  * {@code main_layout.xml}) that shows off the awesome functionality of the Yoga layout engine
  * as well as some optimisations on layout systems that it facilitates.
  */
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
 
   @Override
   public void onCreate(Bundle savedInstanceState) {
@@ -31,4 +35,20 @@ public class MainActivity extends ActionBarActivity {
 
     setContentView(R.layout.main_layout);
   }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    MenuInflater inflater = getMenuInflater();
+    inflater.inflate(R.menu.action_bar_home, menu);
+    return true;
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    // There is only one option
+    Intent intent = new Intent(this, BenchmarkActivity.class);
+    startActivity(intent);
+    this.finish();
+    return true;
+  }
 }

android/sample/res/layout/benchmark_fragment.xml

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

android/sample/res/layout/benchmark_layout_1.xml

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

android/sample/res/layout/benchmark_layout_1_linear.xml

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

android/sample/res/layout/benchmark_layout_2.xml

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

android/sample/res/layout/benchmark_layout_2_linear.xml

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

android/sample/res/layout/benchmark_layout_3.xml

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

android/sample/res/layout/benchmark_layout_3_linear.xml

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

android/sample/res/layout/benchmark_select_layout.xml

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

android/sample/res/layout/main_layout.xml

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

android/sample/res/menu/action_bar_benchmark.xml

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

android/sample/res/menu/action_bar_home.xml

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

android/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
 
   <uses-sdk
     android:minSdkVersion="15"
-    android:targetSdkVersion="19"
+    android:targetSdkVersion="21"
     />
 
   <application/>

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

@@ -5,19 +5,19 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs('//YOGA_DEFS')
+include_defs("//YOGA_DEFS")
 
 android_library(
-  name = 'android',
-  srcs = glob(['**/*.java']),
-  deps = [
-    ANDROID_RES_TARGET,
-    INFER_ANNOTATIONS_TARGET,
-    JAVA_TARGET,
-    JSR_305_TARGET,
-    SOLOADER_TARGET,
-  ],
-  visibility = [
-    'PUBLIC',
-  ]
+    name = "android",
+    srcs = glob(["**/*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        ANDROID_RES_TARGET,
+        INFER_ANNOTATIONS_TARGET,
+        JAVA_TARGET,
+        JSR_305_TARGET,
+        SOLOADER_TARGET,
+    ],
 )

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

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

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

@@ -12,7 +12,7 @@
 <resources>
   <declare-styleable name="yoga">
 
-    <attr name="align_content" format="enum">
+    <attr name="yg_alignContent" format="enum">
       <enum name="auto" value="0"/>
       <enum name="flex_start" value="1"/>
       <enum name="center" value="2"/>
@@ -21,7 +21,7 @@
       <enum name="baseline" value="5"/>
     </attr>
 
-    <attr name="align_items" format="enum">
+    <attr name="yg_alignItems" format="enum">
       <enum name="auto" value="0"/>
       <enum name="flex_start" value="1"/>
       <enum name="center" value="2"/>
@@ -30,7 +30,7 @@
       <enum name="baseline" value="5"/>
     </attr>
 
-    <attr name="align_self" format="enum">
+    <attr name="yg_alignSelf" format="enum">
       <enum name="auto" value="0"/>
       <enum name="flex_start" value="1"/>
       <enum name="center" value="2"/>
@@ -39,46 +39,47 @@
       <enum name="baseline" value="5"/>
     </attr>
 
-    <attr name="aspect_ratio" format="float"/>
+    <attr name="yg_aspectRatio" format="float"/>
 
-    <attr name="border_left" format="dimension"/>
-    <attr name="border_top" format="dimension"/>
-    <attr name="border_right" format="dimension"/>
-    <attr name="border_bottom" format="dimension"/>
-    <attr name="border_start" format="dimension"/>
-    <attr name="border_end" format="dimension"/>
-    <attr name="border_horizontal" format="dimension"/>
-    <attr name="border_vertical" format="dimension"/>
-    <attr name="border_all" format="dimension"/>
+    <attr name="yg_borderLeft" format="dimension"/>
+    <attr name="yg_borderTop" format="dimension"/>
+    <attr name="yg_borderRight" format="dimension"/>
+    <attr name="yg_borderBottom" format="dimension"/>
+    <attr name="yg_borderStart" format="dimension"/>
+    <attr name="yg_borderEnd" format="dimension"/>
+    <attr name="yg_borderHorizontal" format="dimension"/>
+    <attr name="yg_borderVertical" format="dimension"/>
+    <attr name="yg_borderAll" format="dimension"/>
 
-    <attr name="direction" format="enum">
+    <attr name="yg_direction" format="enum">
       <enum name="inherit" value="0"/>
       <enum name="ltr" value="1"/>
       <enum name="rtl" value="2"/>
     </attr>
 
-    <attr name="flex" format="float"/>
+    <attr name="yg_display" format="enum">
+      <enum name="flex" value="0"/>
+      <enum name="none" value="1"/>
+    </attr>
 
-    <attr name="flex_basis" format="float"/>
+    <attr name="yg_flex" format="float"/>
 
-    <attr name="flex_basis_percent" format="float"/>
+    <attr name="yg_flexBasis" format="float|string"/>
 
-    <attr name="flex_direction" format="enum">
+    <attr name="yg_flexDirection" format="enum">
       <enum name="column" value="0"/>
       <enum name="column_reverse" value="1"/>
       <enum name="row" value="2"/>
       <enum name="row_reverse" value="3"/>
     </attr>
 
-    <attr name="flex_grow" format="float"/>
+    <attr name="yg_flexGrow" format="float"/>
 
-    <attr name="flex_shrink" format="float"/>
+    <attr name="yg_flexShrink" format="float"/>
 
-    <attr name="height" format="dimension"/>
+    <attr name="yg_height" format="dimension|string"/>
 
-    <attr name="height_percent" format="float"/>
-
-    <attr name="justify_content" format="enum">
+    <attr name="yg_justifyContent" format="enum">
       <enum name="flex_start" value="0"/>
       <enum name="center" value="1"/>
       <enum name="flex_end" value="2"/>
@@ -86,98 +87,58 @@
       <enum name="space_around" value="4"/>
     </attr>
 
-    <attr name="margin_left" format="dimension"/>
-    <attr name="margin_top" format="dimension"/>
-    <attr name="margin_right" format="dimension"/>
-    <attr name="margin_bottom" format="dimension"/>
-    <attr name="margin_start" format="dimension"/>
-    <attr name="margin_end" format="dimension"/>
-    <attr name="margin_horizontal" format="dimension"/>
-    <attr name="margin_vertical" format="dimension"/>
-    <attr name="margin_all" format="dimension"/>
+    <attr name="yg_marginLeft" format="dimension|string"/>
+    <attr name="yg_marginTop" format="dimension|string"/>
+    <attr name="yg_marginRight" format="dimension|string"/>
+    <attr name="yg_marginBottom" format="dimension|string"/>
+    <attr name="yg_marginStart" format="dimension|string"/>
+    <attr name="yg_marginEnd" format="dimension|string"/>
+    <attr name="yg_marginHorizontal" format="dimension|string"/>
+    <attr name="yg_marginVertical" format="dimension|string"/>
+    <attr name="yg_marginAll" format="dimension|string"/>
 
-    <attr name="margin_percent_left" format="dimension"/>
-    <attr name="margin_percent_top" format="dimension"/>
-    <attr name="margin_percent_right" format="dimension"/>
-    <attr name="margin_percent_bottom" format="dimension"/>
-    <attr name="margin_percent_start" format="dimension"/>
-    <attr name="margin_percent_end" format="dimension"/>
-    <attr name="margin_percent_horizontal" format="dimension"/>
-    <attr name="margin_percent_vertical" format="dimension"/>
-    <attr name="margin_percent_all" format="dimension"/>
+    <attr name="yg_maxHeight" format="dimension|string"/>
 
-    <attr name="max_height" format="dimension"/>
+    <attr name="yg_maxWidth" format="dimension|string"/>
 
-    <attr name="max_height_percent" format="float"/>
+    <attr name="yg_minHeight" format="dimension|string"/>
 
-    <attr name="max_width" format="dimension"/>
+    <attr name="yg_minWidth" format="dimension|string"/>
 
-    <attr name="max_width_percent" format="float"/>
-
-    <attr name="min_height" format="dimension"/>
-
-    <attr name="min_height_percent" format="float"/>
-
-    <attr name="min_width" format="dimension"/>
-
-    <attr name="min_width_percent" format="float"/>
-
-    <attr name="overflow" format="enum">
+    <attr name="yg_overflow" format="enum">
       <enum name="visible" value="0"/>
       <enum name="hidden" value="1"/>
       <enum name="scroll" value="2"/>
     </attr>
 
-    <attr name="padding_left" format="dimension"/>
-    <attr name="padding_top" format="dimension"/>
-    <attr name="padding_right" format="dimension"/>
-    <attr name="padding_bottom" format="dimension"/>
-    <attr name="padding_start" format="dimension"/>
-    <attr name="padding_end" format="dimension"/>
-    <attr name="padding_horizontal" format="dimension"/>
-    <attr name="padding_vertical" format="dimension"/>
-    <attr name="padding_all" format="dimension"/>
+    <attr name="yg_paddingLeft" format="dimension|string"/>
+    <attr name="yg_paddingTop" format="dimension|string"/>
+    <attr name="yg_paddingRight" format="dimension|string"/>
+    <attr name="yg_paddingBottom" format="dimension|string"/>
+    <attr name="yg_paddingStart" format="dimension|string"/>
+    <attr name="yg_paddingEnd" format="dimension|string"/>
+    <attr name="yg_paddingHorizontal" format="dimension|string"/>
+    <attr name="yg_paddingVertical" format="dimension|string"/>
+    <attr name="yg_paddingAll" format="dimension|string"/>
 
-    <attr name="padding_percent_left" format="float"/>
-    <attr name="padding_percent_top" format="float"/>
-    <attr name="padding_percent_right" format="float"/>
-    <attr name="padding_percent_bottom" format="float"/>
-    <attr name="padding_percent_start" format="float"/>
-    <attr name="padding_percent_end" format="float"/>
-    <attr name="padding_percent_horizontal" format="float"/>
-    <attr name="padding_percent_vertical" format="float"/>
-    <attr name="padding_percent_all" format="float"/>
+    <attr name="yg_positionLeft" format="dimension|string"/>
+    <attr name="yg_positionTop" format="dimension|string"/>
+    <attr name="yg_positionRight" format="dimension|string"/>
+    <attr name="yg_positionBottom" format="dimension|string"/>
+    <attr name="yg_positionStart" format="dimension|string"/>
+    <attr name="yg_positionEnd" format="dimension|string"/>
+    <attr name="yg_positionHorizontal" format="dimension|string"/>
+    <attr name="yg_positionVertical" format="dimension|string"/>
+    <attr name="yg_positionAll" format="dimension|string"/>
 
-    <attr name="position_left" format="dimension"/>
-    <attr name="position_top" format="dimension"/>
-    <attr name="position_right" format="dimension"/>
-    <attr name="position_bottom" format="dimension"/>
-    <attr name="position_start" format="dimension"/>
-    <attr name="position_end" format="dimension"/>
-    <attr name="position_horizontal" format="dimension"/>
-    <attr name="position_vertical" format="dimension"/>
-    <attr name="position_all" format="dimension"/>
-
-    <attr name="position_percent_left" format="float"/>
-    <attr name="position_percent_top" format="float"/>
-    <attr name="position_percent_right" format="float"/>
-    <attr name="position_percent_bottom" format="float"/>
-    <attr name="position_percent_start" format="float"/>
-    <attr name="position_percent_end" format="float"/>
-    <attr name="position_percent_horizontal" format="float"/>
-    <attr name="position_percent_vertical" format="float"/>
-    <attr name="position_percent_all" format="float"/>
-
-    <attr name="position_type" format="enum">
+    <attr name="yg_positionType" format="enum">
       <enum name="relative" value="0"/>
       <enum name="absolute" value="1"/>
     </attr>
 
-    <attr name="width" format="dimension"/>
+    <attr name="yg_width" format="dimension|string"/>
 
-    <attr name="width_percent" format="float"/>
-
-    <attr name="wrap" format="enum">
+    <attr name="yg_wrap" format="enum">
       <enum name="no_wrap" value="0"/>
       <enum name="wrap" value="1"/>
     </attr>

benchmark/BUCK

@@ -5,23 +5,23 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs('//YOGA_DEFS')
+include_defs("//YOGA_DEFS")
 
 cxx_binary(
-  name = 'benchmark',
-  srcs = glob(['*.c']),
-  headers = subdir_glob([('', '*.h')]),
-  header_namespace = '',
-  compiler_flags = [
-    '-fno-omit-frame-pointer',
-    '-fexceptions',
-    '-Wall',
-    '-Werror',
-    '-O3',
-    '-std=c11',
-  ],
-  deps = [
-    yoga_dep(':yoga'),
-  ],
-  visibility = ['PUBLIC'],
+    name = "benchmark",
+    srcs = glob(["*.c"]),
+    compiler_flags = [
+        "-fno-omit-frame-pointer",
+        "-fexceptions",
+        "-Wall",
+        "-Werror",
+        "-O3",
+        "-std=c11",
+    ],
+    header_namespace = "",
+    headers = subdir_glob([("", "*.h")]),
+    visibility = ["PUBLIC"],
+    deps = [
+        yoga_dep(":yoga"),
+    ],
 )

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
         classpath 'com.nabilhachicha:android-native-dependencies:0.1'
@@ -17,15 +17,46 @@ buildscript {
 
 allprojects {
   repositories {
-    flatDir {
-      dirs "${rootDir}/lib/jsr-305"
-      dirs "${rootDir}/lib/soloader"
-      dirs "${rootDir}/lib/appcompat"
-      dirs "${rootDir}/lib/android-support"
-    }
+    jcenter()
   }
 }
 
+ext {
+    minSdkVersion = 15
+    targetSdkVersion = 25
+    compileSdkVersion = 25
+    buildToolsVersion = '25.0.2'
+    sourceCompatibilityVersion = JavaVersion.VERSION_1_7
+    targetCompatibilityVersion = JavaVersion.VERSION_1_7
+}
+
+// If you have an idea on how to avoid this, please get in touch or
+// answer https://stackoverflow.com/questions/43867014/how-to-use-the-gradle-ndk-build-to-compile-for-the-host-machine.
+task copyNativeLibs(type: Copy, dependsOn: ':buckBuildNative') {
+    from "${rootDir}/buck-out/gen/java/tests#default,shared-library-symlink-tree/"
+    include '*.so'
+    include '*.dylib'
+    into "$buildDir/jniLibs"
+}
+
+task buckBuildNative(type: Exec) {
+    workingDir rootDir
+    environment BUCKVERSION: 'last'
+    commandLine 'buck', 'build', '//java/...'
+}
+
+allprojects {
+    afterEvaluate {
+        tasks.withType(Test) {
+            dependsOn copyNativeLibs
+            def libDir = "${rootDir}/build/jniLibs"
+            systemProperty 'java.library.path', libDir
+            environment 'LD_LIBRARY_PATH', libDir
+            environment 'DYLD_LIBRARY_PATH', libDir
+        }
+    }
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

csharp/.gitignore

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

csharp/.hgignore

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

csharp/Android/Facebook.Yoga.Android/CustomBuildAction.targets

@@ -4,17 +4,17 @@
         <BuildDependsOn>NativeLibraryARMV7;NativeLibraryX86;$(BuildDependsOn)</BuildDependsOn>
     </PropertyGroup>
     <Target Name="NativeLibraryARMV7" Outputs="$(ProjectDir)/lib/armeabi-v7a/libyoga.so">
-        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet#android-armv7,shared" />
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../build-native.sh" />
         <Copy SourceFiles="$(ProjectDir)../../../buck-out/gen/csharp/yoganet#android-armv7,shared/libyoga.so" DestinationFiles="$(ProjectDir)/lib/armeabi-v7a/libyoga.so" SkipUnchangedFiles="true" />
     </Target>
     <!--
     <Target Name="NativeLibraryARM64" Outputs="$(ProjectDir)/lib/arm64-v8a/libyoga.so">
-        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet#android-arm64,shared" />
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../build-native.sh" />
         <Copy SourceFiles="$(ProjectDir)../../../buck-out/gen/csharp/yoganet#android-arm64,shared/libyoga.so" DestinationFiles="$(ProjectDir)/lib/arm64-v8/libyoga.so" SkipUnchangedFiles="true" />
     </Target>
     -->
     <Target Name="NativeLibraryX86" Outputs="$(ProjectDir)/lib/x86/libyoga.so">
-        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet#android-x86,shared" />
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../build-native.sh" />
         <Copy SourceFiles="$(ProjectDir)../../../buck-out/gen/csharp/yoganet#android-x86,shared/libyoga.so" DestinationFiles="$(ProjectDir)/lib/x86/libyoga.so" SkipUnchangedFiles="true" />
     </Target>
 </Project>

csharp/BUCK

@@ -5,33 +5,33 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs('//YOGA_DEFS')
+include_defs("//YOGA_DEFS")
 
-COMPILER_FLAGS = BASE_COMPILER_FLAGS + ['-std=c++11']
+COMPILER_FLAGS = BASE_COMPILER_FLAGS + ["-std=c++11"]
 
 csharp_library(
-  name = 'yogalibnet46',
-  dll_name = 'Facebook.Yoga.dll',
-  framework_ver = 'net46',
-  srcs = glob(['**/*.cs']),
+    name = "yogalibnet46",
+    srcs = glob(["**/*.cs"]),
+    dll_name = "Facebook.Yoga.dll",
+    framework_ver = "net46",
 )
 
 csharp_library(
-  name = 'yogalibnet45',
-  dll_name = 'Facebook.Yoga.dll',
-  framework_ver = 'net45',
-  srcs = glob(['**/*.cs']),
+    name = "yogalibnet45",
+    srcs = glob(["**/*.cs"]),
+    dll_name = "Facebook.Yoga.dll",
+    framework_ver = "net45",
 )
 
 cxx_library(
-  name = 'yoganet',
-  soname = 'libyoga.$(ext)',
-  srcs = glob(['Yoga/YGInterop.cpp']),
-  compiler_flags = COMPILER_FLAGS,
-  link_style = 'static',
-  link_whole = True,
-  deps = [yoga_dep(':yoga')],
-  visibility = ['PUBLIC'],
+    name = "yoganet",
+    srcs = glob(["Yoga/YGInterop.cpp"]),
+    compiler_flags = COMPILER_FLAGS,
+    link_style = "static",
+    link_whole = True,
+    soname = "libyoga.$(ext)",
+    visibility = ["PUBLIC"],
+    deps = [yoga_dep(":yoga")],
 )
 
 if isdir('/Applications/Xcode.app'):

csharp/Facebook.Yoga/Facebook.Yoga.Shared.projitems

@@ -10,11 +10,15 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)BaselineFunction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Logger.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MeasureFunction.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MeasureOutput.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Native.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGConfigHandle.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YGNodeHandle.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaAlign.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaBaselineFunc.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaConfig.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaConstants.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaDimension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaDirection.cs" />

csharp/Facebook.Yoga/Logger.cs

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+namespace Facebook.Yoga
+{
+    public delegate void Logger(
+        YogaConfig config,
+        YogaNode node,
+        YogaLogLevel level,
+        string message);
+}

csharp/Facebook.Yoga/Native.cs

@@ -12,6 +12,12 @@ using System.Runtime.InteropServices;
 
 namespace Facebook.Yoga
 {
+#if WINDOWS_UWP_ARM
+    using YogaValueType = IntPtr;
+#else
+    using YogaValueType = YogaValue;
+#endif
+
     internal static class Native
     {
 #if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
@@ -20,86 +26,61 @@ namespace Facebook.Yoga
         private const string DllName = "yoga";
 #endif
 
-        internal class YGNodeHandle : SafeHandle
-        {
-#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
-            private GCHandle _managed;
-#endif
-
-            private YGNodeHandle() : base(IntPtr.Zero, true)
-            {
-            }
-
-            public override bool IsInvalid
-            {
-                get
-                {
-                    return this.handle == IntPtr.Zero;
-                }
-            }
-
-            protected override bool ReleaseHandle()
-            {
-#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
-                if (_managed.IsAllocated)
-                {
-                    _managed.Free();
-                }
-#endif
-                Native.YGNodeFree(this.handle);
-                GC.KeepAlive(this);
-                return true;
-            }
-
-#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
-            public void SetContext(YogaNode node)
-            {
-                if (!_managed.IsAllocated)
-                {
-                    _managed = GCHandle.Alloc(node, GCHandleType.Weak);
-                    Native.YGNodeSetContext(this.handle, GCHandle.ToIntPtr(_managed));
-                }
-            }
-
-            public static YogaNode GetManaged(IntPtr ygNodePtr)
-            {
-                var node =
-                    GCHandle.FromIntPtr(Native.YGNodeGetContext(ygNodePtr)).Target as YogaNode;
-                if (node == null)
-                {
-                    throw new InvalidOperationException("YogaNode is already deallocated");
-                }
-
-                return node;
-            }
-#endif
-        }
-
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGInteropSetLogger(
-            [MarshalAs(UnmanagedType.FunctionPtr)] YogaLogger.Func func);
+            [MarshalAs(UnmanagedType.FunctionPtr)] YogaLogger logger);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YGNodeHandle YGNodeNew();
 
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YGNodeHandle YGNodeNewWithConfig(YGConfigHandle config);
+
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeFree(IntPtr node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeReset(YGNodeHandle node);
 
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YGConfigHandle YGConfigGetDefault();
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YGConfigHandle YGConfigNew();
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGConfigFree(IntPtr node);
+
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern int YGNodeGetInstanceCount();
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void YGSetExperimentalFeatureEnabled(
+        public static extern int YGConfigGetInstanceCount();
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGConfigSetExperimentalFeatureEnabled(
+            YGConfigHandle config,
             YogaExperimentalFeature feature,
             bool enabled);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool YGIsExperimentalFeatureEnabled(
+        public static extern bool YGConfigIsExperimentalFeatureEnabled(
+            YGConfigHandle config,
             YogaExperimentalFeature feature);
 
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGConfigSetUseWebDefaults(
+            YGConfigHandle config,
+            bool useWebDefaults);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern bool YGConfigGetUseWebDefaults(YGConfigHandle config);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGConfigSetPointScaleFactor(
+            YGConfigHandle config,
+            float pixelsInPoint);
+
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeInsertChild(
             YGNodeHandle node,
@@ -129,7 +110,7 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeCopyStyle(YGNodeHandle dstNode, YGNodeHandle srcNode);
 
-        #region YG_NODE_PROPERTY
+#region YG_NODE_PROPERTY
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeSetMeasureFunc(
@@ -150,9 +131,9 @@ namespace Facebook.Yoga
         [return: MarshalAs(UnmanagedType.I1)]
         public static extern bool YGNodeGetHasNewLayout(YGNodeHandle node);
 
-        #endregion
+#endregion
 
-        #region YG_NODE_STYLE_PROPERTY
+#region YG_NODE_STYLE_PROPERTY
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetDirection(YGNodeHandle node, YogaDirection direction);
@@ -239,7 +220,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetFlexBasisAuto(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetFlexBasis(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetFlexBasis(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetWidth(YGNodeHandle node, float width);
@@ -251,19 +232,19 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetWidthAuto(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetWidth(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetWidth(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetHeight(YGNodeHandle node, float height);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetHeightPercent(YGNodeHandle node, float height);
-        
+
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetHeightAuto(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetHeight(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetHeight(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMinWidth(YGNodeHandle node, float minWidth);
@@ -272,7 +253,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetMinWidthPercent(YGNodeHandle node, float minWidth);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetMinWidth(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetMinWidth(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMinHeight(YGNodeHandle node, float minHeight);
@@ -281,7 +262,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetMinHeightPercent(YGNodeHandle node, float minHeight);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetMinHeight(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetMinHeight(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMaxWidth(YGNodeHandle node, float maxWidth);
@@ -290,7 +271,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetMaxWidthPercent(YGNodeHandle node, float maxWidth);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetMaxWidth(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetMaxWidth(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMaxHeight(YGNodeHandle node, float maxHeight);
@@ -299,7 +280,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetMaxHeightPercent(YGNodeHandle node, float maxHeight);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetMaxHeight(YGNodeHandle node);
+        public static extern YogaValueType YGNodeStyleGetMaxHeight(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetAspectRatio(YGNodeHandle node, float aspectRatio);
@@ -307,9 +288,9 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeStyleGetAspectRatio(YGNodeHandle node);
 
-        #endregion
+#endregion
 
-        #region YG_NODE_STYLE_EDGE_PROPERTY
+#region YG_NODE_STYLE_EDGE_PROPERTY
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetPosition(YGNodeHandle node, YogaEdge edge, float position);
@@ -318,7 +299,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetPositionPercent(YGNodeHandle node, YogaEdge edge, float position);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetPosition(YGNodeHandle node, YogaEdge edge);
+        public static extern YogaValueType YGNodeStyleGetPosition(YGNodeHandle node, YogaEdge edge);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMargin(YGNodeHandle node, YogaEdge edge, float margin);
@@ -330,7 +311,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetMarginAuto(YGNodeHandle node, YogaEdge edge);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetMargin(YGNodeHandle node, YogaEdge edge);
+        public static extern YogaValueType YGNodeStyleGetMargin(YGNodeHandle node, YogaEdge edge);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetPadding(YGNodeHandle node, YogaEdge edge, float padding);
@@ -339,7 +320,7 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetPaddingPercent(YGNodeHandle node, YogaEdge edge, float padding);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetPadding(YGNodeHandle node, YogaEdge edge);
+        public static extern YogaValueType YGNodeStyleGetPadding(YGNodeHandle node, YogaEdge edge);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetBorder(YGNodeHandle node, YogaEdge edge, float border);
@@ -347,9 +328,9 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeStyleGetBorder(YGNodeHandle node, YogaEdge edge);
 
-        #endregion
+#endregion
 
-        #region YG_NODE_LAYOUT_PROPERTY
+#region YG_NODE_LAYOUT_PROPERTY
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeLayoutGetLeft(YGNodeHandle node);
@@ -378,18 +359,22 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaDirection YGNodeLayoutGetDirection(YGNodeHandle node);
 
-        #endregion
+#endregion
 
-        #region IOS
+#region Context
 
-#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr YGNodeGetContext(IntPtr node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeSetContext(IntPtr node, IntPtr managed);
-#endif
 
-        #endregion
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr YGConfigGetContext(IntPtr config);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGConfigSetContext(IntPtr config, IntPtr managed);
+
+#endregion
     }
 }

csharp/Facebook.Yoga/YGConfigHandle.cs

@@ -0,0 +1,84 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Facebook.Yoga
+{
+    internal class YGConfigHandle : SafeHandle
+    {
+        internal static readonly YGConfigHandle Default = Native.YGConfigGetDefault();
+        private GCHandle _managedConfigHandle;
+
+        private YGConfigHandle() : base(IntPtr.Zero, true)
+        {
+        }
+
+        public override bool IsInvalid
+        {
+            get
+            {
+                return this.handle == IntPtr.Zero;
+            }
+        }
+
+        protected override bool ReleaseHandle()
+        {
+            if (this.handle != Default.handle)
+            {
+                ReleaseManaged();
+                if (!IsInvalid)
+                {
+                    Native.YGConfigFree(this.handle);
+                }
+            }
+            GC.KeepAlive(this);
+            return true;
+        }
+
+        public void SetContext(YogaConfig config)
+        {
+            if (!_managedConfigHandle.IsAllocated)
+            {
+#if UNITY_5_4_OR_NEWER
+                // Weak causes 'GCHandle value belongs to a different domain' error
+                _managedConfigHandle = GCHandle.Alloc(config);
+#else
+                _managedConfigHandle = GCHandle.Alloc(config, GCHandleType.Weak);
+#endif
+                var managedConfigPtr = GCHandle.ToIntPtr(_managedConfigHandle);
+                Native.YGConfigSetContext(this.handle, managedConfigPtr);
+            }
+        }
+
+        private void ReleaseManaged()
+        {
+            if (_managedConfigHandle.IsAllocated)
+            {
+                _managedConfigHandle.Free();
+            }
+        }
+
+        public static YogaConfig GetManaged(IntPtr unmanagedConfigPtr)
+        {
+            if (unmanagedConfigPtr != IntPtr.Zero)
+            {
+                var managedConfigPtr = Native.YGConfigGetContext(unmanagedConfigPtr);
+                var config = GCHandle.FromIntPtr(managedConfigPtr).Target as YogaConfig;
+                if (config == null)
+                {
+                    throw new InvalidOperationException("YogaConfig is already deallocated");
+                }
+                return config;
+            }
+            return null;
+        }
+    }
+}

csharp/Facebook.Yoga/YGNodeHandle.cs

@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Facebook.Yoga
+{
+    internal class YGNodeHandle : SafeHandle
+    {
+        private GCHandle _managedNodeHandle;
+
+        private YGNodeHandle() : base(IntPtr.Zero, true)
+        {
+        }
+
+        public override bool IsInvalid
+        {
+            get
+            {
+                return this.handle == IntPtr.Zero;
+            }
+        }
+
+        protected override bool ReleaseHandle()
+        {
+            ReleaseManaged();
+            if (!IsInvalid)
+            {
+                Native.YGNodeFree(this.handle);
+                GC.KeepAlive(this);
+            }
+            return true;
+        }
+
+        public void SetContext(YogaNode node)
+        {
+            if (!_managedNodeHandle.IsAllocated)
+            {
+#if UNITY_5_4_OR_NEWER
+                // Weak causes 'GCHandle value belongs to a different domain' error
+                _managedNodeHandle = GCHandle.Alloc(node);
+#else
+                _managedNodeHandle = GCHandle.Alloc(node, GCHandleType.Weak);
+#endif
+                var managedNodePtr = GCHandle.ToIntPtr(_managedNodeHandle);
+                Native.YGNodeSetContext(this.handle, managedNodePtr);
+            }
+        }
+
+        public void ReleaseManaged()
+        {
+            if (_managedNodeHandle.IsAllocated)
+            {
+                _managedNodeHandle.Free();
+            }
+        }
+
+        public static YogaNode GetManaged(IntPtr unmanagedNodePtr)
+        {
+            if (unmanagedNodePtr != IntPtr.Zero)
+            {
+                var managedNodePtr = Native.YGNodeGetContext(unmanagedNodePtr);
+                var node = GCHandle.FromIntPtr(managedNodePtr).Target as YogaNode;
+                if (node == null)
+                {
+                    throw new InvalidOperationException("YogaNode is already deallocated");
+                }
+                return node;
+            }
+            return null;
+        }
+    }
+}

csharp/Facebook.Yoga/YogaBaselineFunc.cs

@@ -13,5 +13,5 @@ using System.Runtime.InteropServices;
 namespace Facebook.Yoga
 {
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    public delegate float YogaBaselineFunc(IntPtr node, float width, float height);
+    public delegate float YogaBaselineFunc(IntPtr unmanagedNodePtr, float width, float height);
 }

csharp/Facebook.Yoga/YogaConfig.cs

@@ -0,0 +1,140 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+#if __IOS__
+using ObjCRuntime;
+#endif
+#if ENABLE_IL2CPP
+using AOT;
+#endif
+
+namespace Facebook.Yoga
+{
+    public class YogaConfig
+    {
+        internal static readonly YogaConfig Default = new YogaConfig(YGConfigHandle.Default);
+        private static YogaLogger _managedLogger;
+
+        private YGConfigHandle _ygConfig;
+        private Logger _logger;
+
+        private YogaConfig(YGConfigHandle ygConfig)
+        {
+            _ygConfig = ygConfig;
+            if (_ygConfig.IsInvalid)
+            {
+                throw new InvalidOperationException("Failed to allocate native memory");
+            }
+
+            _ygConfig.SetContext(this);
+
+            if (_ygConfig == YGConfigHandle.Default)
+            {
+                _managedLogger = LoggerInternal;
+                Native.YGInteropSetLogger(_managedLogger);
+            }
+        }
+
+        public YogaConfig()
+            : this(Native.YGConfigNew())
+        {
+        }
+
+        internal YGConfigHandle Handle
+        {
+            get {
+                return _ygConfig;
+            }
+        }
+
+#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
+        [MonoPInvokeCallback(typeof(YogaLogger))]
+#endif
+        private static void LoggerInternal(
+            IntPtr unmanagedConfigPtr,
+            IntPtr unmanagedNodePtr,
+            YogaLogLevel level,
+            string message)
+        {
+            var config = YGConfigHandle.GetManaged(unmanagedConfigPtr);
+            if (config == null || config._logger == null)
+            {
+                // Default logger
+                System.Diagnostics.Debug.WriteLine(message);
+            }
+            else
+            {
+                var node = YGNodeHandle.GetManaged(unmanagedNodePtr);
+                config._logger(config, node, level, message);
+            }
+
+            if (level == YogaLogLevel.Error || level == YogaLogLevel.Fatal)
+            {
+                throw new InvalidOperationException(message);
+            }
+        }
+
+        public Logger Logger
+        {
+            get {
+                return _logger;
+            }
+
+            set {
+                _logger = value;
+            }
+        }
+
+        public void SetExperimentalFeatureEnabled(
+            YogaExperimentalFeature feature,
+            bool enabled)
+        {
+            Native.YGConfigSetExperimentalFeatureEnabled(_ygConfig, feature, enabled);
+        }
+
+        public bool IsExperimentalFeatureEnabled(YogaExperimentalFeature feature)
+        {
+            return Native.YGConfigIsExperimentalFeatureEnabled(_ygConfig, feature);
+        }
+
+        public bool UseWebDefaults
+        {
+            get
+            {
+                return Native.YGConfigGetUseWebDefaults(_ygConfig);
+            }
+
+            set
+            {
+                Native.YGConfigSetUseWebDefaults(_ygConfig, value);
+            }
+        }
+
+        public float PointScaleFactor
+        {
+            set
+            {
+                Native.YGConfigSetPointScaleFactor(_ygConfig, value);
+            }
+        }
+
+        public static int GetInstanceCount()
+        {
+            return Native.YGConfigGetInstanceCount();
+        }
+
+        public static void SetDefaultLogger(Logger logger)
+        {
+            Default.Logger = logger;
+        }
+    }
+}

csharp/Facebook.Yoga/YogaExperimentalFeature.cs

@@ -11,7 +11,6 @@ namespace Facebook.Yoga
 {
     public enum YogaExperimentalFeature
     {
-        Rounding,
         WebFlexBasis,
     }
 }

csharp/Facebook.Yoga/YogaLogLevel.cs

@@ -16,5 +16,6 @@ namespace Facebook.Yoga
         Info,
         Debug,
         Verbose,
+        Fatal,
     }
 }

csharp/Facebook.Yoga/YogaLogger.cs

@@ -10,45 +10,12 @@
 using System;
 using System.Runtime.InteropServices;
 
-#if __IOS__
-using ObjCRuntime;
-#endif
-
 namespace Facebook.Yoga
 {
-    internal static class YogaLogger
-    {
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        public delegate void Func(YogaLogLevel level, string message);
-
-        private static bool _initialized;
-        private static Func _managedLogger = LoggerInternal;
-
-        public static Func Logger = null;
-
-#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
-        [MonoPInvokeCallback(typeof(Func))]
-#endif
-        public static void LoggerInternal(YogaLogLevel level, string message)
-        {
-            if (Logger != null)
-            {
-                Logger(level, message);
-            }
-
-            if (level == YogaLogLevel.Error)
-            {
-                throw new InvalidOperationException(message);
-            }
-        }
-
-        public static void Initialize()
-        {
-            if (!_initialized)
-            {
-                Native.YGInteropSetLogger(_managedLogger);
-                _initialized = true;
-            }
-        }
-    }
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public delegate void YogaLogger(
+        IntPtr unmanagedConfigPtr,
+        IntPtr unmanagedNotePtr,
+        YogaLogLevel level,
+        string message);
 }

csharp/Facebook.Yoga/YogaMeasureFunc.cs

@@ -14,7 +14,7 @@ namespace Facebook.Yoga
 {
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
     public delegate YogaSize YogaMeasureFunc(
-        IntPtr node,
+        IntPtr unmanagedNodePtr,
         float width,
         YogaMeasureMode widthMode,
         float height,

csharp/Facebook.Yoga/YogaNode.Spacing.cs

@@ -7,8 +7,6 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-using System;
-
 namespace Facebook.Yoga
 {
     public partial class YogaNode
@@ -17,7 +15,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Left);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Left));
             }
 
             set
@@ -30,7 +28,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Top);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Top));
             }
 
             set
@@ -43,7 +41,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Right);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Right));
             }
 
             set
@@ -56,7 +54,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Bottom);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Bottom));
             }
 
             set
@@ -69,7 +67,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Start);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Start));
             }
 
             set
@@ -82,7 +80,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.End);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.End));
             }
 
             set
@@ -107,7 +105,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Left);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Left));
             }
 
             set
@@ -120,7 +118,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Top);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Top));
             }
 
             set
@@ -133,7 +131,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Right);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Right));
             }
 
             set
@@ -146,7 +144,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Bottom);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Bottom));
             }
 
             set
@@ -159,7 +157,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Start);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Start));
             }
 
             set
@@ -172,7 +170,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.End);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.End));
             }
 
             set
@@ -185,7 +183,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Horizontal);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Horizontal));
             }
 
             set
@@ -198,7 +196,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Vertical);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Vertical));
             }
 
             set
@@ -211,7 +209,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.All);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.All));
             }
 
             set
@@ -240,7 +238,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Left);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Left));
             }
 
             set
@@ -253,7 +251,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Top);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Top));
             }
 
             set
@@ -266,7 +264,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Right);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Right));
             }
 
             set
@@ -279,7 +277,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Bottom);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Bottom));
             }
 
             set
@@ -292,7 +290,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Start);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Start));
             }
 
             set
@@ -305,7 +303,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.End);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.End));
             }
 
             set
@@ -318,7 +316,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Horizontal);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Horizontal));
             }
 
             set
@@ -331,7 +329,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Vertical);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Vertical));
             }
 
             set
@@ -344,7 +342,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.All);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.All));
             }
 
             set

csharp/Facebook.Yoga/YogaNode.cs

@@ -10,46 +10,44 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using System.Text;
 
-#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
-using System.Runtime.InteropServices;
-#endif
 #if __IOS__
 using ObjCRuntime;
 #endif
+#if ENABLE_IL2CPP
+using AOT;
+#endif
 
 namespace Facebook.Yoga
 {
     public partial class YogaNode : IEnumerable<YogaNode>
     {
-        private Native.YGNodeHandle _ygNode;
+        private readonly YGNodeHandle _ygNode;
+        private readonly YogaConfig _config;
         private WeakReference _parent;
         private List<YogaNode> _children;
         private MeasureFunction _measureFunction;
         private BaselineFunction _baselineFunction;
-        private object _data;
-#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
-        private static YogaMeasureFunc _managedMeasure = MeasureInternalIOS;
-        private static YogaBaselineFunc _managedBaseline = BaselineInternalIOS;
-#else
         private YogaMeasureFunc _managedMeasure;
         private YogaBaselineFunc _managedBaseline;
-#endif
+        private object _data;
 
-        public YogaNode()
+        public YogaNode(YogaConfig config = null)
         {
-            YogaLogger.Initialize();
-
-            _ygNode = Native.YGNodeNew();
+            _config = config == null ? YogaConfig.Default : config;
+            _ygNode = Native.YGNodeNewWithConfig(_config.Handle);
             if (_ygNode.IsInvalid)
             {
                 throw new InvalidOperationException("Failed to allocate native memory");
             }
+
+            _ygNode.SetContext(this);
         }
 
         public YogaNode(YogaNode srcNode)
-            : this()
+            : this(srcNode._config)
         {
             CopyStyle(srcNode);
         }
@@ -60,7 +58,9 @@ namespace Facebook.Yoga
             _baselineFunction = null;
             _data = null;
 
+            _ygNode.ReleaseManaged();
             Native.YGNodeReset(_ygNode);
+            _ygNode.SetContext(this);
         }
 
         public bool IsDirty
@@ -273,7 +273,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetFlexBasis(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetFlexBasis(_ygNode));
             }
 
             set
@@ -297,7 +297,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetWidth(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetWidth(_ygNode));
             }
 
             set
@@ -321,7 +321,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetHeight(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetHeight(_ygNode));
             }
 
             set
@@ -345,7 +345,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMaxWidth(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMaxWidth(_ygNode));
             }
 
             set
@@ -365,7 +365,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMaxHeight(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMaxHeight(_ygNode));
             }
 
             set
@@ -385,7 +385,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMinWidth(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMinWidth(_ygNode));
             }
 
             set
@@ -405,7 +405,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMinHeight(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMinHeight(_ygNode));
             }
 
             set
@@ -421,7 +421,7 @@ namespace Facebook.Yoga
             }
         }
 
-        public float StyleAspectRatio
+        public float AspectRatio
         {
             get
             {
@@ -550,6 +550,20 @@ namespace Facebook.Yoga
             Native.YGNodeRemoveChild(_ygNode, child._ygNode);
         }
 
+        public void AddChild(YogaNode child)
+        {
+            Insert(Count, child);
+        }
+
+        public void RemoveChild(YogaNode child)
+        {
+            int index = IndexOf(child);
+            if (index >= 0)
+            {
+                RemoveAt(index);
+            }
+        }
+
         public void Clear()
         {
             if (_children != null)
@@ -569,28 +583,15 @@ namespace Facebook.Yoga
         public void SetMeasureFunction(MeasureFunction measureFunction)
         {
             _measureFunction = measureFunction;
-            if (measureFunction != null)
-            {
-#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
-                _ygNode.SetContext(this);
-#else
-                _managedMeasure = MeasureInternal;
-#endif
-            }
+            _managedMeasure = measureFunction != null ? MeasureInternal : (YogaMeasureFunc)null;
             Native.YGNodeSetMeasureFunc(_ygNode, _managedMeasure);
         }
 
         public void SetBaselineFunction(BaselineFunction baselineFunction)
         {
             _baselineFunction = baselineFunction;
-            if (baselineFunction != null)
-            {
-#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
-                _ygNode.SetContext(this);
-#else
-                _managedBaseline = BaselineInternal;
-#endif
-            }
+            _managedBaseline =
+                baselineFunction != null ? BaselineInternal : (YogaBaselineFunc)null;
             Native.YGNodeSetBaselineFunc(_ygNode, _managedBaseline);
         }
 
@@ -603,65 +604,48 @@ namespace Facebook.Yoga
                 Native.YGNodeStyleGetDirection(_ygNode));
         }
 
-#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
+#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
         [MonoPInvokeCallback(typeof(YogaMeasureFunc))]
-        private static YogaSize MeasureInternalIOS(
-            IntPtr ygNodePtr,
-            float width,
-            YogaMeasureMode widthMode,
-            float height,
-            YogaMeasureMode heightMode)
-        {
-            var node = Native.YGNodeHandle.GetManaged(ygNodePtr);
-            return node.MeasureInternal(IntPtr.Zero, width, widthMode, height, heightMode);
-        }
 #endif
-
-        private YogaSize MeasureInternal(
-            IntPtr node,
+        private static YogaSize MeasureInternal(
+            IntPtr unmanagedNodePtr,
             float width,
             YogaMeasureMode widthMode,
             float height,
             YogaMeasureMode heightMode)
         {
-            if (_measureFunction == null)
+            var node = YGNodeHandle.GetManaged(unmanagedNodePtr);
+            if (node == null || node._measureFunction == null)
             {
                 throw new InvalidOperationException("Measure function is not defined.");
             }
-
-            return _measureFunction(this, width, widthMode, height, heightMode);
+            return node._measureFunction(node, width, widthMode, height, heightMode);
         }
 
-#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
+#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
         [MonoPInvokeCallback(typeof(YogaBaselineFunc))]
-        private static float BaselineInternalIOS(
-            IntPtr ygNodePtr,
+#endif
+        private static float BaselineInternal(
+            IntPtr unmanagedNodePtr,
             float width,
             float height)
         {
-            var node = Native.YGNodeHandle.GetManaged(ygNodePtr);
-            return node.BaselineInternal(IntPtr.Zero, width, height);
-        }
-#endif
-
-        private float BaselineInternal(IntPtr node, float width, float height)
-        {
-            if (_baselineFunction == null)
+            var node = YGNodeHandle.GetManaged(unmanagedNodePtr);
+            if (node == null || node._baselineFunction == null)
             {
                 throw new InvalidOperationException("Baseline function is not defined.");
             }
-
-            return _baselineFunction(this, width, height);
+            return node._baselineFunction(node, width, height);
         }
 
         public string Print(YogaPrintOptions options =
             YogaPrintOptions.Layout|YogaPrintOptions.Style|YogaPrintOptions.Children)
         {
             StringBuilder sb = new StringBuilder();
-            YogaLogger.Func orig = YogaLogger.Logger;
-            YogaLogger.Logger = (level, message) => {sb.Append(message);};
+            Logger orig = _config.Logger;
+            _config.Logger = (config, node, level, message) => {sb.Append(message);};
             Native.YGNodePrint(_ygNode, options);
-            YogaLogger.Logger = orig;
+            _config.Logger = orig;
             return sb.ToString();
         }
 
@@ -681,17 +665,5 @@ namespace Facebook.Yoga
         {
             return Native.YGNodeGetInstanceCount();
         }
-
-        public static void SetExperimentalFeatureEnabled(
-            YogaExperimentalFeature feature,
-            bool enabled)
-        {
-            Native.YGSetExperimentalFeatureEnabled(feature, enabled);
-        }
-
-        public static bool IsExperimentalFeatureEnabled(YogaExperimentalFeature feature)
-        {
-            return Native.YGIsExperimentalFeatureEnabled(feature);
-        }
     }
 }

csharp/Facebook.Yoga/YogaNodeType.cs

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+namespace Facebook.Yoga
+{
+    public enum YogaNodeType
+    {
+        Default,
+        Text,
+    }
+}

csharp/Facebook.Yoga/YogaPrintOptions.cs

@@ -9,6 +9,7 @@
 
 namespace Facebook.Yoga
 {
+    [System.Flags]
     public enum YogaPrintOptions
     {
         Layout = 1,

csharp/Facebook.Yoga/YogaValue.cs

@@ -7,6 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
+using System;
 using System.Runtime.InteropServices;
 
 namespace Facebook.Yoga
@@ -92,5 +93,17 @@ namespace Facebook.Yoga
         {
             return Point(pointValue);
         }
+
+#if WINDOWS_UWP_ARM
+        internal static YogaValue MarshalValue(IntPtr ptr)
+        {
+            return Marshal.PtrToStructure<YogaValue>(ptr);
+        }
+#else
+        internal static YogaValue MarshalValue(YogaValue value)
+        {
+            return value;
+        }
+#endif
     }
 }

csharp/Mac/CustomBuildAction.targets

@@ -4,7 +4,7 @@
 		<CompileDependsOn>NativeLibrary;$(CompileDependsOn)</CompileDependsOn>
 	</PropertyGroup>
 	<Target Name="NativeLibrary" Outputs="$(ProjectDir)libyoga.dylib">
-		<Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)buck-build.sh //csharp:yoganet-macosx" />
+		<Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../build-native.sh" />
 		<Copy SourceFiles="$(ProjectDir)..\..\buck-out\gen\csharp\yoganet-macosx\libyoga.dylib" DestinationFiles="$(ProjectDir)libyoga.dylib" SkipUnchangedFiles="true" />
 	</Target>
 </Project>

csharp/Mac/Facebook.Yoga.Mac.Tests/Main.cs

@@ -33,6 +33,9 @@ namespace Facebook.Yoga.Mac.Tests
 
 		}
 
+		[System.Runtime.InteropServices.DllImport("/usr/lib/libSystem.dylib")]
+		static extern void _exit(int exit_code);
+
 		class NSRunLoopIntegration : NSObject, IMainLoopIntegration
 		{
 			public void InitializeToolkit()
@@ -51,7 +54,7 @@ namespace Facebook.Yoga.Mac.Tests
 
 			public void Shutdown()
 			{
-				Environment.Exit(TestRunner.ExitCode);
+                _exit(TestRunner.ExitCode);
 			}
 		}
 	}

csharp/Mac/buck-build.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-if buck --version >/dev/null 2>&1; then true; else
-  echo "SKIP: Need to install buck https://buckbuild.com/setup/getting_started.html"
-  exit 0
-fi
-buck build $1

csharp/Windows/Facebook.Yoga.Universal.sln

@@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Universal", "Universal", "{1048DB7D-9B95-48CA-B43E-D9C35AB1DCD4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga.uwp", "..\Yoga\Yoga.Universal.vcxproj", "{2EACF721-73B5-46AE-9775-4A8674D05A9C}"
 EndProject
@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{39A2FF
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal", "Facebook.Yoga.Universal\Facebook.Yoga.Universal.csproj", "{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2EACF721-73B5-46AE-9775-4A8674D05A9C} = {2EACF721-73B5-46AE-9775-4A8674D05A9C}
 	EndProjectSection
@@ -26,7 +26,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tes
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}*SharedItemsImports = 4
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{d6477ad6-9edd-4eba-8c60-cd31f77c52c6}*SharedItemsImports = 4
 		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{4edc82d9-a201-4831-8fe0-98f468f8e4ae}*SharedItemsImports = 13
 		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13
 	EndGlobalSection
@@ -55,22 +55,21 @@ Global
 		{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x64.Build.0 = Release|x64
 		{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x86.ActiveCfg = Release|Win32
 		{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x86.Build.0 = Release|Win32
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|ARM.ActiveCfg = Debug|ARM
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|ARM.Build.0 = Debug|ARM
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x64.ActiveCfg = Debug|x64
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x64.Build.0 = Debug|x64
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.ActiveCfg = Debug|x86
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.Build.0 = Debug|x86
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|ARM
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|ARM
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.ActiveCfg = Release|x64
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.Build.0 = Release|x64
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.ActiveCfg = Release|x86
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.Build.0 = Release|x86
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|ARM.ActiveCfg = Debug|ARM
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|ARM.Build.0 = Debug|ARM
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x64.ActiveCfg = Debug|x64
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x64.Build.0 = Debug|x64
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x86.ActiveCfg = Debug|x86
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x86.Build.0 = Debug|x86
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|ARM.ActiveCfg = Release|ARM
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|ARM.Build.0 = Release|ARM
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|x64.ActiveCfg = Release|x64
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|x64.Build.0 = Release|x64
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|x86.ActiveCfg = Release|x86
 		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.ActiveCfg = Debug|ARM
 		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Build.0 = Debug|ARM
@@ -98,7 +97,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{2EACF721-73B5-46AE-9775-4A8674D05A9C} = {51A8E803-C084-431F-9130-F277481C2BB2}
 		{91C42D32-291D-4B72-90B4-551663D60B8B} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
-		{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD} = {DCF7899B-A487-49C0-BCDE-DC088B6750C2}
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6} = {1048DB7D-9B95-48CA-B43E-D9C35AB1DCD4}
 		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
 		{0C76D2FE-6767-44FE-B03D-21B2076BAA73} = {5289E508-8386-45A1-A12B-258A5899CD45}
 	EndGlobalSection

csharp/Windows/Facebook.Yoga.Universal/Facebook.Yoga.Universal.csproj

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Facebook.Yoga</RootNamespace>
+    <AssemblyName>Facebook.Yoga</AssemblyName>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
+    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
+    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
+    <PlatformTarget>ARM</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\ARM\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;WINDOWS_UWP_ARM</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
+    <PlatformTarget>ARM</PlatformTarget>
+    <OutputPath>bin\ARM\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;WINDOWS_UWP_ARM</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <Optimize>true</Optimize>
+    <NoWarn>;2008</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
+    <None Include="project.json" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="..\..\Facebook.Yoga\Facebook.Yoga.Shared.projitems" Label="Shared" />
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
+    <VisualStudioVersion>14.0</VisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

csharp/Windows/Facebook.Yoga.Universal/project.json

@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.1.0"
+  },
+  "frameworks": {
+    "uap10.0": {}
+  },
+  "runtimes": {
+    "win10-arm": {},
+    "win10-arm-aot": {},
+    "win10-x86": {},
+    "win10-x86-aot": {},
+    "win10-x64": {},
+    "win10-x64-aot": {}
+  }
+}

csharp/Windows/Facebook.Yoga.sln

@@ -29,11 +29,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Desktop.Tests
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0C76D2FE-6767-44FE-B03D-21B2076BAA73}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Universal", "Universal", "{6669329B-017F-45B3-8611-53AFD065E45C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal", "Facebook.Yoga.Universal\Facebook.Yoga.Universal.csproj", "{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}*SharedItemsImports = 4
 		..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{4edc82d9-a201-4831-8fe0-98f468f8e4ae}*SharedItemsImports = 13
 		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13
+		..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{d6477ad6-9edd-4eba-8c60-cd31f77c52c6}*SharedItemsImports = 4
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -118,6 +123,22 @@ Global
 		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.ActiveCfg = Release|ARM
 		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.ActiveCfg = Release|x64
 		{0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.ActiveCfg = Release|x86
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|ARM.ActiveCfg = Debug|ARM
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|ARM.Build.0 = Debug|ARM
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x64.ActiveCfg = Debug|x64
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x64.Build.0 = Debug|x64
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x86.ActiveCfg = Debug|x86
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x86.Build.0 = Debug|x86
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|ARM.ActiveCfg = Release|ARM
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|ARM.Build.0 = Release|ARM
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|x64.ActiveCfg = Release|x64
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|x64.Build.0 = Release|x64
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|x86.ActiveCfg = Release|x86
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -130,5 +151,6 @@ Global
 		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC}
 		{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3} = {5289E508-8386-45A1-A12B-258A5899CD45}
 		{0C76D2FE-6767-44FE-B03D-21B2076BAA73} = {5289E508-8386-45A1-A12B-258A5899CD45}
+		{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6} = {6669329B-017F-45B3-8611-53AFD065E45C}
 	EndGlobalSection
 EndGlobal

csharp/Yoga/YGInterop.cpp

@@ -9,19 +9,23 @@
 
 #include "YGInterop.h"
 
-static YGInteropLoggerFunc gManagedFunc;
+static YGInteropLogger gManagedLogger;
 
-static int unmanagedLogger(YGLogLevel level, const char *format, va_list args) {
+static int unmanagedLogger(const YGConfigRef config,
+                           const YGNodeRef node,
+                           YGLogLevel level,
+                           const char *format,
+                           va_list args) {
   int result = 0;
-  if (gManagedFunc) {
-    char buffer[256];
-    result = vsnprintf(buffer, sizeof(buffer), format, args);
-    (*gManagedFunc)(level, buffer);
+  if (gManagedLogger) {
+    char message[8192];
+    result = vsnprintf(message, sizeof(message), format, args);
+    (*gManagedLogger)(config, node, level, message);
   }
   return result;
 }
 
-void YGInteropSetLogger(YGInteropLoggerFunc managedFunc) {
-  gManagedFunc = managedFunc;
-  YGSetLogger(&unmanagedLogger);
+void YGInteropSetLogger(YGInteropLogger managedLogger) {
+  gManagedLogger = managedLogger;
+  YGConfigSetLogger(YGConfigGetDefault(), &unmanagedLogger);
 }

csharp/Yoga/YGInterop.h

@@ -13,8 +13,13 @@
 
 YG_EXTERN_C_BEGIN
 
-typedef void (*YGInteropLoggerFunc)(YGLogLevel level, const char *message);
+typedef int (*YGInteropLogger)(const void *unmanagedConfigPtr,
+                               const void *unmanagedNodePtr,
+                               YGLogLevel level,
+                               const char *message);
 
-WIN_EXPORT void YGInteropSetLogger(YGInteropLoggerFunc managedFunc);
+WIN_EXPORT YGConfigRef YGConfigGetDefault();
+
+WIN_EXPORT void YGInteropSetLogger(YGInteropLogger managedLogger);
 
 YG_EXTERN_C_END

csharp/Yoga/Yoga.Universal.vcxproj

@@ -104,7 +104,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>bin\Universal\$(PlatformTarget)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(PlatformTarget)\$(Configuration)\</IntDir>
+    <IntDir>obj\Universal\$(PlatformTarget)\$(Configuration)\</IntDir>
     <TargetName>yoga</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -159,7 +159,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;YOGA_EXPORTS;FB_ASSERTIONS_ENABLED=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINARMDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;YOGA_EXPORTS;FB_ASSERTIONS_ENABLED=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
@@ -210,7 +210,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;YOGA_EXPORTS;FB_ASSERTIONS_ENABLED=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WINARMDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;YOGA_EXPORTS;FB_ASSERTIONS_ENABLED=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAsWinRT>false</CompileAsWinRT>
@@ -242,6 +242,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\yoga\YGEnums.h" />
     <ClInclude Include="..\..\yoga\Yoga.h" />
     <ClInclude Include="..\..\yoga\YGMacros.h" />
     <ClInclude Include="..\..\yoga\YGNodeList.h" />
@@ -251,6 +252,7 @@
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\yoga\YGEnums.c" />
     <ClCompile Include="..\..\yoga\Yoga.c" />
     <ClCompile Include="..\..\yoga\YGNodeList.c" />
     <ClCompile Include="YGInterop.cpp" />

csharp/Yoga/Yoga.Universal.vcxproj.filters

@@ -36,6 +36,9 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\yoga\YGEnums.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -53,6 +56,9 @@
     <ClCompile Include="YGInterop.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\yoga\YGEnums.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Yoga.rc">

csharp/Yoga/Yoga.vcxproj

@@ -228,6 +228,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\yoga\Yoga.h" />
+    <ClInclude Include="..\..\yoga\YGEnums.h" />
     <ClInclude Include="..\..\yoga\YGMacros.h" />
     <ClInclude Include="..\..\yoga\YGNodeList.h" />
     <ClInclude Include="resource.h" />
@@ -237,6 +238,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\yoga\Yoga.c" />
+    <ClCompile Include="..\..\yoga\YGEnums.c" />
     <ClCompile Include="..\..\yoga\YGNodeList.c" />
     <ClCompile Include="YGInterop.cpp" />
     <ClCompile Include="dllmain.cpp">

csharp/build-native.sh

@@ -1,16 +1,25 @@
 #!/bin/sh
-if buck --version >/dev/null 2>&1; then true; else
+cd `dirname "$0"`
+echo $ANDROID_SDK
+BUCK_RELEASE=2017.05.09.01
+echo "buck $BUCK_RELEASE"
+BUCK=lib/buck-$BUCK_RELEASE/bin/buck
+if $BUCK --version >/dev/null 2>&1; then true; else
     echo "Building Buck!"
-    mkdir lib
+    BUCK_PATH=buck-$BUCK_RELEASE
+    mkdir -p lib
     cd lib
-    git clone https://github.com/facebook/buck.git --depth 1
-    cd buck
+    rm -f $BUCK_PATH.tar.gz
+    curl -O -J -L https://github.com/facebook/buck/archive/v$BUCK_RELEASE.tar.gz
+    tar xzf $BUCK_PATH.tar.gz
+    cd $BUCK_PATH
     ant
-    cd ..
-    cd ..
+    cd ../..
 fi
-buck build //:yoga
-buck build //csharp:yoganet-ios
-buck build //csharp:yoganet-macosx
-buck build //csharp:yoganet#android-x86,shared
-buck build //csharp:yoganet#android-armv7,shared
+
+$BUCK build \
+    //csharp:yoganet-ios \
+    //csharp:yoganet-macosx \
+    //csharp:yoganet#android-armv7,shared \
+    //csharp:yoganet#android-x86,shared
+

csharp/iOS/Facebook.Yoga.iOS/CustomBuildAction.targets

@@ -4,7 +4,7 @@
         <CompileDependsOn>NativeLibrary;$(CompileDependsOn)</CompileDependsOn>
     </PropertyGroup>
     <Target Name="NativeLibrary" Outputs="$(ProjectDir)libyoga.a">
-        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet-ios" />
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../build-native.sh" />
         <Copy SourceFiles="$(ProjectDir)..\..\..\buck-out\gen\csharp\yoganet-ios\libyoga.a" DestinationFiles="$(ProjectDir)libyoga.a" SkipUnchangedFiles="true" />
     </Target>
 </Project>

csharp/nuget/Facebook.Yoga.nuspec

@@ -12,10 +12,6 @@
     <description>A subset of CSS's flexbox layout algorithm and box model.</description>
     <copyright>Copyright 2016 Facebook</copyright>
     <tags>flexbox flex-box css layout css-layout yoga facebook native</tags>
-    <dependencies>
-      <group targetFramework=".NETStandard1.1" />
-      <group targetFramework="uap10.0" />
-    </dependencies>
   </metadata>
   <files>
     <!-- build -->
@@ -28,7 +24,7 @@
     <file src="..\yoga_windows\bin\Release\Facebook.Yoga.dll" target="lib\netstandard"/>
     
     <!-- UAP -->
-    <file src="..\yoga_windows\bin\Release\Facebook.Yoga.dll" target="lib\uap10.0"/>
+    <file src="..\yoga_universal\bin\Release\Facebook.Yoga.dll" target="lib\uap10.0"/>
 
     <!-- net45 -->
     <file src="..\yoga_windows\bin\Release\Facebook.Yoga.dll" target="lib\net45" />
@@ -44,24 +40,24 @@
     <file src="..\yoga_android\bin\Release\Facebook.Yoga.dll" target="lib\MonoAndroid" />
   
     <!-- runtimes -->
-    <file src="..\yoga_windows\bin\x86\Release\Facebook.Yoga.dll" target="runtimes\win10-x86\lib\netstandard"/>
-    <file src="..\yoga_windows\bin\x86\Release\Facebook.Yoga.pdb" target="runtimes\win10-x86\lib\netstandard"/>
+    <file src="..\yoga_universal\bin\x86\Release\Facebook.Yoga.dll" target="runtimes\win10-x86\lib\netstandard1.0"/>
+    <file src="..\yoga_universal\bin\x86\Release\Facebook.Yoga.pdb" target="runtimes\win10-x86\lib\netstandard1.0"/>
     
-    <file src="..\yoga_windows\bin\x64\Release\Facebook.Yoga.dll" target="runtimes\win10-x64\lib\netstandard"/>
-    <file src="..\yoga_windows\bin\x64\Release\Facebook.Yoga.pdb" target="runtimes\win10-x64\lib\netstandard"/>
+    <file src="..\yoga_universal\bin\x64\Release\Facebook.Yoga.dll" target="runtimes\win10-x64\lib\netstandard1.0"/>
+    <file src="..\yoga_universal\bin\x64\Release\Facebook.Yoga.pdb" target="runtimes\win10-x64\lib\netstandard1.0"/>
     
-    <file src="..\yoga_windows\bin\ARM\Release\Facebook.Yoga.dll" target="runtimes\win10-arm\lib\netstandard"/>
-    <file src="..\yoga_windows\bin\ARM\Release\Facebook.Yoga.pdb" target="runtimes\win10-arm\lib\netstandard"/>    
+    <file src="..\yoga_universal\bin\ARM\Release\Facebook.Yoga.dll" target="runtimes\win10-arm\lib\netstandard1.0"/>
+    <file src="..\yoga_universal\bin\ARM\Release\Facebook.Yoga.pdb" target="runtimes\win10-arm\lib\netstandard1.0"/>    
 
     
-    <file src="..\yoga_windows\bin\x86\Release\Facebook.Yoga.dll" target="runtimes\win-x86\lib\netstandard"/>
-    <file src="..\yoga_windows\bin\x86\Release\Facebook.Yoga.pdb" target="runtimes\win-x86\lib\netstandard"/>
+    <file src="..\yoga_windows\bin\x86\Release\Facebook.Yoga.dll" target="runtimes\win-x86\lib\netstandard1.0"/>
+    <file src="..\yoga_windows\bin\x86\Release\Facebook.Yoga.pdb" target="runtimes\win-x86\lib\netstandard1.0"/>
     
-    <file src="..\yoga_windows\bin\x64\Release\Facebook.Yoga.dll" target="runtimes\win-x64\lib\netstandard"/>
-    <file src="..\yoga_windows\bin\x64\Release\Facebook.Yoga.pdb" target="runtimes\win-x64\lib\netstandard"/>
+    <file src="..\yoga_windows\bin\x64\Release\Facebook.Yoga.dll" target="runtimes\win-x64\lib\netstandard1.0"/>
+    <file src="..\yoga_windows\bin\x64\Release\Facebook.Yoga.pdb" target="runtimes\win-x64\lib\netstandard1.0"/>
 
-    <file src="..\yoga_windows\bin\ARM\Release\Facebook.Yoga.dll" target="runtimes\win8-arm\lib\netstandard"/>
-    <file src="..\yoga_windows\bin\ARM\Release\Facebook.Yoga.pdb" target="runtimes\win8-arm\lib\netstandard"/>    
+    <file src="..\yoga_windows\bin\ARM\Release\Facebook.Yoga.dll" target="runtimes\win8-arm\lib\netstandard1.0"/>
+    <file src="..\yoga_windows\bin\ARM\Release\Facebook.Yoga.pdb" target="runtimes\win8-arm\lib\netstandard1.0"/>    
 
 
     <!-- Native -->

csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.projitems

@@ -22,6 +22,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)YGMinMaxDimensionTest.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YGPaddingTest.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YGRoundingTest.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaConfigTest.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaNodeSpacingTest.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaNodeTest.cs" />
   </ItemGroup>

csharp/tests/Facebook.Yoga/YGAbsolutePositionTest.cs

@@ -20,11 +20,13 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_width_height_start_top()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Start = 10;
             root_child0.Top = 10;
@@ -61,11 +63,13 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_width_height_end_bottom()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.End = 10;
             root_child0.Bottom = 10;
@@ -102,11 +106,13 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_start_top_end_bottom()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Start = 10;
             root_child0.Top = 10;
@@ -143,11 +149,13 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_width_height_start_top_end_bottom()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Start = 10;
             root_child0.Top = 10;
@@ -186,19 +194,21 @@ namespace Facebook.Yoga
         [Test]
         public void Test_do_not_clamp_height_of_absolute_node_to_height_of_its_overflow_hidden_parent()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.Overflow = YogaOverflow.Hidden;
             root.Width = 50;
             root.Height = 50;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Start = 0;
             root_child0.Top = 0;
             root.Insert(0, root_child0);
 
-            YogaNode root_child0_child0 = new YogaNode();
+            YogaNode root_child0_child0 = new YogaNode(config);
             root_child0_child0.Width = 100;
             root_child0_child0.Height = 100;
             root_child0.Insert(0, root_child0_child0);
@@ -242,7 +252,9 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_within_border()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.MarginLeft = 10;
             root.MarginTop = 10;
             root.MarginRight = 10;
@@ -258,7 +270,7 @@ namespace Facebook.Yoga
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Left = 0;
             root_child0.Top = 0;
@@ -266,13 +278,37 @@ namespace Facebook.Yoga
             root_child0.Height = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.PositionType = YogaPositionType.Absolute;
             root_child1.Right = 0;
             root_child1.Bottom = 0;
             root_child1.Width = 50;
             root_child1.Height = 50;
             root.Insert(1, root_child1);
+
+            YogaNode root_child2 = new YogaNode(config);
+            root_child2.PositionType = YogaPositionType.Absolute;
+            root_child2.Left = 0;
+            root_child2.Top = 0;
+            root_child2.MarginLeft = 10;
+            root_child2.MarginTop = 10;
+            root_child2.MarginRight = 10;
+            root_child2.MarginBottom = 10;
+            root_child2.Width = 50;
+            root_child2.Height = 50;
+            root.Insert(2, root_child2);
+
+            YogaNode root_child3 = new YogaNode(config);
+            root_child3.PositionType = YogaPositionType.Absolute;
+            root_child3.Right = 0;
+            root_child3.Bottom = 0;
+            root_child3.MarginLeft = 10;
+            root_child3.MarginTop = 10;
+            root_child3.MarginRight = 10;
+            root_child3.MarginBottom = 10;
+            root_child3.Width = 50;
+            root_child3.Height = 50;
+            root.Insert(3, root_child3);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
 
@@ -291,6 +327,16 @@ namespace Facebook.Yoga
             Assert.AreEqual(50f, root_child1.LayoutWidth);
             Assert.AreEqual(50f, root_child1.LayoutHeight);
 
+            Assert.AreEqual(20f, root_child2.LayoutX);
+            Assert.AreEqual(20f, root_child2.LayoutY);
+            Assert.AreEqual(50f, root_child2.LayoutWidth);
+            Assert.AreEqual(50f, root_child2.LayoutHeight);
+
+            Assert.AreEqual(30f, root_child3.LayoutX);
+            Assert.AreEqual(30f, root_child3.LayoutY);
+            Assert.AreEqual(50f, root_child3.LayoutWidth);
+            Assert.AreEqual(50f, root_child3.LayoutHeight);
+
             root.StyleDirection = YogaDirection.RTL;
             root.CalculateLayout();
 
@@ -308,19 +354,31 @@ namespace Facebook.Yoga
             Assert.AreEqual(40f, root_child1.LayoutY);
             Assert.AreEqual(50f, root_child1.LayoutWidth);
             Assert.AreEqual(50f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(20f, root_child2.LayoutX);
+            Assert.AreEqual(20f, root_child2.LayoutY);
+            Assert.AreEqual(50f, root_child2.LayoutWidth);
+            Assert.AreEqual(50f, root_child2.LayoutHeight);
+
+            Assert.AreEqual(30f, root_child3.LayoutX);
+            Assert.AreEqual(30f, root_child3.LayoutY);
+            Assert.AreEqual(50f, root_child3.LayoutWidth);
+            Assert.AreEqual(50f, root_child3.LayoutHeight);
         }
 
         [Test]
         public void Test_absolute_layout_align_items_and_justify_content_center()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.JustifyContent = YogaJustify.Center;
             root.AlignItems = YogaAlign.Center;
             root.FlexGrow = 1;
             root.Width = 110;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Width = 60;
             root_child0.Height = 40;
@@ -355,14 +413,16 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_align_items_and_justify_content_flex_end()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.JustifyContent = YogaJustify.FlexEnd;
             root.AlignItems = YogaAlign.FlexEnd;
             root.FlexGrow = 1;
             root.Width = 110;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Width = 60;
             root_child0.Height = 40;
@@ -397,13 +457,15 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_justify_content_center()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.JustifyContent = YogaJustify.Center;
             root.FlexGrow = 1;
             root.Width = 110;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Width = 60;
             root_child0.Height = 40;
@@ -438,13 +500,15 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_align_items_center()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.AlignItems = YogaAlign.Center;
             root.FlexGrow = 1;
             root.Width = 110;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Width = 60;
             root_child0.Height = 40;
@@ -479,12 +543,14 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_align_items_center_on_child_only()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexGrow = 1;
             root.Width = 110;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.AlignSelf = YogaAlign.Center;
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Width = 60;
@@ -520,14 +586,16 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_align_items_and_justify_content_center_and_top_position()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.JustifyContent = YogaJustify.Center;
             root.AlignItems = YogaAlign.Center;
             root.FlexGrow = 1;
             root.Width = 110;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Top = 10;
             root_child0.Width = 60;
@@ -563,14 +631,16 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_align_items_and_justify_content_center_and_bottom_position()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.JustifyContent = YogaJustify.Center;
             root.AlignItems = YogaAlign.Center;
             root.FlexGrow = 1;
             root.Width = 110;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Bottom = 10;
             root_child0.Width = 60;
@@ -606,14 +676,16 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_align_items_and_justify_content_center_and_left_position()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.JustifyContent = YogaJustify.Center;
             root.AlignItems = YogaAlign.Center;
             root.FlexGrow = 1;
             root.Width = 110;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Left = 5;
             root_child0.Width = 60;
@@ -649,14 +721,16 @@ namespace Facebook.Yoga
         [Test]
         public void Test_absolute_layout_align_items_and_justify_content_center_and_right_position()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.JustifyContent = YogaJustify.Center;
             root.AlignItems = YogaAlign.Center;
             root.FlexGrow = 1;
             root.Width = 110;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.PositionType = YogaPositionType.Absolute;
             root_child0.Right = 5;
             root_child0.Width = 60;
@@ -689,5 +763,192 @@ namespace Facebook.Yoga
             Assert.AreEqual(40f, root_child0.LayoutHeight);
         }
 
+        [Test]
+        public void Test_position_root_with_rtl_should_position_withoutdirection()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Left = 72;
+            root.Width = 52;
+            root.Height = 52;
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(72f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(52f, root.LayoutWidth);
+            Assert.AreEqual(52f, root.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(72f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(52f, root.LayoutWidth);
+            Assert.AreEqual(52f, root.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_absolute_layout_percentage_bottom_based_on_parent_height()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 100;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Top = 50.Percent();
+            root_child0.Width = 10;
+            root_child0.Height = 10;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.PositionType = YogaPositionType.Absolute;
+            root_child1.Bottom = 50.Percent();
+            root_child1.Width = 10;
+            root_child1.Height = 10;
+            root.Insert(1, root_child1);
+
+            YogaNode root_child2 = new YogaNode(config);
+            root_child2.PositionType = YogaPositionType.Absolute;
+            root_child2.Top = 10.Percent();
+            root_child2.Bottom = 10.Percent();
+            root_child2.Width = 10;
+            root.Insert(2, root_child2);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(100f, root_child0.LayoutY);
+            Assert.AreEqual(10f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(90f, root_child1.LayoutY);
+            Assert.AreEqual(10f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child2.LayoutX);
+            Assert.AreEqual(20f, root_child2.LayoutY);
+            Assert.AreEqual(10f, root_child2.LayoutWidth);
+            Assert.AreEqual(160f, root_child2.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(90f, root_child0.LayoutX);
+            Assert.AreEqual(100f, root_child0.LayoutY);
+            Assert.AreEqual(10f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(90f, root_child1.LayoutX);
+            Assert.AreEqual(90f, root_child1.LayoutY);
+            Assert.AreEqual(10f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(90f, root_child2.LayoutX);
+            Assert.AreEqual(20f, root_child2.LayoutY);
+            Assert.AreEqual(10f, root_child2.LayoutWidth);
+            Assert.AreEqual(160f, root_child2.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_absolute_layout_in_wrap_reverse_column_container()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Wrap = YogaWrap.WrapReverse;
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Width = 20;
+            root_child0.Height = 20;
+            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(80f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, 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(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_absolute_layout_in_wrap_reverse_row_container()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Wrap = YogaWrap.WrapReverse;
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Width = 20;
+            root_child0.Height = 20;
+            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(80f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, 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(80f, root_child0.LayoutX);
+            Assert.AreEqual(80f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+        }
+
     }
 }

csharp/tests/Facebook.Yoga/YGAlignContentTest.cs

@@ -20,33 +20,35 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_flex_start()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 130;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root_child0.Height = 10;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root_child1.Height = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root_child2.Height = 10;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Width = 50;
             root_child3.Height = 10;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root_child4.Height = 10;
             root.Insert(4, root_child4);
@@ -120,30 +122,32 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_flex_start_without_height_on_children()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.Wrap = YogaWrap.Wrap;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root_child1.Height = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Width = 50;
             root_child3.Height = 10;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -216,36 +220,38 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_flex_start_with_flex()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.Wrap = YogaWrap.Wrap;
             root.Width = 100;
             root.Height = 120;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.FlexGrow = 1;
             root_child0.FlexBasis = 0.Percent();
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.FlexGrow = 1;
             root_child1.FlexBasis = 0.Percent();
             root_child1.Width = 50;
             root_child1.Height = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.FlexGrow = 1;
             root_child3.FlexShrink = 1;
             root_child3.FlexBasis = 0.Percent();
             root_child3.Width = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -318,33 +324,35 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_flex_end()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.AlignContent = YogaAlign.FlexEnd;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root_child0.Height = 10;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root_child1.Height = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root_child2.Height = 10;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Width = 50;
             root_child3.Height = 10;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root_child4.Height = 10;
             root.Insert(4, root_child4);
@@ -418,29 +426,31 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 150;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Width = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -513,34 +523,36 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_spacebetween()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.SpaceBetween;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 130;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root_child0.Height = 10;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root_child1.Height = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root_child2.Height = 10;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Width = 50;
             root_child3.Height = 10;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root_child4.Height = 10;
             root.Insert(4, root_child4);
@@ -614,34 +626,36 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_spacearound()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.SpaceAround;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 140;
             root.Height = 120;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root_child0.Height = 10;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root_child1.Height = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root_child2.Height = 10;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Width = 50;
             root_child3.Height = 10;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root_child4.Height = 10;
             root.Insert(4, root_child4);
@@ -715,30 +729,32 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_row()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 150;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Width = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -811,36 +827,38 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_row_with_children()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 150;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child0_child0 = new YogaNode();
+            YogaNode root_child0_child0 = new YogaNode(config);
             root_child0_child0.FlexGrow = 1;
             root_child0_child0.FlexShrink = 1;
             root_child0_child0.FlexBasis = 0.Percent();
             root_child0.Insert(0, root_child0_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Width = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -923,36 +941,38 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_row_with_flex()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 150;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.FlexGrow = 1;
             root_child1.FlexShrink = 1;
             root_child1.FlexBasis = 0.Percent();
             root_child1.Width = 50;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.FlexGrow = 1;
             root_child3.FlexShrink = 1;
             root_child3.FlexBasis = 0.Percent();
             root_child3.Width = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -1025,35 +1045,37 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_row_with_flex_no_shrink()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 150;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.FlexGrow = 1;
             root_child1.FlexShrink = 1;
             root_child1.FlexBasis = 0.Percent();
             root_child1.Width = 50;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.FlexGrow = 1;
             root_child3.FlexBasis = 0.Percent();
             root_child3.Width = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -1126,18 +1148,20 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_row_with_margin()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 150;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.MarginLeft = 10;
             root_child1.MarginTop = 10;
             root_child1.MarginRight = 10;
@@ -1145,11 +1169,11 @@ namespace Facebook.Yoga
             root_child1.Width = 50;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.MarginLeft = 10;
             root_child3.MarginTop = 10;
             root_child3.MarginRight = 10;
@@ -1157,7 +1181,7 @@ namespace Facebook.Yoga
             root_child3.Width = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -1230,18 +1254,20 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_row_with_padding()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 150;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.PaddingLeft = 10;
             root_child1.PaddingTop = 10;
             root_child1.PaddingRight = 10;
@@ -1249,11 +1275,11 @@ namespace Facebook.Yoga
             root_child1.Width = 50;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.PaddingLeft = 10;
             root_child3.PaddingTop = 10;
             root_child3.PaddingRight = 10;
@@ -1261,7 +1287,7 @@ namespace Facebook.Yoga
             root_child3.Width = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -1334,18 +1360,20 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_row_with_single_row()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 150;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
@@ -1388,31 +1416,33 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_row_with_fixed_height()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 150;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root_child1.Height = 60;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Width = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -1485,31 +1515,33 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_row_with_max_height()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 150;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root_child1.MaxHeight = 20;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Width = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -1582,31 +1614,33 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_row_with_min_height()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 150;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 50;
             root_child1.MinHeight = 80;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Width = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Width = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -1679,38 +1713,40 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_column()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.AlignContent = YogaAlign.Stretch;
             root.Wrap = YogaWrap.Wrap;
             root.Width = 100;
             root.Height = 150;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Height = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child0_child0 = new YogaNode();
+            YogaNode root_child0_child0 = new YogaNode(config);
             root_child0_child0.FlexGrow = 1;
             root_child0_child0.FlexShrink = 1;
             root_child0_child0.FlexBasis = 0.Percent();
             root_child0.Insert(0, root_child0_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.FlexGrow = 1;
             root_child1.FlexShrink = 1;
             root_child1.FlexBasis = 0.Percent();
             root_child1.Height = 50;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Height = 50;
             root.Insert(2, root_child2);
 
-            YogaNode root_child3 = new YogaNode();
+            YogaNode root_child3 = new YogaNode(config);
             root_child3.Height = 50;
             root.Insert(3, root_child3);
 
-            YogaNode root_child4 = new YogaNode();
+            YogaNode root_child4 = new YogaNode(config);
             root_child4.Height = 50;
             root.Insert(4, root_child4);
             root.StyleDirection = YogaDirection.LTR;
@@ -1793,10 +1829,12 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_content_stretch_is_not_overriding_align_items()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.AlignContent = YogaAlign.Stretch;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.FlexDirection = YogaFlexDirection.Row;
             root_child0.AlignContent = YogaAlign.Stretch;
             root_child0.AlignItems = YogaAlign.Center;
@@ -1804,7 +1842,7 @@ namespace Facebook.Yoga
             root_child0.Height = 100;
             root.Insert(0, root_child0);
 
-            YogaNode root_child0_child0 = new YogaNode();
+            YogaNode root_child0_child0 = new YogaNode(config);
             root_child0_child0.AlignContent = YogaAlign.Stretch;
             root_child0_child0.Width = 10;
             root_child0_child0.Height = 10;

csharp/tests/Facebook.Yoga/YGAlignSelfTest.cs

@@ -20,11 +20,13 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_self_center()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.AlignSelf = YogaAlign.Center;
             root_child0.Width = 10;
             root_child0.Height = 10;
@@ -59,11 +61,13 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_self_flex_end()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.AlignSelf = YogaAlign.FlexEnd;
             root_child0.Width = 10;
             root_child0.Height = 10;
@@ -98,11 +102,13 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_self_flex_start()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.AlignSelf = YogaAlign.FlexStart;
             root_child0.Width = 10;
             root_child0.Height = 10;
@@ -137,12 +143,14 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_self_flex_end_override_flex_start()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.AlignItems = YogaAlign.FlexStart;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.AlignSelf = YogaAlign.FlexEnd;
             root_child0.Width = 10;
             root_child0.Height = 10;
@@ -177,24 +185,26 @@ namespace Facebook.Yoga
         [Test]
         public void Test_align_self_baseline()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.AlignSelf = YogaAlign.Baseline;
             root_child0.Width = 50;
             root_child0.Height = 50;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.AlignSelf = YogaAlign.Baseline;
             root_child1.Width = 50;
             root_child1.Height = 20;
             root.Insert(1, root_child1);
 
-            YogaNode root_child1_child0 = new YogaNode();
+            YogaNode root_child1_child0 = new YogaNode(config);
             root_child1_child0.Width = 50;
             root_child1_child0.Height = 10;
             root_child1.Insert(0, root_child1_child0);

csharp/tests/Facebook.Yoga/YGBorderTest.cs

@@ -20,7 +20,9 @@ namespace Facebook.Yoga
         [Test]
         public void Test_border_no_size()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.BorderLeftWidth = 10;
             root.BorderTopWidth = 10;
             root.BorderRightWidth = 10;
@@ -45,13 +47,15 @@ namespace Facebook.Yoga
         [Test]
         public void Test_border_container_match_child()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.BorderLeftWidth = 10;
             root.BorderTopWidth = 10;
             root.BorderRightWidth = 10;
             root.BorderBottomWidth = 10;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 10;
             root_child0.Height = 10;
             root.Insert(0, root_child0);
@@ -85,7 +89,9 @@ namespace Facebook.Yoga
         [Test]
         public void Test_border_flex_child()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.BorderLeftWidth = 10;
             root.BorderTopWidth = 10;
             root.BorderRightWidth = 10;
@@ -93,7 +99,7 @@ namespace Facebook.Yoga
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.FlexGrow = 1;
             root_child0.Width = 10;
             root.Insert(0, root_child0);
@@ -127,7 +133,9 @@ namespace Facebook.Yoga
         [Test]
         public void Test_border_stretch_child()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.BorderLeftWidth = 10;
             root.BorderTopWidth = 10;
             root.BorderRightWidth = 10;
@@ -135,7 +143,7 @@ namespace Facebook.Yoga
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Height = 10;
             root.Insert(0, root_child0);
             root.StyleDirection = YogaDirection.LTR;
@@ -168,7 +176,9 @@ namespace Facebook.Yoga
         [Test]
         public void Test_border_center_child()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.JustifyContent = YogaJustify.Center;
             root.AlignItems = YogaAlign.Center;
             root.BorderStartWidth = 10;
@@ -177,7 +187,7 @@ namespace Facebook.Yoga
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 10;
             root_child0.Height = 10;
             root.Insert(0, root_child0);

csharp/tests/Facebook.Yoga/YGDimensionTest.cs

@@ -20,9 +20,11 @@ namespace Facebook.Yoga
         [Test]
         public void Test_wrap_child()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root = new YogaNode(config);
+
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 100;
             root_child0.Height = 100;
             root.Insert(0, root_child0);
@@ -56,12 +58,14 @@ namespace Facebook.Yoga
         [Test]
         public void Test_wrap_grandchild()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root = new YogaNode(config);
+
+            YogaNode root_child0 = new YogaNode(config);
             root.Insert(0, root_child0);
 
-            YogaNode root_child0_child0 = new YogaNode();
+            YogaNode root_child0_child0 = new YogaNode(config);
             root_child0_child0.Width = 100;
             root_child0_child0.Height = 100;
             root_child0.Insert(0, root_child0_child0);

csharp/tests/Facebook.Yoga/YGDisplayTest.cs

@@ -20,16 +20,18 @@ namespace Facebook.Yoga
         [Test]
         public void Test_display_none()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.FlexGrow = 1;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.FlexGrow = 1;
             root_child1.Display = YogaDisplay.None;
             root.Insert(1, root_child1);
@@ -73,16 +75,18 @@ namespace Facebook.Yoga
         [Test]
         public void Test_display_none_fixed_size()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.FlexGrow = 1;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 20;
             root_child1.Height = 20;
             root_child1.Display = YogaDisplay.None;
@@ -127,12 +131,14 @@ namespace Facebook.Yoga
         [Test]
         public void Test_display_none_with_margin()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.MarginLeft = 10;
             root_child0.MarginTop = 10;
             root_child0.MarginRight = 10;
@@ -142,7 +148,7 @@ namespace Facebook.Yoga
             root_child0.Display = YogaDisplay.None;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.FlexGrow = 1;
             root.Insert(1, root_child1);
             root.StyleDirection = YogaDirection.LTR;
@@ -185,25 +191,27 @@ namespace Facebook.Yoga
         [Test]
         public void Test_display_none_with_child()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.FlexGrow = 1;
             root_child0.FlexShrink = 1;
             root_child0.FlexBasis = 0.Percent();
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.FlexGrow = 1;
             root_child1.FlexShrink = 1;
             root_child1.FlexBasis = 0.Percent();
             root_child1.Display = YogaDisplay.None;
             root.Insert(1, root_child1);
 
-            YogaNode root_child1_child0 = new YogaNode();
+            YogaNode root_child1_child0 = new YogaNode(config);
             root_child1_child0.FlexGrow = 1;
             root_child1_child0.FlexShrink = 1;
             root_child1_child0.FlexBasis = 0.Percent();
@@ -212,7 +220,7 @@ namespace Facebook.Yoga
             root_child1_child0.MinHeight = 0;
             root_child1.Insert(0, root_child1_child0);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.FlexGrow = 1;
             root_child2.FlexShrink = 1;
             root_child2.FlexBasis = 0.Percent();
@@ -277,16 +285,18 @@ namespace Facebook.Yoga
         [Test]
         public void Test_display_none_with_position()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.FlexGrow = 1;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.FlexGrow = 1;
             root_child1.Top = 10;
             root_child1.Display = YogaDisplay.None;

csharp/tests/Facebook.Yoga/YGFlexDirectionTest.cs

@@ -20,18 +20,20 @@ namespace Facebook.Yoga
         [Test]
         public void Test_flex_direction_column_no_height()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.Width = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Height = 10;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Height = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
@@ -84,19 +86,21 @@ namespace Facebook.Yoga
         [Test]
         public void Test_flex_direction_row_no_width()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 10;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
@@ -149,19 +153,21 @@ namespace Facebook.Yoga
         [Test]
         public void Test_flex_direction_column()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Height = 10;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Height = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
@@ -214,20 +220,22 @@ namespace Facebook.Yoga
         [Test]
         public void Test_flex_direction_row()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 10;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
@@ -280,20 +288,22 @@ namespace Facebook.Yoga
         [Test]
         public void Test_flex_direction_column_reverse()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.ColumnReverse;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Height = 10;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Height = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Height = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;
@@ -346,20 +356,22 @@ namespace Facebook.Yoga
         [Test]
         public void Test_flex_direction_row_reverse()
         {
-            YogaNode root = new YogaNode();
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.RowReverse;
             root.Width = 100;
             root.Height = 100;
 
-            YogaNode root_child0 = new YogaNode();
+            YogaNode root_child0 = new YogaNode(config);
             root_child0.Width = 10;
             root.Insert(0, root_child0);
 
-            YogaNode root_child1 = new YogaNode();
+            YogaNode root_child1 = new YogaNode(config);
             root_child1.Width = 10;
             root.Insert(1, root_child1);
 
-            YogaNode root_child2 = new YogaNode();
+            YogaNode root_child2 = new YogaNode(config);
             root_child2.Width = 10;
             root.Insert(2, root_child2);
             root.StyleDirection = YogaDirection.LTR;