C# use YogaSize throughout the measure call chain

Summary: Java still has the same problem (see #296) Also there is no need to have double in the method signature as we only use float internally, which could confuse some. Closes https://github.com/facebook/yoga/pull/300 Reviewed By: splhack Differential Revision: D4365993 Pulled By: emilsjolander fbshipit-source-id: 681f8b1725e63eddcfb9a6c756f2ae215a44425a
ignore .buckversion
2016-12-24 02:54:38 -08:00 · 2016-12-24 02:54:38 -08:00 · 2016-12-24 02:54:38 -08:00 · 2016-12-23 12:09:40 -08:00 · 2016-12-23 12:09:40 -08:00 · 2016-12-23 11:24:37 -08:00
122 changed files with 2343 additions and 585 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,48 @@
 /.buckconfig.local
 /.buckd
 /gentest/test.html
+.buckversion

 # Visual studio code
 .vscode
+
+# 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
--- a/.hgignore
+++ b/.hgignore
@@ -5,6 +5,48 @@
 /.buckconfig.local
 /.buckd
 /gentest/test.html
+.buckversion

 # Visual studio code
 .vscode
+
+# 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
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,9 +21,9 @@ before_install:
  - export PATH=$JAVA_HOME/bin:$PATH

 script:
-  - buck test //:CSSLayout
+  - buck test //:yoga
  - buck test //java:java
-  - buck test //YogaKit:YogaKit --config cxx.default_platform=iphonesimulator-x86_64 --config cxx.cflags=-DTRAVIS_CI
+  - buck test //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64 --config cxx.cflags=-DTRAVIS_CI
  - sh csharp/tests/Facebook.Yoga/test_macos.sh
  - buck run //benchmark:benchmark
  - git checkout HEAD^
--- a/23
+++ b/23
@@ -7,14 +7,6 @@

 include_defs('//YOGA_DEFS')

-BASE_COMPILER_FLAGS = [
-  '-fno-omit-frame-pointer',
-  '-fexceptions',
-  '-Wall',
-  '-Werror',
-  '-O3',
-]
-
 GMOCK_OVERRIDE_FLAGS = [
  # gmock does not mark mocked methods as override, ignore the warnings in tests
  '-Wno-inconsistent-missing-override',
@@ -24,25 +16,26 @@ COMPILER_FLAGS = BASE_COMPILER_FLAGS + ['-std=c11', '-fPIC']
 TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + ['-std=c++11']

 cxx_library(
-  name = 'CSSLayout',
-  srcs = glob(['CSSLayout/*.c']),
-  tests=[':tests'],
-  exported_headers = subdir_glob([('', 'CSSLayout/*.h')]),
+  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 [
-    csslayout_dep('lib/fb:ndklog'),
+    yoga_dep('lib/fb:ndklog'),
  ],
  visibility = ['PUBLIC'],
 )

 cxx_test(
-  name = 'tests',
+  name = 'YogaTests',
  contacts = ['emilsj@fb.com'],
  srcs = glob(['tests/*.cpp']),
  compiler_flags = TEST_COMPILER_FLAGS,
  deps = [
-    ':CSSLayout',
+    ':yoga',
    GTEST_TARGET,
  ],
  visibility = ['PUBLIC'],
--- a/7
+++ b/7
@@ -1,10 +1,7 @@
-# Contributing to css-layout
+# Contributing to yoga
 We want to make contributing to this project as easy and transparent as
 possible.

-## Our Development Process
-All the development is happening on GitHub first and we have internal tools to sync down to Facebook codebase.
-
 ## Pull Requests
 We actively welcome your pull requests.
 1. Fork the repo and create your branch from `master`.
@@ -32,5 +29,5 @@ outlined on that page and do not file a public issue.
 * format.sh

 ## License
-By contributing to css-layout, you agree that your contributions will be licensed
+By contributing to yoga, you agree that your contributions will be licensed
 under its BSD license.
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 BSD License

-For css-layout software
+For yoga software

 Copyright (c) 2014-present, Facebook, Inc. All rights reserved.

--- a/9
+++ b/9
@@ -0,0 +1,9 @@
+The examples provided by Facebook are for non-commercial testing and evaluation
+purposes only. Facebook reserves all rights not expressly granted.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+FACEBOOK BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 Additional Grant of Patent Rights Version 2

-"Software" means the CSS Layout software distributed by Facebook, Inc.
+"Software" means the yoga software distributed by Facebook, Inc.

 Facebook, Inc. (“Facebook”) hereby grants to each recipient of the Software
 (“you”) a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
--- a/README.md
+++ b/README.md
@@ -1,162 +1,30 @@
-# CSSLayout [![Build Status](https://travis-ci.org/facebook/css-layout.svg?branch=master)](https://travis-ci.org/facebook/css-layout)
+# Yoga [![Build Status](https://travis-ci.org/facebook/yoga.svg?branch=master)](https://travis-ci.org/facebook/yoga)

-## NOTICE
-A lot is changing this week in the API regarding naming. We suggest you hold off updating to the latest version of the code until this notice is gone. Expect it to take about a week.
+## 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.

-## Goals
-CSSLayout is a cross-platform implementation of flexbox. The goal of CSSLayout is allow native developers to have the same expressive layout system as developers developing for the modern web are used to. CSSLayout allows developers for web, android, iOS, and windows to use the same layout primitives across platforms. This saves time, increases collaboration between platform teams, and makes it easier for developers to work on multiple platforms.
+## Testing
+For testing we rely on [gtest](https://github.com/google/googletest) as a submodule. After cloning Yoga run `git submodule init` followed by `git submodule update`.

-The goal of CSSLayout is not to re-implement all of css. CSSLayout only targets flexbox, and does not have any plans on implementing support for tables, floats, or any other css concepts. CSSLayout also does not plan on supporting styling properties which do not affect layout such as color or background properties.
+For any changes you make you should ensure that all the tests are passing. In case you make any fixes or additions to the library please also add tests for that change to ensure we don't break anything in the future. Tests are located in the `tests` directory. Run the tests by executing `buck test //:yoga`.

-
-## Differences from web
-CSSLayout tries to stay as close as possible to the web implementation of flexbox. There are however certain cases where CSSLayout differs from the web implementation.
-
-### Default values
-CSSLayout has chosen to make changes to the default values of certain properties. These default values were chosen based on our usage of the library. When testing layout with tools such as JSFiddle you can apply the following css style to ensure the defaults match those of CSSLayout. Or fork the [following JSFiddle](http://jsfiddle.net/vjeux/y11txxv9/).
-
-```css
-div, span {
-  box-sizing: border-box;
-  position: relative;
-
-  display: flex;
-  flex-direction: column;
-  align-items: stretch;
-  flex-shrink: 0;
-  align-content: flex-start;
-
-  border: 0 solid black;
-  margin: 0;
-  padding: 0;
-  min-width: 0;
-}
-```
-
- `box-sizing: border-box` is the most convenient way to express the relation between `width` and `borderWidth`.
- Everything is `display: flex` by default. All the behaviors of `block` and `inline-block` can be expressed in term of `flex` but not the opposite.
- All the flex elements are oriented from top to bottom, left to right and do not shrink. This is how things are laid out using the default CSS settings and what you'd expect.
- Everything is `position: relative`. This makes `position: absolute` target the direct parent and not some parent which is either `relative` or `absolute`. If you want to position an element relative to something else, you should move it in the DOM instead of relying of CSS. It also makes `top, left, right, bottom` do something when not specifying `position: absolute`.
-
-### Size units
-CSSLayout currently only supports pixel sizes. The reason being that we have not seen the need for any other units. We would like to support percentage units sometime in the future.
-
-### -start and -end properties
-We think supporting RTL locales is very important. Therefor CSSLayout supports non-standards -start and -end suffixed versions of margin, padding, border, and position.
-
-
-## Usage
-
-### C
-The full API can be found in `CSSLayout/CSSLayout.h`.
-
-```c
-CSSNodeRef root = CSSNodeNew();
-CSSNodeStyleSetWidth(root, 100);
-CSSNodeStyleSetHeight(root, 100);
-
-for (uint32_t i = 0; i < 10; i++) {
-  CSSNodeRef child = CSSNodeNew();
-  CSSNodeStyleSetHeight(child, 10);
-  CSSNodeInsertChild(root, child, 0);
-}
-
-CSSNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
-
-// Get for resulting layout
-CSSNodeLayoutGetLeft(root);
-CSSNodeLayoutGetTop(root);
-CSSNodeLayoutGetWidth(root);
-CSSNodeLayoutGetHeight(root);
-```
-
-### Java
-The full API can be found in `java/com/facebook/csslayout/CSSNode.java`.
-
-```java
-CSSNode root = new CSSNode();
-root.setStyleWidth(100);
-root.setStyleHeight(100);
-
-for (int i = 0; i < 10; i++) {
-  CSSNode child = new CSSNode();
-  child.setStyleHeight(10);
-  root.addChildAt(child, 0);
-}
-
-root.calculateLayout(new CSSLayoutContext());
-
-// Get for resulting layout
-root.getLayoutX();
-root.getLayoutY();
-root.getLayoutWidth();
-root.getLayoutHeight();
-```
-
-### UIKit
-The full API can be found in `YogaKit/UIView+Yoga.h`.
-
-```objective-c
-UIView *root = [UIView new];
-[root yg_setUsesYoga:YES];
-[root yg_setWidth:100];
-[root yg_setHeight:100];
-
-for (NSUInteger i = 0; i < 10; i++) {
-  UIView *child = [UIView new];
-  [child yg_setUsesYoga:YES];
-  [child yg_setHeight:10];
-  [root addSubview:child];
-}
-
-// Resulting layout will be set on the UIView hierarchy frames.
-[root yg_applyLayout];
-```
-
-### .NET
-The full API can be found in `csharp/Facebook.CSSLayout/CSSNode.cs`.
-
-```csharp
-var root = new CSSNode();
-root.StyleWidth = 100;
-root.StyleHeight = 100;
-
-for (var i = 0; i < 10; i++)
-{
-  var child = new CSSNode();
-  child.StyleHeight = 10;
-  root.Insert(0, child);
-}
-
-// Get for resulting layout
-root.LayoutX;
-root.LayoutY;
-root.LayoutWidth;
-root.LayoutHeight;
-```
-
-## Contributing
-To contribute to CSSLayout you need to first install [buck](https://buckbuild.com) which is the build system used by CSSLayout. CSSLayout is implemented in C with language bindings for Java, Objective-C, and .NET. When making changes to `CSSLayout/CSSLayout.h` please ensure to update `java/jni/CSSJNI.h`, `java/com/facebook/csslayout/CSSNode.java`, `uikit/CSSLayout/UIView+CSSLayout.m`, and `csharp/Facebook.CSSLayout/CSSNode.cs` to reflect the API change. Before submitting any code please run `format.sh` to ensure the code matches the project's code style.
-
-Before making any larger changes to CSSLayout please open an issue with a RFC so the changes can be discussed first. Generally we are very open to changes and improvements that will benefit the community.
-
-### Testing
-For any changes you make you should ensure that all the tests are passing. In case you make any fixes or additions to the library please also add at least one test to ensure we don't break anything in the future. Tests are located in `tests/CSSLayoutTest.cpp`. Run the tests by executing `buck test //:CSSLayout`.
-
-Instead of manually writing a test which ensures parity with web implementations of flexbox you can run `gentest/gentest.rb` to generated a test for you. You can write html which you want to verify in CSSLayout, in `gentest/fixtures` folder, such as the following.
+Instead of manually writing a test which ensures parity with web implementations of Flexbox you can run `gentest/gentest.rb` to generated a test for you. You can write html which you want to verify in Yoga, in `gentest/fixtures` folder, such as the following.

 ```html
-<div style="width: 100px; height: 100px; align-items: center;">
+<div id="my_test" style="width: 100px; height: 100px; align-items: center;">
  <div style="width: 50px; height: 50px;"></div>
 </div>
 ```

-Run `gentest/gentest.rb` to generate test code and re-run `buck test //:CSSLayout` to validate the behavior. One test case will be generated for every root `div` in the input html.
+Run `gentest/gentest.rb` to generate test code and re-run `buck test //:yoga` to validate the behavior. One test case will be generated for every root `div` in the input html.

 You may need to install the latest watir-webdriver gem (`gem install watir-webdriver`) and [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/) to run `gentest/gentest.rb` Ruby script.

-#### .NET
-.NET testing is not integrated in buck yet, you might need to set up .NET testing environment. We have a script which to launch C# test on macOS, `csharp/tests/Facebook.CSSLayout/test_macos.sh`.
+### .NET
+.NET testing is not integrated in buck yet, you might need to set up .NET testing environment. We have a script which to launch C# test on macOS, `csharp/tests/Facebook.Yoga/test_macos.sh`.

-### Benchmarks
-Benchmarks are located in `benchmarks/CSSBenchmark.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.
+## Code style
+For the main C implementation of Yoga clang-format is used to ensure a consistent code style. Please run `bash format.sh` before submitting a pull request. For other languages just try to follow the current code style.
+
+## Benchmarks
+Benchmarks are located in `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.
--- a/14
+++ b/14
@@ -1,5 +1,5 @@

-CSSLAYOUT_ROOT = '//...'
+YOGA_ROOT = '//...'
 INFER_ANNOTATIONS_TARGET = '//lib/infer-annotations:infer-annotations'
 JSR_305_TARGET = '//lib/jsr-305:jsr-305'
 JUNIT_TARGET = '//lib/junit:junit'
@@ -12,12 +12,20 @@ FBJNI_TARGET = '//lib/fb:fbjni'
 THIS_IS_FBOBJC = False

 CXX_LIBRARY_WHITELIST = [
-  '//:CSSLayout',
+  '//:yoga',
  '//lib/fb:fbjni',
  '//java:jni',
 ]

-def csslayout_dep(dep):
+BASE_COMPILER_FLAGS = [
+  '-fno-omit-frame-pointer',
+  '-fexceptions',
+  '-Wall',
+  '-Werror',
+  '-O3',
+]
+
+def yoga_dep(dep):
  return '//' + dep

 class allow_unsafe_import:
--- a/YogaKit/BUCK
+++ b/YogaKit/BUCK
@@ -7,7 +7,7 @@

 include_defs('//YOGA_DEFS')

-UIKIT_CSSLAYOUT_COMPILER_FLAGS = [
+COMPILER_FLAGS = [
  '-fobjc-arc',
  '-Wconditional-uninitialized',
  '-Wdangling-else',
@@ -29,8 +29,7 @@ UIKIT_CSSLAYOUT_COMPILER_FLAGS = [

 apple_library(
  name = 'YogaKit',
-  compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS,
-  tests = [':YogaKitTests'],
+  compiler_flags = COMPILER_FLAGS,
  srcs = glob(['*.m']),
  exported_headers = glob(['*.h']),
  frameworks = [
@@ -38,14 +37,14 @@ apple_library(
    '$SDKROOT/System/Library/Frameworks/UIKit.framework',
  ],
  deps = [
-    csslayout_dep(':CSSLayout'),
+    yoga_dep(':yoga'),
  ],
  visibility = ['PUBLIC'],
 )

 apple_test(
  name = 'YogaKitTests',
-  compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS,
+  compiler_flags = COMPILER_FLAGS,
  info_plist = 'Tests/Info.plist',
  srcs = glob(['Tests/**/*.m']),
  frameworks = [
--- a/YogaKit/Tests/YogaKitTests.m
+++ b/YogaKit/Tests/YogaKitTests.m
@@ -9,7 +9,7 @@

 #import <XCTest/XCTest.h>

-#import "UIView+Yoga.h"
+#import <YogaKit/UIView+Yoga.h>

@interface YogaKitTests : XCTestCase
@end
@@ -268,4 +268,79 @@
  }
 }

+- (void)testyg_isLeafFlag
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  XCTAssertTrue(view.yg_isLeaf);
+
+  for (int i=0; i<10; i++) {
+    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+    [view addSubview:subview];
+  }
+  XCTAssertTrue(view.yg_isLeaf);
+
+  [view yg_setUsesYoga:YES];
+  [view yg_setWidth:50.0];
+  XCTAssertTrue(view.yg_isLeaf);
+
+  UIView *const subview = view.subviews[0];
+  [subview yg_setUsesYoga:YES];
+  [subview yg_setWidth:50.0];
+  XCTAssertFalse(view.yg_isLeaf);
+}
+
+- (void)testThatWeCorrectlyAttachNestedViews
+{
+    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+    [container yg_setUsesYoga:YES];
+    [container yg_setFlexDirection:YGFlexDirectionColumn];
+
+    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+    [subview1 yg_setUsesYoga:YES];
+    [subview1 yg_setWidth:100];
+    [subview1 yg_setFlexGrow:1];
+    [subview1 yg_setFlexDirection:YGFlexDirectionColumn];
+    [container addSubview:subview1];
+
+    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+    [subview2 yg_setUsesYoga:YES];
+    [subview2 yg_setWidth:150];
+    [subview2 yg_setFlexGrow:1];
+    [subview2 yg_setFlexDirection:YGFlexDirectionColumn];
+    [container addSubview:subview2];
+
+    for (UIView *view in @[subview1, subview2]) {
+        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
+        [someView yg_setUsesYoga:YES];
+        [someView yg_setFlexGrow:1];
+        [view addSubview:someView];
+    }
+    [container yg_applyLayout];
+
+    // Add the same amount of new views, reapply layout.
+    for (UIView *view in @[subview1, subview2]) {
+        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
+        [someView yg_setUsesYoga:YES];
+        [someView yg_setFlexGrow:1];
+        [view addSubview:someView];
+    }
+    [container yg_applyLayout];
+
+    XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(100, 25), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview1.bounds.size));
+    for (UIView *subview in subview1.subviews) {
+        const CGSize subviewSize = subview.bounds.size;
+        XCTAssertFalse(CGSizeEqualToSize(CGSizeZero, subviewSize));
+        XCTAssertFalse(isnan(subviewSize.height));
+        XCTAssertFalse(isnan(subviewSize.width));
+    }
+
+    XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 25), subview2.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview2.bounds.size));
+    for (UIView *subview in subview2.subviews) {
+        const CGSize subviewSize = subview.bounds.size;
+        XCTAssertFalse(CGSizeEqualToSize(CGSizeZero, subview.bounds.size));
+        XCTAssertFalse(isnan(subviewSize.height));
+        XCTAssertFalse(isnan(subviewSize.width));
+    }
+}
+
@end
--- a/YogaKit/UIView+Yoga.h
+++ b/YogaKit/UIView+Yoga.h
@@ -8,7 +8,7 @@
 */

 #import <UIKit/UIKit.h>
-#import <CSSLayout/Yoga.h>
+#import <yoga/Yoga.h>

@interface UIView (Yoga)

@@ -55,7 +55,7 @@
 - (YGDirection)yg_resolvedDirection;

 /**
- Perform a layout calculation and update the frames of the views in the hierarchy with th results
+ Perform a layout calculation and update the frames of the views in the hierarchy with the results
 */
 - (void)yg_applyLayout;

@@ -69,4 +69,9 @@
 */
 - (NSUInteger)yg_numberOfChildren;

+/**
+ Return a BOOL indiciating whether or not we this node contains any subviews that are included in Yoga's layout.
+ */
+- (BOOL)yg_isLeaf;
+
@end
--- a/YogaKit/UIView+Yoga.m
+++ b/YogaKit/UIView+Yoga.m
@@ -19,7 +19,7 @@

 + (void)initialize
 {
-  YogaSetExperimentalFeatureEnabled(YGExperimentalFeatureWebFlexBasis, true);
+  YGSetExperimentalFeatureEnabled(YGExperimentalFeatureWebFlexBasis, true);
 }

 - (instancetype)init
@@ -53,7 +53,21 @@

 - (NSUInteger)yg_numberOfChildren
 {
-  return YGNodeChildCount([self ygNode]);
+  return YGNodeGetChildCount([self ygNode]);
+}
+
+- (BOOL)yg_isLeaf
+{
+  NSAssert([NSThread isMainThread], @"This method must be called on the main thread.");
+  if ([self yg_usesYoga]) {
+      for (UIView *subview in self.subviews) {
+          if ([subview yg_usesYoga] && [subview yg_includeInLayout]) {
+              return NO;
+          }
+      }
+  }
+
+  return YES;
 }

 #pragma mark - Setters
@@ -276,17 +290,32 @@ static CGFloat YGSanitizeMeasurement(
  return result;
 }

-static void YGAttachNodesFromViewHierachy(UIView *view) {
-  YGNodeRef node = [view ygNode];
+static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *subviews)
+{
+  if (YGNodeGetChildCount(node) != subviews.count) {
+    return NO;
+  }
+
+  for (int i=0; i<subviews.count; i++) {
+    if (YGNodeGetChild(node, i) != subviews[i].ygNode) {
+      return NO;
+    }
+  }
+
+  return YES;
+}
+
+static void YGAttachNodesFromViewHierachy(UIView *const view)
+{
+  const YGNodeRef node = [view ygNode];

  // Only leaf nodes should have a measure function
-  if (![view yg_usesYoga] || view.subviews.count == 0) {
+  if (view.yg_isLeaf) {
    YGNodeSetMeasureFunc(node, YGMeasureView);
    YGRemoveAllChildren(node);
  } else {
    YGNodeSetMeasureFunc(node, NULL);

-    // Create a list of all the subviews that we are going to use for layout.
    NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
    for (UIView *subview in view.subviews) {
      if ([subview yg_includeInLayout]) {
@@ -294,26 +323,15 @@ static void YGAttachNodesFromViewHierachy(UIView *view) {
      }
    }

-    BOOL shouldReconstructChildList = NO;
-    if (YGNodeChildCount(node) != subviewsToInclude.count) {
-      shouldReconstructChildList = YES;
-    } else {
-      for (int i = 0; i < subviewsToInclude.count; i++) {
-        if (YGNodeGetChild(node, i) != [subviewsToInclude[i] ygNode]) {
-          shouldReconstructChildList = YES;
-          break;
+    if (!YGNodeHasExactSameChildren(node, subviewsToInclude)) {
+        YGRemoveAllChildren(node);
+        for (int i=0; i<subviewsToInclude.count; i++) {
+            YGNodeInsertChild(node, [subviewsToInclude[i] ygNode], i);
        }
-      }
    }

-    if (shouldReconstructChildList) {
-      YGRemoveAllChildren(node);
-
-      for (int i = 0 ; i < subviewsToInclude.count; i++) {
-        UIView *const subview = subviewsToInclude[i];
-        YGNodeInsertChild(node, [subview ygNode], i);
+    for (UIView *const subview in subviewsToInclude) {
        YGAttachNodesFromViewHierachy(subview);
-      }
    }
  }
 }
@@ -324,8 +342,8 @@ static void YGRemoveAllChildren(const YGNodeRef node)
      return;
  }

-  while (YGNodeChildCount(node) > 0) {
-    YGNodeRemoveChild(node, YGNodeGetChild(node, YGNodeChildCount(node) - 1));
+  while (YGNodeGetChildCount(node) > 0) {
+    YGNodeRemoveChild(node, YGNodeGetChild(node, YGNodeGetChildCount(node) - 1));
  }
 }

@@ -340,7 +358,8 @@ static CGFloat YGRoundPixelValue(CGFloat value)
  return round(value * scale) / scale;
 }

-static void YGApplyLayoutToViewHierarchy(UIView *view) {
+static void YGApplyLayoutToViewHierarchy(UIView *view)
+{
  NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
  if (![view yg_includeInLayout]) {
     return;
@@ -368,9 +387,8 @@ static void YGApplyLayoutToViewHierarchy(UIView *view) {
    },
  };

-  const BOOL isLeaf = ![view yg_usesYoga] || view.subviews.count == 0;
-  if (!isLeaf) {
-    for (NSUInteger i = 0; i < view.subviews.count; i++) {
+  if (!view.yg_isLeaf) {
+    for (NSUInteger i=0; i<view.subviews.count; i++) {
      YGApplyLayoutToViewHierarchy(view.subviews[i]);
    }
  }
--- a/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj
+++ b/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj
@@ -0,0 +1,376 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	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 */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		13687D771DF878A000E7C260 /* yoga */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = include/yoga;
+			dstSubfolderSpec = 16;
+			files = (
+				13687D781DF878C600E7C260 /* YGEnums.h in yoga */,
+				13687D791DF878C600E7C260 /* YGMacros.h in yoga */,
+				13687D7A1DF878C600E7C260 /* Yoga.h in yoga */,
+			);
+			name = yoga;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		13687D7B1DF878CE00E7C260 /* YogaKit */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = include/YogaKit;
+			dstSubfolderSpec = 16;
+			files = (
+				13687D7C1DF878DD00E7C260 /* UIView+Yoga.h in YogaKit */,
+			);
+			name = YogaKit;
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* 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; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		13687D401DF8748300E7C260 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				13687D871DF87D2400E7C260 /* Foundation.framework in Frameworks */,
+				13687D851DF87D1E00E7C260 /* UIKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		13687D3A1DF8748300E7C260 = {
+			isa = PBXGroup;
+			children = (
+				13687D5D1DF8778F00E7C260 /* yoga */,
+				13687D641DF8778F00E7C260 /* YogaKit */,
+				13687D451DF8748400E7C260 /* YogaKitSample */,
+				13687D441DF8748400E7C260 /* Products */,
+				13687D831DF87D1E00E7C260 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		13687D441DF8748400E7C260 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				13687D431DF8748400E7C260 /* YogaKitSample.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		13687D451DF8748400E7C260 /* YogaKitSample */ = {
+			isa = PBXGroup;
+			children = (
+				13687D491DF8748400E7C260 /* AppDelegate.h */,
+				13687D4A1DF8748400E7C260 /* AppDelegate.m */,
+				13687D4C1DF8748400E7C260 /* ViewController.h */,
+				13687D4D1DF8748400E7C260 /* ViewController.m */,
+				13687D521DF8748400E7C260 /* Assets.xcassets */,
+				13687D571DF8748400E7C260 /* Info.plist */,
+				13687D461DF8748400E7C260 /* Supporting Files */,
+			);
+			path = YogaKitSample;
+			sourceTree = "<group>";
+		};
+		13687D461DF8748400E7C260 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				13687D471DF8748400E7C260 /* main.m */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		13687D5D1DF8778F00E7C260 /* yoga */ = {
+			isa = PBXGroup;
+			children = (
+				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 */,
+			);
+			name = YogaKit;
+			path = ..;
+			sourceTree = "<group>";
+		};
+		13687D831DF87D1E00E7C260 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				13687D861DF87D2400E7C260 /* Foundation.framework */,
+				13687D841DF87D1E00E7C260 /* UIKit.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		13687D421DF8748300E7C260 /* YogaKitSample */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 13687D5A1DF8748400E7C260 /* Build configuration list for PBXNativeTarget "YogaKitSample" */;
+			buildPhases = (
+				13687D771DF878A000E7C260 /* yoga */,
+				13687D7B1DF878CE00E7C260 /* YogaKit */,
+				13687D3F1DF8748300E7C260 /* Sources */,
+				13687D401DF8748300E7C260 /* Frameworks */,
+				13687D411DF8748300E7C260 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = YogaKitSample;
+			productName = YogaKitSample;
+			productReference = 13687D431DF8748400E7C260 /* YogaKitSample.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		13687D3B1DF8748300E7C260 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0810;
+				ORGANIZATIONNAME = facebook;
+				TargetAttributes = {
+					13687D421DF8748300E7C260 = {
+						CreatedOnToolsVersion = 8.1;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 13687D3E1DF8748300E7C260 /* Build configuration list for PBXProject "YogaKitSample" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 13687D3A1DF8748300E7C260;
+			productRefGroup = 13687D441DF8748400E7C260 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				13687D421DF8748300E7C260 /* YogaKitSample */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		13687D411DF8748300E7C260 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				13687D531DF8748400E7C260 /* Assets.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		13687D3F1DF8748300E7C260 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				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 */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		13687D581DF8748400E7C260 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		13687D591DF8748400E7C260 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		13687D5B1DF8748400E7C260 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				INFOPLIST_FILE = YogaKitSample/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		13687D5C1DF8748400E7C260 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				INFOPLIST_FILE = YogaKitSample/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		13687D3E1DF8748300E7C260 /* Build configuration list for PBXProject "YogaKitSample" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				13687D581DF8748400E7C260 /* Debug */,
+				13687D591DF8748400E7C260 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		13687D5A1DF8748400E7C260 /* Build configuration list for PBXNativeTarget "YogaKitSample" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				13687D5B1DF8748400E7C260 /* Debug */,
+				13687D5C1DF8748400E7C260 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 13687D3B1DF8748300E7C260 /* Project object */;
+}
--- a/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+++ b/YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:YogaKitSample.xcodeproj">
+   </FileRef>
+</Workspace>
--- a/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.h
+++ b/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.h
@@ -0,0 +1,16 @@
+/**
+ * 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
+
--- a/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.m
+++ b/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.m
@@ -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 "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
--- a/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,48 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
--- a/YogaKit/YogaKitSample/YogaKitSample/Info.plist
+++ b/YogaKit/YogaKitSample/YogaKitSample/Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string></string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
--- a/YogaKit/YogaKitSample/YogaKitSample/ViewController.h
+++ b/YogaKit/YogaKitSample/YogaKitSample/ViewController.h
@@ -0,0 +1,15 @@
+/**
+ * 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
+
--- a/YogaKit/YogaKitSample/YogaKitSample/ViewController.m
+++ b/YogaKit/YogaKitSample/YogaKitSample/ViewController.m
@@ -0,0 +1,60 @@
+/**
+ * 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 "ViewController.h"
+
+#import <YogaKit/UIView+Yoga.h>
+
+@interface ViewController ()
+
+@end
+
+@implementation ViewController
+
+- (void)viewDidLoad
+{
+    UIView *root = self.view;
+    root.backgroundColor = [UIColor redColor];
+    [root yg_setUsesYoga:YES];
+    [root yg_setWidth:self.view.bounds.size.width];
+    [root yg_setHeight:self.view.bounds.size.height];
+    [root yg_setAlignItems:YGAlignCenter];
+    [root yg_setJustifyContent:YGJustifyCenter];
+
+    UIView *child1 = [UIView new];
+    child1.backgroundColor = [UIColor blueColor];
+    [child1 yg_setUsesYoga:YES];
+    [child1 yg_setWidth:100];
+    [child1 yg_setHeight:100];
+
+    UIView *child2 = [UIView new];
+    child2.backgroundColor = [UIColor greenColor];
+    child2.frame = (CGRect) {
+        .size = {
+            .width = 200,
+            .height = 100,
+        }
+    };
+
+    UIView *child3 = [UIView new];
+    child3.backgroundColor = [UIColor yellowColor];
+    child3.frame = (CGRect) {
+        .size = {
+            .width = 100,
+            .height = 100,
+        }
+    };
+
+    [child2 addSubview:child3];
+    [root addSubview:child1];
+    [root addSubview:child2];
+    [root yg_applyLayout];
+}
+
+
+@end
--- a/YogaKit/YogaKitSample/YogaKitSample/main.m
+++ b/YogaKit/YogaKitSample/YogaKitSample/main.m
@@ -0,0 +1,16 @@
+/**
+ * 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]));
+    }
+}
--- a/benchmark/BUCK
+++ b/benchmark/BUCK
@@ -21,7 +21,7 @@ cxx_binary(
    '-std=c11',
  ],
  deps = [
-    csslayout_dep(':CSSLayout'),
+    yoga_dep(':yoga'),
  ],
  visibility = ['PUBLIC'],
 )
--- a/benchmark/YGBenchmark.c
+++ b/benchmark/YGBenchmark.c
@@ -9,7 +9,7 @@

 #include "YGBenchmark.h"

-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>

 static YGSize _measure(YGNodeRef node,
                        float width,
--- a/csharp/.gitignore
+++ b/csharp/.gitignore
@@ -34,6 +34,10 @@ bld/
 # NUNIT
 *.VisualState.xml
 TestResult.xml
+tests/Facebook.Yoga/NUnit-[0-9\.]*/
+tests/Facebook.Yoga/YogaTest.dll
+tests/Facebook.Yoga/YogaTest.dll.mdb
+tests/Facebook.Yoga/libyoga.dylib

 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -262,4 +266,4 @@ paket-files/

 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
--- a/csharp/.hgignore
+++ b/csharp/.hgignore
@@ -34,6 +34,10 @@ bld/
 # NUNIT
 *.VisualState.xml
 TestResult.xml
+tests/Facebook.Yoga/NUnit-[0-9\.]*/
+tests/Facebook.Yoga/YogaTest.dll
+tests/Facebook.Yoga/YogaTest.dll.mdb
+tests/Facebook.Yoga/libyoga.dylib

 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -262,4 +266,4 @@ paket-files/

 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
--- a/csharp/BUCK
+++ b/csharp/BUCK
@@ -5,16 +5,59 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.

+include_defs('//YOGA_DEFS')
+
+COMPILER_FLAGS = BASE_COMPILER_FLAGS + ['-std=c++11']
+
 csharp_library(
-  name = 'csslibnet46',
+  name = 'yogalibnet46',
  dll_name = 'Facebook.Yoga.dll',
  framework_ver = 'net46',
  srcs = glob(['**/*.cs']),
 )

 csharp_library(
-  name = 'csslibnet45',
+  name = 'yogalibnet45',
  dll_name = 'Facebook.Yoga.dll',
  framework_ver = 'net45',
  srcs = glob(['**/*.cs']),
 )
+
+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'],
+)
+
+with allow_unsafe_import():
+  import os
+
+if os.path.isdir('/Applications/Xcode.app'):
+  yoganet_ios_srcs = []
+  for arch in ['iphonesimulator-x86_64', 'iphoneos-arm64', 'iphoneos-armv7']:
+    name = 'yoganet-' + arch
+    yoganet_ios_srcs.append(':' + name)
+    genrule(
+      name = name,
+      srcs = [
+        yoga_dep(':yoga#%s,static' % arch),
+        yoga_dep('YogaKit:YogaKit#%s,static' % arch),
+        yoga_dep('csharp:yoganet#%s,static' % arch),
+      ],
+      out = 'libyoga-%s.a' % arch,
+      cmd = 'libtool -static -o $OUT $SRCS',
+      visibility = [yoga_dep('csharp:yoganet-ios')],
+    )
+
+  genrule(
+    name = 'yoganet-ios',
+    srcs = yoganet_ios_srcs,
+    out = 'libyoga.a',
+    cmd = 'lipo $SRCS -create -output $OUT',
+    visibility = ['PUBLIC'],
+  )
--- a/csharp/Facebook.Yoga/MeasureFunction.cs
+++ b/csharp/Facebook.Yoga/MeasureFunction.cs
@@ -9,7 +9,7 @@

 namespace Facebook.Yoga
 {
-    public delegate long MeasureFunction(
+    public delegate YogaSize MeasureFunction(
        YogaNode node,
        float width,
        YogaMeasureMode widthMode,
--- a/csharp/Facebook.Yoga/MeasureOutput.cs
+++ b/csharp/Facebook.Yoga/MeasureOutput.cs
@@ -11,24 +11,9 @@ namespace Facebook.Yoga
 {
    public class MeasureOutput
    {
-        public static long Make(double width, double height)
+        public static YogaSize Make(float width, float height)
        {
-            return Make((int) width, (int) height);
-        }
-
-        public static long Make(int width, int height)
-        {
-            return (long)(((ulong) width) << 32 | ((uint) height));
-        }
-
-        public static int GetWidth(long measureOutput)
-        {
-            return (int) (0xFFFFFFFF & (measureOutput >> 32));
-        }
-
-        public static int GetHeight(long measureOutput)
-        {
-            return (int) (0xFFFFFFFF & measureOutput);
+            return new YogaSize { width = width, height = height};
        }
    }
 }
--- a/csharp/Facebook.Yoga/Native.cs
+++ b/csharp/Facebook.Yoga/Native.cs
@@ -14,27 +14,46 @@ namespace Facebook.Yoga
 {
    internal static class Native
    {
-#if UNITY_IOS && !UNITY_EDITOR
+#if (UNITY_IOS && !UNITY_EDITOR) || __IOS__
        private const string DllName = "__Internal";
 #else
        private const string DllName = "yoga";
 #endif

+        internal class YGNodeHandle : SafeHandle
+        {
+            private YGNodeHandle() : base(IntPtr.Zero, true)
+            {
+            }
+
+            public override bool IsInvalid
+            {
+                get
+                {
+                    return this.handle == IntPtr.Zero;
+                }
+            }
+
+            protected override bool ReleaseHandle()
+            {
+                Native.YGNodeFree(this.handle);
+                GC.KeepAlive(this);
+                return true;
+            }
+        }
+
        [DllImport(DllName)]
        public static extern void YGInteropSetLogger(
            [MarshalAs(UnmanagedType.FunctionPtr)] YogaLogger.Func func);

        [DllImport(DllName)]
-        public static extern IntPtr YGNodeNew();
+        public static extern YGNodeHandle YGNodeNew();

        [DllImport(DllName)]
-        public static extern void YGNodeInit(IntPtr cssNode);
+        public static extern void YGNodeFree(IntPtr node);

        [DllImport(DllName)]
-        public static extern void YGNodeFree(IntPtr cssNode);
-
-        [DllImport(DllName)]
-        public static extern void YGNodeReset(IntPtr cssNode);
+        public static extern void YGNodeReset(YGNodeHandle node);

        [DllImport(DllName)]
        public static extern int YGNodeGetInstanceCount();
@@ -49,237 +68,225 @@ namespace Facebook.Yoga
            YogaExperimentalFeature feature);

        [DllImport(DllName)]
-        public static extern void YGNodeInsertChild(IntPtr node, IntPtr child, uint index);
+        public static extern void YGNodeInsertChild(YGNodeHandle node, YGNodeHandle child, uint index);

        [DllImport(DllName)]
-        public static extern void YGNodeRemoveChild(IntPtr node, IntPtr child);
+        public static extern void YGNodeRemoveChild(YGNodeHandle node, YGNodeHandle child);

        [DllImport(DllName)]
-        public static extern IntPtr YGNodeGetChild(IntPtr node, uint index);
-
-        [DllImport(DllName)]
-        public static extern uint YGNodeChildCount(IntPtr node);
-
-        [DllImport(DllName)]
-        public static extern void YGNodeCalculateLayout(IntPtr node,
+        public static extern void YGNodeCalculateLayout(YGNodeHandle node,
                            float availableWidth,
                            float availableHeight,
                            YogaDirection parentDirection);

        [DllImport(DllName)]
-        public static extern void YGNodeMarkDirty(IntPtr node);
+        public static extern void YGNodeMarkDirty(YGNodeHandle node);

        [DllImport(DllName)]
        [return: MarshalAs(UnmanagedType.I1)]
-        public static extern bool YGNodeIsDirty(IntPtr node);
+        public static extern bool YGNodeIsDirty(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodePrint(IntPtr node, YogaPrintOptions options);
+        public static extern void YGNodePrint(YGNodeHandle node, YogaPrintOptions options);

        [DllImport(DllName)]
        [return: MarshalAs(UnmanagedType.I1)]
        public static extern bool YGValueIsUndefined(float value);

        [DllImport(DllName)]
-        public static extern void YGNodeCopyStyle(IntPtr dstNode, IntPtr srcNode);
+        public static extern void YGNodeCopyStyle(YGNodeHandle dstNode, YGNodeHandle srcNode);

        #region YG_NODE_PROPERTY

-        [DllImport(DllName)]
-        public static extern void YGNodeSetContext(IntPtr node, IntPtr context);
-
-        [DllImport(DllName)]
-        public static extern IntPtr YGNodeGetContext(IntPtr node);
-
        [DllImport(DllName)]
        public static extern void YGNodeSetMeasureFunc(
-            IntPtr node,
+            YGNodeHandle node,
            [MarshalAs(UnmanagedType.FunctionPtr)] YogaMeasureFunc measureFunc);

        [DllImport(DllName)]
        [return: MarshalAs(UnmanagedType.FunctionPtr)]
-        public static extern YogaMeasureFunc YGNodeGetMeasureFunc(IntPtr node);
+        public static extern YogaMeasureFunc YGNodeGetMeasureFunc(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeSetHasNewLayout(IntPtr node, [MarshalAs(UnmanagedType.I1)] bool hasNewLayout);
+        public static extern void YGNodeSetHasNewLayout(YGNodeHandle node, [MarshalAs(UnmanagedType.I1)] bool hasNewLayout);

        [DllImport(DllName)]
        [return: MarshalAs(UnmanagedType.I1)]
-        public static extern bool YGNodeGetHasNewLayout(IntPtr node);
+        public static extern bool YGNodeGetHasNewLayout(YGNodeHandle node);

        #endregion

        #region YG_NODE_STYLE_PROPERTY

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetDirection(IntPtr node, YogaDirection direction);
+        public static extern void YGNodeStyleSetDirection(YGNodeHandle node, YogaDirection direction);

        [DllImport(DllName)]
-        public static extern YogaDirection YGNodeStyleGetDirection(IntPtr node);
+        public static extern YogaDirection YGNodeStyleGetDirection(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlexDirection(IntPtr node, YogaFlexDirection flexDirection);
+        public static extern void YGNodeStyleSetFlexDirection(YGNodeHandle node, YogaFlexDirection flexDirection);

        [DllImport(DllName)]
-        public static extern YogaFlexDirection YGNodeStyleGetFlexDirection(IntPtr node);
+        public static extern YogaFlexDirection YGNodeStyleGetFlexDirection(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetJustifyContent(IntPtr node, YogaJustify justifyContent);
+        public static extern void YGNodeStyleSetJustifyContent(YGNodeHandle node, YogaJustify justifyContent);

        [DllImport(DllName)]
-        public static extern YogaJustify YGNodeStyleGetJustifyContent(IntPtr node);
+        public static extern YogaJustify YGNodeStyleGetJustifyContent(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetAlignContent(IntPtr node, YogaAlign alignContent);
+        public static extern void YGNodeStyleSetAlignContent(YGNodeHandle node, YogaAlign alignContent);

        [DllImport(DllName)]
-        public static extern YogaAlign YGNodeStyleGetAlignContent(IntPtr node);
+        public static extern YogaAlign YGNodeStyleGetAlignContent(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetAlignItems(IntPtr node, YogaAlign alignItems);
+        public static extern void YGNodeStyleSetAlignItems(YGNodeHandle node, YogaAlign alignItems);

        [DllImport(DllName)]
-        public static extern YogaAlign YGNodeStyleGetAlignItems(IntPtr node);
+        public static extern YogaAlign YGNodeStyleGetAlignItems(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetAlignSelf(IntPtr node, YogaAlign alignSelf);
+        public static extern void YGNodeStyleSetAlignSelf(YGNodeHandle node, YogaAlign alignSelf);

        [DllImport(DllName)]
-        public static extern YogaAlign YGNodeStyleGetAlignSelf(IntPtr node);
+        public static extern YogaAlign YGNodeStyleGetAlignSelf(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetPositionType(IntPtr node, YogaPositionType positionType);
+        public static extern void YGNodeStyleSetPositionType(YGNodeHandle node, YogaPositionType positionType);

        [DllImport(DllName)]
-        public static extern YogaPositionType YGNodeStyleGetPositionType(IntPtr node);
+        public static extern YogaPositionType YGNodeStyleGetPositionType(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlexWrap(IntPtr node, YogaWrap flexWrap);
+        public static extern void YGNodeStyleSetFlexWrap(YGNodeHandle node, YogaWrap flexWrap);

        [DllImport(DllName)]
-        public static extern YogaWrap YGNodeStyleGetFlexWrap(IntPtr node);
+        public static extern YogaWrap YGNodeStyleGetFlexWrap(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetOverflow(IntPtr node, YogaOverflow flexWrap);
+        public static extern void YGNodeStyleSetOverflow(YGNodeHandle node, YogaOverflow flexWrap);

        [DllImport(DllName)]
-        public static extern YogaOverflow YGNodeStyleGetOverflow(IntPtr node);
+        public static extern YogaOverflow YGNodeStyleGetOverflow(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlex(IntPtr node, float flex);
+        public static extern void YGNodeStyleSetFlex(YGNodeHandle node, float flex);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlexGrow(IntPtr node, float flexGrow);
+        public static extern void YGNodeStyleSetFlexGrow(YGNodeHandle node, float flexGrow);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetFlexGrow(IntPtr node);
+        public static extern float YGNodeStyleGetFlexGrow(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlexShrink(IntPtr node, float flexShrink);
+        public static extern void YGNodeStyleSetFlexShrink(YGNodeHandle node, float flexShrink);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetFlexShrink(IntPtr node);
+        public static extern float YGNodeStyleGetFlexShrink(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlexBasis(IntPtr node, float flexBasis);
+        public static extern void YGNodeStyleSetFlexBasis(YGNodeHandle node, float flexBasis);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetFlexBasis(IntPtr node);
+        public static extern float YGNodeStyleGetFlexBasis(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetWidth(IntPtr node, float width);
+        public static extern void YGNodeStyleSetWidth(YGNodeHandle node, float width);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetWidth(IntPtr node);
+        public static extern float YGNodeStyleGetWidth(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetHeight(IntPtr node, float height);
+        public static extern void YGNodeStyleSetHeight(YGNodeHandle node, float height);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetHeight(IntPtr node);
+        public static extern float YGNodeStyleGetHeight(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetMinWidth(IntPtr node, float minWidth);
+        public static extern void YGNodeStyleSetMinWidth(YGNodeHandle node, float minWidth);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMinWidth(IntPtr node);
+        public static extern float YGNodeStyleGetMinWidth(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetMinHeight(IntPtr node, float minHeight);
+        public static extern void YGNodeStyleSetMinHeight(YGNodeHandle node, float minHeight);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMinHeight(IntPtr node);
+        public static extern float YGNodeStyleGetMinHeight(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetMaxWidth(IntPtr node, float maxWidth);
+        public static extern void YGNodeStyleSetMaxWidth(YGNodeHandle node, float maxWidth);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMaxWidth(IntPtr node);
+        public static extern float YGNodeStyleGetMaxWidth(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetMaxHeight(IntPtr node, float maxHeight);
+        public static extern void YGNodeStyleSetMaxHeight(YGNodeHandle node, float maxHeight);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMaxHeight(IntPtr node);
+        public static extern float YGNodeStyleGetMaxHeight(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetAspectRatio(IntPtr node, float aspectRatio);
+        public static extern void YGNodeStyleSetAspectRatio(YGNodeHandle node, float aspectRatio);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetAspectRatio(IntPtr node);
+        public static extern float YGNodeStyleGetAspectRatio(YGNodeHandle node);

        #endregion

        #region YG_NODE_STYLE_EDGE_PROPERTY

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetPosition(IntPtr node, YogaEdge edge, float position);
+        public static extern void YGNodeStyleSetPosition(YGNodeHandle node, YogaEdge edge, float position);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetPosition(IntPtr node, YogaEdge edge);
+        public static extern float YGNodeStyleGetPosition(YGNodeHandle node, YogaEdge edge);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetMargin(IntPtr node, YogaEdge edge, float margin);
+        public static extern void YGNodeStyleSetMargin(YGNodeHandle node, YogaEdge edge, float margin);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMargin(IntPtr node, YogaEdge edge);
+        public static extern float YGNodeStyleGetMargin(YGNodeHandle node, YogaEdge edge);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetPadding(IntPtr node, YogaEdge edge, float padding);
+        public static extern void YGNodeStyleSetPadding(YGNodeHandle node, YogaEdge edge, float padding);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetPadding(IntPtr node, YogaEdge edge);
+        public static extern float YGNodeStyleGetPadding(YGNodeHandle node, YogaEdge edge);

        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetBorder(IntPtr node, YogaEdge edge, float border);
+        public static extern void YGNodeStyleSetBorder(YGNodeHandle node, YogaEdge edge, float border);

        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetBorder(IntPtr node, YogaEdge edge);
+        public static extern float YGNodeStyleGetBorder(YGNodeHandle node, YogaEdge edge);

        #endregion

        #region YG_NODE_LAYOUT_PROPERTY

        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetLeft(IntPtr node);
+        public static extern float YGNodeLayoutGetLeft(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetTop(IntPtr node);
+        public static extern float YGNodeLayoutGetTop(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetRight(IntPtr node);
+        public static extern float YGNodeLayoutGetRight(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetBottom(IntPtr node);
+        public static extern float YGNodeLayoutGetBottom(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetWidth(IntPtr node);
+        public static extern float YGNodeLayoutGetWidth(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetHeight(IntPtr node);
+        public static extern float YGNodeLayoutGetHeight(YGNodeHandle node);

        [DllImport(DllName)]
-        public static extern YogaDirection YGNodeLayoutGetDirection(IntPtr node);
+        public static extern YogaDirection YGNodeLayoutGetDirection(YGNodeHandle node);

        #endregion
    }
--- a/csharp/Facebook.Yoga/YogaNode.Create.cs
+++ b/csharp/Facebook.Yoga/YogaNode.Create.cs
@@ -31,12 +31,12 @@ namespace Facebook.Yoga
            Spacing margin = null,
            Spacing padding = null,
            Spacing border = null,
-            float? Width = null,
-            float? Height = null,
-            float? MaxWidth = null,
-            float? MaxHeight = null,
-            float? MinWidth = null,
-            float? MinHeight = null)
+            float? width = null,
+            float? height = null,
+            float? maxWidth = null,
+            float? maxHeight = null,
+            float? minWidth = null,
+            float? minHeight = null)
        {
            YogaNode node = new YogaNode();

@@ -197,34 +197,34 @@ namespace Facebook.Yoga
                }
            }

-            if (Width.HasValue)
+            if (width.HasValue)
            {
-                node.Width = Width.Value;
+                node.Width = width.Value;
            }

-            if (Height.HasValue)
+            if (height.HasValue)
            {
-                node.Height = Height.Value;
+                node.Height = height.Value;
            }

-            if (MinWidth.HasValue)
+            if (minWidth.HasValue)
            {
-                node.MinWidth = MinWidth.Value;
+                node.MinWidth = minWidth.Value;
            }

-            if (MinHeight.HasValue)
+            if (minHeight.HasValue)
            {
-                node.MinHeight = MinHeight.Value;
+                node.MinHeight = minHeight.Value;
            }

-            if (MaxWidth.HasValue)
+            if (maxWidth.HasValue)
            {
-                node.MaxWidth = MaxWidth.Value;
+                node.MaxWidth = maxWidth.Value;
            }

-            if (MaxHeight.HasValue)
+            if (maxHeight.HasValue)
            {
-                node.MaxHeight = MaxHeight.Value;
+                node.MaxHeight = maxHeight.Value;
            }

            return node;
--- a/csharp/Facebook.Yoga/YogaNode.cs
+++ b/csharp/Facebook.Yoga/YogaNode.cs
@@ -17,7 +17,7 @@ namespace Facebook.Yoga
 {
    public partial class YogaNode : IEnumerable<YogaNode>
    {
-        private IntPtr _ygNode;
+        private Native.YGNodeHandle _ygNode;
        private WeakReference _parent;
        private List<YogaNode> _children;
        private MeasureFunction _measureFunction;
@@ -29,17 +29,12 @@ namespace Facebook.Yoga
            YogaLogger.Initialize();

            _ygNode = Native.YGNodeNew();
-            if (_ygNode == IntPtr.Zero)
+            if (_ygNode.IsInvalid)
            {
                throw new InvalidOperationException("Failed to allocate native memory");
            }
        }

-        ~YogaNode()
-        {
-            Native.YGNodeFree(_ygNode);
-        }
-
        public void Reset()
        {
            _measureFunction = null;
@@ -537,8 +532,7 @@ namespace Facebook.Yoga
                throw new InvalidOperationException("Measure function is not defined.");
            }

-            long output = _measureFunction(this, width, widthMode, height, heightMode);
-            return new YogaSize { width = MeasureOutput.GetWidth(output), height = MeasureOutput.GetHeight(output) };
+            return _measureFunction(this, width, widthMode, height, heightMode);
        }

        public string Print(YogaPrintOptions options =
--- a/csharp/Facebook.Yoga/project.json
+++ b/csharp/Facebook.Yoga/project.json
@@ -3,7 +3,8 @@
  "version": "3.0.0-*",

  "dependencies": {
-    "NETStandard.Library": "1.6.0"
+    "NETStandard.Library": "1.6.0",
+    "System.Runtime.Handles": "4.3.0"
  },

  "frameworks": {
--- a/csharp/Unity/.gitignore
+++ b/csharp/Unity/.gitignore
@@ -0,0 +1,3 @@
+Yoga
+yoga.dll
+yoga.unitypackage
--- a/csharp/Unity/pack.sh
+++ b/csharp/Unity/pack.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+# 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.
+
+set -e
+
+cd "$( dirname "$0" )"
+
+if [ \! -f yoga.dll ]; then
+  echo "Launch win.bat on Windows and copy yoga.dll to here"
+  exit 1
+fi
+
+function build {
+  buck build $1
+  echo "$root/`buck targets --show-output $1|tail -1|awk '{print $2}'`"
+}
+
+function copy {
+  mkdir -p $3
+  cp $1 $3/$2
+}
+
+rm -rf Yoga yoga.unitypackage
+
+root=`buck root|tail -f`
+mac=$(build '//csharp:yoganet#default,shared')
+armv7=$(build '//csharp:yoganet#android-armv7,shared')
+ios=$(build '//csharp:yoganet-ios')
+win=yoga.dll
+
+Unity -quit -batchMode -createProject Yoga
+
+copy $win ${win##*/} Yoga/Assets/Facebook.Yoga/Plugins/x86_64
+copy $mac yoga Yoga/Assets/Facebook.Yoga/Plugins/x86_64/yoga.bundle/Contents/MacOS
+armv7path=Assets/Plugins/Android/libs/armeabi-v7a
+copy $armv7 ${armv7##*/} Yoga/$armv7path
+iospath=Assets/Plugins/iOS
+copy $ios ${ios##*/} Yoga/$iospath
+libs="$armv7path/${armv7##*/} $iospath/${ios##*/}"
+
+scripts=Yoga/Assets/Facebook.Yoga/Scripts/Facebook.Yoga
+mkdir -p $scripts
+(cd ../Facebook.Yoga; tar cf - *.cs)|tar -C $scripts -xf -
+
+tests=Yoga/Assets/Facebook.Yoga/Editor/Facebook.Yoga.Tests
+mkdir -p $tests
+(cd ../tests/Facebook.Yoga; tar cf - *.cs)|tar -C $tests -xf -
+
+function onerror {
+  local xml=Yoga/EditorTestResults.xml
+  if [ -f $xml ]; then cat $xml|grep 'success="False"'; fi
+}
+trap onerror EXIT
+Unity -quit -batchMode -projectPath `pwd`/Yoga -runEditorTests
+
+pkg="`pwd`/yoga.unitypackage"
+Unity -quit -batchMode -projectPath `pwd`/Yoga -exportPackage Assets/Facebook.Yoga $libs $pkg
+
+echo "Success: $pkg"
--- a/csharp/Unity/win.bat
+++ b/csharp/Unity/win.bat
@@ -0,0 +1,2 @@
+"C:\Program Files (x86)\MSBuild\14.0\Bin\MSBuild.exe" ..\Yoga\Yoga.vcxproj /p:configuration=Release /property:Platform=x64
+xcopy "..\Yoga\x64\Release\yoga.dll" %~dp0 /s /d /y
--- a/csharp/Yoga/YGInterop.h
+++ b/csharp/Yoga/YGInterop.h
@@ -9,7 +9,7 @@

 #pragma once

-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>

 YG_EXTERN_C_BEGIN

--- a/csharp/Yoga/Yoga.vcxproj
+++ b/csharp/Yoga/Yoga.vcxproj
@@ -21,6 +21,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
+    <ProjectName>yoga</ProjectName>
    <RootNamespace>Yoga</RootNamespace>
    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
@@ -150,16 +151,16 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
-    <ClInclude Include="..\..\CSSLayout\Yoga.h" />
-    <ClInclude Include="..\..\CSSLayout\YGMacros.h" />
-    <ClInclude Include="..\..\CSSLayout\YGNodeList.h" />
+    <ClInclude Include="..\..\yoga\Yoga.h" />
+    <ClInclude Include="..\..\yoga\YGMacros.h" />
+    <ClInclude Include="..\..\yoga\YGNodeList.h" />
    <ClInclude Include="YGInterop.h" />
    <ClInclude Include="stdafx.h" />
    <ClInclude Include="targetver.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="..\..\CSSLayout\Yoga.c" />
-    <ClCompile Include="..\..\CSSLayout\YGNodeList.c" />
+    <ClCompile Include="..\..\yoga\Yoga.c" />
+    <ClCompile Include="..\..\yoga\YGNodeList.c" />
    <ClCompile Include="YGInterop.cpp" />
    <ClCompile Include="dllmain.cpp">
      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
--- a/csharp/Yoga/Yoga.vcxproj.filters
+++ b/csharp/Yoga/Yoga.vcxproj.filters
@@ -21,13 +21,13 @@
    <ClInclude Include="targetver.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\CSSLayout\Yoga.h">
+    <ClInclude Include="..\..\yoga\Yoga.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\CSSLayout\YGMacros.h">
+    <ClInclude Include="..\..\yoga\YGMacros.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\CSSLayout\YGNodeList.h">
+    <ClInclude Include="..\..\yoga\YGNodeList.h">
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="YGInterop.h">
@@ -41,10 +41,10 @@
    <ClCompile Include="dllmain.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\CSSLayout\Yoga.c">
+    <ClCompile Include="..\..\yoga\Yoga.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\CSSLayout\YGNodeList.c">
+    <ClCompile Include="..\..\yoga\YGNodeList.c">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="YGInterop.cpp">
--- a/csharp/tests/Facebook.Yoga/YGMinMaxDimensionTest.cs
+++ b/csharp/tests/Facebook.Yoga/YGMinMaxDimensionTest.cs
@@ -454,5 +454,226 @@ namespace Facebook.Yoga
            Assert.AreEqual(20f, root_child0_child0.LayoutHeight);
        }

+        [Test]
+        public void Test_flex_grow_within_constrained_min_row()
+        {
+            YogaNode root = new YogaNode();
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.MinWidth = 100f;
+            root.Height = 100f;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1f;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.Width = 50f;
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(50f, root_child0.LayoutWidth);
+            Assert.AreEqual(100f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(50f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(50f, root_child1.LayoutWidth);
+            Assert.AreEqual(100f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(50f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(50f, root_child0.LayoutWidth);
+            Assert.AreEqual(100f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(50f, root_child1.LayoutWidth);
+            Assert.AreEqual(100f, root_child1.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_flex_grow_within_constrained_min_column()
+        {
+            YogaNode root = new YogaNode();
+            root.MinHeight = 100f;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexGrow = 1f;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.Height = 50f;
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(0f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(50f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(50f, root_child1.LayoutY);
+            Assert.AreEqual(0f, root_child1.LayoutWidth);
+            Assert.AreEqual(50f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(0f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(50f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(50f, root_child1.LayoutY);
+            Assert.AreEqual(0f, root_child1.LayoutWidth);
+            Assert.AreEqual(50f, root_child1.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_flex_grow_within_constrained_max_row()
+        {
+            YogaNode root = new YogaNode();
+            root.Width = 200f;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexDirection = YogaFlexDirection.Row;
+            root_child0.MaxWidth = 100f;
+            root_child0.Height = 100f;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child0_child0 = new YogaNode();
+            root_child0_child0.FlexShrink = 1f;
+            root_child0_child0.FlexBasis = 100f;
+            root_child0.Insert(0, root_child0_child0);
+
+            YogaNode root_child0_child1 = new YogaNode();
+            root_child0_child1.Width = 50f;
+            root_child0.Insert(1, root_child0_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(100f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(50f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(100f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(50f, root_child0_child1.LayoutX);
+            Assert.AreEqual(0f, root_child0_child1.LayoutY);
+            Assert.AreEqual(50f, root_child0_child1.LayoutWidth);
+            Assert.AreEqual(100f, root_child0_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(100f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(100f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(50f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(50f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(100f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child1.LayoutX);
+            Assert.AreEqual(0f, root_child0_child1.LayoutY);
+            Assert.AreEqual(50f, root_child0_child1.LayoutWidth);
+            Assert.AreEqual(100f, root_child0_child1.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_flex_grow_within_constrained_max_column()
+        {
+            YogaNode root = new YogaNode();
+            root.Width = 100f;
+            root.MaxHeight = 100f;
+
+            YogaNode root_child0 = new YogaNode();
+            root_child0.FlexShrink = 1f;
+            root_child0.FlexBasis = 100f;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode();
+            root_child1.Height = 50f;
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(50f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(50f, root_child1.LayoutY);
+            Assert.AreEqual(100f, root_child1.LayoutWidth);
+            Assert.AreEqual(50f, root_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(50f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(50f, root_child1.LayoutY);
+            Assert.AreEqual(100f, root_child1.LayoutWidth);
+            Assert.AreEqual(50f, root_child1.LayoutHeight);
+        }
+
    }
 }
--- a/csharp/tests/Facebook.Yoga/YogaNodeCreateTest.cs
+++ b/csharp/tests/Facebook.Yoga/YogaNodeCreateTest.cs
@@ -87,12 +87,12 @@ namespace Facebook.Yoga
                padding: new Spacing(top: 13, bottom: 14, left: 15, right: 16),
                border: new Spacing(top: 17, bottom: 18, left: 19, right: 20),

-                Width: 21,
-                Height: 22,
-                MinWidth: 23,
-                MinHeight: 24,
-                MaxWidth: 25,
-                MaxHeight: 26);
+                width: 21,
+                height: 22,
+                minWidth: 23,
+                minHeight: 24,
+                maxWidth: 25,
+                maxHeight: 26);

            Assert.AreEqual(YogaDirection.RTL, node.StyleDirection);
            Assert.AreEqual(YogaFlexDirection.RowReverse, node.FlexDirection);
--- a/csharp/tests/Facebook.Yoga/YogaNodeTest.cs
+++ b/csharp/tests/Facebook.Yoga/YogaNodeTest.cs
@@ -169,8 +169,8 @@ namespace Facebook.Yoga
                return MeasureOutput.Make(123.4f, 81.7f);
            });
            node.CalculateLayout();
-            Assert.AreEqual(123, node.LayoutWidth);
-            Assert.AreEqual(81, node.LayoutHeight);
+            Assert.AreEqual(123.4f, node.LayoutWidth);
+            Assert.AreEqual(81.7f, node.LayoutHeight);
        }

        [Test]
@@ -228,7 +228,6 @@ namespace Facebook.Yoga
            Assert.AreEqual(100, node0.MaxHeight);
        }

-#if !UNITY_EDITOR
        private void ForceGC()
        {
            GC.Collect(GC.MaxGeneration);
@@ -356,6 +355,5 @@ namespace Facebook.Yoga
                return MeasureOutput.Make(120, 130);
            });
        }
-#endif
    }
 }
--- a/csharp/tests/Facebook.Yoga/test_macos.sh
+++ b/csharp/tests/Facebook.Yoga/test_macos.sh
@@ -1,16 +1,6 @@
 #!/bin/sh
-if clang --version >/dev/null 2>&1; then true; else
-  echo "ERROR: Can't execute clang. You need to install Xcode and command line tools."
-  exit 1
-fi
-
-if mcs --version >/dev/null 2>&1; then true; else
-  echo "ERROR: Can't execute mcs. You need to install Mono from http://www.mono-project.com/download/ and re-login to apply PATH environment."
-  exit 1
-fi
-
-if mono --version >/dev/null 2>&1; then true; else
-  echo "ERROR: Can't execute mono64. You need to install Mono from http://www.mono-project.com/download/ and re-login to apply PATH environment."
+if mcs --version >/dev/null 2>&1 && mono --version >/dev/null 2>&1; then true; else
+  echo "ERROR: Need to install Mono (brew install mono, or http://www.mono-project.com/download/)"
  exit 1
 fi

@@ -28,6 +18,11 @@ if [ -d $NUNIT \
  rm NUnit-2.6.4.zip
 fi

-clang -g -Wall -Wextra -dynamiclib -o libyoga.dylib -I../../.. ../../../CSSLayout/*.c ../../Yoga/YGInterop.cpp
+TARGET=//csharp:yoganet#default,shared
+buck build $TARGET
+ROOT=`buck root|tail -1`
+DYLIB=`buck targets --show-output $TARGET|tail -1|awk '{print $2}'`
+cp $ROOT/$DYLIB .
+
 mcs -debug -t:library -r:$NUNIT/nunit.framework.dll -out:YogaTest.dll *.cs ../../../csharp/Facebook.Yoga/*cs
 MONO_PATH=$NUNIT mono --arch=64 --debug $NUNIT/nunit-console.exe YogaTest.dll
--- a/enums.py
+++ b/enums.py
@@ -111,30 +111,31 @@ def to_java_upper(symbol):
    return out


-root = os.path.dirname(__file__)
+root = os.path.dirname(os.path.abspath(__file__))

-# write out C header
-with open(root + '/CSSLayout/YGEnums.h', 'w') as f:
+# write out C headers
+with open(root + '/yoga/YGEnums.h', 'w') as f:
    f.write(LICENSE)
-    remaining = len(ENUMS)
+    f.write('#pragma once\n\n')
+    f.write('#include "YGMacros.h"\n\n')
+    f.write('YG_EXTERN_C_BEGIN\n\n')
    for name, values in ENUMS.items():
+        f.write('#define YG%sCount %s\n' % (name, len(values)))
        f.write('typedef enum YG%s {\n' % name)
        for value in values:
            if isinstance(value, tuple):
                f.write('  YG%s%s = %d,\n' % (name, value[0], value[1]))
            else:
                f.write('  YG%s%s,\n' % (name, value))
-        f.write('  YG%sCount,\n' % name)
        f.write('} YG%s;\n' % name)
-        if remaining > 1:
-            f.write('\n')
-        remaining = remaining - 1
+        f.write('\n')
+    f.write('YG_EXTERN_C_END\n')

 # write out java files
 for name, values in ENUMS.items():
-    with open(root + '/java/com/facebook/csslayout/Yoga%s.java' % name, 'w') as f:
+    with open(root + '/java/com/facebook/yoga/Yoga%s.java' % name, 'w') as f:
        f.write(LICENSE)
-        f.write('package com.facebook.csslayout;\n\n')
+        f.write('package com.facebook.yoga;\n\n')
        f.write('import com.facebook.proguard.annotations.DoNotStrip;\n\n')
        f.write('@DoNotStrip\n')
        f.write('public enum Yoga%s {\n' % name)
--- a/format.sh
+++ b/format.sh
@@ -29,7 +29,6 @@ clang-format \
    SpaceAfterCStyleCast: true, \
    UseTab: Never, \
  }" "$@" \
-  -i $(dirname $0)/CSSLayout/*.{h,c,cpp} \
-     $(dirname $0)/tests/CSSLayoutTestUtils/*.{h,c,cpp} \
+  -i $(dirname $0)/yoga/*.{h,c,cpp} \
     $(dirname $0)/benchmarks/*.{h,c,cpp} \
     $(dirname $0)/java/jni/*.{h,c,cpp}
--- a/gentest/fixtures/YGMinMaxDimensionTest.html
+++ b/gentest/fixtures/YGMinMaxDimensionTest.html
@@ -41,3 +41,25 @@
    <div style="height: 20px; flex-grow: 1;"></div>
  </div>
 </div>
+
+<div id="flex_grow_within_constrained_min_row" style="min-width: 100px; height:100px; flex-direction: row;">
+  <div style="flex-grow:1;"></div>
+  <div style="width: 50px;"></div>
+</div>
+
+<div id="flex_grow_within_constrained_min_column" style="min-height: 100px;">
+  <div style="flex-grow:1;"></div>
+  <div style="height: 50px;"></div>
+</div>
+
+<div id="flex_grow_within_constrained_max_row" style="width: 200px;">
+  <div style="height: 100px; max-width: 100px; flex-direction: row;">
+    <div style="flex-shrink:1; flex-basis:100px"></div>
+    <div style="width: 50px;"></div>
+  </div>
+</div>
+
+<div id="flex_grow_within_constrained_max_column" style="max-height: 100px; width: 100px;">
+  <div style="flex-shrink:1; flex-basis:100px"></div>
+  <div style="height: 50px;"></div>
+</div>
--- a/gentest/gentest-cpp.js
+++ b/gentest/gentest-cpp.js
@@ -20,7 +20,7 @@ CPPEmitter.prototype = Object.create(Emitter.prototype, {

  emitPrologue:{value:function() {
    this.push([
-      '#include <CSSLayout/Yoga.h>',
+      '#include <yoga/Yoga.h>',
      '#include <gtest/gtest.h>',
      '',
    ]);
--- a/gentest/gentest-java.js
+++ b/gentest/gentest-java.js
@@ -28,7 +28,7 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {

  emitPrologue:{value:function() {
    this.push([
-      'package com.facebook.csslayout;',
+      'package com.facebook.yoga;',
      '',
      'import org.junit.Test;',
      '',
--- a/gentest/gentest.rb
+++ b/gentest/gentest.rb
@@ -40,7 +40,7 @@ Dir['fixtures/*.html'].each do |file|
  f.write eval(logs[0].message.sub(/^[^"]*/, ''))
  f.close

-  f = File.open("../java/tests/com/facebook/csslayout/#{name}.java", 'w')
+  f = File.open("../java/tests/com/facebook/yoga/#{name}.java", 'w')
  f.write eval(logs[1].message.sub(/^[^"]*/, '')).sub('YogaTest', name)
  f.close

--- a/java/BUCK
+++ b/java/BUCK
@@ -24,16 +24,16 @@ cxx_library(
  deps = [
    FBJNI_TARGET,
    JNI_TARGET,
-    csslayout_dep(':CSSLayout'),
+    yoga_dep(':yoga'),
  ],
  visibility = ['PUBLIC'],
 )

 java_library(
  name = 'java',
-  srcs = glob(['com/facebook/csslayout/*.java']),
+  srcs = glob(['com/facebook/yoga/*.java']),
  tests=[
-    csslayout_dep('java:tests'),
+    yoga_dep('java:tests'),
  ],
  source = '1.7',
  target = '1.7',
--- a/java/com/facebook/proguard/annotations/BUCK
+++ b/java/com/facebook/proguard/annotations/BUCK
@@ -13,5 +13,5 @@ java_library(
  source = '1.7',
  target = '1.7',
  deps = [],
-  visibility = [CSSLAYOUT_ROOT],
+  visibility = [YOGA_ROOT],
 )
--- a/java/com/facebook/csslayout/YogaAlign.java
+++ b/java/com/facebook/csslayout/YogaAlign.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaConstants.java
+++ b/java/com/facebook/csslayout/YogaConstants.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 public class YogaConstants {

--- a/java/com/facebook/csslayout/YogaDimension.java
+++ b/java/com/facebook/csslayout/YogaDimension.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaDirection.java
+++ b/java/com/facebook/csslayout/YogaDirection.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaEdge.java
+++ b/java/com/facebook/csslayout/YogaEdge.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaExperimentalFeature.java
+++ b/java/com/facebook/csslayout/YogaExperimentalFeature.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaFlexDirection.java
+++ b/java/com/facebook/csslayout/YogaFlexDirection.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaJustify.java
+++ b/java/com/facebook/csslayout/YogaJustify.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaLogLevel.java
+++ b/java/com/facebook/csslayout/YogaLogLevel.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaLogger.java
+++ b/java/com/facebook/csslayout/YogaLogger.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaMeasureFunction.java
+++ b/java/com/facebook/csslayout/YogaMeasureFunction.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaMeasureMode.java
+++ b/java/com/facebook/csslayout/YogaMeasureMode.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaMeasureOutput.java
+++ b/java/com/facebook/csslayout/YogaMeasureOutput.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 /**
 * Helpers for building measure output value.
--- a/java/com/facebook/csslayout/YogaNode.java
+++ b/java/com/facebook/csslayout/YogaNode.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import javax.annotation.Nullable;

--- a/java/com/facebook/csslayout/YogaNodeAPI.java
+++ b/java/com/facebook/csslayout/YogaNodeAPI.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 // This only exists for legacy reasons. It will be removed sometime in the near future.
 public interface YogaNodeAPI<YogaNodeType extends YogaNodeAPI> {
--- a/java/com/facebook/csslayout/YogaOverflow.java
+++ b/java/com/facebook/csslayout/YogaOverflow.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaPositionType.java
+++ b/java/com/facebook/csslayout/YogaPositionType.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaPrintOptions.java
+++ b/java/com/facebook/csslayout/YogaPrintOptions.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/com/facebook/csslayout/YogaWrap.java
+++ b/java/com/facebook/csslayout/YogaWrap.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import com.facebook.proguard.annotations.DoNotStrip;

--- a/java/jni/YGJNI.cpp
+++ b/java/jni/YGJNI.cpp
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>
 #include <fb/fbjni.h>
 #include <iostream>

@@ -36,7 +36,7 @@ static void YGTransferLayoutOutputsRecursive(YGNodeRef root) {
    obj->setFieldValue(topField, YGNodeLayoutGetTop(root));
    YGTransferLayoutDirection(root, obj);

-    for (uint32_t i = 0; i < YGNodeChildCount(root); i++) {
+    for (uint32_t i = 0; i < YGNodeGetChildCount(root); i++) {
      YGTransferLayoutOutputsRecursive(YGNodeGetChild(root, i));
    }
  } else {
@@ -58,7 +58,7 @@ static YGSize YGJNIMeasureFunc(YGNodeRef node,
                               float height,
                               YGMeasureMode heightMode) {
  if (auto obj = YGNodeJobject(node)->lockLocal()) {
-    static auto measureFunc = findClassLocal("com/facebook/csslayout/YogaNode")
+    static auto measureFunc = findClassLocal("com/facebook/yoga/YogaNode")
                                  ->getMethod<jlong(jfloat, jint, jfloat, jint)>("measure");

    YGTransferLayoutDirection(node, obj);
@@ -81,7 +81,7 @@ static YGSize YGJNIMeasureFunc(YGNodeRef node,
 }

 struct JYogaLogLevel : public JavaClass<JYogaLogLevel> {
-  static constexpr auto kJavaDescriptor = "Lcom/facebook/csslayout/YogaLogLevel;";
+  static constexpr auto kJavaDescriptor = "Lcom/facebook/yoga/YogaLogLevel;";
 };

 static global_ref<jobject> *jLogger;
@@ -89,7 +89,7 @@ static int YGLog(YGLogLevel level, const char *format, va_list args) {
  char buffer[256];
  int result = vsnprintf(buffer, sizeof(buffer), format, args);

-  static auto logFunc = findClassLocal("com/facebook/csslayout/YogaLogger")
+  static auto logFunc = findClassLocal("com/facebook/yoga/YogaLogger")
                            ->getMethod<void(local_ref<JYogaLogLevel>, jstring)>("log");

  static auto logLevelFromInt =
@@ -261,7 +261,7 @@ YG_NODE_JNI_STYLE_PROP(jfloat, float, AspectRatio);

 jint JNI_OnLoad(JavaVM *vm, void *) {
  return initialize(vm, [] {
-    registerNatives("com/facebook/csslayout/YogaNode",
+    registerNatives("com/facebook/yoga/YogaNode",
                    {
                        YGMakeNativeMethod(jni_YGNodeNew),
                        YGMakeNativeMethod(jni_YGNodeFree),
--- a/java/tests/com/facebook/csslayout/YGAbsolutePositionTest.java
+++ b/java/tests/com/facebook/csslayout/YGAbsolutePositionTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAbsolutePositionTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YGAlignContentTest.java
+++ b/java/tests/com/facebook/csslayout/YGAlignContentTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignContentTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YGAlignItemsTest.java
+++ b/java/tests/com/facebook/csslayout/YGAlignItemsTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignItemsTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YGAlignSelfTest.java
+++ b/java/tests/com/facebook/csslayout/YGAlignSelfTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignSelfTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YGBorderTest.java
+++ b/java/tests/com/facebook/csslayout/YGBorderTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGBorderTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YGFlexDirectionTest.java
+++ b/java/tests/com/facebook/csslayout/YGFlexDirectionTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexDirectionTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YGFlexTest.java
+++ b/java/tests/com/facebook/csslayout/YGFlexTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YGFlexWrapTest.java
+++ b/java/tests/com/facebook/csslayout/YGFlexWrapTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexWrapTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YGJustifyContentTest.java
+++ b/java/tests/com/facebook/csslayout/YGJustifyContentTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGJustifyContentTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YGMarginTest.java
+++ b/java/tests/com/facebook/csslayout/YGMarginTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGMarginTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YGMinMaxDimensionTest.java
+++ b/java/tests/com/facebook/csslayout/YGMinMaxDimensionTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGMinMaxDimensionTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

@@ -444,4 +444,221 @@ public class YGMinMaxDimensionTest {
    assertEquals(20f, root_child0_child0.getLayoutHeight(), 0.0f);
  }

+  @Test
+  public void test_flex_grow_within_constrained_min_row() {
+    final YogaNode root = new YogaNode();
+    root.setFlexDirection(YogaFlexDirection.ROW);
+    root.setMinWidth(100f);
+    root.setHeight(100f);
+
+    final YogaNode root_child0 = new YogaNode();
+    root_child0.setFlexGrow(1f);
+    root.addChildAt(root_child0, 0);
+
+    final YogaNode root_child1 = new YogaNode();
+    root_child1.setWidth(50f);
+    root.addChildAt(root_child1, 1);
+    root.setDirection(YogaDirection.LTR);
+    root.calculateLayout();
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(100f, root.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(50f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(50f, root_child1.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child1.getLayoutY(), 0.0f);
+    assertEquals(50f, root_child1.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root_child1.getLayoutHeight(), 0.0f);
+
+    root.setDirection(YogaDirection.RTL);
+    root.calculateLayout();
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(100f, root.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(50f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(50f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child1.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child1.getLayoutY(), 0.0f);
+    assertEquals(50f, root_child1.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root_child1.getLayoutHeight(), 0.0f);
+  }
+
+  @Test
+  public void test_flex_grow_within_constrained_min_column() {
+    final YogaNode root = new YogaNode();
+    root.setMinHeight(100f);
+
+    final YogaNode root_child0 = new YogaNode();
+    root_child0.setFlexGrow(1f);
+    root.addChildAt(root_child0, 0);
+
+    final YogaNode root_child1 = new YogaNode();
+    root_child1.setHeight(50f);
+    root.addChildAt(root_child1, 1);
+    root.setDirection(YogaDirection.LTR);
+    root.calculateLayout();
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(0f, root.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(50f, root_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child1.getLayoutX(), 0.0f);
+    assertEquals(50f, root_child1.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child1.getLayoutWidth(), 0.0f);
+    assertEquals(50f, root_child1.getLayoutHeight(), 0.0f);
+
+    root.setDirection(YogaDirection.RTL);
+    root.calculateLayout();
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(0f, root.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(50f, root_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child1.getLayoutX(), 0.0f);
+    assertEquals(50f, root_child1.getLayoutY(), 0.0f);
+    assertEquals(0f, root_child1.getLayoutWidth(), 0.0f);
+    assertEquals(50f, root_child1.getLayoutHeight(), 0.0f);
+  }
+
+  @Test
+  public void test_flex_grow_within_constrained_max_row() {
+    final YogaNode root = new YogaNode();
+    root.setWidth(200f);
+
+    final YogaNode root_child0 = new YogaNode();
+    root_child0.setFlexDirection(YogaFlexDirection.ROW);
+    root_child0.setMaxWidth(100f);
+    root_child0.setHeight(100f);
+    root.addChildAt(root_child0, 0);
+
+    final YogaNode root_child0_child0 = new YogaNode();
+    root_child0_child0.setFlexShrink(1f);
+    root_child0_child0.setFlexBasis(100f);
+    root_child0.addChildAt(root_child0_child0, 0);
+
+    final YogaNode root_child0_child1 = new YogaNode();
+    root_child0_child1.setWidth(50f);
+    root_child0.addChildAt(root_child0_child1, 1);
+    root.setDirection(YogaDirection.LTR);
+    root.calculateLayout();
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(200f, root.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(100f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0_child0.getLayoutY(), 0.0f);
+    assertEquals(50f, root_child0_child0.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root_child0_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(50f, root_child0_child1.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0_child1.getLayoutY(), 0.0f);
+    assertEquals(50f, root_child0_child1.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root_child0_child1.getLayoutHeight(), 0.0f);
+
+    root.setDirection(YogaDirection.RTL);
+    root.calculateLayout();
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(200f, root.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(100f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(100f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(50f, root_child0_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0_child0.getLayoutY(), 0.0f);
+    assertEquals(50f, root_child0_child0.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root_child0_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0_child1.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0_child1.getLayoutY(), 0.0f);
+    assertEquals(50f, root_child0_child1.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root_child0_child1.getLayoutHeight(), 0.0f);
+  }
+
+  @Test
+  public void test_flex_grow_within_constrained_max_column() {
+    final YogaNode root = new YogaNode();
+    root.setWidth(100f);
+    root.setMaxHeight(100f);
+
+    final YogaNode root_child0 = new YogaNode();
+    root_child0.setFlexShrink(1f);
+    root_child0.setFlexBasis(100f);
+    root.addChildAt(root_child0, 0);
+
+    final YogaNode root_child1 = new YogaNode();
+    root_child1.setHeight(50f);
+    root.addChildAt(root_child1, 1);
+    root.setDirection(YogaDirection.LTR);
+    root.calculateLayout();
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(100f, root.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(100f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(50f, root_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child1.getLayoutX(), 0.0f);
+    assertEquals(50f, root_child1.getLayoutY(), 0.0f);
+    assertEquals(100f, root_child1.getLayoutWidth(), 0.0f);
+    assertEquals(50f, root_child1.getLayoutHeight(), 0.0f);
+
+    root.setDirection(YogaDirection.RTL);
+    root.calculateLayout();
+
+    assertEquals(0f, root.getLayoutX(), 0.0f);
+    assertEquals(0f, root.getLayoutY(), 0.0f);
+    assertEquals(100f, root.getLayoutWidth(), 0.0f);
+    assertEquals(100f, root.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child0.getLayoutX(), 0.0f);
+    assertEquals(0f, root_child0.getLayoutY(), 0.0f);
+    assertEquals(100f, root_child0.getLayoutWidth(), 0.0f);
+    assertEquals(50f, root_child0.getLayoutHeight(), 0.0f);
+
+    assertEquals(0f, root_child1.getLayoutX(), 0.0f);
+    assertEquals(50f, root_child1.getLayoutY(), 0.0f);
+    assertEquals(100f, root_child1.getLayoutWidth(), 0.0f);
+    assertEquals(50f, root_child1.getLayoutHeight(), 0.0f);
+  }
+
 }
--- a/java/tests/com/facebook/csslayout/YGPaddingTest.java
+++ b/java/tests/com/facebook/csslayout/YGPaddingTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGPaddingTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YGRoundingTest.java
+++ b/java/tests/com/facebook/csslayout/YGRoundingTest.java
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGRoundingTest.html

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/java/tests/com/facebook/csslayout/YogaNodeTest.java
+++ b/java/tests/com/facebook/csslayout/YogaNodeTest.java
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-package com.facebook.csslayout;
+package com.facebook.yoga;

 import org.junit.Test;

--- a/lib/fb/BUCK
+++ b/lib/fb/BUCK
@@ -11,9 +11,9 @@ prebuilt_cxx_library(
  name = 'ndklog',
  header_only = True,
  exported_platform_linker_flags = [
-    ('android.*', ['-llog']),
+    ('^android.*', ['-llog']),
  ],
-  visibility = [CSSLAYOUT_ROOT],
+  visibility = [YOGA_ROOT],
 )

 cxx_library(
--- a/lib/gtest/BUCK
+++ b/lib/gtest/BUCK
@@ -23,5 +23,5 @@ cxx_library(
  header_namespace = '',
  compiler_flags = COMPILER_FLAGS,
  deps = [],
-  visibility = [CSSLAYOUT_ROOT],
+  visibility = [YOGA_ROOT],
 )
--- a/lib/infer-annotations/BUCK
+++ b/lib/infer-annotations/BUCK
@@ -17,5 +17,5 @@ java_library(
  exported_deps = [
    ':infer-annotations-jar',
  ],
-  visibility = [CSSLAYOUT_ROOT],
+  visibility = [YOGA_ROOT],
 )
--- a/lib/jsr-305/BUCK
+++ b/lib/jsr-305/BUCK
@@ -17,5 +17,5 @@ java_library(
  exported_deps = [
    ':jsr305-jar',
  ],
-  visibility = [CSSLAYOUT_ROOT],
+  visibility = [YOGA_ROOT],
 )
--- a/lib/junit/BUCK
+++ b/lib/junit/BUCK
@@ -17,5 +17,5 @@ java_library(
  exported_deps = [
    ':junit-jar',
  ],
-  visibility = [CSSLAYOUT_ROOT],
+  visibility = [YOGA_ROOT],
 )
--- a/lib/soloader/BUCK
+++ b/lib/soloader/BUCK
@@ -10,5 +10,5 @@ include_defs('//YOGA_DEFS')
 android_prebuilt_aar(
  name = 'soloader',
  aar = 'soloader-0.1.0.aar',
-  visibility = [CSSLAYOUT_ROOT],
+  visibility = [YOGA_ROOT],
 )
--- a/tests/YGAbsolutePositionTest.cpp
+++ b/tests/YGAbsolutePositionTest.cpp
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAbsolutePositionTest.html

-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>
 #include <gtest/gtest.h>

 TEST(YogaTest, absolute_layout_width_height_start_top) {
--- a/tests/YGAlignContentTest.cpp
+++ b/tests/YGAlignContentTest.cpp
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignContentTest.html

-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>
 #include <gtest/gtest.h>

 TEST(YogaTest, align_content_flex_start) {
--- a/tests/YGAlignItemsTest.cpp
+++ b/tests/YGAlignItemsTest.cpp
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignItemsTest.html

-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>
 #include <gtest/gtest.h>

 TEST(YogaTest, align_items_stretch) {
--- a/tests/YGAlignSelfTest.cpp
+++ b/tests/YGAlignSelfTest.cpp
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignSelfTest.html

-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>
 #include <gtest/gtest.h>

 TEST(YogaTest, align_self_center) {
--- a/tests/YGLayoutAspectRatioTest.cpp
+++ b/tests/YGLayoutAspectRatioTest.cpp
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>
 #include <gtest/gtest.h>

 static YGSize _measure(YGNodeRef node,
@@ -63,12 +63,15 @@ TEST(YogaTest, aspect_ratio_main_defined) {
  YGNodeFreeRecursive(root);
 }

-TEST(YogaTest, aspect_ratio_both_dimensions_defined) {
+TEST(YogaTest, aspect_ratio_both_dimensions_defined_row) {
  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);
+  YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
  YGNodeStyleSetWidth(root, 100);
  YGNodeStyleSetHeight(root, 100);

  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetWidth(root_child0, 100);
  YGNodeStyleSetHeight(root_child0, 50);
  YGNodeStyleSetAspectRatio(root_child0, 1);
  YGNodeInsertChild(root, root_child0, 0);
@@ -78,6 +81,28 @@ TEST(YogaTest, aspect_ratio_both_dimensions_defined) {
  ASSERT_EQ(0, YGNodeLayoutGetLeft(root_child0));
  ASSERT_EQ(0, YGNodeLayoutGetTop(root_child0));
  ASSERT_EQ(100, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_EQ(100, YGNodeLayoutGetHeight(root_child0));
+
+  YGNodeFreeRecursive(root);
+}
+
+TEST(YogaTest, aspect_ratio_both_dimensions_defined_column) {
+  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
+  YGNodeStyleSetWidth(root, 100);
+  YGNodeStyleSetHeight(root, 100);
+
+  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetWidth(root_child0, 100);
+  YGNodeStyleSetHeight(root_child0, 50);
+  YGNodeStyleSetAspectRatio(root_child0, 1);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_EQ(0, YGNodeLayoutGetTop(root_child0));
+  ASSERT_EQ(50, YGNodeLayoutGetWidth(root_child0));
  ASSERT_EQ(50, YGNodeLayoutGetHeight(root_child0));

  YGNodeFreeRecursive(root);
@@ -351,7 +376,7 @@ TEST(YogaTest, aspect_ratio_double_main) {

  const YGNodeRef root_child0 = YGNodeNew();
  YGNodeStyleSetWidth(root_child0, 50);
-  YGNodeStyleSetAspectRatio(root_child0, 2);
+  YGNodeStyleSetAspectRatio(root_child0, 0.5);
  YGNodeInsertChild(root, root_child0, 0);

  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
@@ -372,7 +397,7 @@ TEST(YogaTest, aspect_ratio_half_main) {

  const YGNodeRef root_child0 = YGNodeNew();
  YGNodeStyleSetWidth(root_child0, 100);
-  YGNodeStyleSetAspectRatio(root_child0, 0.5);
+  YGNodeStyleSetAspectRatio(root_child0, 2);
  YGNodeInsertChild(root, root_child0, 0);

  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
@@ -405,3 +430,249 @@ TEST(YogaTest, aspect_ratio_with_measure_func) {

  YGNodeFreeRecursive(root);
 }
+
+TEST(YogaTest, aspect_ratio_width_height_flex_grow_row) {
+  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);
+  YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
+  YGNodeStyleSetWidth(root, 100);
+  YGNodeStyleSetHeight(root, 200);
+
+  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetWidth(root_child0, 50);
+  YGNodeStyleSetHeight(root_child0, 50);
+  YGNodeStyleSetFlexGrow(root_child0, 1);
+  YGNodeStyleSetAspectRatio(root_child0, 1);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_EQ(0, YGNodeLayoutGetTop(root_child0));
+  ASSERT_EQ(100, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_EQ(100, YGNodeLayoutGetHeight(root_child0));
+
+  YGNodeFreeRecursive(root);
+}
+
+TEST(YogaTest, aspect_ratio_width_height_flex_grow_column) {
+  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
+  YGNodeStyleSetWidth(root, 200);
+  YGNodeStyleSetHeight(root, 100);
+
+  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetWidth(root_child0, 50);
+  YGNodeStyleSetHeight(root_child0, 50);
+  YGNodeStyleSetFlexGrow(root_child0, 1);
+  YGNodeStyleSetAspectRatio(root_child0, 1);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_EQ(0, YGNodeLayoutGetTop(root_child0));
+  ASSERT_EQ(100, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_EQ(100, YGNodeLayoutGetHeight(root_child0));
+
+  YGNodeFreeRecursive(root);
+}
+
+TEST(YogaTest, aspect_ratio_height_as_flex_basis) {
+  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
+  YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);
+  YGNodeStyleSetWidth(root, 200);
+  YGNodeStyleSetHeight(root, 200);
+
+  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetHeight(root_child0, 50);
+  YGNodeStyleSetFlexGrow(root_child0, 1);
+  YGNodeStyleSetAspectRatio(root_child0, 1);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  const YGNodeRef root_child1 = YGNodeNew();
+  YGNodeStyleSetHeight(root_child1, 100);
+  YGNodeStyleSetFlexGrow(root_child1, 1);
+  YGNodeStyleSetAspectRatio(root_child1, 1);
+  YGNodeInsertChild(root, root_child1, 1);
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_EQ(0, YGNodeLayoutGetTop(root_child0));
+  ASSERT_EQ(75, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_EQ(75, YGNodeLayoutGetHeight(root_child0));
+
+  ASSERT_EQ(75, YGNodeLayoutGetLeft(root_child1));
+  ASSERT_EQ(0, YGNodeLayoutGetTop(root_child1));
+  ASSERT_EQ(125, YGNodeLayoutGetWidth(root_child1));
+  ASSERT_EQ(125, YGNodeLayoutGetHeight(root_child1));
+
+  YGNodeFreeRecursive(root);
+}
+
+TEST(YogaTest, aspect_ratio_width_as_flex_basis) {
+  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
+  YGNodeStyleSetWidth(root, 200);
+  YGNodeStyleSetHeight(root, 200);
+
+  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetWidth(root_child0, 50);
+  YGNodeStyleSetFlexGrow(root_child0, 1);
+  YGNodeStyleSetAspectRatio(root_child0, 1);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  const YGNodeRef root_child1 = YGNodeNew();
+  YGNodeStyleSetWidth(root_child1, 100);
+  YGNodeStyleSetFlexGrow(root_child1, 1);
+  YGNodeStyleSetAspectRatio(root_child1, 1);
+  YGNodeInsertChild(root, root_child1, 1);
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_EQ(0, YGNodeLayoutGetTop(root_child0));
+  ASSERT_EQ(75, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_EQ(75, YGNodeLayoutGetHeight(root_child0));
+
+  ASSERT_EQ(0, YGNodeLayoutGetLeft(root_child1));
+  ASSERT_EQ(75, YGNodeLayoutGetTop(root_child1));
+  ASSERT_EQ(125, YGNodeLayoutGetWidth(root_child1));
+  ASSERT_EQ(125, YGNodeLayoutGetHeight(root_child1));
+
+  YGNodeFreeRecursive(root);
+}
+
+TEST(YogaTest, aspect_ratio_overrides_flex_grow_row) {
+  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
+  YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);
+  YGNodeStyleSetWidth(root, 100);
+  YGNodeStyleSetHeight(root, 100);
+
+  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetWidth(root_child0, 50);
+  YGNodeStyleSetFlexGrow(root_child0, 1);
+  YGNodeStyleSetAspectRatio(root_child0, 0.5);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_EQ(0, YGNodeLayoutGetTop(root_child0));
+  ASSERT_EQ(50, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_EQ(100, YGNodeLayoutGetHeight(root_child0));
+
+  YGNodeFreeRecursive(root);
+}
+
+TEST(YogaTest, aspect_ratio_overrides_flex_grow_column) {
+  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetAlignItems(root, YGAlignFlexStart);
+  YGNodeStyleSetWidth(root, 100);
+  YGNodeStyleSetHeight(root, 100);
+
+  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetHeight(root_child0, 50);
+  YGNodeStyleSetFlexGrow(root_child0, 1);
+  YGNodeStyleSetAspectRatio(root_child0, 2);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_EQ(0, YGNodeLayoutGetTop(root_child0));
+  ASSERT_EQ(100, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_EQ(50, YGNodeLayoutGetHeight(root_child0));
+
+  YGNodeFreeRecursive(root);
+}
+
+TEST(YogaTest, aspect_ratio_left_right_absolute) {
+  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetWidth(root, 100);
+  YGNodeStyleSetHeight(root, 100);
+
+  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetPositionType(root_child0, YGPositionTypeAbsolute);
+  YGNodeStyleSetPosition(root_child0, YGEdgeLeft, 10);
+  YGNodeStyleSetPosition(root_child0, YGEdgeTop, 10);
+  YGNodeStyleSetPosition(root_child0, YGEdgeRight, 10);
+  YGNodeStyleSetAspectRatio(root_child0, 1);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_EQ(10, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_EQ(10, YGNodeLayoutGetTop(root_child0));
+  ASSERT_EQ(80, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_EQ(80, YGNodeLayoutGetHeight(root_child0));
+
+  YGNodeFreeRecursive(root);
+}
+
+TEST(YogaTest, aspect_ratio_top_bottom_absolute) {
+  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetWidth(root, 100);
+  YGNodeStyleSetHeight(root, 100);
+
+  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetPositionType(root_child0, YGPositionTypeAbsolute);
+  YGNodeStyleSetPosition(root_child0, YGEdgeLeft, 10);
+  YGNodeStyleSetPosition(root_child0, YGEdgeTop, 10);
+  YGNodeStyleSetPosition(root_child0, YGEdgeBottom, 10);
+  YGNodeStyleSetAspectRatio(root_child0, 1);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_EQ(10, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_EQ(10, YGNodeLayoutGetTop(root_child0));
+  ASSERT_EQ(80, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_EQ(80, YGNodeLayoutGetHeight(root_child0));
+
+  YGNodeFreeRecursive(root);
+}
+
+TEST(YogaTest, aspect_ratio_width_overrides_align_stretch_row) {
+  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);
+  YGNodeStyleSetWidth(root, 100);
+  YGNodeStyleSetHeight(root, 100);
+
+  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetWidth(root_child0, 50);
+  YGNodeStyleSetAspectRatio(root_child0, 1);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_EQ(0, YGNodeLayoutGetTop(root_child0));
+  ASSERT_EQ(50, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_EQ(50, YGNodeLayoutGetHeight(root_child0));
+
+  YGNodeFreeRecursive(root);
+}
+
+TEST(YogaTest, aspect_ratio_height_overrides_align_stretch_column) {
+  const YGNodeRef root = YGNodeNew();
+  YGNodeStyleSetWidth(root, 100);
+  YGNodeStyleSetHeight(root, 100);
+
+  const YGNodeRef root_child0 = YGNodeNew();
+  YGNodeStyleSetHeight(root_child0, 50);
+  YGNodeStyleSetAspectRatio(root_child0, 1);
+  YGNodeInsertChild(root, root_child0, 0);
+
+  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
+
+  ASSERT_EQ(0, YGNodeLayoutGetLeft(root_child0));
+  ASSERT_EQ(0, YGNodeLayoutGetTop(root_child0));
+  ASSERT_EQ(50, YGNodeLayoutGetWidth(root_child0));
+  ASSERT_EQ(50, YGNodeLayoutGetHeight(root_child0));
+
+  YGNodeFreeRecursive(root);
+}
--- a/tests/YGBorderTest.cpp
+++ b/tests/YGBorderTest.cpp
@@ -9,7 +9,7 @@

 // @Generated by gentest/gentest.rb from gentest/fixtures/YGBorderTest.html

-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>
 #include <gtest/gtest.h>

 TEST(YogaTest, border_no_size) {
--- a/tests/YGLayoutDefaultValuesTest.cpp
+++ b/tests/YGLayoutDefaultValuesTest.cpp
@@ -7,13 +7,13 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>
 #include <gtest/gtest.h>

 TEST(YogaTest, assert_default_values) {
  const YGNodeRef root = YGNodeNew();

-  ASSERT_EQ(0, YGNodeChildCount(root));
+  ASSERT_EQ(0, YGNodeGetChildCount(root));
  ASSERT_EQ(NULL, YGNodeGetChild(root, 1));

  ASSERT_EQ(YGDirectionInherit, YGNodeStyleGetDirection(root));
--- a/tests/YGDirtyMarkingTest.cpp
+++ b/tests/YGDirtyMarkingTest.cpp
@@ -7,7 +7,7 @@
 * of patent rights can be found in the PATENTS file in the same directory.
 */

-#include <CSSLayout/Yoga.h>
+#include <yoga/Yoga.h>
 #include <gtest/gtest.h>

 TEST(YogaTest, dirty_propagation) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lukas Woehrl	cd78291de5	C# use YogaSize throughout the measure call chain Summary: Java still has the same problem (see #296) Also there is no need to have double in the method signature as we only use float internally, which could confuse some. Closes https://github.com/facebook/yoga/pull/300 Reviewed By: splhack Differential Revision: D4365993 Pulled By: emilsjolander fbshipit-source-id: 681f8b1725e63eddcfb9a6c756f2ae215a44425a	2016-12-24 02:54:38 -08:00
Emil Sjolander	ab595d1875	ignore .buckversion Summary: ignore .buckversion file from source control Reviewed By: vjeux Differential Revision: D4366002 fbshipit-source-id: 910173bab5f3235673a8686ae6b606624380df09	2016-12-24 02:54:38 -08:00
Emil Sjolander	597544e30a	Add note about gtest submodule to readme Summary: Add note about gtest submodule to readme Reviewed By: vjeux Differential Revision: D4366004 fbshipit-source-id: 13ddc040faa251d52aa4c253caff9f5478e12ca6	2016-12-24 02:54:38 -08:00
Kazuki Sakamoto	9f59a13836	Remove unused P/Invoke interface Summary: - Remove YGNodeGetContext and YGNodeSetContext from Native.cs - https://github.com/facebook/yoga/pull/297#discussion_r93789907 Reviewed By: emilsjolander Differential Revision: D4365845 fbshipit-source-id: 89b41ec773baa1b4901f637f5e83427c9fba4aed	2016-12-23 12:09:40 -08:00
Kazuki Sakamoto	12017e49bd	Update .git/hgignore Summary: Fix paths Reviewed By: emilsjolander Differential Revision: D4365853 fbshipit-source-id: 1eb5b1046f4bb7a18b8f29d2876c0d560c3fad49	2016-12-23 12:09:40 -08:00
Kazuki Sakamoto	abad796c44	Fix BUCK Summary: Remove internal arg Reviewed By: emilsjolander Differential Revision: D4365827 fbshipit-source-id: 705855732146e03da65f21cbaa746277719b72f4	2016-12-23 11:24:37 -08:00
desmondyao	92137273a2	Not re-calculate value in Step1. Summary: Not re-calculate `paddingAndBorderAxisMain`/`paddingAndBorderAxisCross`/`paddingAndBorderAxisRow`/`paddingAndBorderAxisColumn` in Step1 of `YGNodelayoutImpl`. They can be figure out by values calculated before. Closes https://github.com/facebook/yoga/pull/298 Reviewed By: dshahidehpour Differential Revision: D4365533 Pulled By: emilsjolander fbshipit-source-id: 6caf60bc6ef3addd49915b39b48f01a8b4926e9c	2016-12-23 10:24:32 -08:00
Kazuki Sakamoto	f1ab289022	Run unit tests before building Unity package Summary: - Enable destructor unit tests in Unity Editor - Exit pack.sh immediately if a command exits with a non-zero status - Run unit tests before building Unity package Reviewed By: emilsjolander Differential Revision: D4365773 fbshipit-source-id: 20d0a51f4cef791154c17d329ac36598dc333a60	2016-12-23 09:54:32 -08:00
David Hart	a302b76d59	Added gitignore rule for Xcode xcuserdata Summary: Closes https://github.com/facebook/yoga/pull/294 Reviewed By: dshahidehpour Differential Revision: D4365534 Pulled By: emilsjolander fbshipit-source-id: ff899d3526156ce9bbe8cba07418ca77b2f38ac8	2016-12-23 08:54:37 -08:00
Filip Frącz	4717594e93	Switched to using SafeHandle for native code interrupt Summary: This PR fixes issue #295 - Created a new internal YGNodeHandle class extending SafeHandle. - YogaNode now stores a reference to YGNodeHandle. - Removed finalizer from YogaNode. - Pulling in System.Runtime.Handles 4.3.0. Closes https://github.com/facebook/yoga/pull/297 Reviewed By: emilsjolander Differential Revision: D4365462 Pulled By: splhack fbshipit-source-id: 73293b105962cbedb71f4e3d8d1244251db1ea79	2016-12-23 08:39:33 -08:00
Hannes Verlinde	df0f76bba5	Run unit tests on Sandcastle Summary: - Change the CI config so it runs the tests for Editor on Sandcastle - Don't run tests for effects-framework and yoga libraries when building for Mac (triggers code signing issues that I don't want to deal with right now) - Add target for unit tests (aka EditorTests) - Make the existing unit tests build and pass. These include both Objective-C and Swift (we should probably get rid of some of these though). I will convert these to Swift 3 before landing (after the migration is complete). - Exclude the EditorUITests target for now. It only contains a single dummy test and it causes a code signing failure on Sandcastle. I did not manage to work around that yet but there is a separate task for it. Reviewed By: Perspx Differential Revision: D4352670 fbshipit-source-id: 0295004a72953bd8e7ae83895b2e5712bab7bd32	2016-12-23 02:09:35 -08:00
Kazuki Sakamoto	e43c9f66ff	Add script to build Unity package Summary: Added Bash script and bat file to build a package of Yoga in order to import Yoga for Unity easily. Closes https://github.com/facebook/yoga/pull/288 Reviewed By: emilsjolander Differential Revision: D4344198 Pulled By: splhack fbshipit-source-id: 49ae27dbc513b4a2d161840ca5c5f4c9df2ab227	2016-12-22 08:39:35 -08:00
Emil Sjolander	0df58d8aa2	Declaratively initialize default values of nodes Summary: Improve performance of allocations and reseting by writing fewer bits. Also just looks nicer imho. Reviewed By: passy Differential Revision: D4356994 fbshipit-source-id: ebbe52163e0c86230bfa4131b657941afe16fbf1	2016-12-22 03:10:06 -08:00
David Hart	ff1a0e1eb8	Transform the Count enum values into private constants Summary: Hides implementation details for the C, Objective-C and Swift APIs. Closes https://github.com/facebook/yoga/pull/292 Differential Revision: D4351523 Pulled By: emilsjolander fbshipit-source-id: 18a1149d169f0d52bd078714295000b5d07434dd	2016-12-22 03:10:06 -08:00
Emil Sjolander	ed765fe508	Convert max cache count into a define Summary: This should not be an enum. A define makes a whole lot more sense Differential Revision: D4346529 fbshipit-source-id: 8641c4c5017d915d64e5884cae09ac8f01861337	2016-12-22 03:10:06 -08:00
Emil Sjolander	1b5eb7da5e	BREAKING - Increase priority of AspectRatio to override flex, align stretch, and fixed sizes if specified. Summary: @public AspectRatio is a new addition and soon after introduction we noticed use cases which is did not support. Specifically we wanted to support a node being as large as possible within a container while maintaining an arbitrary aspect ratio. This was not possible due to the low priority of AspectRatio, by increasing the priority of AspectRatio this is now possible as FlexGrow will grow an item to fit its parent unless the AspectRatio makes it too big in the cross axis, the AspectRatio will now override the FlexGrow in the main axis in that case. Differential Revision: D4346720 fbshipit-source-id: 1f15613604190e3ad5ff4a467ba57db4bcfd2741	2016-12-22 03:10:06 -08:00
Emil Sjolander	071f576db9	BREAKING - Change aspect ratio to always be width/height Summary: @public Aspect ratio being defined as width/height or height/width depending on the situation it was used in turned out to be very confusing. This diff makes aspect ratio always be defined as width/height irregardless of the usage. Differential Revision: D4339132 fbshipit-source-id: e5da32750b55ddaf6acaf1cbd7662d86f2b480c3	2016-12-22 03:10:06 -08:00
Emil Sjolander	3d10ba5f72	Correctly check if child is flex by also accounting for undefined Summary: We were incorrectly returning true for children which had no flex as the flex was nan and not 0. Differential Revision: D4346712 fbshipit-source-id: 69ef0bb3fe5b4fcd3b3e2fe5aa348529be40252a	2016-12-22 03:10:05 -08:00
Georgiy Kassabli	85b8386ba1	Test for minHeight with flexing Summary: This test creates a repro case for Yoga to emulate UFI layout failure Reviewed By: emilsjolander Differential Revision: D4313632 fbshipit-source-id: 35be7d86b50a9ae08c81891a889a74e4b61f2d27	2016-12-21 11:39:34 -08:00
Dustin Shahidehpour	7ec3607446	Fix diffing algorithm for reattaching views. Summary: There is a bug currently where we don't traverse the entire tree to detect view hierarchy changes. Currently, if you had a hierachy like this: ``` container = UIView container.subviews = @[subview1, subview2]; subview1.subviews = @[sub11, sub12, sub13]; subview2.subviews = @[sub21, sub22, sub23]; ``` and then modified via: ``` subview2.subviews = @[newView1, newView2, newView3]; ``` our algorithm wouldn't identify that we had new views that needed their layout calculated, and would cause a crash later on. Reviewed By: emilsjolander Differential Revision: D4357662 fbshipit-source-id: 2f61f213c5f1a62948a653f3b1fa3d874c5075f7	2016-12-21 11:09:38 -08:00
Dustin Shahidehpour	835bb1cd9c	Add isLeaf flag to Views. Summary: While building some views with YogaKit, I found an interesting problem. If you are apply `yg_` properties to a view which is constructed of subclassed views (that don't use Yoga.) we still treat view (and it's subviews) like they are using YogaKit. This fixes that behavior. Reviewed By: emilsjolander Differential Revision: D4348344 fbshipit-source-id: 37b8648918529f55afea1d1883a03af398aac849	2016-12-20 11:39:36 -08:00
yiminghe	9d35dce63e	explicit default justifyContent value Summary: make default justifyContent value explicit like alignItems https://developer.mozilla.org/en-US/docs/Web/CSS/justify-content https://developer.mozilla.org/en-US/docs/Web/CSS/align-items https://developer.mozilla.org/en-US/docs/Web/CSS/align-content Closes https://github.com/facebook/yoga/pull/293 Differential Revision: D4351597 Pulled By: emilsjolander fbshipit-source-id: b65ff2284ede4d75f1cc5e22d4106042ab0b0d02	2016-12-20 03:24:40 -08:00
Emil Sjolander	74fb205083	Rename test files to match other test file names Summary: Rename test files to match other test file names Differential Revision: D4335198 fbshipit-source-id: b8f38162c3094231476059eb1f54326d8ba84848	2016-12-16 09:09:37 -08:00
Kazuki Sakamoto	ba0bb10366	Build iOS fat static library for Unity and Xamarin Summary: $ buck build //csharp:yoganet-ios $ buck targets --show-output //csharp:yoganet-ios //csharp:yoganet-ios buck-out/gen/csharp/yoganet-ios/libyoga.a $ lipo -info buck-out/gen/csharp/yoganet-ios/libyoga.a Architectures in the fat file: buck-out/gen/csharp/yoganet-ios/libyoga.a are: armv7 x86_64 arm64 $ nm buck-out/gen/csharp/yoganet-ios/libyoga.a\|grep -e 'T _YGNodeNew' -e 'ygNode' -e 'T _YGInteropSetLogger' 0000000000000000 T _YGNodeNew 0000000000001070 t -[UIView(Yoga) ygNode] 0000000000000000 T _YGInteropSetLogger Closes https://github.com/facebook/yoga/pull/286 Reviewed By: emilsjolander Differential Revision: D4338919 Pulled By: splhack fbshipit-source-id: 7acfdfa0dc4d152d7bfe92161efdeb9f161f70e6	2016-12-16 06:54:35 -08:00
Emil Sjolander	0296511f2c	YGNodeChildCount -> YGNodeGetChildCount for consistency Summary: I kept wrongly typing this function which is a good sign that the name is inconsistent. Reviewed By: gkassabli Differential Revision: D4333480 fbshipit-source-id: 17058f18fa9e26b3e02f7a1651f7295cae59acad	2016-12-16 04:39:41 -08:00
Kazuki Sakamoto	04fe81f88f	YGNodeInit is no longer exported Summary: - Problem: Can't link yoga static libraries with Unity and Xamarin.iOS since YGNodeInit is undefined in the libraries. - Solution: Remove the reference in Native.cs Reviewed By: emilsjolander Differential Revision: D4338485 fbshipit-source-id: 9dc95aec8f1fd50f3f9d66e1623afe2fb1992210	2016-12-16 00:09:40 -08:00
Kazuki Sakamoto	98bbc15435	Support Xamarin.iOS Summary: - `__Internal` https://developer.xamarin.com/guides/ios/advanced_topics/native_interop/#Static_Libraries > Since you can only use static libraries on iOS, there is no external shared library to link with, so the path parameter in the DllImport attribute needs to use the special name __Internal (note the double underscore characters at the start of the name) as opposed to the path name. - `__IOS__` https://developer.xamarin.com/guides/cross-platform/application_fundamentals/building_cross_platform_applications/part_4_-_platform_divergence_abstraction_divergent_implementation/#iOS > Xamarin.iOS defines __IOS__ which you can use to detect iOS devices. Closes https://github.com/facebook/yoga/pull/277 Reviewed By: emilsjolander Differential Revision: D4338420 Pulled By: splhack fbshipit-source-id: 375efecbaf88fffbba544073c6d6b30fb1f4c8ba	2016-12-16 00:09:40 -08:00
Kazuki Sakamoto	25b206ac53	Build native library with BUCK for .NET (Mono, Xamarin) Summary: Examples: - macOS on macOS (Mono, Xamarin.Mac, Unity) - `buck build //csharp:yoganet#shared,default` -> `libyoga.dylib` - Android (Xamarin.Android, Unity) - `buck build //csharp:yoganet#shared,android-armv7` -> `libyoga.so` - iOS (Xamarin.iOS, Unity) - `buck build //:yoga#static,iphoneos-arm64` -> `libyoga.a` - `buck build //csharp:yoganet#static,iphoneos-arm64` -> `libyoganet.a` Closes https://github.com/facebook/yoga/pull/282 Reviewed By: emilsjolander Differential Revision: D4333811 Pulled By: splhack fbshipit-source-id: 54f4364d93b2419d7504392eb558296a5d06772f	2016-12-15 13:54:34 -08:00
Emil Sjolander	88a4e44fd4	Add YGNodeGetParent api Summary: Fixes https://github.com/facebook/css-layout/issues/248 Reviewed By: gkassabli Differential Revision: D4333456 fbshipit-source-id: 388afd0a01c19a6db73c175bf24c566278832cb9	2016-12-15 09:54:35 -08:00
Kazuki Sakamoto	642ea07d6f	Update unmanaged dll name Summary: - Update unmanaged dll name from `Yoga.dll` to `yoga.dll` since Native.cs `DllName` referes lowercase `yoga` Reviewed By: emilsjolander Differential Revision: D4295954 fbshipit-source-id: 16b91c407506685b84902102cf4380cb149b5b2c	2016-12-15 07:24:46 -08:00
Kazuki Sakamoto	e85c5ce39d	lowercase argument Summary: - Fix arguments of YogaNode.Create Reviewed By: emilsjolander Differential Revision: D4296488 fbshipit-source-id: f6eb5074b1b1462f2251d330929f7b8082ad72eb	2016-12-15 07:24:46 -08:00
Jatin Pandey	cf753af247	Make documentation clearer Summary: Fixing a typo :) Closes https://github.com/facebook/yoga/pull/270 Reviewed By: dshahidehpour Differential Revision: D4333129 Pulled By: emilsjolander fbshipit-source-id: 28215de8fcd571fb889fe145ff303f231a50c598	2016-12-15 07:24:46 -08:00
Emil Sjolander	12efe604bb	Fix YogaKit tests on travis Summary: Fix include path Reviewed By: dshahidehpour Differential Revision: D4333185 fbshipit-source-id: 27638324e093260aa1b23134fab5140a0c703bc9	2016-12-15 07:24:46 -08:00
Emil Sjolander	f36f545d75	Add an anchor to the android platform regex Summary: This prevents android from matching in the middle of a platform. Reviewed By: gkassabli Differential Revision: D4306164 fbshipit-source-id: 7f62a6a017724f8f6741d3e53b5fbe0650c8c88e	2016-12-10 17:37:12 -08:00
Joel Marcey	8fcd544c81	A bit more syncing after the name change	2016-12-10 17:31:11 -08:00
Emil Sjolander	73662ebf83	example license	2016-12-07 17:41:50 +00:00
Emil Sjolander	47a8ec06a1	Add sample project for YogaKit	2016-12-07 17:27:25 +00:00
Emil Sjolander	b611fac20b	update naming and fix test	2016-12-07 16:18:13 +00:00
Emil Sjolander	b11155423c	Rename directories Reviewed By: gkassabli Differential Revision: D4284681 Summary: Rename csslayout directories to yoga fbshipit-source-id: f0c6855c2c6e4389b7867f48f72cbb697830fc5a	2016-12-07 05:22:52 -08:00
Emil Sjolander	40371cbf2d	Remove init from api Summary: Both New and Reset already call init internally. No reason to expose this function Reviewed By: gkassabli Differential Revision: D4276177 fbshipit-source-id: c4404d0534f381dfacee0625b2847d38de58e038	2016-12-06 14:52:34 -08:00
Emil Sjolander	613590b0d8	Ignore csharp test dependencies which are downloaded on the fly Summary: Running csharp tests should not result in uncommited files. Reviewed By: splhack Differential Revision: D4271411 fbshipit-source-id: abf6c69555ed657356a9426ca37864f8c2eaa78f	2016-12-05 12:37:36 -08:00
Emil Sjolander	4710a65f7a	Fix an error initializing needsCrossTrailingPos Summary: https://github.com/facebook/css-layout/pull/259 Reviewed By: gkassabli Differential Revision: D4271422 fbshipit-source-id: e8d72af742d96829684958780eb56e2c375df20c	2016-12-05 09:37:38 -08:00
Emil Sjolander	901f65ca05	Fix prefix typo in YogaKit Summary: Forgot to update this in rename. Reviewed By: dshahidehpour, gkassabli Differential Revision: D4271399 fbshipit-source-id: cf354928a8839a864e9961e091d9f48840a5d4d4	2016-12-05 08:07:41 -08:00
Emil Sjolander	72cf6806de	Add #pragma once and extern C to YGEnums.h Summary: Makes YGEnums.h header looks like other Yoga headers Reviewed By: gkassabli Differential Revision: D4274156 fbshipit-source-id: 9fa0ae146bb9e5bd40d93fa3c56f83424ebd2bf9	2016-12-05 05:07:37 -08:00
Emil Sjolander	1b7ae2ed3d	Update java package name to yoga Summary: Update package name of java code to refer to yoga instead of csslayout. Still need to change the name of the folder where this code resides but that requires update github sync scripts etc so it is safer and easier to split these diffs apart. Differential Revision: D4271420 fbshipit-source-id: b3cf150569a2331868410339cd19e5c694f2059e	2016-12-05 03:07:33 -08:00