Nicer formatting of gists in docs

Summary: The gists in the docs have large margins to fit with the front page.  This diff specialises that margin setting and sets it to something smaller for other gists.

Reviewed By: emilsjolander

Differential Revision: D4666016

fbshipit-source-id: 5121849a153e78d523b33e10b96641426e794f8d

.buckconfig

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

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,17 @@
+# Report
+
+- [ ] I have searched [existing issues](https://github.com/facebook/yoga/issues) and this is not a duplicate
+
+# Issues and Steps to Reproduce
+***Replaces this with steps to repro your issue.***
+
+# Expected Behavior
+***Describe what you expected would happen.***
+
+# Actual Behavior
+***Describe what actually happened.***
+
+# Link to Code
+***If you have some code that maintainers can clone/test for themselves, bugs can be resolved much faster. Please paste a link here.***
+
+***When applicable, use this [fiddle](https://jsfiddle.net/emilsjolander/jckmwztt/) to post a web repro.***

.gitignore

@@ -7,6 +7,10 @@
 /gentest/test.html
 .buckversion
 
+# Jekyll
+/.sass-cache/
+/_site/
+
 # Visual studio code
 .vscode
 *.pdb
@@ -56,3 +60,6 @@ Pods/
 # Carthage/Checkouts
 
 Carthage/Build
+
+# Gradle
+.gradle

.hgignore

@@ -1,58 +0,0 @@
-.DS_STORE
-
-/buck-cache/
-/buck-out/
-/.buckconfig.local
-/.buckd
-/gentest/test.html
-.buckversion
-
-# Visual studio code
-.vscode
-*.pdb
-*.tlog
-*.obj
-*.pch
-*.log
-*.orig
-
-# Xcode
-## Build generated
-build/
-DerivedData/
-
-## Various settings
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xcuserstate
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-Pods/
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build

.swift-version

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

.travis.yml

@@ -6,37 +6,115 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 
 os: osx
-osx_image: xcode7.3
+osx_image: xcode8.2
 language: cpp
 compiler: clang
 
+env:
+  - TARGET=c
+  - TARGET=java
+  - TARGET=net
+  - TARGET=ios
+  - TARGET=js
+  - TARGET=android
+
 before_install:
-  - brew update
+  - brew update > /dev/null
   - brew tap facebook/fb
   - brew install buck
-  - brew cask install java
-  - brew outdated xctool || brew upgrade xctool
-  - brew install mono
 
-  - export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)
-  - export PATH=$JAVA_HOME/bin:$PATH
+  # Java
+  - |
+    if [[ $TARGET = "java" ]]; then
+      brew cask install java &&
+      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) &&
+      export PATH=$JAVA_HOME/bin:$PATH
+    fi
 
-install:
-  - cd javascript
-  - npm install
-  - cd $TRAVIS_BUILD_DIR
+  # .NET
+  - |
+    if [[ $TARGET = "net" ]]; then
+      brew install mono
+    fi
+
+  # iOS
+  - |
+    if [[ $TARGET = "ios" ]]; then
+      brew outdated xctool || brew upgrade xctool
+    fi
+
+  # Emscripten (used for js tests)
+  # Note: cannot be ran on Linux (because it will compile Clang from its sources :|)
+  - |
+    if [[ $TARGET = "js" ]]; then
+      wget -O /tmp/emsdk-portable.tar.gz https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz &&
+      tar xf /tmp/emsdk-portable.tar.gz -C /tmp/ &&
+      /tmp/emsdk_portable/emsdk install latest >& /dev/null &&
+      /tmp/emsdk_portable/emsdk activate latest
+    fi
+
+  # Android
+  - |
+    if [[ $TARGET = "android" ]]; then
+      brew cask install java;
+      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8);
+      export PATH=$JAVA_HOME/bin:$PATH;
+      brew install android-sdk;
+      export ANDROID_SDK=/usr/local/Cellar/android-sdk/24.4.1_1;
+      export ANDROID_HOME=/usr/local/Cellar/android-sdk/24.4.1_1;
+      brew install lib32stdc++6 lib32z1;
+      echo y | $ANDROID_SDK/tools/android update sdk --filter android-19,addon-google_apis-google-19,build-tools-19.1.0 --no-ui;
+      echo y | $ANDROID_SDK/tools/android update sdk -u;
+    fi
+
+  # JavaScript
+  - |
+    if [[ $TARGET = "js" ]]; then (
+      cd javascript &&
+      npm install &&
+      unset CC && unset CXX && unset LINK &&
+      source /tmp/emsdk_portable/emsdk_env.sh &&
+      npm run build:browser
+    ) fi
 
 script:
-  - buck test //:yoga
-  - buck test //java:java
-  - buck test //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64 --config cxx.cflags=-DTRAVIS_CI
-  - sh csharp/tests/Facebook.Yoga/test_macos.sh
+  # C
+  - |
+    if [[ $TARGET = "c" ]]; then
+      buck test --verbose 0 //:yoga &&
+      buck run --verbose 0 //benchmark:benchmark &&
+      git checkout HEAD^ &&
+      buck run --verbose 0 //benchmark:benchmark
+    fi
 
-  - cd javascript
-  - npm run test:all
-  - npm run bench
-  - cd $TRAVIS_BUILD_DIR
+  # Java
+  - |
+    if [[ $TARGET = "java" ]]; then
+      buck test --verbose 0 //java:java
+    fi
 
-  - buck run //benchmark:benchmark
-  - git checkout HEAD^
-  - buck run //benchmark:benchmark
+  # .NET
+  - |
+    if [[ $TARGET = "net" ]]; then
+      sh csharp/tests/Facebook.Yoga/test_macos.sh
+    fi
+
+  # iOS
+  - |
+    if [[ $TARGET = "ios" ]]; then
+      buck test --verbose 0 //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64
+    fi
+
+  # Android
+  - |
+    if [[ $TARGET = "android" ]]; then
+      buck build --verbose 0 //android/sample:sample
+    fi
+
+  # JavaScript
+  - |
+    if [[ $TARGET = "js" ]]; then (
+      cd javascript &&
+      npm run test:all &&
+      npm run bench
+    ) fi

BUCK

@@ -5,38 +5,42 @@
 # 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 = BASE_COMPILER_FLAGS + [
+    "-std=c11",
+    "-fPIC",
+]
+
+TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + ["-std=c++11"]
 
 cxx_library(
-  name = 'yoga',
-  soname = 'libyogacore.$(ext)',
-  srcs = glob(['yoga/*.c']),
-  tests=[':YogaTests'],
-  exported_headers = subdir_glob([('', 'yoga/*.h')]),
-  header_namespace = '',
-  compiler_flags = COMPILER_FLAGS,
-  deps = [] if THIS_IS_FBOBJC else [
-    yoga_dep('lib/fb:ndklog'),
-  ],
-  visibility = ['PUBLIC'],
+    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,
+    ],
 )

README.md

@@ -1,4 +1,11 @@
-# Yoga [![Build Status](https://travis-ci.org/facebook/yoga.svg?branch=master)](https://travis-ci.org/facebook/yoga)
+# 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)
+
+[![C Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=c&label=C)](https://travis-ci.org/facebook/yoga)
+[![Java Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=java&label=Java)](https://travis-ci.org/facebook/yoga)
+[![iOS Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=ios&label=iOS)](https://travis-ci.org/facebook/yoga)
+[![.NET Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=net&label=.NET)](https://travis-ci.org/facebook/yoga)
+[![JavaScript Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=js&label=JavaScript)](https://travis-ci.org/facebook/yoga)
+[![Android Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=android&label=Android)](https://travis-ci.org/facebook/yoga)
 
 ## Building
 Yoga builds with [buck](https://buckbuild.com). Make sure you install buck before contributing to Yoga. Yoga's main implementation is in C, with bindings to supported languages and frameworks. When making changes to Yoga please ensure the changes are also propagated to these bindings when applicable.
@@ -27,4 +34,4 @@ You may need to install the latest watir-webdriver gem (`gem install watir-webdr
 For the main C implementation of Yoga clang-format is used to ensure a consistent code style. Please run `bash format.sh` before submitting a pull request. For other languages just try to follow the current code style.
 
 ## Benchmarks
-Benchmarks are located in `benchmarks/YGBenchmark.c` and can be run with `buck run //benchmarks:benchmarks`. 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.
+Benchmarks are located in `benchmark/YGBenchmark.c` and can be run with `buck run //benchmark:benchmark`. If you think your change has affected performance please run this before and after your change to validate that nothing has regressed. Benchmarks are run on every commit in CI.

YOGA_DEFS

@@ -1,5 +1,6 @@
 
 YOGA_ROOT = '//...'
+JAVA_TARGET = '//java:java'
 INFER_ANNOTATIONS_TARGET = '//lib/infer-annotations:infer-annotations'
 JSR_305_TARGET = '//lib/jsr-305:jsr-305'
 JUNIT_TARGET = '//lib/junit:junit'
@@ -8,6 +9,13 @@ SOLOADER_TARGET = '//lib/soloader:soloader'
 GTEST_TARGET = '//lib/gtest:gtest'
 JNI_TARGET = '//lib/jni:jni'
 FBJNI_TARGET = '//lib/fb:fbjni'
+APPCOMPAT_TARGET = '//lib/appcompat:appcompat'
+ANDROID_SUPPORT_TARGET = '//lib/android-support:android-support'
+ANDROID_TARGET = '//android:android'
+ANDROID_JAVA_TARGET = '//android/src/main/java/com/facebook/yoga/android:android'
+ANDROID_RES_TARGET = '//android:res'
+ANDROID_SAMPLE_JAVA_TARGET = '//android/sample/java/com/facebook/samples/yoga:yoga'
+ANDROID_SAMPLE_RES_TARGET = '//android/sample:res'
 
 THIS_IS_FBOBJC = False
 
@@ -28,8 +36,7 @@ BASE_COMPILER_FLAGS = [
 def yoga_dep(dep):
   return '//' + dep
 
-class allow_unsafe_import:
-    def __enter__(self):
-        pass
-    def __exit__(self, type, value, traceback):
-        pass
+with allow_unsafe_import():
+  import os.path
+def isdir(filename):
+  return os.path.isdir(filename)

Yoga.podspec

@@ -0,0 +1,28 @@
+Pod::Spec.new do |spec|
+  spec.name = 'Yoga'
+  spec.version = '1.2.0'
+  spec.license =  { :type => 'BSD', :file => "LICENSE" }
+  spec.homepage = 'https://facebook.github.io/yoga/'
+  spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/c/'
+
+  spec.summary = 'Yoga is a cross-platform layout engine which implements Flexbox.'
+  spec.description = 'Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.'
+
+  spec.authors = 'Facebook'
+  spec.source = {
+    :git => 'https://github.com/facebook/yoga.git',
+    :tag => '1.2.0',
+  }
+
+  spec.module_name = 'yoga'
+  spec.requires_arc = false
+  spec.compiler_flags = [
+      '-fno-omit-frame-pointer',
+      '-fexceptions',
+      '-Wall',
+      '-Werror',
+      '-std=c11',
+      '-fPIC'
+  ]
+  spec.source_files = 'yoga/**/*.{c,h}'
+end

YogaKit.podspec

@@ -0,0 +1,29 @@
+podspec = Pod::Spec.new do |spec|
+  spec.name = 'YogaKit'
+  spec.version = '1.2.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/'
+
+  spec.summary = 'Yoga is a cross-platform layout engine which implements Flexbox.'
+  spec.description = 'Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.'
+
+  spec.authors = 'Facebook'
+  spec.source = {
+    :git => 'https://github.com/facebook/yoga.git',
+    :tag => '1.2.0',
+  }
+
+  spec.platform = :ios
+  spec.ios.deployment_target = '8.0'
+  spec.ios.frameworks = 'UIKit'
+
+  spec.dependency 'Yoga', '~> 1.2'
+  spec.source_files = 'YogaKit/Source/*.{h,m}'
+  spec.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h'
+  spec.private_header_files = 'YogaKit/Source/YGLayout+Private.h'
+end
+
+# See https://github.com/facebook/yoga/pull/366
+podspec.attributes_hash["readme"] = "YogaKit/README.md"
+podspec

YogaKit/.swift-version

@@ -0,0 +1 @@
+3.0.2

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(['*.m']),
-  exported_headers = glob(['*.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

@@ -0,0 +1,46 @@
+# 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

@@ -0,0 +1,22 @@
+# YogaKit
+
+[![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg?style=flat)](https://cocoapods.org/pods/YogaKit)
+[![Platform](https://img.shields.io/badge/platforms-iOS-orange.svg)](https://facebook.github.io/yoga/docs/api/yogakit/)
+[![Languages](https://img.shields.io/badge/languages-ObjC%20%7C%20Swift-orange.svg)](https://facebook.github.io/yoga/docs/api/yogakit/)
+
+## Installation
+YogaKit is available to install via [CocoaPods](https://cocoapods.org/).
+
+```
+pod 'YogaKit', '~> 1.1'
+```
+
+## Getting Started
+Checkout the docs [here](https://facebook.github.io/yoga/docs/api/yogakit/).
+
+We also have a sample project. To try it out, clone this repo and open `YogaKitSample.xcodeproj` in the [YogaKitSample](https://github.com/facebook/yoga/tree/master/YogaKit/YogaKitSample) directory.
+
+## 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.

YogaKit/Source/UIView+Yoga.h

@@ -0,0 +1,34 @@
+/**
+ * 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.
+ */
+
+#import "YGLayout.h"
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef void (^YGLayoutConfigurationBlock)(YGLayout *);
+
+@interface UIView (Yoga)
+
+/**
+ The YGLayout that is attached to this view. It is lazily created.
+ */
+@property (nonatomic, readonly, strong) YGLayout *yoga;
+
+/**
+ In ObjC land, every time you access `view.yoga.*` you are adding another `objc_msgSend`
+ to your code. If you plan on making multiple changes to YGLayout, it's more performant
+ to use this method, which uses a single objc_msgSend call.
+ */
+- (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block
+    NS_SWIFT_NAME(configureLayout(block:));
+
+@end
+
+NS_ASSUME_NONNULL_END

YogaKit/Source/UIView+Yoga.m

@@ -26,5 +26,11 @@ static const void *kYGYogaAssociatedKey = &kYGYogaAssociatedKey;
   return yoga;
 }
 
+- (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block
+{
+  if (block != nil) {
+    block(self.yoga);
+  }
+}
 
 @end

YogaKit/Source/YGLayout+Private.h

@@ -8,8 +8,11 @@
  */
 
 #import "YGLayout.h"
+#import <yoga/Yoga.h>
 
-@interface YGLayout (Private)
+@interface YGLayout ()
+
+@property (nonatomic, assign, readonly) YGNodeRef node;
 
 - (instancetype)initWithView:(UIView *)view;
 

YogaKit/Source/YGLayout.h

@@ -18,7 +18,8 @@
 @property (nonatomic, readwrite, assign, setter=setIncludedInLayout:) BOOL isIncludedInLayout;
 
 /**
- The property that decides during layout/sizing whether or not styling properties should be applied. Defaults to NO.
+ The property that decides during layout/sizing whether or not styling properties should be applied.
+ Defaults to NO.
  */
 @property (nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;
 
@@ -31,6 +32,7 @@
 @property (nonatomic, readwrite, assign) YGPositionType position;
 @property (nonatomic, readwrite, assign) YGWrap flexWrap;
 @property (nonatomic, readwrite, assign) YGOverflow overflow;
+@property (nonatomic, readwrite, assign) YGDisplay display;
 
 @property (nonatomic, readwrite, assign) CGFloat flexGrow;
 @property (nonatomic, readwrite, assign) CGFloat flexShrink;
@@ -84,27 +86,37 @@
 /**
  Get the resolved direction of this node. This won't be YGDirectionInherit
  */
- @property (nonatomic, readonly, assign) YGDirection resolvedDirection;
+@property (nonatomic, readonly, assign) YGDirection resolvedDirection;
 
 /**
- Perform a layout calculation and update the frames of the views in the hierarchy with the results
+ Perform a layout calculation and update the frames of the views in the hierarchy with the results.
+ If the origin is not preserved, the root view's layout results will applied from {0,0}.
  */
-- (void)applyLayout NS_SWIFT_NAME(applyLayout());
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
+    NS_SWIFT_NAME(applyLayout(preservingOrigin:));
 
 /**
- Returns the size of the view if no constraints were given. This could equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
+ 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;
+@property (nonatomic, readonly, assign) CGSize intrinsicSize;
 
 /**
  Returns the number of children that are using Flexbox.
  */
- @property (nonatomic, readonly, assign) NSUInteger numberOfChildren;
+@property (nonatomic, readonly, assign) NSUInteger numberOfChildren;
 
 /**
- Return a BOOL indiciating whether or not we this node contains any subviews that are included in Yoga's layout.
+ Return a BOOL indiciating whether or not we this node contains any subviews that are included in
+ Yoga's layout.
  */
- @property (nonatomic, readonly, assign) BOOL isLeaf;
+@property (nonatomic, readonly, assign) BOOL isLeaf;
+
+/**
+ Return's a BOOL indicating if a view is dirty. When a node is dirty
+ it usually indicates that it will be remeasured on the next layout pass.
+ */
+@property (nonatomic, readonly, assign) BOOL isDirty;
 
 /**
  Mark that a view's layout needs to be recalculated. Only works for leaf views.

YogaKit/Source/YGLayout.m

@@ -9,75 +9,87 @@
 
 #import "YGLayout+Private.h"
 #import "UIView+Yoga.h"
-#import <yoga/Yoga.h>
 
-#define YG_STYLE_PROPERTY_IMPL(type, lowercased_name, capitalized_name) \
-- (type)lowercased_name                                                 \
-{                                                                       \
-  return YGNodeStyleGet##capitalized_name(self.node);                   \
-}                                                                       \
-                                                                        \
-- (void)set##capitalized_name:(type)lowercased_name                     \
-{                                                                       \
-  YGNodeStyleSet##capitalized_name(self.node, lowercased_name);         \
+#define YG_PROPERTY(type, lowercased_name, capitalized_name)    \
+- (type)lowercased_name                                         \
+{                                                               \
+  return YGNodeStyleGet##capitalized_name(self.node);           \
+}                                                               \
+                                                                \
+- (void)set##capitalized_name:(type)lowercased_name             \
+{                                                               \
+  YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
 }
 
-#define YG_STYLE_EDGE_PROPERTY_IMPL(lowercased_name, capitalized_name, property, edge) \
-- (CGFloat)lowercased_name {                                                           \
-  return YGNodeStyleGet##property(self.node, edge);                                    \
-}                                                                                      \
-                                                                                       \
-- (void)set##capitalized_name:(CGFloat)lowercased_name {                               \
-  YGNodeStyleSet##property(self.node, edge, 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_STYLE_VALUE_PROPERTY_IMPL(lowercased_name, capitalized_name) \
-- (CGFloat)lowercased_name                                              \
-{                                                                       \
-  YGValue value = YGNodeStyleGet##capitalized_name(self.node);          \
-  if (value.unit == YGUnitPixel) {                                      \
-    return value.value;                                                 \
-  } else {                                                              \
-    return YGUndefined;                                                 \
-  }                                                                     \
-}                                                                       \
-                                                                        \
-- (void)set##capitalized_name:(CGFloat)lowercased_name                  \
-{                                                                       \
-  YGNodeStyleSet##capitalized_name(self.node, lowercased_name);         \
+#define YG_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge) \
+- (CGFloat)lowercased_name                                                         \
+{                                                                                  \
+  return YGNodeStyleGet##property(self.node, edge);                                \
 }
 
-#define YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, edge, edge_suffix) \
-- (CGFloat)lowercased_name##edge_suffix                                                        \
-{                                                                                              \
-  YGValue value = YGNodeStyleGet##capitalized_name(self.node, edge);                           \
-  if (value.unit == YGUnitPixel) {                                                             \
-    return value.value;                                                                        \
-  } else {                                                                                     \
-    return YGUndefined;                                                                        \
-  }                                                                                            \
-}                                                                                              \
-                                                                                               \
-- (void)set##capitalized_name##edge_suffix:(CGFloat)lowercased_name                            \
-{                                                                                              \
-  YGNodeStyleSet##capitalized_name(self.node, edge, lowercased_name);                          \
+#define YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge) \
+- (void)set##capitalized_name:(CGFloat)lowercased_name                             \
+{                                                                                  \
+  YGNodeStyleSet##property(self.node, edge, lowercased_name);                      \
 }
 
-#define YG_STYLE_ALL_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name)                   \
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeLeft, Left)             \
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeTop, Top)               \
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeRight, Right)           \
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeBottom, Bottom)         \
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeStart, Start)           \
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeEnd, End)               \
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeHorizontal, Horizontal) \
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeVertical, Vertical)     \
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeAll, )
+#define YG_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
+YG_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge)  \
+YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
+
+#define YG_VALUE_EDGE_PROPERTY_GETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
+- (CGFloat)objc_lowercased_name                                                                  \
+{                                                                                                \
+  YGValue value = YGNodeStyleGet##c_name(self.node, edge);                                       \
+  if (value.unit == YGUnitPoint) {                                                               \
+    return value.value;                                                                          \
+  } else {                                                                                       \
+    return YGUndefined;                                                                          \
+  }                                                                                              \
+}
+
+#define YG_VALUE_EDGE_PROPERTY_SETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
+- (void)set##objc_capitalized_name:(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)  \
+YG_VALUE_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
+
+#define YG_VALUE_EDGES_PROPERTIES(lowercased_name, capitalized_name)                                                            \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Left, capitalized_name##Left, capitalized_name, YGEdgeLeft)                             \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Top, capitalized_name##Top, capitalized_name, YGEdgeTop)                                \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Right, capitalized_name##Right, capitalized_name, YGEdgeRight)                          \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Bottom, capitalized_name##Bottom, capitalized_name, YGEdgeBottom)                       \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Start, capitalized_name##Start, capitalized_name, YGEdgeStart)                          \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##End, capitalized_name##End, capitalized_name, YGEdgeEnd)                                \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Horizontal, capitalized_name##Horizontal, capitalized_name, YGEdgeHorizontal) \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Vertical, capitalized_name##Vertical, capitalized_name, YGEdgeVertical)       \
+YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, capitalized_name, YGEdgeAll)
+
+static YGConfigRef globalConfig;
 
 @interface YGLayout ()
 
 @property (nonatomic, weak, readonly) UIView *view;
-@property (nonatomic, assign, readonly) YGNodeRef node;
 
 @end
 
@@ -85,17 +97,19 @@ YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeAll, )
 
 @synthesize isEnabled=_isEnabled;
 @synthesize isIncludedInLayout=_isIncludedInLayout;
+@synthesize node=_node;
 
 + (void)initialize
 {
-  YGSetExperimentalFeatureEnabled(YGExperimentalFeatureWebFlexBasis, true);
+  globalConfig = YGConfigNew();
+  YGConfigSetExperimentalFeatureEnabled(globalConfig, YGExperimentalFeatureWebFlexBasis, true);
 }
 
 - (instancetype)initWithView:(UIView*)view
 {
   if (self = [super init]) {
     _view = view;
-    _node = YGNodeNew();
+    _node = YGNodeNewWithConfig(globalConfig);
     YGNodeSetContext(_node, (__bridge void *) view);
     _isEnabled = NO;
     _isIncludedInLayout = YES;
@@ -109,11 +123,26 @@ YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeAll, )
   YGNodeFree(self.node);
 }
 
+- (BOOL)isDirty
+{
+  return YGNodeIsDirty(self.node);
+}
+
 - (void)markDirty
 {
-  if (self.isLeaf) {
-    YGNodeMarkDirty(self.node);
+  if (self.isDirty || !self.isLeaf) {
+    return;
   }
+
+  // Yoga is not happy if we try to mark a node as "dirty" before we have set
+  // the measure function. Since we already know that this is a leaf,
+  // this *should* be fine. Forgive me Hack Gods.
+  const YGNodeRef node = self.node;
+  if (YGNodeGetMeasureFunc(node) == NULL) {
+    YGNodeSetMeasureFunc(node, YGMeasureView);
+  }
+
+  YGNodeMarkDirty(node);
 }
 
 - (NSUInteger)numberOfChildren
@@ -148,43 +177,44 @@ YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(lowercased_name, capitalized_name, YGEdgeAll, )
   YGNodeStyleSetPositionType(self.node, position);
 }
 
-YG_STYLE_PROPERTY_IMPL(YGDirection, direction, Direction)
-YG_STYLE_PROPERTY_IMPL(YGFlexDirection, flexDirection, FlexDirection)
-YG_STYLE_PROPERTY_IMPL(YGJustify, justifyContent, JustifyContent)
-YG_STYLE_PROPERTY_IMPL(YGAlign, alignContent, AlignContent)
-YG_STYLE_PROPERTY_IMPL(YGAlign, alignItems, AlignItems)
-YG_STYLE_PROPERTY_IMPL(YGAlign, alignSelf, AlignSelf)
-YG_STYLE_PROPERTY_IMPL(YGWrap, flexWrap, FlexWrap)
-YG_STYLE_PROPERTY_IMPL(YGOverflow, overflow, Overflow)
+YG_PROPERTY(YGDirection, direction, Direction)
+YG_PROPERTY(YGFlexDirection, flexDirection, FlexDirection)
+YG_PROPERTY(YGJustify, justifyContent, JustifyContent)
+YG_PROPERTY(YGAlign, alignContent, AlignContent)
+YG_PROPERTY(YGAlign, alignItems, AlignItems)
+YG_PROPERTY(YGAlign, alignSelf, AlignSelf)
+YG_PROPERTY(YGWrap, flexWrap, FlexWrap)
+YG_PROPERTY(YGOverflow, overflow, Overflow)
+YG_PROPERTY(YGDisplay, display, Display)
 
-YG_STYLE_PROPERTY_IMPL(CGFloat, flexGrow, FlexGrow)
-YG_STYLE_PROPERTY_IMPL(CGFloat, flexShrink, FlexShrink)
-YG_STYLE_VALUE_PROPERTY_IMPL(flexBasis, FlexBasis)
+YG_PROPERTY(CGFloat, flexGrow, FlexGrow)
+YG_PROPERTY(CGFloat, flexShrink, FlexShrink)
+YG_VALUE_PROPERTY(flexBasis, FlexBasis)
 
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeLeft, Left)
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeTop, Top)
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeRight, Right)
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeBottom, Bottom)
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeStart, Start)
-YG_STYLE_EDGE_PROPERTY_UNIT_IMPL(position, Position, YGEdgeEnd, End)
-YG_STYLE_ALL_EDGE_PROPERTY_UNIT_IMPL(margin, Margin)
-YG_STYLE_ALL_EDGE_PROPERTY_UNIT_IMPL(padding, Padding)
+YG_VALUE_EDGE_PROPERTY(left, Left, Position, YGEdgeLeft)
+YG_VALUE_EDGE_PROPERTY(top, Top, Position, YGEdgeTop)
+YG_VALUE_EDGE_PROPERTY(right, Right, Position, YGEdgeRight)
+YG_VALUE_EDGE_PROPERTY(bottom, Bottom, Position, YGEdgeBottom)
+YG_VALUE_EDGE_PROPERTY(start, Start, Position, YGEdgeStart)
+YG_VALUE_EDGE_PROPERTY(end, End, Position, YGEdgeEnd)
+YG_VALUE_EDGES_PROPERTIES(margin, Margin)
+YG_VALUE_EDGES_PROPERTIES(padding, Padding)
 
-YG_STYLE_EDGE_PROPERTY_IMPL(borderLeftWidth, BorderLeftWidth, Border, YGEdgeLeft)
-YG_STYLE_EDGE_PROPERTY_IMPL(borderTopWidth, BorderTopWidth, Border, YGEdgeTop)
-YG_STYLE_EDGE_PROPERTY_IMPL(borderRightWidth, BorderRightWidth, Border, YGEdgeRight)
-YG_STYLE_EDGE_PROPERTY_IMPL(borderBottomWidth, BorderBottomWidth, Border, YGEdgeBottom)
-YG_STYLE_EDGE_PROPERTY_IMPL(borderStartWidth, BorderStartWidth, Border, YGEdgeStart)
-YG_STYLE_EDGE_PROPERTY_IMPL(borderEndWidth, BorderEndWidth, Border, YGEdgeEnd)
-YG_STYLE_EDGE_PROPERTY_IMPL(borderWidth, BorderWidth, Border, YGEdgeAll)
+YG_EDGE_PROPERTY(borderLeftWidth, BorderLeftWidth, Border, YGEdgeLeft)
+YG_EDGE_PROPERTY(borderTopWidth, BorderTopWidth, Border, YGEdgeTop)
+YG_EDGE_PROPERTY(borderRightWidth, BorderRightWidth, Border, YGEdgeRight)
+YG_EDGE_PROPERTY(borderBottomWidth, BorderBottomWidth, Border, YGEdgeBottom)
+YG_EDGE_PROPERTY(borderStartWidth, BorderStartWidth, Border, YGEdgeStart)
+YG_EDGE_PROPERTY(borderEndWidth, BorderEndWidth, Border, YGEdgeEnd)
+YG_EDGE_PROPERTY(borderWidth, BorderWidth, Border, YGEdgeAll)
 
-YG_STYLE_VALUE_PROPERTY_IMPL(width, Width)
-YG_STYLE_VALUE_PROPERTY_IMPL(height, Height)
-YG_STYLE_VALUE_PROPERTY_IMPL(minWidth, MinWidth)
-YG_STYLE_VALUE_PROPERTY_IMPL(minHeight, MinHeight)
-YG_STYLE_VALUE_PROPERTY_IMPL(maxWidth, MaxWidth)
-YG_STYLE_VALUE_PROPERTY_IMPL(maxHeight, MaxHeight)
-YG_STYLE_PROPERTY_IMPL(CGFloat, aspectRatio, AspectRatio)
+YG_VALUE_PROPERTY(width, Width)
+YG_VALUE_PROPERTY(height, Height)
+YG_VALUE_PROPERTY(minWidth, MinWidth)
+YG_VALUE_PROPERTY(minHeight, MinHeight)
+YG_VALUE_PROPERTY(maxWidth, MaxWidth)
+YG_VALUE_PROPERTY(maxHeight, MaxHeight)
+YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
 
 #pragma mark - Layout and Sizing
 
@@ -196,7 +226,13 @@ YG_STYLE_PROPERTY_IMPL(CGFloat, aspectRatio, AspectRatio)
 - (void)applyLayout
 {
   [self calculateLayoutWithSize:self.view.bounds.size];
-  YGApplyLayoutToViewHierarchy(self.view);
+  YGApplyLayoutToViewHierarchy(self.view, NO);
+}
+
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
+{
+  [self calculateLayoutWithSize:self.view.bounds.size];
+  YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
 }
 
 - (CGSize)intrinsicSize
@@ -335,10 +371,10 @@ static CGFloat YGRoundPixelValue(CGFloat value)
     scale = [UIScreen mainScreen].scale;
   });
 
-  return round(value * scale) / scale;
+  return roundf(value * scale) / scale;
 }
 
-static void YGApplyLayoutToViewHierarchy(UIView *view)
+static void YGApplyLayoutToViewHierarchy(UIView *view, BOOL preserveOrigin)
 {
   NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
 
@@ -359,10 +395,11 @@ static void YGApplyLayoutToViewHierarchy(UIView *view)
     topLeft.y + YGNodeLayoutGetHeight(node),
   };
 
+  const CGPoint origin = preserveOrigin ? view.frame.origin : CGPointZero;
   view.frame = (CGRect) {
     .origin = {
-      .x = YGRoundPixelValue(topLeft.x),
-      .y = YGRoundPixelValue(topLeft.y),
+      .x = YGRoundPixelValue(topLeft.x + origin.x),
+      .y = YGRoundPixelValue(topLeft.y + origin.y),
     },
     .size = {
       .width = YGRoundPixelValue(bottomRight.x) - YGRoundPixelValue(topLeft.x),
@@ -372,7 +409,7 @@ static void YGApplyLayoutToViewHierarchy(UIView *view)
 
   if (!yoga.isLeaf) {
     for (NSUInteger i=0; i<view.subviews.count; i++) {
-      YGApplyLayoutToViewHierarchy(view.subviews[i]);
+      YGApplyLayoutToViewHierarchy(view.subviews[i], NO);
     }
   }
 }

YogaKit/Tests/YogaKitTests.m

@@ -10,47 +10,72 @@
 #import <XCTest/XCTest.h>
 
 #import <YogaKit/UIView+Yoga.h>
+#import <YogaKit/YGLayout+Private.h>
+#import <yoga/Yoga.h>
 
 @interface YogaKitTests : XCTestCase
 @end
 
 @implementation YogaKitTests
 
-#ifndef TRAVIS_CI
+- (void)testConfigureLayoutIsNoOpWithNilBlock
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  XCTAssertNoThrow([view configureLayoutWithBlock:nil]);
+}
+
+- (void)testConfigureLayoutBlockWorksWithValidBlock
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  [view configureLayoutWithBlock:^(YGLayout *layout){
+    XCTAssertNotNil(layout);
+    layout.isEnabled = YES;
+    layout.width = 25;
+  }];
+
+  XCTAssertTrue(view.yoga.isEnabled);
+  XCTAssertEqual(view.yoga.width, 25);
+}
 
 - (void)testNodesAreDeallocedWithSingleView
 {
-  XCTAssertEqual(0, YGNodeGetInstanceCount());
+  __weak YGLayout *layoutRef = nil;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  view.yoga.flexBasis = 1;
-  XCTAssertEqual(1, YGNodeGetInstanceCount());
-  view = nil;
+  @autoreleasepool {
+    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+    view.yoga.flexBasis = 1;
 
-  XCTAssertEqual(0, YGNodeGetInstanceCount());
+    layoutRef = view.yoga;
+    XCTAssertNotNil(layoutRef);
+
+    view = nil;
+  }
+
+  XCTAssertNil(layoutRef);
 }
 
 - (void)testNodesAreDeallocedCascade
 {
-  XCTAssertEqual(0, YGNodeGetInstanceCount());
+  __weak YGLayout *topLayout = nil;
+  __weak YGLayout *subviewLayout = nil;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  view.yoga.flexBasis = 1;
+  @autoreleasepool {
+    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+    topLayout = view.yoga;
+    topLayout.flexBasis = 1;
 
-  for (int i=0; i<10; i++) {
     UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
-    subview.yoga.flexBasis = 1;
-    [view addSubview:subview];
-  }
-  XCTAssertEqual(11, YGNodeGetInstanceCount());
-  view = nil;
+    subviewLayout = subview.yoga;
+    subviewLayout.flexBasis = 1;
 
-  XCTAssertEqual(0, YGNodeGetInstanceCount());
+    view = nil;
+  }
+
+  XCTAssertNil(topLayout);
+  XCTAssertNil(subviewLayout);
 }
 
-#endif
-
-- (void)testUsesYoga
+- (void)testIsEnabled
 {
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   XCTAssertFalse(view.yoga.isEnabled);
@@ -87,13 +112,63 @@
 
   UIView *textBadgeView = [[UIView alloc] initWithFrame:CGRectZero];
   textBadgeView.yoga.isEnabled = YES;
-  textBadgeView.yoga.marginLeft = 3.0;
+  textBadgeView.yoga.margin = 0;
   textBadgeView.yoga.width = 10;
   textBadgeView.yoga.height = 10;
   [container addSubview:textBadgeView];
 
+  const CGSize textBadgeViewSize = textBadgeView.yoga.intrinsicSize;
+  XCTAssertEqual(textBadgeViewSize.height, 10);
+  XCTAssertEqual(textBadgeViewSize.width, 10);
+
   const CGSize containerSize = container.yoga.intrinsicSize;
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(514,21), containerSize), @"Size is actually %@", NSStringFromCGSize(containerSize));
+  const CGSize longTextLabelSize = longTextLabel.yoga.intrinsicSize;
+
+  XCTAssertEqual(longTextLabelSize.height, containerSize.height);
+  XCTAssertEqual(longTextLabelSize.width + textBadgeView.yoga.intrinsicSize.width, containerSize.width);
+}
+
+- (void)testPreservingOrigin
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,50,75)];
+  container.yoga.isEnabled = YES;
+
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  view.yoga.isEnabled = YES;
+  view.yoga.flexBasis = 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.flexGrow = 1;
+  [container addSubview:view2];
+
+  [container.yoga applyLayoutPreservingOrigin:YES];
+  XCTAssertEqual(50, view2.frame.origin.y);
+
+  [view2.yoga applyLayoutPreservingOrigin:NO];
+  XCTAssertEqual(25, view2.frame.origin.y);
+}
+
+- (void)testMarkingDirtyOnlyWorksOnLeafNodes
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
+  container.yoga.isEnabled = YES;
+
+  UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+  subview.yoga.isEnabled = YES;
+  [container addSubview:subview];
+
+  XCTAssertFalse(container.yoga.isDirty);
+  [container.yoga markDirty];
+  XCTAssertFalse(container.yoga.isDirty);
+
+  XCTAssertFalse(subview.yoga.isDirty);
+  [subview.yoga markDirty];
+  XCTAssertTrue(subview.yoga.isDirty);
 }
 
 - (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation
@@ -103,20 +178,22 @@
   container.yoga.flexDirection = YGFlexDirectionRow;
   container.yoga.alignItems = YGAlignFlexStart;
 
-  UILabel *label = [[UILabel alloc] initWithFrame:CGRectZero];
-  label.text = @"This is a short text.";
-  label.numberOfLines = 1;
-  label.yoga.isEnabled = YES;
-  [container addSubview:label];
+  UILabel *view = [[UILabel alloc] initWithFrame:CGRectZero];
+  view.text = @"This is a short text.";
+  view.numberOfLines = 1;
+  view.yoga.isEnabled = YES;
+  [container addSubview:view];
 
-  [container.yoga applyLayout];
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(146,21), label.bounds.size), @"Size is actually %@", NSStringFromCGSize(label.bounds.size));
+  [container.yoga applyLayoutPreservingOrigin:YES];
+  CGSize const viewSizeAfterFirstPass = view.frame.size;
 
-  label.text = @"This is a slightly longer text.";
-  [label.yoga markDirty];
+  view.text = @"This is a slightly longer text.";
+  XCTAssertTrue(CGSizeEqualToSize(view.frame.size, viewSizeAfterFirstPass));
 
-  [container.yoga applyLayout];
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(213,21), label.bounds.size), @"Size is actually %@", NSStringFromCGSize(label.bounds.size));
+  [view.yoga markDirty];
+
+  [container.yoga applyLayoutPreservingOrigin:YES];
+  XCTAssertFalse(CGSizeEqualToSize(view.frame.size, viewSizeAfterFirstPass));
 }
 
 - (void)testFrameAndOriginPlacement
@@ -127,18 +204,25 @@
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  for (int i = 0; i < 3; i++) {
-    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
-    subview.yoga.isEnabled = YES;
-    subview.yoga.flexGrow = 1;
+  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  subview1.yoga.isEnabled = YES;
+  subview1.yoga.flexGrow = 1;
+  [container addSubview:subview1];
 
-    [container addSubview:subview];
-  }
-  [container.yoga applyLayout];
+  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  subview2.yoga.isEnabled = YES;
+  subview2.yoga.flexGrow = 1;
+  [container addSubview:subview2];
 
-  XCTAssertFalse(CGRectIntersectsRect([container.subviews objectAtIndex:0].frame, [container.subviews objectAtIndex:1].frame));
-  XCTAssertFalse(CGRectIntersectsRect([container.subviews objectAtIndex:1].frame, [container.subviews objectAtIndex:2].frame));
-  XCTAssertFalse(CGRectIntersectsRect([container.subviews objectAtIndex:0].frame, [container.subviews objectAtIndex:2].frame));
+  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  subview3.yoga.isEnabled = YES;
+  subview3.yoga.flexGrow = 1;
+  [container addSubview:subview3];
+
+  [container.yoga applyLayoutPreservingOrigin:YES];
+
+  XCTAssertEqualWithAccuracy(subview2.frame.origin.x, CGRectGetMaxX(subview1.frame), FLT_EPSILON);
+  XCTAssertEqualWithAccuracy(subview3.frame.origin.x, CGRectGetMaxX(subview2.frame), FLT_EPSILON);
 
   CGFloat totalWidth = 0;
   for (UIView *view in container.subviews) {
@@ -171,15 +255,15 @@
   subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
-  [container.yoga applyLayout];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 
   XCTAssertTrue(CGRectEqualToRect(subview1.frame, CGRectMake(0, 0, 100, 50)));
-  XCTAssertTrue(CGRectEqualToRect(subview2.frame, CGRectMake(100, 0, 100, 50)), @"It's actually %@", NSStringFromCGRect(subview2.frame));
+  XCTAssertTrue(CGRectEqualToRect(subview2.frame, CGRectMake(100, 0, 100, 50)));
   XCTAssertTrue(CGRectEqualToRect(subview3.frame, CGRectMake(200, 0, 100, 50)));
 
   [container exchangeSubviewAtIndex:2 withSubviewAtIndex:0];
   subview2.yoga.isIncludedInLayout = NO;
-  [container.yoga applyLayout];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 
   XCTAssertTrue(CGRectEqualToRect(subview3.frame, CGRectMake(0, 0, 150, 50)));
   XCTAssertTrue(CGRectEqualToRect(subview1.frame, CGRectMake(150, 0, 150, 50)));
@@ -211,20 +295,20 @@
   subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
-  [container.yoga applyLayout];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 
-  for (UIView *view in container.subviews) {
-    XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(100, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(view.bounds.size));
+  for (UIView *subview in container.subviews) {
+    XCTAssertEqual(subview.bounds.size.width, 100);
   }
 
   subview3.yoga.isIncludedInLayout = NO;
-  [container.yoga applyLayout];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview1.bounds.size));
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview2.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview2.bounds.size));
+  XCTAssertEqual(subview1.bounds.size.width, 150);
+  XCTAssertEqual(subview2.bounds.size.width, 150);
 
   // We don't set the frame to zero, so, it should be set to what it was previously at.
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(100, 50), subview3.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview3.bounds.size));
+  XCTAssertEqual(subview3.bounds.size.width, 100);
 }
 
 - (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews
@@ -248,12 +332,12 @@
   subview3.yoga.isIncludedInLayout = YES;
   [container addSubview:subview3];
 
-  [container.yoga applyLayout];
-  XCTAssertEqual(1, container.yoga.numberOfChildren);
+  [container.yoga applyLayoutPreservingOrigin:YES];
+  XCTAssertEqual(container.yoga.numberOfChildren, 1);
 
   subview2.yoga.isIncludedInLayout = YES;
-  [container.yoga applyLayout];
-  XCTAssertEqual(2, container.yoga.numberOfChildren);
+  [container.yoga applyLayoutPreservingOrigin:YES];
+  XCTAssertEqual(container.yoga.numberOfChildren, 2);
 }
 
 - (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond
@@ -278,20 +362,21 @@
   subview3.yoga.isIncludedInLayout = NO;
   [container addSubview:subview3];
 
-  [container.yoga applyLayout];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview1.bounds.size));
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview2.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview2.bounds.size));
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeZero, subview3.bounds.size), @"Actual size %@", NSStringFromCGSize(subview3.bounds.size));
+  XCTAssertEqual(subview1.bounds.size.width, 150);
+  XCTAssertEqual(subview2.bounds.size.width, 150);
+  XCTAssertEqual(subview3.bounds.size.width, 0);
 
   subview3.yoga.isIncludedInLayout = YES;
-  [container.yoga applyLayout];
-  for (UIView *view in container.subviews) {
-    XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(100, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(view.bounds.size));
-  }
+  [container.yoga applyLayoutPreservingOrigin:YES];
+
+  XCTAssertEqual(subview1.bounds.size.width, 100);
+  XCTAssertEqual(subview2.bounds.size.width, 100);
+  XCTAssertEqual(subview3.bounds.size.width, 100);
 }
 
-- (void)testyg_isLeafFlag
+- (void)testIsLeafFlag
 {
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   XCTAssertTrue(view.yoga.isLeaf);
@@ -338,7 +423,7 @@
         someView.yoga.flexGrow = 1;
         [view addSubview:someView];
     }
-    [container.yoga applyLayout];
+    [container.yoga applyLayoutPreservingOrigin:YES];
 
     // Add the same amount of new views, reapply layout.
     for (UIView *view in @[subview1, subview2]) {
@@ -347,20 +432,24 @@
         someView.yoga.flexGrow = 1;
         [view addSubview:someView];
     }
-    [container.yoga applyLayout];
+    [container.yoga applyLayoutPreservingOrigin:YES];
 
-    XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(100, 25), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview1.bounds.size));
+    XCTAssertEqual(subview1.bounds.size.width, 100);
+    XCTAssertEqual(subview1.bounds.size.height, 25);
     for (UIView *subview in subview1.subviews) {
         const CGSize subviewSize = subview.bounds.size;
-        XCTAssertFalse(CGSizeEqualToSize(CGSizeZero, subviewSize));
+        XCTAssertNotEqual(subviewSize.width, 0);
+        XCTAssertNotEqual(subviewSize.height, 0);
         XCTAssertFalse(isnan(subviewSize.height));
         XCTAssertFalse(isnan(subviewSize.width));
     }
 
-    XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 25), subview2.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview2.bounds.size));
+    XCTAssertEqual(subview2.bounds.size.width, 150);
+    XCTAssertEqual(subview2.bounds.size.height, 25);
     for (UIView *subview in subview2.subviews) {
         const CGSize subviewSize = subview.bounds.size;
-        XCTAssertFalse(CGSizeEqualToSize(CGSizeZero, subview.bounds.size));
+        XCTAssertNotEqual(subviewSize.width, 0);
+        XCTAssertNotEqual(subviewSize.height, 0);
         XCTAssertFalse(isnan(subviewSize.height));
         XCTAssertFalse(isnan(subviewSize.width));
     }
@@ -379,9 +468,192 @@
     subview2.yoga.isEnabled = YES;
     [subview1 addSubview:subview2];
 
-    [container.yoga applyLayout];
+    [container.yoga applyLayoutPreservingOrigin:YES];
     [subview2 removeFromSuperview];
-    [container.yoga applyLayout];
+    [container.yoga applyLayoutPreservingOrigin:YES];
+}
+
+- (void)testPositionalPropertiesWork
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+
+  view.yoga.left = 1;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeLeft).value, 1);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeLeft).unit, YGUnitPoint);
+  XCTAssertEqual(view.yoga.left, 1);
+
+  view.yoga.right = 2;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeRight).value, 2);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeRight).unit, YGUnitPoint);
+  XCTAssertEqual(view.yoga.right, 2);
+
+  view.yoga.top = 3;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeTop).value, 3);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeTop).unit, YGUnitPoint);
+  XCTAssertEqual(view.yoga.top, 3);
+
+  view.yoga.bottom = 4;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeBottom).value, 4);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeBottom).unit, YGUnitPoint);
+  XCTAssertEqual(view.yoga.bottom, 4);
+
+  view.yoga.start = 5;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeStart).value, 5);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeStart).unit, YGUnitPoint);
+  XCTAssertEqual(view.yoga.start, 5);
+
+  view.yoga.end = 6;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeEnd).value, 6);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeEnd).unit, YGUnitPoint);
+  XCTAssertEqual(view.yoga.end, 6);
+}
+
+- (void)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.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.marginVertical = 3;
+  XCTAssertEqual(view.yoga.marginVertical, 3);
+  XCTAssertTrue(isnan(view.yoga.marginTop));
+  XCTAssertTrue(isnan(view.yoga.marginBottom));
+
+  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.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.marginTop = 6;
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeTop).value, 6);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeTop).unit, YGUnitPoint);
+  XCTAssertEqual(view.yoga.marginTop, 6);
+
+  view.yoga.marginBottom = 7;
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeBottom).value, 7);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeBottom).unit, YGUnitPoint);
+  XCTAssertEqual(view.yoga.marginBottom, 7);
+
+  view.yoga.marginStart = 8;
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeStart).value, 8);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeStart).unit, YGUnitPoint);
+  XCTAssertEqual(view.yoga.marginStart, 8);
+
+  view.yoga.marginEnd = 9;
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeEnd).value, 9);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeEnd).unit, YGUnitPoint);
+  XCTAssertEqual(view.yoga.marginEnd, 9);
+}
+
+- (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.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.paddingVertical = 3;
+  XCTAssertEqual(view.yoga.paddingVertical, 3);
+  XCTAssertTrue(isnan(view.yoga.paddingTop));
+  XCTAssertTrue(isnan(view.yoga.paddingBottom));
+
+  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.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.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.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.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.paddingEnd = 9;
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeEnd).value, 9);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeEnd).unit, YGUnitPoint);
+  XCTAssertEqual(view.yoga.paddingEnd, 9);
+}
+
+- (void)testBorderWidthPropertiesWork
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+
+  view.yoga.borderWidth = 1;
+  XCTAssertEqual(view.yoga.borderWidth, 1);
+  XCTAssertTrue(isnan(view.yoga.borderLeftWidth));
+  XCTAssertTrue(isnan(view.yoga.borderRightWidth));
+  XCTAssertTrue(isnan(view.yoga.borderStartWidth));
+  XCTAssertTrue(isnan(view.yoga.borderEndWidth));
+  XCTAssertTrue(isnan(view.yoga.borderTopWidth));
+  XCTAssertTrue(isnan(view.yoga.borderBottomWidth));
+
+  view.yoga.borderLeftWidth = 2;
+  XCTAssertEqual(view.yoga.borderLeftWidth, 2);
+
+  view.yoga.borderRightWidth = 3;
+  XCTAssertEqual(view.yoga.borderRightWidth, 3);
+
+  view.yoga.borderTopWidth = 4;
+  XCTAssertEqual(view.yoga.borderTopWidth, 4);
+
+  view.yoga.borderBottomWidth = 5;
+  XCTAssertEqual(view.yoga.borderBottomWidth, 5);
+
+  view.yoga.borderStartWidth = 6;
+  XCTAssertEqual(view.yoga.borderStartWidth, 6);
+
+  view.yoga.borderEndWidth = 7;
+  XCTAssertEqual(view.yoga.borderEndWidth, 7);
 }
 
 @end

YogaKit/YogaKitSample/Podfile

@@ -0,0 +1,6 @@
+use_frameworks!
+
+target 'YogaKitSample' do
+  pod 'YogaKit', :path => '../../YogaKit.podspec'
+  pod 'IGListKit', '~> 2.1.0'
+end

YogaKit/YogaKitSample/Podfile.lock

@@ -0,0 +1,26 @@
+PODS:
+  - IGListKit (2.1.0):
+    - IGListKit/Default (= 2.1.0)
+  - IGListKit/Default (2.1.0):
+    - IGListKit/Diffing
+  - IGListKit/Diffing (2.1.0)
+  - Yoga (1.2.0)
+  - YogaKit (1.2.0):
+    - Yoga (~> 1.2)
+
+DEPENDENCIES:
+  - IGListKit (~> 2.1.0)
+  - YogaKit (from `../../YogaKit.podspec`)
+
+EXTERNAL SOURCES:
+  YogaKit:
+    :path: "../../YogaKit.podspec"
+
+SPEC CHECKSUMS:
+  IGListKit: b826c68ef7a4ae1626c09d4d3e1ea7a169e6c36e
+  Yoga: 20fc010c282cc5f3c27ce512de1329cd1e72b077
+  YogaKit: 72d5c8a806dc5cf2aa50c93a6dd88913cdbec6fe
+
+PODFILE CHECKSUM: 216f8e7127767709e0e43f3711208d238fa5c404
+
+COCOAPODS: 1.2.0

YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj

@@ -7,24 +7,27 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		13687D481DF8748400E7C260 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13687D471DF8748400E7C260 /* main.m */; };
-		13687D4B1DF8748400E7C260 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13687D4A1DF8748400E7C260 /* AppDelegate.m */; };
-		13687D4E1DF8748400E7C260 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 13687D4D1DF8748400E7C260 /* ViewController.m */; };
 		13687D531DF8748400E7C260 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13687D521DF8748400E7C260 /* Assets.xcassets */; };
-		13687D781DF878C600E7C260 /* YGEnums.h in yoga */ = {isa = PBXBuildFile; fileRef = 13687D5E1DF8778F00E7C260 /* YGEnums.h */; };
-		13687D791DF878C600E7C260 /* YGMacros.h in yoga */ = {isa = PBXBuildFile; fileRef = 13687D5F1DF8778F00E7C260 /* YGMacros.h */; };
-		13687D7A1DF878C600E7C260 /* Yoga.h in yoga */ = {isa = PBXBuildFile; fileRef = 13687D631DF8778F00E7C260 /* Yoga.h */; };
-		13687D7C1DF878DD00E7C260 /* UIView+Yoga.h in YogaKit */ = {isa = PBXBuildFile; fileRef = 13687D691DF8778F00E7C260 /* UIView+Yoga.h */; };
-		13687D801DF87CEC00E7C260 /* UIView+Yoga.m in Sources */ = {isa = PBXBuildFile; fileRef = 13687D6A1DF8778F00E7C260 /* UIView+Yoga.m */; };
-		13687D811DF87CF200E7C260 /* YGNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = 13687D601DF8778F00E7C260 /* YGNodeList.c */; };
-		13687D821DF87CF200E7C260 /* Yoga.c in Sources */ = {isa = PBXBuildFile; fileRef = 13687D621DF8778F00E7C260 /* Yoga.c */; };
 		13687D851DF87D1E00E7C260 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 13687D841DF87D1E00E7C260 /* UIKit.framework */; };
 		13687D871DF87D2400E7C260 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 13687D861DF87D2400E7C260 /* Foundation.framework */; };
-		638A94431E1EF5D000A726AD /* YGLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 638A94411E1EF5D000A726AD /* YGLayout.m */; };
-		638A94451E1EF8A900A726AD /* YGValue.h in yoga */ = {isa = PBXBuildFile; fileRef = 638A94441E1EF89C00A726AD /* YGValue.h */; };
-		638A94481E1F06D100A726AD /* SwiftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 638A94471E1F06D100A726AD /* SwiftViewController.swift */; };
+		15A7CB5995C9DAB1C8803834 /* Pods_YogaKitSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C80A931E90C7F3088CB86822 /* Pods_YogaKitSample.framework */; };
+		40BD9F461E477A09002790A9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40BD9F451E477A09002790A9 /* AppDelegate.swift */; };
+		40BD9F4B1E47850C002790A9 /* BasicViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40BD9F4A1E47850C002790A9 /* BasicViewController.swift */; };
+		40BD9F501E479079002790A9 /* SingleLabelCollectionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40BD9F4F1E479079002790A9 /* SingleLabelCollectionCell.swift */; };
+		40BD9F521E479173002790A9 /* LayoutInclusionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40BD9F511E479173002790A9 /* LayoutInclusionViewController.swift */; };
+		638A94481E1F06D100A726AD /* ExamplesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 638A94471E1F06D100A726AD /* ExamplesViewController.swift */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		638A94541E215CC800A726AD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 13687D3B1DF8748300E7C260 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 13687D421DF8748300E7C260;
+			remoteInfo = YogaKitSample;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		13687D771DF878A000E7C260 /* yoga */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -32,10 +35,6 @@
 			dstPath = include/yoga;
 			dstSubfolderSpec = 16;
 			files = (
-				638A94451E1EF8A900A726AD /* YGValue.h in yoga */,
-				13687D781DF878C600E7C260 /* YGEnums.h in yoga */,
-				13687D791DF878C600E7C260 /* YGMacros.h in yoga */,
-				13687D7A1DF878C600E7C260 /* Yoga.h in yoga */,
 			);
 			name = yoga;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -46,7 +45,6 @@
 			dstPath = include/YogaKit;
 			dstSubfolderSpec = 16;
 			files = (
-				13687D7C1DF878DD00E7C260 /* UIView+Yoga.h in YogaKit */,
 			);
 			name = YogaKit;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -55,29 +53,19 @@
 
 /* Begin PBXFileReference section */
 		13687D431DF8748400E7C260 /* YogaKitSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = YogaKitSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		13687D471DF8748400E7C260 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		13687D491DF8748400E7C260 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
-		13687D4A1DF8748400E7C260 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		13687D4C1DF8748400E7C260 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
-		13687D4D1DF8748400E7C260 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		13687D521DF8748400E7C260 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		13687D571DF8748400E7C260 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		13687D5E1DF8778F00E7C260 /* YGEnums.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YGEnums.h; sourceTree = "<group>"; };
-		13687D5F1DF8778F00E7C260 /* YGMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YGMacros.h; sourceTree = "<group>"; };
-		13687D601DF8778F00E7C260 /* YGNodeList.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = YGNodeList.c; sourceTree = "<group>"; };
-		13687D611DF8778F00E7C260 /* YGNodeList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YGNodeList.h; sourceTree = "<group>"; };
-		13687D621DF8778F00E7C260 /* Yoga.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = Yoga.c; sourceTree = "<group>"; };
-		13687D631DF8778F00E7C260 /* Yoga.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Yoga.h; sourceTree = "<group>"; };
-		13687D691DF8778F00E7C260 /* UIView+Yoga.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+Yoga.h"; sourceTree = "<group>"; };
-		13687D6A1DF8778F00E7C260 /* UIView+Yoga.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+Yoga.m"; sourceTree = "<group>"; };
 		13687D841DF87D1E00E7C260 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		13687D861DF87D2400E7C260 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		638A94401E1EF5D000A726AD /* YGLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGLayout.h; sourceTree = "<group>"; };
-		638A94411E1EF5D000A726AD /* YGLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YGLayout.m; sourceTree = "<group>"; };
-		638A94421E1EF5D000A726AD /* YGLayout+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "YGLayout+Private.h"; sourceTree = "<group>"; };
-		638A94441E1EF89C00A726AD /* YGValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YGValue.h; sourceTree = "<group>"; };
-		638A94461E1F06D100A726AD /* YogaKitSample-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "YogaKitSample-Bridging-Header.h"; sourceTree = "<group>"; };
-		638A94471E1F06D100A726AD /* SwiftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftViewController.swift; sourceTree = "<group>"; };
+		1D2FF4D5FCA6A8C54A4074A3 /* Pods-YogaKitSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YogaKitSample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample.debug.xcconfig"; sourceTree = "<group>"; };
+		40BD9F451E477A09002790A9 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		40BD9F4A1E47850C002790A9 /* BasicViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = BasicViewController.swift; path = ViewControllers/BasicViewController.swift; sourceTree = "<group>"; };
+		40BD9F4F1E479079002790A9 /* SingleLabelCollectionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SingleLabelCollectionCell.swift; path = Views/SingleLabelCollectionCell.swift; sourceTree = "<group>"; };
+		40BD9F511E479173002790A9 /* LayoutInclusionViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = LayoutInclusionViewController.swift; path = ViewControllers/LayoutInclusionViewController.swift; sourceTree = "<group>"; };
+		638A94471E1F06D100A726AD /* ExamplesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExamplesViewController.swift; sourceTree = "<group>"; };
+		638A944F1E215CC800A726AD /* YogaKitSampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = YogaKitSampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		82F0896A88112E957EF37C7F /* Pods-YogaKitSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YogaKitSample.release.xcconfig"; path = "Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample.release.xcconfig"; sourceTree = "<group>"; };
+		C80A931E90C7F3088CB86822 /* Pods_YogaKitSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YogaKitSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -87,6 +75,14 @@
 			files = (
 				13687D871DF87D2400E7C260 /* Foundation.framework in Frameworks */,
 				13687D851DF87D1E00E7C260 /* UIKit.framework in Frameworks */,
+				15A7CB5995C9DAB1C8803834 /* Pods_YogaKitSample.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		638A944C1E215CC800A726AD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -96,11 +92,10 @@
 		13687D3A1DF8748300E7C260 = {
 			isa = PBXGroup;
 			children = (
-				13687D5D1DF8778F00E7C260 /* yoga */,
-				13687D641DF8778F00E7C260 /* YogaKit */,
 				13687D451DF8748400E7C260 /* YogaKitSample */,
 				13687D441DF8748400E7C260 /* Products */,
 				13687D831DF87D1E00E7C260 /* Frameworks */,
+				E1C759E3C8E84821213ECE8D /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -108,6 +103,7 @@
 			isa = PBXGroup;
 			children = (
 				13687D431DF8748400E7C260 /* YogaKitSample.app */,
+				638A944F1E215CC800A726AD /* YogaKitSampleTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -115,64 +111,52 @@
 		13687D451DF8748400E7C260 /* YogaKitSample */ = {
 			isa = PBXGroup;
 			children = (
-				13687D491DF8748400E7C260 /* AppDelegate.h */,
-				13687D4A1DF8748400E7C260 /* AppDelegate.m */,
-				13687D4C1DF8748400E7C260 /* ViewController.h */,
-				13687D4D1DF8748400E7C260 /* ViewController.m */,
-				638A94471E1F06D100A726AD /* SwiftViewController.swift */,
-				638A94461E1F06D100A726AD /* YogaKitSample-Bridging-Header.h */,
+				40BD9F4E1E47902F002790A9 /* Views */,
+				40BD9F481E4784B3002790A9 /* ViewControllers */,
+				638A94471E1F06D100A726AD /* ExamplesViewController.swift */,
 				13687D521DF8748400E7C260 /* Assets.xcassets */,
 				13687D571DF8748400E7C260 /* Info.plist */,
-				13687D461DF8748400E7C260 /* Supporting Files */,
+				40BD9F451E477A09002790A9 /* AppDelegate.swift */,
 			);
 			path = YogaKitSample;
 			sourceTree = "<group>";
 		};
-		13687D461DF8748400E7C260 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				13687D471DF8748400E7C260 /* main.m */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		13687D5D1DF8778F00E7C260 /* yoga */ = {
-			isa = PBXGroup;
-			children = (
-				638A94441E1EF89C00A726AD /* YGValue.h */,
-				13687D5E1DF8778F00E7C260 /* YGEnums.h */,
-				13687D5F1DF8778F00E7C260 /* YGMacros.h */,
-				13687D601DF8778F00E7C260 /* YGNodeList.c */,
-				13687D611DF8778F00E7C260 /* YGNodeList.h */,
-				13687D621DF8778F00E7C260 /* Yoga.c */,
-				13687D631DF8778F00E7C260 /* Yoga.h */,
-			);
-			name = yoga;
-			path = ../../yoga;
-			sourceTree = "<group>";
-		};
-		13687D641DF8778F00E7C260 /* YogaKit */ = {
-			isa = PBXGroup;
-			children = (
-				13687D691DF8778F00E7C260 /* UIView+Yoga.h */,
-				13687D6A1DF8778F00E7C260 /* UIView+Yoga.m */,
-				638A94401E1EF5D000A726AD /* YGLayout.h */,
-				638A94421E1EF5D000A726AD /* YGLayout+Private.h */,
-				638A94411E1EF5D000A726AD /* YGLayout.m */,
-			);
-			name = YogaKit;
-			path = ..;
-			sourceTree = "<group>";
-		};
 		13687D831DF87D1E00E7C260 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				13687D861DF87D2400E7C260 /* Foundation.framework */,
 				13687D841DF87D1E00E7C260 /* UIKit.framework */,
+				C80A931E90C7F3088CB86822 /* Pods_YogaKitSample.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		40BD9F481E4784B3002790A9 /* ViewControllers */ = {
+			isa = PBXGroup;
+			children = (
+				40BD9F4A1E47850C002790A9 /* BasicViewController.swift */,
+				40BD9F511E479173002790A9 /* LayoutInclusionViewController.swift */,
+			);
+			name = ViewControllers;
+			sourceTree = "<group>";
+		};
+		40BD9F4E1E47902F002790A9 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				40BD9F4F1E479079002790A9 /* SingleLabelCollectionCell.swift */,
+			);
+			name = Views;
+			sourceTree = "<group>";
+		};
+		E1C759E3C8E84821213ECE8D /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				1D2FF4D5FCA6A8C54A4074A3 /* Pods-YogaKitSample.debug.xcconfig */,
+				82F0896A88112E957EF37C7F /* Pods-YogaKitSample.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -180,11 +164,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13687D5A1DF8748400E7C260 /* Build configuration list for PBXNativeTarget "YogaKitSample" */;
 			buildPhases = (
+				513B543F92B2E4F4D1EE1CE7 /* [CP] Check Pods Manifest.lock */,
 				13687D771DF878A000E7C260 /* yoga */,
 				13687D7B1DF878CE00E7C260 /* YogaKit */,
 				13687D3F1DF8748300E7C260 /* Sources */,
 				13687D401DF8748300E7C260 /* Frameworks */,
 				13687D411DF8748300E7C260 /* Resources */,
+				FA2FB9DD6471BDD3FBCE503B /* [CP] Embed Pods Frameworks */,
+				6E01EB987F1564F3D71EBE5A /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -195,6 +182,24 @@
 			productReference = 13687D431DF8748400E7C260 /* YogaKitSample.app */;
 			productType = "com.apple.product-type.application";
 		};
+		638A944E1E215CC800A726AD /* YogaKitSampleTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 638A94561E215CC800A726AD /* Build configuration list for PBXNativeTarget "YogaKitSampleTests" */;
+			buildPhases = (
+				638A944B1E215CC800A726AD /* Sources */,
+				638A944C1E215CC800A726AD /* Frameworks */,
+				638A944D1E215CC800A726AD /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				638A94551E215CC800A726AD /* PBXTargetDependency */,
+			);
+			name = YogaKitSampleTests;
+			productName = YogaKitSampleTests;
+			productReference = 638A944F1E215CC800A726AD /* YogaKitSampleTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
@@ -209,6 +214,11 @@
 						LastSwiftMigration = 0820;
 						ProvisioningStyle = Automatic;
 					};
+					638A944E1E215CC800A726AD = {
+						CreatedOnToolsVersion = 8.2.1;
+						ProvisioningStyle = Automatic;
+						TestTargetID = 13687D421DF8748300E7C260;
+					};
 				};
 			};
 			buildConfigurationList = 13687D3E1DF8748300E7C260 /* Build configuration list for PBXProject "YogaKitSample" */;
@@ -225,6 +235,7 @@
 			projectRoot = "";
 			targets = (
 				13687D421DF8748300E7C260 /* YogaKitSample */,
+				638A944E1E215CC800A726AD /* YogaKitSampleTests */,
 			);
 		};
 /* End PBXProject section */
@@ -238,26 +249,93 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		638A944D1E215CC800A726AD /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		513B543F92B2E4F4D1EE1CE7 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+		6E01EB987F1564F3D71EBE5A /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		FA2FB9DD6471BDD3FBCE503B /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		13687D3F1DF8748300E7C260 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				638A94481E1F06D100A726AD /* SwiftViewController.swift in Sources */,
-				13687D801DF87CEC00E7C260 /* UIView+Yoga.m in Sources */,
-				13687D4E1DF8748400E7C260 /* ViewController.m in Sources */,
-				13687D4B1DF8748400E7C260 /* AppDelegate.m in Sources */,
-				13687D821DF87CF200E7C260 /* Yoga.c in Sources */,
-				13687D811DF87CF200E7C260 /* YGNodeList.c in Sources */,
-				13687D481DF8748400E7C260 /* main.m in Sources */,
-				638A94431E1EF5D000A726AD /* YGLayout.m in Sources */,
+				40BD9F501E479079002790A9 /* SingleLabelCollectionCell.swift in Sources */,
+				40BD9F521E479173002790A9 /* LayoutInclusionViewController.swift in Sources */,
+				638A94481E1F06D100A726AD /* ExamplesViewController.swift in Sources */,
+				40BD9F4B1E47850C002790A9 /* BasicViewController.swift in Sources */,
+				40BD9F461E477A09002790A9 /* AppDelegate.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		638A944B1E215CC800A726AD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		638A94551E215CC800A726AD /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 13687D421DF8748300E7C260 /* YogaKitSample */;
+			targetProxy = 638A94541E215CC800A726AD /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
 		13687D581DF8748400E7C260 /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -351,6 +429,7 @@
 		};
 		13687D5B1DF8748400E7C260 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1D2FF4D5FCA6A8C54A4074A3 /* Pods-YogaKitSample.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
@@ -358,7 +437,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "YogaKitSample/YogaKitSample-Bridging-Header.h";
+				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 			};
@@ -366,6 +445,7 @@
 		};
 		13687D5C1DF8748400E7C260 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 82F0896A88112E957EF37C7F /* Pods-YogaKitSample.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
@@ -373,11 +453,39 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "YogaKitSample/YogaKitSample-Bridging-Header.h";
+				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
+		638A94571E215CC800A726AD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				INFOPLIST_FILE = YogaKitSampleTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSampleTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/YogaKitSample.app/YogaKitSample";
+			};
+			name = Debug;
+		};
+		638A94581E215CC800A726AD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				INFOPLIST_FILE = YogaKitSampleTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSampleTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/YogaKitSample.app/YogaKitSample";
+			};
+			name = Release;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -399,6 +507,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		638A94561E215CC800A726AD /* Build configuration list for PBXNativeTarget "YogaKitSampleTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				638A94571E215CC800A726AD /* Debug */,
+				638A94581E215CC800A726AD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 13687D3B1DF8748300E7C260 /* Project object */;

YogaKit/YogaKitSample/YogaKitSample.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:YogaKitSample.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>

YogaKit/YogaKitSample/YogaKitSample/AppDelegate.h

@@ -1,16 +0,0 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
- */
-
-#import <UIKit/UIKit.h>
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@end
-

YogaKit/YogaKitSample/YogaKitSample/AppDelegate.m

@@ -1,27 +0,0 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
- */
-
-#import "AppDelegate.h"
-#import "ViewController.h"
-
-@interface AppDelegate ()
-
-@end
-
-@implementation AppDelegate
-
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-    self.window.rootViewController = [ViewController new];
-    self.window.backgroundColor = [UIColor whiteColor];
-    [self.window makeKeyAndVisible];
-    return YES;
-}
-
-@end

YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift

@@ -0,0 +1,27 @@
+/**
+ * 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.
+ */
+
+import Foundation
+import UIKit
+
+@UIApplicationMain
+class AppDelegate: UIResponder, UIApplicationDelegate {
+    var window: UIWindow?
+
+    func applicationDidFinishLaunching(_ application: UIApplication) {
+        self.window = UIWindow(frame: UIScreen.main.bounds)
+        if let window = self.window {
+            let navigationController = UINavigationController(rootViewController: ExamplesViewController())
+            navigationController.navigationBar.isTranslucent = false
+
+            window.rootViewController = navigationController
+            window.backgroundColor = .white
+            window.makeKeyAndVisible()
+        }
+    }
+}

YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,43 +1,69 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Yoga-20x20@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Yoga-20x20@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
-      "scale" : "2x"
+      "idiom" : "iphone",
+      "filename" : "Yoga-29x29@1x.png",
+      "scale" : "1x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
-      "scale" : "3x"
-    },
-    {
       "idiom" : "iphone",
-      "size" : "40x40",
+      "filename" : "Yoga-29x29@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "size" : "40x40",
+      "filename" : "Yoga-29x29@3x.png",
       "scale" : "3x"
     },
     {
+      "size" : "40x40",
       "idiom" : "iphone",
-      "size" : "60x60",
+      "filename" : "Yoga-40x40@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "40x40",
       "idiom" : "iphone",
+      "filename" : "Yoga-40x40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Yoga-57x57@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Yoga-57x57@2x.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Yoga-60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Yoga-60x60@3x.png",
       "scale" : "3x"
     }
   ],

YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift

@@ -0,0 +1,100 @@
+/**
+ * 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.
+ */
+
+import UIKit
+import IGListKit
+
+private final class ExampleModel {
+    let title: String
+    let controllerClass: UIViewController.Type
+
+    init(title: String, controllerClass: UIViewController.Type) {
+        self.title = title
+        self.controllerClass = controllerClass
+    }
+}
+
+extension ExampleModel: IGListDiffable {
+    fileprivate func diffIdentifier() -> NSObjectProtocol {
+        return title as NSString
+    }
+
+    fileprivate func isEqual(toDiffableObject object: IGListDiffable?) -> Bool {
+        guard let otherObj = object as? ExampleModel else { return false }
+
+        return (title == otherObj.title) &&
+               (controllerClass == otherObj.controllerClass)
+    }
+}
+
+final class ExamplesViewController: UIViewController, IGListAdapterDataSource, IGListSingleSectionControllerDelegate {
+    private lazy var adapter: IGListAdapter = {
+        return IGListAdapter(updater: IGListAdapterUpdater(), viewController: self, workingRangeSize: 0)
+    }()
+    private let collectionView = IGListCollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())
+
+
+    // Update this to array to create more examples.
+    private let models: [ExampleModel] = [ExampleModel(title: "Basic Layout", controllerClass: BasicViewController.self),
+                                          ExampleModel(title: "Exclude Views in Layout", controllerClass: LayoutInclusionViewController.self)]
+
+    //MARK: UIViewController
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        title = "Examples"
+        view.addSubview(collectionView)
+        adapter.collectionView = collectionView
+        adapter.dataSource = self
+    }
+
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        collectionView.frame = view.bounds
+    }
+
+    //MARK: IGListAdapterDataSource
+
+    func objects(for listAdapter: IGListAdapter) -> [IGListDiffable] {
+        return models as [IGListDiffable]
+    }
+
+    func listAdapter(_ listAdapter: IGListAdapter, sectionControllerFor object: Any) -> IGListSectionController {
+        let sizeBlock: IGListSingleSectionCellSizeBlock = { (model, context) in
+            return CGSize(width: (context?.containerSize.width)!, height: 75.0)
+        }
+
+        let configureBlock: IGListSingleSectionCellConfigureBlock = { (model, cell) in
+            guard let m = model as? ExampleModel, let c = cell as? SingleLabelCollectionCell else {
+                return
+            }
+
+            c.label.text = m.title
+        }
+
+        let sectionController = IGListSingleSectionController(cellClass: SingleLabelCollectionCell.self,
+                                                              configureBlock: configureBlock,
+                                                              sizeBlock: sizeBlock)
+        sectionController.selectionDelegate = self
+        return sectionController
+    }
+
+    func emptyView(for listAdapter: IGListAdapter) -> UIView? { return nil }
+
+    //MARK: IGListSingleSectionControllerDelegate
+
+    func didSelect(_ sectionController: IGListSingleSectionController) {
+        let section = adapter.section(for: sectionController)
+        let model = models[section]
+
+        let controller = model.controllerClass.init()
+        controller.title = model.title
+
+        self.navigationController?.pushViewController(controller, animated: true)
+    }
+}

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

@@ -7,34 +7,60 @@
  */
 
 import UIKit
+import IGListKit
+import YogaKit
 
-class SwiftViewController: UIViewController {
-  override func viewDidLoad() {
-    let root = self.view!
-    root.backgroundColor = .red
-    root.yoga.isEnabled = true
-    root.yoga.width = self.view.bounds.size.width
-    root.yoga.height = self.view.bounds.size.height
-    root.yoga.alignItems = .center
-    root.yoga.justifyContent = .center
-
-    let child1 = UIView()
-    child1.backgroundColor = .blue
-    child1.yoga.isEnabled = true
-    child1.yoga.width = 100
-    child1.yoga.height = 10
-
-    let child2 = UIView()
-    child2.backgroundColor = .green
-    child2.frame = CGRect(x: 0, y: 0, width: 200, height: 100)
-
-    let child3 = UIView()
-    child3.backgroundColor = .yellow
-    child3.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
-
-    child2.addSubview(child3)
-    root.addSubview(child1)
-    root.addSubview(child2)
-    root.yoga.applyLayout()
-  }
+struct DemoItem {
+    let name: String
+}
+
+final class SwiftViewController: UIViewController, IGListAdapterDataSource {
+
+    lazy var adapter: IGListAdapter = {
+        return IGListAdapter(updater: IGListAdapterUpdater(), viewController: self, workingRangeSize: 0)
+    }()
+    let collectionView = IGListCollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())
+
+    //MARK: UIViewController
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        title = "YogaKit Examples"
+        view.addSubview(collectionView)
+        adapter.collectionView = collectionView
+        adapter.dataSource = self
+    }
+
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        collectionView.frame = view.bounds
+    }
+
+
+    //MARK: IGListAdapterDataSource
+
+    func objects(for listAdapter: IGListAdapter) -> [IGListDiffable] {
+        return ["Dustin" as IGListDiffable, "Ryan" as IGListDiffable]
+    }
+
+    func listAdapter(_ listAdapter: IGListAdapter, sectionControllerFor object: Any) -> IGListSectionController {
+        let sizeBlock: IGListSingleSectionCellSizeBlock = { (model, context) in
+            return CGSize(width: (context?.containerSize.width)!, height: 100.0)
+        }
+        let configureBlock: IGListSingleSectionCellConfigureBlock = { (model, cell) in
+            guard let m = model as? String else {
+                return
+            }
+
+            cell.backgroundColor = (m == "Dustin") ? .blue : .red
+        }
+
+        return IGListSingleSectionController(cellClass: UICollectionViewCell.self,
+                                             configureBlock: configureBlock,
+                                             sizeBlock: sizeBlock)
+    }
+
+    func emptyView(for listAdapter: IGListAdapter) -> UIView? {
+        return nil
+    }
 }

YogaKit/YogaKitSample/YogaKitSample/ViewController.h

@@ -1,15 +0,0 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
- */
-
-#import <UIKit/UIKit.h>
-
-@interface ViewController : UIViewController
-
-
-@end
-

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -10,10 +10,6 @@
 
 #import <YogaKit/UIView+Yoga.h>
 
-@interface ViewController ()
-
-@end
-
 @implementation ViewController
 
 - (void)viewDidLoad
@@ -53,7 +49,7 @@
     [child2 addSubview:child3];
     [root addSubview:child1];
     [root addSubview:child2];
-    [root.yoga applyLayout];
+    [root.yoga applyLayoutPreservingOrigin:NO];
 }
 
 

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift

@@ -0,0 +1,48 @@
+/**
+ * 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.
+ */
+
+import UIKit
+import YogaKit
+
+final class BasicViewController: UIViewController {
+    override func viewDidLoad() {
+        let containerSize = self.view.bounds.size
+
+        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
+
+        let child1 = UIView()
+        child1.backgroundColor = .blue
+        child1.yoga.isEnabled = true
+        child1.yoga.width = 100
+        child1.yoga.height = 10
+        child1.yoga.marginBottom = 25
+        root.addSubview(child1)
+
+        let child2 = UIView()
+        child2.yoga.isEnabled = true
+        child2.yoga.alignSelf = .flexEnd
+        child2.backgroundColor = .green
+        child2.frame = CGRect(x: 0, y: 0, width: 200, height: 100)
+        root.addSubview(child2)
+
+        let child3 = UIView()
+        child3.yoga.isEnabled = true
+        child3.yoga.alignSelf = .flexStart
+        child3.backgroundColor = .yellow
+        child3.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
+        root.addSubview(child3)
+
+        root.yoga.applyLayout(preservingOrigin: true)
+    }
+}

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift

@@ -0,0 +1,70 @@
+/**
+ * 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.
+ */
+
+import UIKit
+import YogaKit
+
+final class LayoutInclusionViewController: UIViewController {
+    private let button: UIButton = UIButton(type: .system)
+    private let disappearingView: UIView = UIView(frame: .zero)
+    private let contentView: UIView = UIView(frame: .zero)
+
+    override func viewDidLoad() {
+        let root = self.view!
+        root.backgroundColor = .white
+        root.yoga.isEnabled = true
+        root.yoga.flexDirection = .column
+        root.yoga.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
+        self.view.addSubview(contentView)
+
+        let redView = UIView(frame: .zero)
+        redView.backgroundColor = .red
+        redView.yoga.isEnabled = true
+        redView.yoga.flexGrow = 1
+        redView.yoga.flexShrink = 1
+        contentView.addSubview(redView)
+
+        disappearingView.backgroundColor = .blue
+        disappearingView.yoga.isEnabled = true
+        disappearingView.yoga.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
+        root.addSubview(button)
+
+        root.yoga.applyLayout(preservingOrigin: false)
+    }
+
+    // MARK - UIButton Action
+    func buttonWasTapped() {
+        button.isSelected = !button.isSelected
+
+        button.isUserInteractionEnabled = false
+        disappearingView.yoga.isIncludedInLayout = !disappearingView.yoga.isIncludedInLayout
+        disappearingView.isHidden = !disappearingView.isHidden
+
+        contentView.yoga.applyLayout(preservingOrigin: true)
+        button.isUserInteractionEnabled = true
+    }
+}

YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift

@@ -0,0 +1,45 @@
+/**
+ * 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.
+ */
+
+import UIKit
+import YogaKit
+
+final class SingleLabelCollectionCell: UICollectionViewCell {
+    let label: UILabel = UILabel(frame: .zero)
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+
+        contentView.yoga.isEnabled = true
+        contentView.yoga.flexDirection = .column
+        contentView.yoga.justifyContent = .flexEnd
+
+        label.textAlignment = .center
+        label.numberOfLines = 1
+        label.yoga.isIncludedInLayout = false
+        contentView.addSubview(label)
+
+        let border = UIView(frame: .zero)
+        border.backgroundColor = .lightGray
+        border.yoga.isEnabled = true
+        border.yoga.height = 0.5
+        border.yoga.marginHorizontal = 25
+        contentView.addSubview(border)
+    }
+
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+
+        contentView.yoga.applyLayout(preservingOrigin: false)
+        label.frame = contentView.bounds
+    }
+}

YogaKit/YogaKitSample/YogaKitSample/YogaKitSample-Bridging-Header.h

@@ -1,10 +0,0 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
- */
-
-#import "UIView+Yoga.h"
-#import <yoga/Yoga.h>

YogaKit/YogaKitSample/YogaKitSample/main.m

@@ -1,16 +0,0 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
- */
-
-#import <UIKit/UIKit.h>
-#import "AppDelegate.h"
-
-int main(int argc, char * argv[]) {
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
-}

android/BUCK

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

android/build.gradle

@@ -0,0 +1,52 @@
+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.2.0'
+group = 'com.facebook.yoga.android'
+
+android {
+    compileSdkVersion 19
+    buildToolsVersion "19.1.0"
+
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 19
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+}
+
+dependencies {
+    compile 'com.facebook.yoga:yoga:1.2.0'
+}
+
+task sourcesJar(type: Jar) {
+    classifier = 'source'
+    from android.sourceSets.main.java.srcDirs
+}
+
+task javadoc(type: Javadoc) {
+    failOnError false
+    source = android.sourceSets.main.java.sourceFiles
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    classpath += configurations.compile
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+ext {
+    bintrayName = "com.facebook.yoga.android:yoga-layout"
+}
+
+apply from: rootProject.file('gradle/android-jcenter-install.gradle')

android/sample/AndroidManifest.xml

@@ -0,0 +1,47 @@
+<?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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.facebook.samples.yoga"
+          android:versionCode="1"
+          android:versionName="1.0"
+          >
+
+  <variable name="applicationId" value="com.facebook.yoga"/>
+  <variable name="app_label" value="Yoga Sample App"/>
+
+  <uses-sdk
+    android:minSdkVersion="15"
+    android:targetSdkVersion="19"
+    />
+
+  <application
+      android:label="@string/app_name"
+      android:icon="@drawable/ic_launcher"
+      android:allowBackup="false"
+      android:theme="@style/NoTitleBarWhiteBG"
+      android:supportsRtl="true"
+      >
+
+    <activity
+        android:name=".MainActivity"
+        android:exported="true"
+        >
+
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+
+    </activity>
+
+  </application>
+
+</manifest>

android/sample/BUCK

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

android/sample/debug.keystore.properties

@@ -0,0 +1,3 @@
+key.alias=androiddebugkey
+key.store.password=android
+key.alias.password=android

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

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

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

@@ -0,0 +1,34 @@
+/**
+ * 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.
+ */
+
+package com.facebook.samples.yoga;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.LayoutInflater;
+
+import com.facebook.samples.yoga.R;
+import com.facebook.soloader.SoLoader;
+import com.facebook.yoga.android.YogaViewLayoutFactory;
+
+/**
+ * An activity to show off Yoga in Android.  This activity shows a simple layout (defined in
+ * {@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 {
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    LayoutInflater.from(this).setFactory(YogaViewLayoutFactory.getInstance());
+    super.onCreate(savedInstanceState);
+    SoLoader.init(this, false);
+
+    setContentView(R.layout.main_layout);
+  }
+}

android/sample/res/drawable/action_bar_background.xml

@@ -0,0 +1,17 @@
+<?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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="rectangle"
+  >
+  <solid
+    android:color="@color/yoga_grey"
+    />
+</shape>

android/sample/res/drawable/sample_children_background.xml

@@ -0,0 +1,34 @@
+<?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.
+-->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    >
+
+  <corners
+      android:radius="4dp"
+      />
+
+  <stroke
+      android:width="1dp"
+      android:color="@color/children_stroke"
+      />
+
+  <padding
+      android:top="6dp"
+      android:bottom="6dp"
+      android:left="8dp"
+      android:right="8dp"
+      />
+
+  <solid
+      android:color="@color/children_background"
+      />
+</shape>

android/sample/res/layout/main_layout.xml

@@ -0,0 +1,137 @@
+<?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.
+-->
+
+<YogaLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yoga="http://schemas.android.com/apk/res/com.facebook.samples.yoga"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+  <YogaLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="@drawable/sample_children_background"
+      yoga:yg_margin_horizontal="10dp"
+      yoga:yg_margin_top="5dp"
+      yoga:yg_flex_direction="row"
+      yoga:yg_align_items="center"
+      >
+    <ImageView
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@drawable/ic_launcher"
+        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:yg_flex="1"
+        yoga:yg_margin_start="8dp"
+        />
+  </YogaLayout>
+  <YogaLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="@drawable/sample_children_background"
+      yoga:yg_margin_horizontal="10dp"
+      yoga:yg_margin_top="5dp"
+      yoga:yg_flex_direction="row"
+      yoga:yg_align_items="center"
+      >
+    <ImageView
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@drawable/ic_launcher"
+        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:yg_flex="1"
+        yoga:yg_margin_start="8dp"
+        />
+  </YogaLayout>
+  <YogaLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="@drawable/sample_children_background"
+      yoga:yg_margin_horizontal="10dp"
+      yoga:yg_margin_top="5dp"
+      yoga:yg_flex_direction="row"
+      yoga:yg_align_items="center"
+      >
+    <ImageView
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@drawable/ic_launcher"
+        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:yg_flex="1"
+        yoga:yg_margin_start="8dp"
+        />
+  </YogaLayout>
+  <YogaLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="@drawable/sample_children_background"
+      yoga:yg_margin_horizontal="10dp"
+      yoga:yg_margin_top="5dp"
+      yoga:yg_flex_direction="row"
+      yoga:yg_align_items="center"
+      >
+    <ImageView
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@drawable/ic_launcher"
+        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:yg_flex="1"
+        yoga:yg_margin_start="8dp"
+        />
+  </YogaLayout>
+  <YogaLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="@drawable/sample_children_background"
+      yoga:yg_margin_horizontal="10dp"
+      yoga:yg_margin_top="5dp"
+      yoga:yg_flex_direction="row"
+      yoga:yg_align_items="center"
+      >
+    <ImageView
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@drawable/ic_launcher"
+        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:yg_flex="1"
+        yoga:yg_margin_start="10dp"
+        />
+  </YogaLayout>
+</YogaLayout>

android/sample/res/values/colors.xml

@@ -0,0 +1,20 @@
+<?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.
+-->
+
+<resources>
+
+  <color name="yoga_grey">#FF303846</color>
+  <color name="yoga_blue">#FF97DCCF</color>
+
+  <color name="children_background">#FFFFFFFF</color>
+  <color name="children_stroke">#665890ff</color>
+  <color name="children_text">#FF23355b</color>
+
+</resources>

android/sample/res/values/strings.xml

@@ -0,0 +1,33 @@
+<?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.
+-->
+
+<resources>
+  <string name="app_name">Yoga</string>
+  <string
+      name="child_1_text"
+      description="Placeholder text for the first element in the layout"
+      >Hello.  I am Yoga!</string>
+  <string
+      name="child_2_text"
+      description="Placeholder text for the second element in the layout"
+      >I am a layout engine!</string>
+  <string
+      name="child_3_text"
+      description="Placeholder text for the third element in the layout"
+      >I run natively.</string>
+  <string
+      name="child_4_text"
+      description="Placeholder text for the fourth element in the layout"
+      >So I\'m fast.</string>
+  <string
+      name="child_5_text"
+      description="Placeholder text for the fifth element in the layout"
+      >Who are you?</string>
+</resources>

android/sample/res/values/styles.xml

@@ -0,0 +1,23 @@
+<?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.
+-->
+
+<resources>
+  <style name="NoTitleBarWhiteBG" parent="Theme.AppCompat.Light">
+    <item name="android:actionBarStyle">@style/MyActionBar</item>
+    <item name="android:textDirection">locale</item>
+  </style>
+  <style name="MyActionBar" parent="Widget.AppCompat.Light.ActionBar">
+    <item name="android:titleTextStyle">@style/MyTitleText</item>
+    <item name="android:background">@drawable/action_bar_background</item>
+  </style>
+  <style name="MyTitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
+    <item name="android:textColor">@color/yoga_blue</item>
+  </style>
+</resources>

android/src/main/AndroidManifest.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.facebook.yoga.android"
+          android:versionCode="1"
+          android:versionName="1.0"
+          >
+
+  <uses-sdk
+    android:minSdkVersion="15"
+    android:targetSdkVersion="21"
+    />
+
+  <application/>
+
+</manifest>

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

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

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

@@ -0,0 +1,150 @@
+/**
+ * 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.
+ */
+
+package com.facebook.yoga.android;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.facebook.yoga.YogaNode;
+
+/**
+ * Much like a {@link YogaLayout}, except this class does not render itself (the container) to the
+ * screen.  As a result, <i>do not use this if you wish the container to have a background or
+ * foreground</i>.  However, all of its children will still render as expected.
+ *
+ * <p>
+ * In practice, this class never added to the View tree, and all its children become children of its
+ * parent.  As a result, all the layout (such as the traversal of the tree) is performed by Yoga
+ * (and so natively) increasing performance.
+ */
+public class VirtualYogaLayout extends ViewGroup {
+
+  final private List<View> mChildren = new LinkedList<>();
+  final private Map<View, YogaNode> mYogaNodes = new HashMap<>();
+  final private YogaNode mYogaNode = new YogaNode();
+
+  public VirtualYogaLayout(Context context) {
+    super(context);
+  }
+
+  public VirtualYogaLayout(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public VirtualYogaLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+    YogaLayout.LayoutParams lp = new YogaLayout.LayoutParams(context, attrs);
+    YogaLayout.applyLayoutParams(lp, mYogaNode, this);
+  }
+
+  public YogaNode getYogaNode() {
+    return mYogaNode;
+  }
+
+  /**
+   * Called to add a view, creating a new yoga node for it and adding that yoga node to the parent.
+   * If the child is a {@link VirtualYogaLayout}, we simply transfer all its children to this one
+   * in a manner that maintains the tree, and add its root to the tree.
+   *
+   * @param child the View to add
+   * @param index the position at which to add it (ignored)
+   * @param params the layout parameters to apply
+   */
+  @Override
+  public void addView(View child, int index, ViewGroup.LayoutParams params) {
+    if (child instanceof VirtualYogaLayout) {
+      ((VirtualYogaLayout) child).transferChildren(this);
+
+      final YogaNode childNode = ((VirtualYogaLayout) child).getYogaNode();
+      mYogaNode.addChildAt(childNode, mYogaNode.getChildCount());
+
+      return;
+    }
+
+    YogaNode node = new YogaNode();
+    YogaLayout.LayoutParams lp = new YogaLayout.LayoutParams(params);
+    YogaLayout.applyLayoutParams(lp, node, child);
+    node.setData(child);
+    node.setMeasureFunction(new YogaLayout.ViewMeasureFunction());
+
+    mYogaNode.addChildAt(node, mYogaNode.getChildCount());
+
+    addView(child, node);
+  }
+
+  /**
+   * Called to add a view with a corresponding node, but not to change the Yoga tree in any way.
+   *
+   * @param child the View to add
+   * @param node the corresponding yoga node
+   */
+  public void addView(View child, YogaNode node) {
+    mChildren.add(child);
+    mYogaNodes.put(child, node);
+  }
+
+  /**
+   * Gives up children {@code View}s to the parent, maintaining the Yoga tree.  This function calls
+   * {@link YogaLayout#addView(View, YogaNode)} or {@link VirtualYogaLayout#addView(View, YogaNode)}
+   * on the parent to add the {@code View} without generating new yoga nodes.
+   *
+   * @param parent the parent to pass children to (must be a YogaLayout or a VirtualYogaLayout)
+   */
+  protected void transferChildren(ViewGroup parent) {
+    if (parent instanceof VirtualYogaLayout) {
+      for (View child : mChildren) {
+        ((VirtualYogaLayout) parent).addView(child, mYogaNodes.get(child));
+      }
+    } else if (parent instanceof YogaLayout) {
+      for (View child : mChildren) {
+        ((YogaLayout) parent).addView(child, mYogaNodes.get(child));
+      }
+    } else {
+      throw new RuntimeException("VirtualYogaLayout cannot transfer children to ViewGroup of type "
+          +parent.getClass().getCanonicalName()+".  Must either be a VirtualYogaLayout or a " +
+          "YogaLayout.");
+    }
+    mChildren.clear();
+  }
+
+  @Override
+  protected void onLayout(boolean changed, int l, int t, int r, int b) {
+    throw new RuntimeException("Attempting to layout a VirtualYogaLayout");
+  }
+
+  @Override
+  public ViewGroup.LayoutParams generateLayoutParams(AttributeSet attrs) {
+    return new YogaLayout.LayoutParams(getContext(), attrs);
+  }
+
+  @Override
+  protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
+    return new YogaLayout.LayoutParams(
+        ViewGroup.LayoutParams.MATCH_PARENT,
+        ViewGroup.LayoutParams.MATCH_PARENT);
+  }
+
+  @Override
+  protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
+    return new YogaLayout.LayoutParams(p);
+  }
+
+  @Override
+  protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+    return p instanceof YogaLayout.LayoutParams;
+  }
+}

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

@@ -0,0 +1,814 @@
+/**
+ * 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.
+ */
+
+package com.facebook.yoga.android;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import android.content.Context;
+import android.content.res.Configuration;
+import android.content.res.TypedArray;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.util.SparseArray;
+import android.util.TypedValue;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.facebook.yoga.android.R;
+import com.facebook.yoga.YogaAlign;
+import com.facebook.yoga.YogaConstants;
+import com.facebook.yoga.YogaDirection;
+import com.facebook.yoga.YogaDisplay;
+import com.facebook.yoga.YogaEdge;
+import com.facebook.yoga.YogaFlexDirection;
+import com.facebook.yoga.YogaJustify;
+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.YogaOverflow;
+import com.facebook.yoga.YogaPositionType;
+import com.facebook.yoga.YogaWrap;
+
+/**
+ * A {@code ViewGroup} based on the Yoga layout engine.
+ *
+ * <p>
+ * This class is designed to be as "plug and play" as possible.  That is, you can use it in XML
+ * like this (note: to use {@code YogaLayout} you need to use the {@link YogaViewLayoutFactory}):
+ * <p>
+ * <pre>{@code
+ * <YogaLayout
+ *     xmlns:android="http://schemas.android.com/apk/res/android"
+ *     xmlns:yoga="http://schemas.android.com/lib/com.facebook.yoga.android"
+ *     android:layout_width="match_parent"
+ *     android:layout_height="match_parent"
+ *     yoga:flex_direction="row"
+ *     yoga:padding_all="10dp"
+ *     >
+ *     <TextView
+ *         android:layout_width="match_parent"
+ *         android:layout_height="match_parent"
+ *         android:text="Hello, World!"
+ *         yoga:flex="1"
+ *         />
+ * </YogaLayout>
+ * }</pre>
+ *
+ * Under the hood, all views added to this {@code ViewGroup} are laid out using flexbox rules
+ * and the Yoga engine.
+ */
+public class YogaLayout extends ViewGroup {
+  private final Map<View, YogaNode> mYogaNodes;
+  private final YogaNode mYogaNode;
+
+  public YogaLayout(Context context) {
+    this(context, null, 0);
+  }
+
+  public YogaLayout(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public YogaLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+
+    mYogaNode = new YogaNode();
+    mYogaNodes = new HashMap<>();
+
+    mYogaNode.setData(this);
+    mYogaNode.setMeasureFunction(new ViewMeasureFunction());
+
+    final LayoutParams layoutParams = new LayoutParams(context, attrs);
+    applyLayoutParams(layoutParams, mYogaNode, this);
+  }
+
+  YogaNode getYogaNode() {
+    return mYogaNode;
+  }
+
+  YogaNode getYogaNodeForView(View view) {
+    return mYogaNodes.get(view);
+  }
+
+  /**
+   * 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 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
+   * child, but use its root node instead.
+   *
+   * If the child is a {@link VirtualYogaLayout}, we also use its Yoga node, but we also instruct it
+   * to transfer all of its children to this {@link YogaLayout} while preserving the Yoga tree (so
+   * that the layout of its children is correct).  The {@link VirtualYogaLayout} is then not added
+   * to the View hierarchy.
+   *
+   * <p><strong>Note:</strong> do not invoke this method from
+   * {@code #draw(android.graphics.Canvas)}, {@code onDraw(android.graphics.Canvas)},
+   * {@code #dispatchDraw(android.graphics.Canvas)} or any related method.</p>
+   *
+   * @param child the child view to add
+   * @param index the position at which to add the child or -1 to add last
+   * @param params the layout parameters to set on the child
+   */
+  @Override
+  public void addView(View child, int index, ViewGroup.LayoutParams params) {
+    // Internal nodes (which this is now) cannot have measure functions
+    mYogaNode.setMeasureFunction(null);
+
+    if (child instanceof VirtualYogaLayout) {
+      ((VirtualYogaLayout) child).transferChildren(this);
+      final YogaNode childNode = ((VirtualYogaLayout) child).getYogaNode();
+
+      mYogaNode.addChildAt(childNode, mYogaNode.getChildCount());
+
+      return;
+    }
+
+    super.addView(child, index, params);
+
+    // It is possible that addView is being called as part of a transferal of children, in which
+    // case we already know about the YogaNode and only need the Android View tree to be aware
+    // that we now own this child.  If so, we don't need to do anything further
+    if (mYogaNodes.containsKey(child)) {
+      return;
+    }
+
+    YogaNode childNode;
+
+    if (child instanceof YogaLayout) {
+      childNode = ((YogaLayout) child).getYogaNode();
+    } else {
+      childNode = new YogaNode();
+
+      childNode.setData(child);
+      childNode.setMeasureFunction(new ViewMeasureFunction());
+    }
+
+    final LayoutParams lp = (LayoutParams) child.getLayoutParams();
+    applyLayoutParams(lp, childNode, child);
+
+    mYogaNodes.put(child, childNode);
+    mYogaNode.addChildAt(childNode, mYogaNode.getChildCount());
+  }
+
+  /**
+   * Adds a view to this {@code ViewGroup} with an already given {@code YogaNode}.  Use
+   * this function if you already have a Yoga node (and perhaps tree) associated with the view you
+   * are adding, that you would like to preserve.
+   *
+   * @param child The view to add
+   * @param node The Yoga node belonging to the view
+   */
+  public void addView(View child, YogaNode node) {
+    mYogaNodes.put(child, node);
+    addView(child);
+  }
+
+  @Override
+  public void removeView(View view) {
+    removeViewFromYogaTree(view, false);
+    super.removeView(view);
+  }
+
+  @Override
+  public void removeViewAt(int index) {
+    removeViewFromYogaTree(getChildAt(index), false);
+    super.removeViewAt(index);
+  }
+
+  @Override
+  public void removeViewInLayout(View view) {
+    removeViewFromYogaTree(view, true);
+    super.removeViewInLayout(view);
+  }
+
+  @Override
+  public void removeViews(int start, int count) {
+    for (int i = start; i < start + count; i++) {
+      removeViewFromYogaTree(getChildAt(i), false);
+    }
+    super.removeViews(start, count);
+  }
+
+  @Override
+  public void removeViewsInLayout(int start, int count) {
+    for (int i = start; i < start + count; i++) {
+      removeViewFromYogaTree(getChildAt(i), true);
+    }
+    super.removeViewsInLayout(start, count);
+  }
+
+  @Override
+  public void removeAllViews() {
+    final int childCount = getChildCount();
+    for (int i = 0; i < childCount; i++) {
+      removeViewFromYogaTree(getChildAt(i), false);
+    }
+    super.removeAllViews();
+  }
+
+  @Override
+  public void removeAllViewsInLayout() {
+    final int childCount = getChildCount();
+    for (int i = 0; i < childCount; i++) {
+      removeViewFromYogaTree(getChildAt(i), true);
+    }
+    super.removeAllViewsInLayout();
+  }
+
+  /**
+   * Marks a particular view as "dirty" and to be relaid out.  If the view is not a child of this
+   * {@link YogaLayout}, the entire tree is traversed to find it.
+   *
+   * @param view the view to mark as dirty
+   */
+  public void invalidate(View view) {
+    if (mYogaNodes.containsKey(view)) {
+      mYogaNodes.get(view).dirty();
+      return;
+    }
+
+    final int childCount = mYogaNode.getChildCount();
+    for (int i = 0; i < childCount; i++) {
+      final YogaNode yogaNode = mYogaNode.getChildAt(i);
+      if (yogaNode.getData() instanceof YogaLayout) {
+        ((YogaLayout) yogaNode.getData()).invalidate(view);
+      }
+    }
+    invalidate();
+  }
+
+  private void removeViewFromYogaTree(View view, boolean inLayout) {
+    final YogaNode node = mYogaNodes.get(view);
+    if (node == null) {
+      return;
+    }
+
+    final YogaNode parent = node.getParent();
+
+    for (int i = 0; i < parent.getChildCount(); i++) {
+      if (parent.getChildAt(i).equals(node)) {
+        parent.removeChildAt(i);
+        break;
+      }
+    }
+
+    node.setData(null);
+    mYogaNodes.remove(view);
+
+    if (inLayout) {
+      mYogaNode.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
+    }
+  }
+
+  private void applyLayoutRecursive(YogaNode node, float xOffset, float yOffset) {
+    View view = (View) node.getData();
+    if (view != null && view != this) {
+      if (view.getVisibility() == GONE) {
+        return;
+      }
+      view.measure(
+          View.MeasureSpec.makeMeasureSpec(
+              Math.round(node.getLayoutWidth()),
+              View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(
+              Math.round(node.getLayoutHeight()),
+              View.MeasureSpec.EXACTLY));
+      view.layout(
+          Math.round(xOffset + node.getLayoutX()),
+          Math.round(yOffset + node.getLayoutY()),
+          Math.round(xOffset + node.getLayoutX() + node.getLayoutWidth()),
+          Math.round(yOffset + node.getLayoutY() + node.getLayoutHeight()));
+    }
+
+    final int childrenCount = node.getChildCount();
+    for (int i = 0; i < childrenCount; i++) {
+      if (this.equals(view)) {
+        applyLayoutRecursive(node.getChildAt(i), xOffset, yOffset);
+      } else if (view instanceof YogaLayout) {
+        continue;
+      } else {
+        applyLayoutRecursive(
+            node.getChildAt(i),
+            xOffset + node.getLayoutX(),
+            yOffset + node.getLayoutY());
+      }
+    }
+  }
+
+  @Override
+  protected void onLayout(boolean changed, int l, int t, int r, int b) {
+    // Either we are a root of a tree, or this function is called by our parent's onLayout, in which
+    // case our r-l and b-t are the size of our node.
+    if (!(getParent() instanceof YogaLayout)) {
+        createLayout(
+            MeasureSpec.makeMeasureSpec(r - l, MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(b - t, MeasureSpec.EXACTLY));
+    }
+
+    applyLayoutRecursive(mYogaNode, 0, 0);
+  }
+
+  /**
+   * This function is mostly unneeded, because Yoga is doing the measuring.  Hence we only need to
+   * return accurate results if we are the root.
+   *
+   * @param widthMeasureSpec the suggested specification for the width
+   * @param heightMeasureSpec the suggested specification for the height
+   */
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    if (!(getParent() instanceof YogaLayout)) {
+      createLayout(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    setMeasuredDimension(
+        Math.round(mYogaNode.getLayoutWidth()),
+        Math.round(mYogaNode.getLayoutHeight()));
+  }
+
+  private void createLayout(int widthMeasureSpec, int heightMeasureSpec) {
+    final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
+    final int heightSize = MeasureSpec.getSize(heightMeasureSpec);
+    final int widthMode = MeasureSpec.getMode(widthMeasureSpec);
+    final int heightMode = MeasureSpec.getMode(heightMeasureSpec);
+
+    if (heightMode == MeasureSpec.EXACTLY) {
+      mYogaNode.setHeight(heightSize);
+    }
+    if (widthMode == MeasureSpec.EXACTLY) {
+      mYogaNode.setWidth(widthSize);
+    }
+    if (heightMode == MeasureSpec.AT_MOST) {
+      mYogaNode.setMaxHeight(heightSize);
+    }
+    if (widthMode == MeasureSpec.AT_MOST) {
+      mYogaNode.setMaxWidth(widthSize);
+    }
+
+    mYogaNode.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
+  }
+
+  /**
+   * Applies the layout parameters to the YogaNode.  That is, this function is a translator from
+   * {@code yoga:X="Y"} to {@code yogaNode.setX(Y);}, with some reasonable defaults.
+   *
+   * <p>
+   * If the SDK version is high enough, and the {@code yoga:direction} is not set on
+   * the component, the direction (LTR or RTL) is set according to the locale.
+   *
+   * <p>
+   * The attributes {@code padding_top}, {@code padding_right} etc. default to those of the view's
+   * drawable background, if it has one.
+   *
+   * @param layoutParameters The source set of params
+   * @param node The destination node
+   */
+  protected static void applyLayoutParams(LayoutParams layoutParameters, YogaNode node, View view) {
+    // JELLY_BEAN_MR1 (17) is the first version supporting getLayoutDirection()
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+      Configuration configuration = view.getResources().getConfiguration();
+      if (configuration.getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
+        node.setDirection(YogaDirection.RTL);
+      }
+    }
+
+    Drawable background = view.getBackground();
+    if (background != null) {
+      final Rect backgroundPadding = new Rect();
+      if (background.getPadding(backgroundPadding)) {
+        node.setPadding(YogaEdge.LEFT, backgroundPadding.left);
+        node.setPadding(YogaEdge.TOP, backgroundPadding.top);
+        node.setPadding(YogaEdge.RIGHT, backgroundPadding.right);
+        node.setPadding(YogaEdge.BOTTOM, backgroundPadding.bottom);
+      }
+    }
+
+    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_yg_align_content) {
+        node.setAlignContent(YogaAlign.fromInt(Math.round(value)));
+      } else if (attribute == R.styleable.yoga_yg_align_items) {
+        node.setAlignItems(YogaAlign.fromInt(Math.round(value)));
+      } else if (attribute == R.styleable.yoga_yg_align_self) {
+        node.setAlignSelf(YogaAlign.fromInt(Math.round(value)));
+      } else if (attribute == R.styleable.yoga_yg_aspect_ratio) {
+        node.setAspectRatio(value);
+      } else if (attribute == R.styleable.yoga_yg_border_left) {
+        node.setBorder(YogaEdge.LEFT, value);
+      } else if (attribute == R.styleable.yoga_yg_border_top) {
+        node.setBorder(YogaEdge.TOP, value);
+      } else if (attribute == R.styleable.yoga_yg_border_right) {
+        node.setBorder(YogaEdge.RIGHT, value);
+      } else if (attribute == R.styleable.yoga_yg_border_bottom) {
+        node.setBorder(YogaEdge.BOTTOM, value);
+      } else if (attribute == R.styleable.yoga_yg_border_start) {
+        node.setBorder(YogaEdge.START, value);
+      } else if (attribute == R.styleable.yoga_yg_border_end) {
+        node.setBorder(YogaEdge.END, value);
+      } else if (attribute == R.styleable.yoga_yg_border_horizontal) {
+        node.setBorder(YogaEdge.HORIZONTAL, value);
+      } else if (attribute == R.styleable.yoga_yg_border_vertical) {
+        node.setBorder(YogaEdge.VERTICAL, value);
+      } else if (attribute == R.styleable.yoga_yg_border_all) {
+        node.setBorder(YogaEdge.ALL, value);
+      } else if (attribute == R.styleable.yoga_yg_direction) {
+        node.setDirection(YogaDirection.fromInt(Math.round(value)));
+      } 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_yg_flex_basis) {
+        node.setFlexBasis(value);
+      } else if (attribute == R.styleable.yoga_yg_flex_direction) {
+        node.setFlexDirection(YogaFlexDirection.fromInt(Math.round(value)));
+      } else if (attribute == R.styleable.yoga_yg_flex_grow) {
+        node.setFlexGrow(value);
+      } else if (attribute == R.styleable.yoga_yg_flex_shrink) {
+        node.setFlexShrink(value);
+      } else if (attribute == R.styleable.yoga_yg_height) {
+        node.setHeight(value);
+      } else if (attribute == R.styleable.yoga_yg_margin_left) {
+        node.setMargin(YogaEdge.LEFT, value);
+      } else if (attribute == R.styleable.yoga_yg_justify_content) {
+        node.setJustifyContent(YogaJustify.fromInt(Math.round(value)));
+      } else if (attribute == R.styleable.yoga_yg_margin_top) {
+        node.setMargin(YogaEdge.TOP, value);
+      } else if (attribute == R.styleable.yoga_yg_margin_right) {
+        node.setMargin(YogaEdge.RIGHT, value);
+      } else if (attribute == R.styleable.yoga_yg_margin_bottom) {
+        node.setMargin(YogaEdge.BOTTOM, value);
+      } else if (attribute == R.styleable.yoga_yg_margin_start) {
+        node.setMargin(YogaEdge.START, value);
+      } else if (attribute == R.styleable.yoga_yg_margin_end) {
+        node.setMargin(YogaEdge.END, value);
+      } else if (attribute == R.styleable.yoga_yg_margin_horizontal) {
+        node.setMargin(YogaEdge.HORIZONTAL, value);
+      } else if (attribute == R.styleable.yoga_yg_margin_vertical) {
+        node.setMargin(YogaEdge.VERTICAL, value);
+      } else if (attribute == R.styleable.yoga_yg_margin_all) {
+        node.setMargin(YogaEdge.ALL, value);
+      } else if (attribute == R.styleable.yoga_yg_max_height) {
+        node.setMaxHeight(value);
+      } else if (attribute == R.styleable.yoga_yg_max_width) {
+        node.setMaxWidth(value);
+      } else if (attribute == R.styleable.yoga_yg_min_height) {
+        node.setMinHeight(value);
+      } else if (attribute == R.styleable.yoga_yg_min_width) {
+        node.setMinWidth(value);
+      } else if (attribute == R.styleable.yoga_yg_overflow) {
+        node.setOverflow(YogaOverflow.fromInt(Math.round(value)));
+      } else if (attribute == R.styleable.yoga_yg_padding_left) {
+        node.setPadding(YogaEdge.LEFT, value);
+      } else if (attribute == R.styleable.yoga_yg_padding_top) {
+        node.setPadding(YogaEdge.TOP, value);
+      } else if (attribute == R.styleable.yoga_yg_padding_right) {
+        node.setPadding(YogaEdge.RIGHT, value);
+      } else if (attribute == R.styleable.yoga_yg_padding_bottom) {
+        node.setPadding(YogaEdge.BOTTOM, value);
+      } else if (attribute == R.styleable.yoga_yg_padding_start) {
+        node.setPadding(YogaEdge.START, value);
+      } else if (attribute == R.styleable.yoga_yg_padding_end) {
+        node.setPadding(YogaEdge.END, value);
+      } else if (attribute == R.styleable.yoga_yg_padding_horizontal) {
+        node.setPadding(YogaEdge.HORIZONTAL, value);
+      } else if (attribute == R.styleable.yoga_yg_padding_vertical) {
+        node.setPadding(YogaEdge.VERTICAL, value);
+      } else if (attribute == R.styleable.yoga_yg_padding_all) {
+        node.setPadding(YogaEdge.ALL, value);
+      } else if (attribute == R.styleable.yoga_yg_position_left) {
+        node.setPosition(YogaEdge.LEFT, value);
+      } else if (attribute == R.styleable.yoga_yg_position_top) {
+        node.setPosition(YogaEdge.TOP, value);
+      } else if (attribute == R.styleable.yoga_yg_position_right) {
+        node.setPosition(YogaEdge.RIGHT, value);
+      } else if (attribute == R.styleable.yoga_yg_position_bottom) {
+        node.setPosition(YogaEdge.BOTTOM, value);
+      } else if (attribute == R.styleable.yoga_yg_position_start) {
+        node.setPosition(YogaEdge.START, value);
+      } else if (attribute == R.styleable.yoga_yg_position_end) {
+        node.setPosition(YogaEdge.END, value);
+      } else if (attribute == R.styleable.yoga_yg_position_horizontal) {
+        node.setPosition(YogaEdge.HORIZONTAL, value);
+      } else if (attribute == R.styleable.yoga_yg_position_vertical) {
+        node.setPosition(YogaEdge.VERTICAL, value);
+      } else if (attribute == R.styleable.yoga_yg_position_all) {
+        node.setPosition(YogaEdge.ALL, value);
+      } else if (attribute == R.styleable.yoga_yg_position_type) {
+        node.setPositionType(YogaPositionType.fromInt(Math.round(value)));
+      } else if (attribute == R.styleable.yoga_yg_width) {
+        node.setWidth(value);
+      } 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_margin_left) {
+          node.setMarginAuto(YogaEdge.LEFT);
+        } else if (attribute == R.styleable.yoga_yg_margin_top) {
+          node.setMarginAuto(YogaEdge.TOP);
+        } else if (attribute == R.styleable.yoga_yg_margin_right) {
+          node.setMarginAuto(YogaEdge.RIGHT);
+        } else if (attribute == R.styleable.yoga_yg_margin_bottom) {
+          node.setMarginAuto(YogaEdge.BOTTOM);
+        } else if (attribute == R.styleable.yoga_yg_margin_start) {
+          node.setMarginAuto(YogaEdge.START);
+        } else if (attribute == R.styleable.yoga_yg_margin_end) {
+          node.setMarginAuto(YogaEdge.END);
+        } else if (attribute == R.styleable.yoga_yg_margin_horizontal) {
+          node.setMarginAuto(YogaEdge.HORIZONTAL);
+        } else if (attribute == R.styleable.yoga_yg_margin_vertical) {
+          node.setMarginAuto(YogaEdge.VERTICAL);
+        } else if (attribute == R.styleable.yoga_yg_margin_all) {
+          node.setMarginAuto(YogaEdge.ALL);
+        }
+      }
+
+      if (value.endsWith("%")) {
+        final float numericValue = Float.parseFloat(value.substring(0, value.length()-1));
+
+        if (attribute == R.styleable.yoga_yg_flex_basis) {
+          node.setFlexBasisPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_height) {
+          node.setHeightPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_margin_left) {
+          node.setMarginPercent(YogaEdge.LEFT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_margin_top) {
+          node.setMarginPercent(YogaEdge.TOP, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_margin_right) {
+          node.setMarginPercent(YogaEdge.RIGHT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_margin_bottom) {
+          node.setMarginPercent(YogaEdge.BOTTOM, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_margin_start) {
+          node.setMarginPercent(YogaEdge.START, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_margin_end) {
+          node.setMarginPercent(YogaEdge.END, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_margin_horizontal) {
+          node.setMarginPercent(YogaEdge.HORIZONTAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_margin_vertical) {
+          node.setMarginPercent(YogaEdge.VERTICAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_margin_all) {
+          node.setMarginPercent(YogaEdge.ALL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_max_height) {
+          node.setMaxHeightPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_max_width) {
+          node.setMaxWidthPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_min_height) {
+          node.setMinHeightPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_min_width) {
+          node.setMinWidthPercent(numericValue);
+        } else if (attribute == R.styleable.yoga_yg_padding_left) {
+          node.setPaddingPercent(YogaEdge.LEFT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_padding_top) {
+          node.setPaddingPercent(YogaEdge.TOP, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_padding_right) {
+          node.setPaddingPercent(YogaEdge.RIGHT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_padding_bottom) {
+          node.setPaddingPercent(YogaEdge.BOTTOM, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_padding_start) {
+          node.setPaddingPercent(YogaEdge.START, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_padding_end) {
+          node.setPaddingPercent(YogaEdge.END, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_padding_horizontal) {
+          node.setPaddingPercent(YogaEdge.HORIZONTAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_padding_vertical) {
+          node.setPaddingPercent(YogaEdge.VERTICAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_padding_all) {
+          node.setPaddingPercent(YogaEdge.ALL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_position_left) {
+          node.setPositionPercent(YogaEdge.LEFT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_position_top) {
+          node.setPositionPercent(YogaEdge.TOP, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_position_right) {
+          node.setPositionPercent(YogaEdge.RIGHT, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_position_bottom) {
+          node.setPositionPercent(YogaEdge.BOTTOM, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_position_start) {
+          node.setPositionPercent(YogaEdge.START, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_position_end) {
+          node.setPositionPercent(YogaEdge.END, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_position_horizontal) {
+          node.setPositionPercent(YogaEdge.HORIZONTAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_position_vertical) {
+          node.setPositionPercent(YogaEdge.VERTICAL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_position_all) {
+          node.setPositionPercent(YogaEdge.ALL, numericValue);
+        } else if (attribute == R.styleable.yoga_yg_width) {
+          node.setWidthPercent(numericValue);
+        }
+      }
+    }
+  }
+
+  @Override
+  public ViewGroup.LayoutParams generateLayoutParams(AttributeSet attrs) {
+    return new YogaLayout.LayoutParams(getContext(), attrs);
+  }
+
+  @Override
+  protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
+    return new YogaLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                                       ViewGroup.LayoutParams.MATCH_PARENT);
+  }
+
+  @Override
+  protected ViewGroup.LayoutParams generateLayoutParams(ViewGroup.LayoutParams p) {
+    return new YogaLayout.LayoutParams(p);
+  }
+
+  @Override
+  protected boolean checkLayoutParams(ViewGroup.LayoutParams p) {
+    return p instanceof LayoutParams;
+  }
+
+  /**
+   * {@code YogaLayout.LayoutParams} are used by views to tell {@link YogaLayout} how they want to
+   * be laid out.  More precisely, the specify the yoga parameters of the view.
+   *
+   * <p>
+   * This is actually mostly a wrapper around a {@code SparseArray} that holds a mapping between
+   * 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_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> 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
+     * actually a {@link YogaLayout.LayoutParams}, we can copy all the yoga attributes.  Otherwise
+     * we start with a blank slate.
+     *
+     * @param source The layout params to copy from
+     */
+    public LayoutParams(ViewGroup.LayoutParams source) {
+      super(source);
+      if (source instanceof LayoutParams) {
+        numericAttributes = ((LayoutParams) source).numericAttributes.clone();
+        stringAttributes = ((LayoutParams) source).stringAttributes.clone();
+      } else {
+        numericAttributes = new SparseArray<>();
+        stringAttributes = new SparseArray<>();
+
+        // Negative values include MATCH_PARENT and WRAP_CONTENT
+        if (source.width >= 0) {
+          numericAttributes.put(R.styleable.yoga_yg_width, (float) width);
+        }
+        if (source.height >= 0) {
+          numericAttributes.put(R.styleable.yoga_yg_height, (float) height);
+        }
+      }
+    }
+
+    /**
+     * Constructs a set of layout params, given width and height specs.  In this case, we can set
+     * the {@code yoga:width} and {@code yoga:height} if we are given them explicitly.  If other
+     * options (such as {@code match_parent} or {@code wrap_content} are given, then the parent
+     * LayoutParams will store them, and we deal with them during layout. (see
+     * {@link YogaLayout#createLayout})
+     *
+     * @param width the requested width, either a pixel size, {@code WRAP_CONTENT} or
+     *        {@code MATCH_PARENT}.
+     * @param height the requested height, either a pixel size, {@code WRAP_CONTENT} or
+     *        {@code MATCH_PARENT}.
+     */
+    public LayoutParams(int width, int height) {
+      super(width, height);
+      numericAttributes = new SparseArray<>();
+      stringAttributes = new SparseArray<>();
+      // Negative values include MATCH_PARENT and WRAP_CONTENT
+      if (width >= 0) {
+        numericAttributes.put(R.styleable.yoga_yg_width, (float) width);
+      }
+      if (height >= 0) {
+        numericAttributes.put(R.styleable.yoga_yg_height, (float) height);
+      }
+    }
+
+    /**
+     * Constructs a set of layout params, given attributes.  Grabs all the {@code yoga:*}
+     * defined in {@code ALL_YOGA_ATTRIBUTES} and collects the ones that are set in {@code attrs}.
+     *
+     * @param context the application environment
+     * @param attrs the set of attributes from which to extract the yoga specific attributes
+     */
+    public LayoutParams(Context context, AttributeSet attrs) {
+      super(context, attrs);
+      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) {
+        numericAttributes.put(R.styleable.yoga_yg_width, (float) width);
+      }
+      if (height >= 0) {
+        numericAttributes.put(R.styleable.yoga_yg_height, (float) height);
+      }
+
+      final int attributeCount = a.getIndexCount();
+      for (int i = 0; i < attributeCount; i++) {
+        final int attribute = a.getIndex(i);
+        final TypedValue val = new TypedValue();
+        a.getValue(attribute, val);
+
+        if (val.type == TypedValue.TYPE_DIMENSION) {
+          numericAttributes.put(
+              attribute,
+              (float) a.getDimensionPixelSize(attribute, 0));
+        } else if (val.type == TypedValue.TYPE_STRING) {
+          stringAttributes.put(attribute, a.getString(attribute));
+        } else {
+          numericAttributes.put(attribute, a.getFloat(attribute, 0));
+        }
+      }
+      a.recycle();
+    }
+  }
+
+  /**
+   * Wrapper around measure function for yoga leaves.
+   */
+  public static class ViewMeasureFunction implements YogaMeasureFunction {
+
+    /**
+     * A function to measure leaves of the Yoga tree.  Yoga needs some way to know how large
+     * elements want to be.  This function passes that question directly through to the relevant
+     * {@code View}'s measure function.
+     *
+     * @param node The yoga node to measure
+     * @param width The suggested width from the parent
+     * @param widthMode The type of suggestion for the width
+     * @param height The suggested height from the parent
+     * @param heightMode The type of suggestion for the height
+     * @return A measurement output ({@code YogaMeasureOutput}) for the node
+     */
+    public long measure(
+        YogaNodeAPI node,
+        float width,
+        YogaMeasureMode widthMode,
+        float height,
+        YogaMeasureMode heightMode) {
+      final View view = (View) node.getData();
+      if (view == null || view instanceof YogaLayout) {
+        return YogaMeasureOutput.make(0, 0);
+      }
+
+      final int widthMeasureSpec = MeasureSpec.makeMeasureSpec(
+          (int) width,
+          viewMeasureSpecFromYogaMeasureMode(widthMode));
+      final int heightMeasureSpec = MeasureSpec.makeMeasureSpec(
+          (int) height,
+          viewMeasureSpecFromYogaMeasureMode(heightMode));
+
+      view.measure(widthMeasureSpec, heightMeasureSpec);
+
+      return YogaMeasureOutput.make(view.getMeasuredWidth(), view.getMeasuredHeight());
+    }
+
+    private int viewMeasureSpecFromYogaMeasureMode(YogaMeasureMode mode) {
+      if (mode == YogaMeasureMode.AT_MOST) {
+        return MeasureSpec.AT_MOST;
+      } else if (mode == YogaMeasureMode.EXACTLY) {
+        return MeasureSpec.EXACTLY;
+      } else {
+        return MeasureSpec.UNSPECIFIED;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,59 @@
+/**
+ * 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.
+ */
+
+package com.facebook.yoga.android;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+
+/**
+ * A layout inflater factory.  This provides our custom {@link YogaViewLayoutFactory#onCreateView}
+ * to the XML inflation system, allowing us to replace XML tags.
+ */
+public class YogaViewLayoutFactory implements LayoutInflater.Factory {
+  private static YogaViewLayoutFactory sYogaViewLayoutFactory;
+
+  /**
+   * Obtains (and initialises if necessary) the singleton {@link YogaViewLayoutFactory}.
+   *
+   * @return The singleton instance
+   */
+  public static YogaViewLayoutFactory getInstance() {
+    if (sYogaViewLayoutFactory == null) {
+      sYogaViewLayoutFactory = new YogaViewLayoutFactory();
+    }
+    return sYogaViewLayoutFactory;
+  }
+
+  YogaViewLayoutFactory() {}
+
+  /**
+   * Hook for inflating from a LayoutInflater.  This hook replaces the cumbersome
+   * {@code com.facebook.etc.YogaLayout} with simply {@code YogaLayout} in your XML and the same
+   * with {@code VirtualYogaLayout}.
+   *
+   * @param name Tag name to be inflated.
+   * @param context The context the view is being created in.
+   * @param attrs Inflation attributes as specified in XML file.
+   *
+   * @return View Newly created view. Return null for the default behavior.
+   */
+  @Override
+  public View onCreateView(String name, Context context, AttributeSet attrs) {
+    if (YogaLayout.class.getSimpleName().equals(name)) {
+      return new YogaLayout(context, attrs);
+    }
+    if (VirtualYogaLayout.class.getSimpleName().equals(name)) {
+      return new VirtualYogaLayout(context, attrs);
+    }
+    return null;
+  }
+}

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

@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!--
+  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.
+-->
+
+<resources>
+  <declare-styleable name="yoga">
+
+    <attr name="yg_align_content" format="enum">
+      <enum name="auto" value="0"/>
+      <enum name="flex_start" value="1"/>
+      <enum name="center" value="2"/>
+      <enum name="flex_end" value="3"/>
+      <enum name="stretch" value="4"/>
+      <enum name="baseline" value="5"/>
+    </attr>
+
+    <attr name="yg_align_items" format="enum">
+      <enum name="auto" value="0"/>
+      <enum name="flex_start" value="1"/>
+      <enum name="center" value="2"/>
+      <enum name="flex_end" value="3"/>
+      <enum name="stretch" value="4"/>
+      <enum name="baseline" value="5"/>
+    </attr>
+
+    <attr name="yg_align_self" format="enum">
+      <enum name="auto" value="0"/>
+      <enum name="flex_start" value="1"/>
+      <enum name="center" value="2"/>
+      <enum name="flex_end" value="3"/>
+      <enum name="stretch" value="4"/>
+      <enum name="baseline" value="5"/>
+    </attr>
+
+    <attr name="yg_aspect_ratio" format="float"/>
+
+    <attr name="yg_border_left" format="dimension"/>
+    <attr name="yg_border_top" format="dimension"/>
+    <attr name="yg_border_right" format="dimension"/>
+    <attr name="yg_border_bottom" format="dimension"/>
+    <attr name="yg_border_start" format="dimension"/>
+    <attr name="yg_border_end" format="dimension"/>
+    <attr name="yg_border_horizontal" format="dimension"/>
+    <attr name="yg_border_vertical" format="dimension"/>
+    <attr name="yg_border_all" format="dimension"/>
+
+    <attr name="yg_direction" format="enum">
+      <enum name="inherit" value="0"/>
+      <enum name="ltr" value="1"/>
+      <enum name="rtl" value="2"/>
+    </attr>
+
+    <attr name="yg_display" format="enum">
+      <enum name="flex" value="0"/>
+      <enum name="none" value="1"/>
+    </attr>
+
+    <attr name="yg_flex" format="float"/>
+
+    <attr name="yg_flex_basis" format="float|string"/>
+
+    <attr name="yg_flex_direction" 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="yg_flex_grow" format="float"/>
+
+    <attr name="yg_flex_shrink" format="float"/>
+
+    <attr name="yg_height" format="dimension|string"/>
+
+    <attr name="yg_justify_content" format="enum">
+      <enum name="flex_start" value="0"/>
+      <enum name="center" value="1"/>
+      <enum name="flex_end" value="2"/>
+      <enum name="space_between" value="3"/>
+      <enum name="space_around" value="4"/>
+    </attr>
+
+    <attr name="yg_margin_left" format="dimension|string"/>
+    <attr name="yg_margin_top" format="dimension|string"/>
+    <attr name="yg_margin_right" format="dimension|string"/>
+    <attr name="yg_margin_bottom" format="dimension|string"/>
+    <attr name="yg_margin_start" format="dimension|string"/>
+    <attr name="yg_margin_end" format="dimension|string"/>
+    <attr name="yg_margin_horizontal" format="dimension|string"/>
+    <attr name="yg_margin_vertical" format="dimension|string"/>
+    <attr name="yg_margin_all" format="dimension|string"/>
+
+    <attr name="yg_max_height" format="dimension|string"/>
+
+    <attr name="yg_max_width" format="dimension|string"/>
+
+    <attr name="yg_min_height" format="dimension|string"/>
+
+    <attr name="yg_min_width" format="dimension|string"/>
+
+    <attr name="yg_overflow" format="enum">
+      <enum name="visible" value="0"/>
+      <enum name="hidden" value="1"/>
+      <enum name="scroll" value="2"/>
+    </attr>
+
+    <attr name="yg_padding_left" format="dimension|string"/>
+    <attr name="yg_padding_top" format="dimension|string"/>
+    <attr name="yg_padding_right" format="dimension|string"/>
+    <attr name="yg_padding_bottom" format="dimension|string"/>
+    <attr name="yg_padding_start" format="dimension|string"/>
+    <attr name="yg_padding_end" format="dimension|string"/>
+    <attr name="yg_padding_horizontal" format="dimension|string"/>
+    <attr name="yg_padding_vertical" format="dimension|string"/>
+    <attr name="yg_padding_all" format="dimension|string"/>
+
+    <attr name="yg_position_left" format="dimension|string"/>
+    <attr name="yg_position_top" format="dimension|string"/>
+    <attr name="yg_position_right" format="dimension|string"/>
+    <attr name="yg_position_bottom" format="dimension|string"/>
+    <attr name="yg_position_start" format="dimension|string"/>
+    <attr name="yg_position_end" format="dimension|string"/>
+    <attr name="yg_position_horizontal" format="dimension|string"/>
+    <attr name="yg_position_vertical" format="dimension|string"/>
+    <attr name="yg_position_all" format="dimension|string"/>
+
+    <attr name="yg_position_type" format="enum">
+      <enum name="relative" value="0"/>
+      <enum name="absolute" value="1"/>
+    </attr>
+
+    <attr name="yg_width" format="dimension|string"/>
+
+    <attr name="yg_wrap" format="enum">
+      <enum name="no_wrap" value="0"/>
+      <enum name="wrap" value="1"/>
+    </attr>
+  </declare-styleable>
+</resources>

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"),
+    ],
 )

benchmark/YGBenchmark.c

@@ -12,10 +12,10 @@
 #include <yoga/Yoga.h>
 
 static YGSize _measure(YGNodeRef node,
-                        float width,
-                        YGMeasureMode widthMode,
-                        float height,
-                        YGMeasureMode heightMode) {
+                       float width,
+                       YGMeasureMode widthMode,
+                       float height,
+                       YGMeasureMode heightMode) {
   return (YGSize){
       .width = widthMode == YGMeasureModeUndefined ? 10 : width,
       .height = heightMode == YGMeasureModeUndefined ? 10 : width,

benchmark/YGBenchmark.h

@@ -17,7 +17,7 @@
 
 #define NUM_REPETITIONS 1000
 
-#define YGBENCHMARKS(BLOCK)              \
+#define YGBENCHMARKS(BLOCK)                \
   int main(int argc, char const *argv[]) { \
     clock_t __start;                       \
     clock_t __endTimes[NUM_REPETITIONS];   \
@@ -25,7 +25,7 @@
     return 0;                              \
   }
 
-#define YGBENCHMARK(NAME, BLOCK)                       \
+#define YGBENCHMARK(NAME, BLOCK)                         \
   __start = clock();                                     \
   for (uint32_t __i = 0; __i < NUM_REPETITIONS; __i++) { \
     { BLOCK }                                            \

build.gradle

@@ -0,0 +1,32 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+        classpath 'com.nabilhachicha:android-native-dependencies:0.1'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+  repositories {
+    jcenter()
+    flatDir {
+      dirs "${rootDir}/lib/jsr-305"
+      dirs "${rootDir}/lib/soloader"
+      dirs "${rootDir}/lib/appcompat"
+      dirs "${rootDir}/lib/android-support"
+    }
+  }
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}

csharp/Android/.gitignore

@@ -0,0 +1 @@
+lib/

csharp/Android/Facebook.Yoga.Android.Tests/Facebook.Yoga.Android.Tests.csproj

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{2021459E-8FB1-44A4-89F1-E291769CD2C6}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Facebook.Yoga.Android.Tests</RootNamespace>
+    <AssemblyName>Facebook.Yoga.Android.Tests</AssemblyName>
+    <TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
+    <AndroidApplication>True</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+    <AndroidResgenClass>Resource</AndroidResgenClass>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <AndroidTlsProvider></AndroidTlsProvider>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="Xamarin.Android.NUnitLite" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MainActivity.cs" />
+    <Compile Include="Resources\Resource.designer.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AndroidManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Facebook.Yoga.Android\Facebook.Yoga.Android.csproj">
+      <Project>{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}</Project>
+      <Name>Facebook.Yoga.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems" Label="Shared" Condition="Exists('..\..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems')" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+</Project>

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

@@ -0,0 +1,25 @@
+/**
+ * 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.
+ */
+
+using System.Reflection;
+using Android.App;
+using Android.OS;
+using Xamarin.Android.NUnitLite;
+
+namespace Facebook.Yoga.Android.Tests
+{
+	[Activity(Label = "Facebook.Yoga.Android.Tests", MainLauncher = true)]
+	public class MainActivity : TestSuiteActivity
+	{
+		protected override void OnCreate(Bundle bundle)
+		{
+			AddTest(Assembly.GetExecutingAssembly());
+			base.OnCreate(bundle);
+		}
+	}
+}

csharp/Android/Facebook.Yoga.Android.Tests/Properties/AndroidManifest.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="1"
+    android:versionName="1.0"
+    package="Facebook.Yoga.Android.Tests">
+
+    <uses-sdk
+        android:minSdkVersion="19" />
+
+    <application
+        android:label="Facebook.Yoga.Android.Tests">
+    </application>
+
+</manifest>

csharp/Android/Facebook.Yoga.Android.sln

@@ -0,0 +1,33 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Android.Tests", "Facebook.Yoga.Android.Tests\Facebook.Yoga.Android.Tests.csproj", "{2021459E-8FB1-44A4-89F1-E291769CD2C6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Android", "Facebook.Yoga.Android\Facebook.Yoga.Android.csproj", "{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{4804A8E6-E7B7-4F9E-A446-3DE8E73DB38A}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{4EDC82D9-A201-4831-8FE0-98F468F8E4AE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{91C42D32-291D-4B72-90B4-551663D60B8B} = {4804A8E6-E7B7-4F9E-A446-3DE8E73DB38A}
+		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {4804A8E6-E7B7-4F9E-A446-3DE8E73DB38A}
+	EndGlobalSection
+EndGlobal

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <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" />
+        <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" />
+        <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" />
+        <Copy SourceFiles="$(ProjectDir)../../../buck-out/gen/csharp/yoganet#android-x86,shared/libyoga.so" DestinationFiles="$(ProjectDir)/lib/x86/libyoga.so" SkipUnchangedFiles="true" />
+    </Target>
+</Project>

csharp/Android/Facebook.Yoga.Android/Facebook.Yoga.Android.csproj

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<ProjectGuid>{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}</ProjectGuid>
+		<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+		<OutputType>Library</OutputType>
+		<RootNamespace>Facebook.Yoga.Android</RootNamespace>
+		<AssemblyName>Facebook.Yoga</AssemblyName>
+		<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
+		<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+		<AndroidResgenClass>Resource</AndroidResgenClass>
+		<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+		<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+		<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+		<AndroidTlsProvider></AndroidTlsProvider>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>full</DebugType>
+		<Optimize>false</Optimize>
+		<OutputPath>bin\Debug</OutputPath>
+		<DefineConstants>DEBUG;</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<AndroidLinkMode>None</AndroidLinkMode>
+		<AndroidSupportedAbis>arm64-v8a;armeabi;armeabi-v7a;x86</AndroidSupportedAbis>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>pdbonly</DebugType>
+		<Optimize>true</Optimize>
+		<OutputPath>bin\Release</OutputPath>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<AndroidManagedSymbols>true</AndroidManagedSymbols>
+		<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+	</PropertyGroup>
+	<ItemGroup>
+		<Reference Include="System" />
+		<Reference Include="System.Xml" />
+		<Reference Include="System.Core" />
+		<Reference Include="Mono.Android" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="CustomBuildAction.targets" />
+	</ItemGroup>
+	<ItemGroup>
+	  <Folder Include="lib\x86\" />
+	  <Folder Include="lib\armeabi-v7a\" />
+	</ItemGroup>
+	<ItemGroup>
+	  <EmbeddedNativeLibrary Include="lib\x86\libyoga.so">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </EmbeddedNativeLibrary>
+	  <EmbeddedNativeLibrary Include="lib\armeabi-v7a\libyoga.so">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </EmbeddedNativeLibrary>
+	</ItemGroup>
+	<Import Project="..\..\Facebook.Yoga\Facebook.Yoga.Shared.projitems" Label="Shared" Condition="Exists('..\..\Facebook.Yoga\Facebook.Yoga.Shared.projitems')" />
+	<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+	<Import Project="CustomBuildAction.targets" />
+</Project>

csharp/BUCK

@@ -5,41 +5,40 @@
 # 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")],
 )
 
-with allow_unsafe_import():
-  import os
-
-if os.path.isdir('/Applications/Xcode.app'):
+if isdir('/Applications/Xcode.app'):
   yoganet_ios_srcs = []
-  for arch in ['iphonesimulator-x86_64', 'iphoneos-arm64', 'iphoneos-armv7']:
+  for arch in [
+    'iphonesimulator-x86_64', 'iphonesimulator-i386', 'iphoneos-arm64', 'iphoneos-armv7'
+  ]:
     name = 'yoganet-' + arch
     yoganet_ios_srcs.append(':' + name)
     genrule(
@@ -61,3 +60,15 @@ if os.path.isdir('/Applications/Xcode.app'):
     cmd = 'lipo $SRCS -create -output $OUT',
     visibility = ['PUBLIC'],
   )
+
+  yoganet_macosx_target = 'csharp:yoganet#macosx-%s,dynamic'
+  genrule(
+    name = 'yoganet-macosx',
+    srcs = [
+      yoga_dep(yoganet_macosx_target % 'x86_64'),
+      yoga_dep(yoganet_macosx_target % 'i386'),
+    ],
+    out = 'libyoga.dylib',
+    cmd = 'lipo $SRCS -create -output $OUT',
+    visibility = ['PUBLIC'],
+  )

csharp/Facebook.Yoga.Xamarin.sln

@@ -0,0 +1,130 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Android", "Android", "{B674A497-DC8E-4286-A889-0C004235AA18}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{AC14A7DE-A180-46EC-8A88-77F60E73A099}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{09905D88-652D-4A72-8521-6CB1AF347795}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "macOS", "macOS", "{9BDE3670-188E-470F-9B89-CEC0EB042AB5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.iOS", "iOS\Facebook.Yoga.iOS\Facebook.Yoga.iOS.csproj", "{128FB32A-C4A1-4363-BF06-0A36E700B7FA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.iOS.Tests", "iOS\Facebook.Yoga.iOS.Tests\Facebook.Yoga.iOS.Tests.csproj", "{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{4EDC82D9-A201-4831-8FE0-98F468F8E4AE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Android", "Android\Facebook.Yoga.Android\Facebook.Yoga.Android.csproj", "{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Android.Tests", "Android\Facebook.Yoga.Android.Tests\Facebook.Yoga.Android.Tests.csproj", "{2021459E-8FB1-44A4-89F1-E291769CD2C6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuspec", "nuspec", "{2C3685DB-91B9-4207-9446-1C513DB36978}"
+	ProjectSection(SolutionItems) = preProject
+		nuget\Facebook.Yoga.dll.config = nuget\Facebook.Yoga.dll.config
+		nuget\Facebook.Yoga.nuspec = nuget\Facebook.Yoga.nuspec
+		nuget\Facebook.Yoga.OSX.targets = nuget\Facebook.Yoga.OSX.targets
+		nuget\Facebook.Yoga.targets = nuget\Facebook.Yoga.targets
+		nuget\Facebook.Yoga.Universal.targets = nuget\Facebook.Yoga.Universal.targets
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac", "Mac\Facebook.Yoga.Mac.csproj", "{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac.Tests", "Mac\Facebook.Yoga.Mac.Tests\Facebook.Yoga.Mac.Tests.csproj", "{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Debug|iPhone = Debug|iPhone
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Release|iPhone.Build.0 = Release|Any CPU
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Release|Any CPU.ActiveCfg = Release|iPhone
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Release|Any CPU.Build.0 = Release|iPhone
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Release|iPhone.ActiveCfg = Release|iPhone
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Release|iPhone.Build.0 = Release|iPhone
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Debug|iPhone.ActiveCfg = Debug|iPhone
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71}.Debug|iPhone.Build.0 = Debug|iPhone
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Release|iPhone.Build.0 = Release|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Release|iPhone.Build.0 = Release|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Release|iPhone.Build.0 = Release|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Release|iPhone.Build.0 = Release|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Debug|iPhone.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{128FB32A-C4A1-4363-BF06-0A36E700B7FA} = {AC14A7DE-A180-46EC-8A88-77F60E73A099}
+		{FCF0BE59-AE56-4D4F-8524-94532B2DFC71} = {AC14A7DE-A180-46EC-8A88-77F60E73A099}
+		{91C42D32-291D-4B72-90B4-551663D60B8B} = {09905D88-652D-4A72-8521-6CB1AF347795}
+		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {09905D88-652D-4A72-8521-6CB1AF347795}
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363} = {B674A497-DC8E-4286-A889-0C004235AA18}
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6} = {B674A497-DC8E-4286-A889-0C004235AA18}
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71} = {9BDE3670-188E-470F-9B89-CEC0EB042AB5}
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77} = {9BDE3670-188E-470F-9B89-CEC0EB042AB5}
+	EndGlobalSection
+EndGlobal

csharp/Facebook.Yoga/Border.cs

@@ -1,32 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace Facebook.Yoga
-{
-    [System.Obsolete]
-    public class Border
-    {
-        public float? Top;
-        public float? Bottom;
-        public float? Left;
-        public float? Right;
-
-        public Border(
-            float? top = null,
-            float? bottom = null,
-            float? left = null,
-            float? right = null)
-        {
-            Top = top;
-            Bottom = bottom;
-            Left = left;
-            Right = right;
-        }
-    }
-}

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

@@ -10,16 +10,15 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)BaselineFunction.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Border.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MeasureFunction.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)MeasureOutput.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Native.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Spacing.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaAlign.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaBaselineFunc.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaConstants.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaDimension.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaDirection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaDisplay.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaEdge.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaExperimentalFeature.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaFlexDirection.cs" />
@@ -28,7 +27,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)YogaLogLevel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaMeasureFunc.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaMeasureMode.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)YogaNode.Create.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaNode.Spacing.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaNode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)YogaOverflow.cs" />

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__
@@ -22,6 +28,10 @@ namespace Facebook.Yoga
 
         internal class YGNodeHandle : SafeHandle
         {
+#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
+            private GCHandle _managed;
+#endif
+
             private YGNodeHandle() : base(IntPtr.Zero, true)
             {
             }
@@ -36,10 +46,71 @@ namespace Facebook.Yoga
 
             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
+        }
+
+        internal class YGConfigHandle : SafeHandle
+        {
+#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
+            private GCHandle _managed;
+#endif
+
+            private YGConfigHandle() : 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.YGConfigFree(this.handle);
+                GC.KeepAlive(this);
+                return true;
+            }
         }
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
@@ -49,35 +120,50 @@ namespace Facebook.Yoga
         [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 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 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 YGNodeInsertChild(YGNodeHandle node, YGNodeHandle child, uint index);
+        public static extern void YGNodeInsertChild(
+            YGNodeHandle node,
+            YGNodeHandle child,
+            uint index);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeRemoveChild(YGNodeHandle node, YGNodeHandle child);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void YGNodeCalculateLayout(YGNodeHandle node,
-                            float availableWidth,
-                            float availableHeight,
-                            YogaDirection parentDirection);
+        public static extern void YGNodeCalculateLayout(
+            YGNodeHandle node,
+            float availableWidth,
+            float availableHeight,
+            YogaDirection parentDirection);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeMarkDirty(YGNodeHandle node);
@@ -89,14 +175,10 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodePrint(YGNodeHandle node, YogaPrintOptions options);
 
-        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        [return: MarshalAs(UnmanagedType.I1)]
-        public static extern bool YGValueIsUndefined(float value);
-
         [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(
@@ -109,15 +191,17 @@ namespace Facebook.Yoga
             [MarshalAs(UnmanagedType.FunctionPtr)] YogaBaselineFunc baselineFunc);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern void YGNodeSetHasNewLayout(YGNodeHandle node, [MarshalAs(UnmanagedType.I1)] bool hasNewLayout);
+        public static extern void YGNodeSetHasNewLayout(
+            YGNodeHandle node,
+            [MarshalAs(UnmanagedType.I1)] bool hasNewLayout);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         [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);
@@ -173,6 +257,12 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaOverflow YGNodeStyleGetOverflow(YGNodeHandle node);
 
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetDisplay(YGNodeHandle node, YogaDisplay display);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaDisplay YGNodeStyleGetDisplay(YGNodeHandle node);
+
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetFlex(YGNodeHandle node, float flex);
 
@@ -195,7 +285,10 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetFlexBasisPercent(YGNodeHandle node, float flexBasis);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetFlexBasis(YGNodeHandle node);
+        public static extern void YGNodeStyleSetFlexBasisAuto(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValueType YGNodeStyleGetFlexBasis(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetWidth(YGNodeHandle node, float width);
@@ -204,7 +297,10 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetWidthPercent(YGNodeHandle node, float width);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetWidth(YGNodeHandle node);
+        public static extern void YGNodeStyleSetWidthAuto(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValueType YGNodeStyleGetWidth(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetHeight(YGNodeHandle node, float height);
@@ -213,7 +309,10 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetHeightPercent(YGNodeHandle node, float height);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetHeight(YGNodeHandle node);
+        public static extern void YGNodeStyleSetHeightAuto(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValueType YGNodeStyleGetHeight(YGNodeHandle node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeStyleSetMinWidth(YGNodeHandle node, float minWidth);
@@ -222,7 +321,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);
@@ -231,7 +330,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);
@@ -240,7 +339,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);
@@ -249,7 +348,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);
@@ -257,9 +356,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);
@@ -268,7 +367,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);
@@ -277,7 +376,10 @@ namespace Facebook.Yoga
         public static extern void YGNodeStyleSetMarginPercent(YGNodeHandle node, YogaEdge edge, float margin);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
-        public static extern YogaValue YGNodeStyleGetMargin(YGNodeHandle node, YogaEdge edge);
+        public static extern void YGNodeStyleSetMarginAuto(YGNodeHandle node, YogaEdge edge);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        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);
@@ -286,7 +388,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);
@@ -294,9 +396,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);
@@ -316,12 +418,27 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeLayoutGetHeight(YGNodeHandle node);
 
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeLayoutGetMargin(YGNodeHandle node, YogaEdge edge);
+
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeLayoutGetPadding(YGNodeHandle node, YogaEdge edge);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YogaDirection YGNodeLayoutGetDirection(YGNodeHandle node);
 
-        #endregion
+#endregion
+
+#region IOS
+
+#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
     }
 }

csharp/Facebook.Yoga/Spacing.cs

@@ -1,32 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace Facebook.Yoga
-{
-    [System.Obsolete]
-    public class Spacing
-    {
-        public YogaValue? Top;
-        public YogaValue? Bottom;
-        public YogaValue? Left;
-        public YogaValue? Right;
-
-        public Spacing(
-            YogaValue? top = null,
-            YogaValue? bottom = null,
-            YogaValue? left = null,
-            YogaValue? right = null)
-        {
-            Top = top;
-            Bottom = bottom;
-            Left = left;
-            Right = right;
-        }
-    }
-}

csharp/Facebook.Yoga/YogaAlign.cs

@@ -17,5 +17,7 @@ namespace Facebook.Yoga
         FlexEnd,
         Stretch,
         Baseline,
+        SpaceBetween,
+        SpaceAround,
     }
 }

csharp/Facebook.Yoga/YogaDisplay.cs

@@ -7,11 +7,11 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <UIKit/UIKit.h>
-#import "YGLayout.h"
-
-@interface UIView (Yoga)
-
-@property (nonatomic, readonly, strong) YGLayout *yoga;
-
-@end
+namespace Facebook.Yoga
+{
+    public enum YogaDisplay
+    {
+        Flex,
+        None,
+    }
+}

csharp/Facebook.Yoga/YogaExperimentalFeature.cs

@@ -13,5 +13,6 @@ namespace Facebook.Yoga
     {
         Rounding,
         WebFlexBasis,
+        MinFlexFix,
     }
 }

csharp/Facebook.Yoga/YogaLogger.cs

@@ -10,6 +10,10 @@
 using System;
 using System.Runtime.InteropServices;
 
+#if __IOS__
+using ObjCRuntime;
+#endif
+
 namespace Facebook.Yoga
 {
     internal static class YogaLogger
@@ -18,25 +22,30 @@ namespace Facebook.Yoga
         public delegate void Func(YogaLogLevel level, string message);
 
         private static bool _initialized;
-        private static Func _managedLogger = null;
+        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)
             {
-                _managedLogger = (level, message) => {
-                    if (Logger != null)
-                    {
-                        Logger(level, message);
-                    }
-
-                    if (level == YogaLogLevel.Error)
-                    {
-                        throw new InvalidOperationException(message);
-                    }
-                };
                 Native.YGInteropSetLogger(_managedLogger);
                 _initialized = true;
             }

csharp/Facebook.Yoga/YogaNode.Create.cs

@@ -1,234 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System;
-
-namespace Facebook.Yoga
-{
-    public partial class YogaNode
-    {
-        [Obsolete("use Object Initializer")]
-        public static YogaNode Create(
-            YogaDirection? styleDirection = null,
-            YogaFlexDirection? flexDirection = null,
-            YogaJustify? justifyContent = null,
-            YogaAlign? alignContent = null,
-            YogaAlign? alignItems = null,
-            YogaAlign? alignSelf = null,
-            YogaPositionType? positionType = null,
-            YogaWrap? wrap = null,
-            YogaOverflow? overflow = null,
-            float? flex = null,
-            float? flexGrow = null,
-            float? flexShrink = null,
-            YogaValue? flexBasis = null,
-            Spacing position = null,
-            Spacing margin = null,
-            Spacing padding = null,
-            Border border = null,
-            YogaValue? width = null,
-            YogaValue? height = null,
-            YogaValue? maxWidth = null,
-            YogaValue? maxHeight = null,
-            YogaValue? minWidth = null,
-            YogaValue? minHeight = null)
-        {
-            YogaNode node = new YogaNode();
-
-            if (styleDirection.HasValue)
-            {
-                node.StyleDirection = styleDirection.Value;
-            }
-
-            if (flexDirection.HasValue)
-            {
-                node.FlexDirection = flexDirection.Value;
-            }
-
-            if (justifyContent.HasValue)
-            {
-                node.JustifyContent = justifyContent.Value;
-            }
-
-            if (alignContent.HasValue)
-            {
-                node.AlignContent = alignContent.Value;
-            }
-
-            if (alignItems.HasValue)
-            {
-                node.AlignItems = alignItems.Value;
-            }
-
-            if (alignSelf.HasValue)
-            {
-                node.AlignSelf = alignSelf.Value;
-            }
-
-            if (positionType.HasValue)
-            {
-                node.PositionType = positionType.Value;
-            }
-
-            if (wrap.HasValue)
-            {
-                node.Wrap = wrap.Value;
-            }
-
-            if (overflow.HasValue)
-            {
-                node.Overflow = overflow.Value;
-            }
-
-            if (flex.HasValue)
-            {
-                node.Flex = flex.Value;
-            }
-
-            if (flexGrow.HasValue)
-            {
-                node.FlexGrow = flexGrow.Value;
-            }
-
-            if (flexShrink.HasValue)
-            {
-                node.FlexShrink = flexShrink.Value;
-            }
-
-            if (flexBasis.HasValue)
-            {
-                node.FlexBasis = flexBasis.Value;
-            }
-
-            if (position != null)
-            {
-                if (position.Top.HasValue)
-                {
-                    node.Top = position.Top.Value;
-                }
-
-                if (position.Bottom.HasValue)
-                {
-                    node.Bottom = position.Bottom.Value;
-                }
-
-                if (position.Left.HasValue)
-                {
-                    node.Left = position.Left.Value;
-                }
-
-                if (position.Right.HasValue)
-                {
-                    node.Right = position.Right.Value;
-                }
-            }
-
-            if (margin != null)
-            {
-                if (margin.Top.HasValue)
-                {
-                    node.MarginTop = margin.Top.Value;
-                }
-
-                if (margin.Bottom.HasValue)
-                {
-                    node.MarginBottom = margin.Bottom.Value;
-                }
-
-                if (margin.Left.HasValue)
-                {
-                    node.MarginLeft = margin.Left.Value;
-                }
-
-                if (margin.Right.HasValue)
-                {
-                    node.MarginRight = margin.Right.Value;
-                }
-            }
-
-            if (padding != null)
-            {
-                if (padding.Top.HasValue)
-                {
-                    node.PaddingTop = padding.Top.Value;
-                }
-
-                if (padding.Bottom.HasValue)
-                {
-                    node.PaddingBottom = padding.Bottom.Value;
-                }
-
-                if (padding.Left.HasValue)
-                {
-                    node.PaddingLeft = padding.Left.Value;
-                }
-
-                if (padding.Right.HasValue)
-                {
-                    node.PaddingRight = padding.Right.Value;
-                }
-            }
-
-            if (border != null)
-            {
-                if (border.Top.HasValue)
-                {
-                    node.BorderTopWidth = border.Top.Value;
-                }
-
-                if (border.Bottom.HasValue)
-                {
-                    node.BorderBottomWidth = border.Bottom.Value;
-                }
-
-                if (border.Left.HasValue)
-                {
-                    node.BorderLeftWidth = border.Left.Value;
-                }
-
-                if (border.Right.HasValue)
-                {
-                    node.BorderRightWidth = border.Right.Value;
-                }
-            }
-
-            if (width.HasValue)
-            {
-                node.Width = width.Value;
-            }
-
-            if (height.HasValue)
-            {
-                node.Height = height.Value;
-            }
-
-            if (minWidth.HasValue)
-            {
-                node.MinWidth = minWidth.Value;
-            }
-
-            if (minHeight.HasValue)
-            {
-                node.MinHeight = minHeight.Value;
-            }
-
-            if (maxWidth.HasValue)
-            {
-                node.MaxWidth = maxWidth.Value;
-            }
-
-            if (maxHeight.HasValue)
-            {
-                node.MaxHeight = maxHeight.Value;
-            }
-
-            return node;
-        }
-    }
-}

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
@@ -226,6 +224,10 @@ namespace Facebook.Yoga
             {
                 Native.YGNodeStyleSetMarginPercent(_ygNode, edge, value.Value);
             }
+            else if (value.Unit == YogaUnit.Auto)
+            {
+                Native.YGNodeStyleSetMarginAuto(_ygNode, edge);
+            }
             else
             {
                 Native.YGNodeStyleSetMargin(_ygNode, edge, value.Value);
@@ -236,7 +238,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Left);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Left));
             }
 
             set
@@ -249,7 +251,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Top);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Top));
             }
 
             set
@@ -262,7 +264,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Right);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Right));
             }
 
             set
@@ -275,7 +277,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Bottom);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Bottom));
             }
 
             set
@@ -288,7 +290,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Start);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Start));
             }
 
             set
@@ -301,7 +303,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.End);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.End));
             }
 
             set
@@ -314,7 +316,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Horizontal);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Horizontal));
             }
 
             set
@@ -327,7 +329,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Vertical);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Vertical));
             }
 
             set
@@ -340,7 +342,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.All);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.All));
             }
 
             set
@@ -452,6 +454,54 @@ namespace Facebook.Yoga
             }
         }
 
+        public float LayoutMarginLeft
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Left);
+            }
+        }
+
+        public float LayoutMarginTop
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Top);
+            }
+        }
+
+        public float LayoutMarginRight
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Right);
+            }
+        }
+
+        public float LayoutMarginBottom
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Bottom);
+            }
+        }
+
+        public float LayoutMarginStart
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Start);
+            }
+        }
+
+        public float LayoutMarginEnd
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.End);
+            }
+        }
+
         public float LayoutPaddingLeft
         {
             get

csharp/Facebook.Yoga/YogaNode.cs

@@ -12,18 +12,64 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Text;
 
+#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
+using System.Runtime.InteropServices;
+#endif
+#if __IOS__
+using ObjCRuntime;
+#endif
+
 namespace Facebook.Yoga
 {
+    public class YogaConfig
+    {
+
+        private Native.YGConfigHandle _ygConfig;
+
+        public YogaConfig()
+        {
+            _ygConfig = Native.YGConfigNew();
+            if (_ygConfig.IsInvalid)
+            {
+                throw new InvalidOperationException("Failed to allocate native memory");
+            }
+        }
+
+        internal Native.YGConfigHandle Handle {
+            get {
+                return _ygConfig;
+            }
+        }
+
+        public void SetExperimentalFeatureEnabled(
+            YogaExperimentalFeature feature,
+            bool enabled)
+        {
+            Native.YGConfigSetExperimentalFeatureEnabled(_ygConfig, feature, enabled);
+        }
+
+        public bool IsExperimentalFeatureEnabled(YogaExperimentalFeature feature)
+        {
+            return Native.YGConfigIsExperimentalFeatureEnabled(_ygConfig, feature);
+        }
+
+    }
+
     public partial class YogaNode : IEnumerable<YogaNode>
     {
         private Native.YGNodeHandle _ygNode;
         private WeakReference _parent;
         private List<YogaNode> _children;
         private MeasureFunction _measureFunction;
-        private YogaMeasureFunc _ygMeasureFunc;
         private BaselineFunction _baselineFunction;
-        private YogaBaselineFunc _ygBaselineFunc;
         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
 
         public YogaNode()
         {
@@ -36,6 +82,23 @@ namespace Facebook.Yoga
             }
         }
 
+        public YogaNode(YogaConfig config)
+        {
+            YogaLogger.Initialize();
+
+            _ygNode = Native.YGNodeNewWithConfig(config.Handle);
+            if (_ygNode.IsInvalid)
+            {
+                throw new InvalidOperationException("Failed to allocate native memory");
+            }
+        }
+
+        public YogaNode(YogaNode srcNode)
+            : this()
+        {
+            CopyStyle(srcNode);
+        }
+
         public void Reset()
         {
             _measureFunction = null;
@@ -139,6 +202,19 @@ namespace Facebook.Yoga
             }
         }
 
+        public YogaDisplay Display
+        {
+            get
+            {
+                return Native.YGNodeStyleGetDisplay(_ygNode);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetDisplay(_ygNode, value);
+            }
+        }
+
         public YogaAlign AlignItems
         {
             get
@@ -242,7 +318,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetFlexBasis(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetFlexBasis(_ygNode));
             }
 
             set
@@ -251,6 +327,10 @@ namespace Facebook.Yoga
                 {
                     Native.YGNodeStyleSetFlexBasisPercent(_ygNode, value.Value);
                 }
+                else if (value.Unit == YogaUnit.Auto)
+                {
+                    Native.YGNodeStyleSetFlexBasisAuto(_ygNode);
+                }
                 else
                 {
                     Native.YGNodeStyleSetFlexBasis(_ygNode, value.Value);
@@ -258,86 +338,11 @@ namespace Facebook.Yoga
             }
         }
 
-        [Obsolete("use Margin properties")]
-        public YogaValue GetMargin(YogaEdge edge)
-        {
-            return Native.YGNodeStyleGetMargin(_ygNode, edge);
-        }
-
-        [Obsolete("use Margin properties")]
-        public void SetMargin(YogaEdge edge, YogaValue value)
-        {
-            if (value.Unit == YogaUnit.Percent)
-            {
-                Native.YGNodeStyleSetMarginPercent(_ygNode, edge, value.Value);
-            }
-            else
-            {
-                Native.YGNodeStyleSetMargin(_ygNode, edge, value.Value);
-            }
-        }
-
-        [Obsolete("use Padding properties")]
-        public YogaValue GetPadding(YogaEdge edge)
-        {
-            return Native.YGNodeStyleGetPadding(_ygNode, edge);
-        }
-
-        [Obsolete("use Padding properties")]
-        public void SetPadding(YogaEdge edge, YogaValue value)
-        {
-            if (value.Unit == YogaUnit.Percent)
-            {
-                Native.YGNodeStyleSetPaddingPercent(_ygNode, edge, value.Value);
-            }
-            else
-            {
-                Native.YGNodeStyleSetPadding(_ygNode, edge, value.Value);
-            }
-        }
-
-        [Obsolete("use BorderWidth properties")]
-        public float GetBorder(YogaEdge edge)
-        {
-            return Native.YGNodeStyleGetBorder(_ygNode, edge);
-        }
-
-        [Obsolete("use BorderWidth properties")]
-        public void SetBorder(YogaEdge edge, float border)
-        {
-            Native.YGNodeStyleSetBorder(_ygNode, edge, border);
-        }
-
-        [Obsolete("use Position properties")]
-        public YogaValue GetPosition(YogaEdge edge)
-        {
-            return Native.YGNodeStyleGetPosition(_ygNode, edge);
-        }
-
-        [Obsolete("use Position properties")]
-        public void SetPosition(YogaEdge edge, YogaValue value)
-        {
-            if (value.Unit == YogaUnit.Percent)
-            {
-                Native.YGNodeStyleSetPositionPercent(_ygNode, edge, value.Value);
-            }
-            else
-            {
-                Native.YGNodeStyleSetPosition(_ygNode, edge, value.Value);
-            }
-        }
-
-        [Obsolete("use LayoutPadding properties")]
-        public float GetLayoutPadding(YogaEdge edge)
-        {
-            return Native.YGNodeLayoutGetPadding(_ygNode, edge);
-        }
-
         public YogaValue Width
         {
             get
             {
-                return Native.YGNodeStyleGetWidth(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetWidth(_ygNode));
             }
 
             set
@@ -346,6 +351,10 @@ namespace Facebook.Yoga
                 {
                     Native.YGNodeStyleSetWidthPercent(_ygNode, value.Value);
                 }
+                else if (value.Unit == YogaUnit.Auto)
+                {
+                    Native.YGNodeStyleSetWidthAuto(_ygNode);
+                }
                 else
                 {
                     Native.YGNodeStyleSetWidth(_ygNode, value.Value);
@@ -357,7 +366,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetHeight(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetHeight(_ygNode));
             }
 
             set
@@ -366,6 +375,10 @@ namespace Facebook.Yoga
                 {
                     Native.YGNodeStyleSetHeightPercent(_ygNode, value.Value);
                 }
+                else if (value.Unit == YogaUnit.Auto)
+                {
+                    Native.YGNodeStyleSetHeightAuto(_ygNode);
+                }
                 else
                 {
                     Native.YGNodeStyleSetHeight(_ygNode, value.Value);
@@ -377,7 +390,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMaxWidth(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMaxWidth(_ygNode));
             }
 
             set
@@ -397,7 +410,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMaxHeight(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMaxHeight(_ygNode));
             }
 
             set
@@ -417,7 +430,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMinWidth(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMinWidth(_ygNode));
             }
 
             set
@@ -437,7 +450,7 @@ namespace Facebook.Yoga
         {
             get
             {
-                return Native.YGNodeStyleGetMinHeight(_ygNode);
+                return YogaValue.MarshalValue(Native.YGNodeStyleGetMinHeight(_ygNode));
             }
 
             set
@@ -601,15 +614,29 @@ namespace Facebook.Yoga
         public void SetMeasureFunction(MeasureFunction measureFunction)
         {
             _measureFunction = measureFunction;
-            _ygMeasureFunc = measureFunction != null ? MeasureInternal : (YogaMeasureFunc)null;
-            Native.YGNodeSetMeasureFunc(_ygNode, _ygMeasureFunc);
+            if (measureFunction != null)
+            {
+#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
+                _ygNode.SetContext(this);
+#else
+                _managedMeasure = MeasureInternal;
+#endif
+            }
+            Native.YGNodeSetMeasureFunc(_ygNode, _managedMeasure);
         }
 
         public void SetBaselineFunction(BaselineFunction baselineFunction)
         {
             _baselineFunction = baselineFunction;
-            _ygBaselineFunc = baselineFunction != null ? BaselineInternal : (YogaBaselineFunc)null;
-            Native.YGNodeSetBaselineFunc(_ygNode, _ygBaselineFunc);
+            if (baselineFunction != null)
+            {
+#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
+                _ygNode.SetContext(this);
+#else
+                _managedBaseline = BaselineInternal;
+#endif
+            }
+            Native.YGNodeSetBaselineFunc(_ygNode, _managedBaseline);
         }
 
         public void CalculateLayout()
@@ -621,6 +648,20 @@ namespace Facebook.Yoga
                 Native.YGNodeStyleGetDirection(_ygNode));
         }
 
+#if (UNITY_IOS && !UNITY_EDITOR) || __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,
             float width,
@@ -636,6 +677,18 @@ namespace Facebook.Yoga
             return _measureFunction(this, width, widthMode, height, heightMode);
         }
 
+#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
+        [MonoPInvokeCallback(typeof(YogaBaselineFunc))]
+        private static float BaselineInternalIOS(
+            IntPtr ygNodePtr,
+            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)
@@ -673,17 +726,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/YogaUnit.cs

@@ -12,7 +12,8 @@ namespace Facebook.Yoga
     public enum YogaUnit
     {
         Undefined,
-        Pixel,
+        Point,
         Percent,
+        Auto,
     }
 }

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
@@ -33,12 +34,12 @@ namespace Facebook.Yoga
             }
         }
 
-        public static YogaValue Pixel(float value)
+        public static YogaValue Point(float value)
         {
             return new YogaValue
             {
                 value = value,
-                unit = YogaConstants.IsUndefined(value) ? YogaUnit.Undefined : YogaUnit.Pixel
+                unit = YogaConstants.IsUndefined(value) ? YogaUnit.Undefined : YogaUnit.Point
             };
         }
 
@@ -70,6 +71,15 @@ namespace Facebook.Yoga
             };
         }
 
+        public static YogaValue Auto()
+        {
+            return new YogaValue
+            {
+                value = 0f,
+                unit = YogaUnit.Auto
+            };
+        }
+
         public static YogaValue Percent(float value)
         {
             return new YogaValue
@@ -79,9 +89,21 @@ namespace Facebook.Yoga
             };
         }
 
-        public static implicit operator YogaValue(float pixelValue)
+        public static implicit operator YogaValue(float pointValue)
         {
-            return Pixel(pixelValue);
+            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/Facebook.Yoga/YogaValueExtensions.cs

@@ -16,9 +16,9 @@ namespace Facebook.Yoga
             return YogaValue.Percent(value);
         }
 
-        public static YogaValue Px(this float value)
+        public static YogaValue Pt(this float value)
         {
-            return YogaValue.Pixel(value);
+            return YogaValue.Point(value);
         }
 
         public static YogaValue Percent(this int value)
@@ -26,9 +26,9 @@ namespace Facebook.Yoga
             return YogaValue.Percent(value);
         }
 
-        public static YogaValue Px(this int value)
+        public static YogaValue Pt(this int value)
         {
-            return YogaValue.Pixel(value);
+            return YogaValue.Point(value);
         }
     }
 }