v1.7.0

Summary: Version bumps.

Reviewed By: emilsjolander

Differential Revision: D6284124

fbshipit-source-id: 08f6116bb0237791210847976533206055376f1a

.buckconfig

@@ -1,9 +1,10 @@
 [cxx]
   gtest_dep = //lib/gtest:gtest
 [android]
-  target = android-23
+  target = android-25
+  build_tools_version = 26.0.2
 [ndk]
-  ndk_version = 13.1.3345770
+  ndk_version = 15.2.4203891
   compiler = clang
   app_platform = android-21
   cpu_abis = arm64, armv7, x86, x86_64

.editorconfig

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

.travis.yml

@@ -9,6 +9,11 @@ os: osx
 osx_image: xcode8.2
 language: cpp
 compiler: clang
+cache:
+  directories:
+    - $HOME/Library/Caches/Homebrew
+    - $HOME/android-sdk
+    - $HOME/android-ndk
 
 env:
   - TARGET=c
@@ -19,9 +24,13 @@ env:
   - TARGET=android
 
 before_install:
+  - |
+    if [[ -n "$encrypted_d27e803291ff_iv" ]]; then
+      openssl aes-256-cbc -K $encrypted_d27e803291ff_key -iv $encrypted_d27e803291ff_iv -in scripts/setup-keys.enc -d >> gradle.properties;
+    fi
+
   - brew update > /dev/null
-  - brew tap facebook/fb
-  - brew install buck
+  - brew install --HEAD facebook/fb/buck
 
   # Java
   - |
@@ -53,8 +62,8 @@ before_install:
     if [[ $TARGET = "js" ]]; then
       wget -O /tmp/emsdk-portable.tar.gz https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz &&
       tar xf /tmp/emsdk-portable.tar.gz -C /tmp/ &&
-      /tmp/emsdk_portable/emsdk install latest >& /dev/null &&
-      /tmp/emsdk_portable/emsdk activate latest
+      /tmp/emsdk-portable/emsdk install latest 2>&1 | grep -v '^x ' &&
+      /tmp/emsdk-portable/emsdk activate latest
     fi
 
   # Android
@@ -63,12 +72,11 @@ before_install:
       brew cask install java;
       export JAVA_HOME=$(/usr/libexec/java_home -v 1.8);
       export PATH=$JAVA_HOME/bin:$PATH;
-      brew install android-sdk;
-      export ANDROID_SDK=/usr/local/Cellar/android-sdk/24.4.1_1;
-      export ANDROID_HOME=/usr/local/Cellar/android-sdk/24.4.1_1;
-      brew install lib32stdc++6 lib32z1;
-      echo y | $ANDROID_SDK/tools/android update sdk --filter android-19,addon-google_apis-google-19,build-tools-19.1.0 --no-ui;
-      echo y | $ANDROID_SDK/tools/android update sdk -u;
+      export TERMINAL=dumb;
+      source scripts/android-setup.sh && installAndroidSDK
+      export ANDROID_SDK=$ANDROID_HOME
+      export ANDROID_NDK_REPOSITORY=$HOME/android-ndk
+      export ANDROID_NDK_HOME=$ANDROID_NDK_REPOSITORY/android-ndk-r15c
     fi
 
   # JavaScript
@@ -77,7 +85,7 @@ before_install:
       cd javascript &&
       npm install &&
       unset CC && unset CXX && unset LINK &&
-      source /tmp/emsdk_portable/emsdk_env.sh &&
+      source /tmp/emsdk-portable/emsdk_env.sh &&
       npm run build:browser
     ) fi
 
@@ -114,7 +122,9 @@ script:
   # Android
   - |
     if [[ $TARGET = "android" ]]; then
-      buck build --verbose 0 //android/sample:sample
+      buck build --verbose 0 //android/sample:sample &&
+      ./gradlew testDebugUnit &&
+      scripts/publish-snapshot.sh
     fi
 
   # JavaScript

BUCK

@@ -21,9 +21,9 @@ TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + ["-std=c++11"
 cxx_library(
     name = "yoga",
     srcs = glob(["yoga/*.c"]),
-    compiler_flags = COMPILER_FLAGS,
-    exported_headers = subdir_glob([("", "yoga/*.h")]),
     header_namespace = "",
+    exported_headers = subdir_glob([("", "yoga/*.h")]),
+    compiler_flags = COMPILER_FLAGS,
     soname = "libyogacore.$(ext)",
     tests = [":YogaTests"],
     visibility = ["PUBLIC"],

README.md

@@ -38,3 +38,26 @@ For the main C implementation of Yoga clang-format is used to ensure a consisten
 
 ## Benchmarks
 Benchmarks are located in `benchmark/YGBenchmark.c` and can be run with `buck run //benchmark:benchmark`. If you think your change has affected performance please run this before and after your change to validate that nothing has regressed. Benchmarks are run on every commit in CI.
+
+### JavaScript
+Installing through NPM
+```sh
+npm install yoga-layout
+```
+By default this will install the library and try to build for all platforms (node, browser asm, and standalone webpack). You may receive errors if you do not have the required platform development tools already installed. To preset the platform you'd like to build for you can set a .npmrc property first.
+```sh
+npm config set yoga-layout:platform standalone
+```
+This will now only run the standalone webpack build upon install.
+
+## Build Platforms
+
+| name           | description                                     |
+|----------------|-------------------------------------------------|
+| all (default)  | Builds all of these platforms.                  |
+| browser        | Builds asm js browser version.                  |
+| node           | Builds node js version.                         |
+| standalone     | Runs webpack.                                   |
+| none           | Does nothing. You can use the prepackaged libs. |
+
+

YOGA_DEFS

@@ -9,6 +9,7 @@ SOLOADER_TARGET = '//lib/soloader:soloader'
 GTEST_TARGET = '//lib/gtest:gtest'
 JNI_TARGET = '//lib/jni:jni'
 FBJNI_TARGET = '//lib/fb:fbjni'
+FBJNI_JAVA_TARGET = '//lib/fb/src/main/java/com/facebook/jni:jni'
 APPCOMPAT_TARGET = '//lib/appcompat:appcompat'
 ANDROID_SUPPORT_TARGET = '//lib/android-support:android-support'
 ANDROID_TARGET = '//android:android'

Yoga.podspec

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

YogaKit.podspec

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

YogaKit/BUCK

@@ -30,12 +30,13 @@ COMPILER_FLAGS = [
 apple_library(
     name = "YogaKit",
     srcs = glob(["Source/**/*.m"]),
-    compiler_flags = COMPILER_FLAGS,
     exported_headers = glob(["Source/**/*.h"]),
+    compiler_flags = COMPILER_FLAGS,
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
         "$SDKROOT/System/Library/Frameworks/UIKit.framework",
     ],
+    link_whole = True,
     visibility = ["PUBLIC"],
     deps = [
         yoga_dep(":yoga"),

YogaKit/CHANGELOG.md

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

YogaKit/README.md

@@ -8,7 +8,7 @@
 YogaKit is available to install via [CocoaPods](https://cocoapods.org/).
 
 ```
-pod 'YogaKit', '~> 1.3'
+pod 'YogaKit', '~> 1.7'
 ```
 
 ## Getting Started

YogaKit/Source/UIView+Yoga.h

@@ -20,6 +20,10 @@ typedef void (^YGLayoutConfigurationBlock)(YGLayout *);
  The YGLayout that is attached to this view. It is lazily created.
  */
 @property (nonatomic, readonly, strong) YGLayout *yoga;
+/**
+ Indicates whether or not Yoga is enabled
+ */
+@property (nonatomic, readonly, assign) BOOL isYogaEnabled;
 
 /**
  In ObjC land, every time you access `view.yoga.*` you are adding another `objc_msgSend`

YogaKit/Source/UIView+Yoga.m

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

YogaKit/Source/YGLayout.h

@@ -9,6 +9,17 @@
 
 #import <UIKit/UIKit.h>
 #import <yoga/YGEnums.h>
+#import <yoga/Yoga.h>
+#import <yoga/YGMacros.h>
+
+YG_EXTERN_C_BEGIN
+
+extern YGValue YGPointValue(CGFloat value)
+    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
+extern YGValue YGPercentValue(CGFloat value)
+    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
+
+YG_EXTERN_C_END
 
 typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
   YGDimensionFlexibilityFlexibleWidth = 1 << 0,
@@ -41,34 +52,34 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
 
 @property (nonatomic, readwrite, assign) CGFloat flexGrow;
 @property (nonatomic, readwrite, assign) CGFloat flexShrink;
-@property (nonatomic, readwrite, assign) CGFloat flexBasis;
+@property (nonatomic, readwrite, assign) YGValue flexBasis;
 
-@property (nonatomic, readwrite, assign) CGFloat left;
-@property (nonatomic, readwrite, assign) CGFloat top;
-@property (nonatomic, readwrite, assign) CGFloat right;
-@property (nonatomic, readwrite, assign) CGFloat bottom;
-@property (nonatomic, readwrite, assign) CGFloat start;
-@property (nonatomic, readwrite, assign) CGFloat end;
+@property (nonatomic, readwrite, assign) YGValue left;
+@property (nonatomic, readwrite, assign) YGValue top;
+@property (nonatomic, readwrite, assign) YGValue right;
+@property (nonatomic, readwrite, assign) YGValue bottom;
+@property (nonatomic, readwrite, assign) YGValue start;
+@property (nonatomic, readwrite, assign) YGValue end;
 
-@property (nonatomic, readwrite, assign) CGFloat marginLeft;
-@property (nonatomic, readwrite, assign) CGFloat marginTop;
-@property (nonatomic, readwrite, assign) CGFloat marginRight;
-@property (nonatomic, readwrite, assign) CGFloat marginBottom;
-@property (nonatomic, readwrite, assign) CGFloat marginStart;
-@property (nonatomic, readwrite, assign) CGFloat marginEnd;
-@property (nonatomic, readwrite, assign) CGFloat marginHorizontal;
-@property (nonatomic, readwrite, assign) CGFloat marginVertical;
-@property (nonatomic, readwrite, assign) CGFloat margin;
+@property (nonatomic, readwrite, assign) YGValue marginLeft;
+@property (nonatomic, readwrite, assign) YGValue marginTop;
+@property (nonatomic, readwrite, assign) YGValue marginRight;
+@property (nonatomic, readwrite, assign) YGValue marginBottom;
+@property (nonatomic, readwrite, assign) YGValue marginStart;
+@property (nonatomic, readwrite, assign) YGValue marginEnd;
+@property (nonatomic, readwrite, assign) YGValue marginHorizontal;
+@property (nonatomic, readwrite, assign) YGValue marginVertical;
+@property (nonatomic, readwrite, assign) YGValue margin;
 
-@property (nonatomic, readwrite, assign) CGFloat paddingLeft;
-@property (nonatomic, readwrite, assign) CGFloat paddingTop;
-@property (nonatomic, readwrite, assign) CGFloat paddingRight;
-@property (nonatomic, readwrite, assign) CGFloat paddingBottom;
-@property (nonatomic, readwrite, assign) CGFloat paddingStart;
-@property (nonatomic, readwrite, assign) CGFloat paddingEnd;
-@property (nonatomic, readwrite, assign) CGFloat paddingHorizontal;
-@property (nonatomic, readwrite, assign) CGFloat paddingVertical;
-@property (nonatomic, readwrite, assign) CGFloat padding;
+@property (nonatomic, readwrite, assign) YGValue paddingLeft;
+@property (nonatomic, readwrite, assign) YGValue paddingTop;
+@property (nonatomic, readwrite, assign) YGValue paddingRight;
+@property (nonatomic, readwrite, assign) YGValue paddingBottom;
+@property (nonatomic, readwrite, assign) YGValue paddingStart;
+@property (nonatomic, readwrite, assign) YGValue paddingEnd;
+@property (nonatomic, readwrite, assign) YGValue paddingHorizontal;
+@property (nonatomic, readwrite, assign) YGValue paddingVertical;
+@property (nonatomic, readwrite, assign) YGValue padding;
 
 @property (nonatomic, readwrite, assign) CGFloat borderLeftWidth;
 @property (nonatomic, readwrite, assign) CGFloat borderTopWidth;
@@ -78,12 +89,12 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
 @property (nonatomic, readwrite, assign) CGFloat borderEndWidth;
 @property (nonatomic, readwrite, assign) CGFloat borderWidth;
 
-@property (nonatomic, readwrite, assign) CGFloat width;
-@property (nonatomic, readwrite, assign) CGFloat height;
-@property (nonatomic, readwrite, assign) CGFloat minWidth;
-@property (nonatomic, readwrite, assign) CGFloat minHeight;
-@property (nonatomic, readwrite, assign) CGFloat maxWidth;
-@property (nonatomic, readwrite, assign) CGFloat maxHeight;
+@property (nonatomic, readwrite, assign) YGValue width;
+@property (nonatomic, readwrite, assign) YGValue height;
+@property (nonatomic, readwrite, assign) YGValue minWidth;
+@property (nonatomic, readwrite, assign) YGValue minHeight;
+@property (nonatomic, readwrite, assign) YGValue maxWidth;
+@property (nonatomic, readwrite, assign) YGValue maxHeight;
 
 // Yoga specific properties, not compatible with flexbox specification
 @property (nonatomic, readwrite, assign) CGFloat aspectRatio;
@@ -104,7 +115,8 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
  Perform a layout calculation and update the frames of the views in the hierarchy with the results.
  If the origin is not preserved, the root view's layout results will applied from {0,0}.
  */
-- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin dimensionFlexibility:(YGDimensionFlexibility)dimensionFlexibility
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
+               dimensionFlexibility:(YGDimensionFlexibility)dimensionFlexibility
     NS_SWIFT_NAME(applyLayout(preservingOrigin:dimensionFlexibility:));
 
 /**
@@ -113,6 +125,12 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
  */
 @property (nonatomic, readonly, assign) CGSize intrinsicSize;
 
+/**
+  Returns the size of the view based on provided constraints. Pass NaN for an unconstrained dimension.
+ */
+- (CGSize)calculateLayoutWithSize:(CGSize)size
+    NS_SWIFT_NAME(calculateLayout(with:));
+
 /**
  Returns the number of children that are using Flexbox.
  */

YogaKit/Source/YGLayout.m

@@ -21,26 +21,30 @@
   YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
 }
 
-#define YG_VALUE_PROPERTY(lowercased_name, capitalized_name)    \
-- (CGFloat)lowercased_name                                      \
-{                                                               \
-  YGValue value = YGNodeStyleGet##capitalized_name(self.node);  \
-  if (value.unit == YGUnitPoint) {                              \
-    return value.value;                                         \
-  } else {                                                      \
-    return YGUndefined;                                         \
-  }                                                             \
-}                                                               \
-                                                                \
-- (void)set##capitalized_name:(CGFloat)lowercased_name          \
-{                                                               \
-  YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
+#define YG_VALUE_PROPERTY(lowercased_name, capitalized_name)                       \
+- (YGValue)lowercased_name                                                         \
+{                                                                                  \
+  return YGNodeStyleGet##capitalized_name(self.node);                              \
+}                                                                                  \
+                                                                                   \
+- (void)set##capitalized_name:(YGValue)lowercased_name                             \
+{                                                                                  \
+  switch (lowercased_name.unit) {                                                  \
+    case YGUnitPoint:                                                              \
+      YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value);          \
+      break;                                                                       \
+    case YGUnitPercent:                                                            \
+      YGNodeStyleSet##capitalized_name##Percent(self.node, lowercased_name.value); \
+      break;                                                                       \
+    default:                                                                       \
+      NSAssert(NO, @"Not implemented");                                            \
+  }                                                                                \
 }
 
-#define YG_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge) \
-- (CGFloat)lowercased_name                                                         \
-{                                                                                  \
-  return YGNodeStyleGet##property(self.node, edge);                                \
+#define YG_EDGE_PROPERTY_GETTER(type, lowercased_name, capitalized_name, property, edge) \
+- (type)lowercased_name                                                                  \
+{                                                                                        \
+  return YGNodeStyleGet##property(self.node, edge);                                      \
 }
 
 #define YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge) \
@@ -49,42 +53,50 @@
   YGNodeStyleSet##property(self.node, edge, lowercased_name);                      \
 }
 
-#define YG_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
-YG_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge)  \
+#define YG_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge)         \
+YG_EDGE_PROPERTY_GETTER(CGFloat, lowercased_name, capitalized_name, property, edge) \
 YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
 
-#define YG_VALUE_EDGE_PROPERTY_GETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
-- (CGFloat)objc_lowercased_name                                                                  \
+#define YG_VALUE_EDGE_PROPERTY_SETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
+- (void)set##objc_capitalized_name:(YGValue)objc_lowercased_name                                 \
 {                                                                                                \
-  YGValue value = YGNodeStyleGet##c_name(self.node, edge);                                       \
-  if (value.unit == YGUnitPoint) {                                                               \
-    return value.value;                                                                          \
-  } else {                                                                                       \
-    return YGUndefined;                                                                          \
+  switch (objc_lowercased_name.unit) {                                                           \
+    case YGUnitPoint:                                                                            \
+      YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name.value);                       \
+      break;                                                                                     \
+    case YGUnitPercent:                                                                          \
+      YGNodeStyleSet##c_name##Percent(self.node, edge, objc_lowercased_name.value);              \
+      break;                                                                                     \
+    default:                                                                                     \
+      NSAssert(NO, @"Not implemented");                                                          \
   }                                                                                              \
 }
 
-#define YG_VALUE_EDGE_PROPERTY_SETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
-- (void)set##objc_capitalized_name:(CGFloat)objc_lowercased_name                                 \
-{                                                                                                \
-  YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name);                                 \
-}
-
-#define YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
-YG_VALUE_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge)  \
+#define YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge)   \
+YG_EDGE_PROPERTY_GETTER(YGValue, lowercased_name, capitalized_name, property, edge) \
 YG_VALUE_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
 
-#define YG_VALUE_EDGES_PROPERTIES(lowercased_name, capitalized_name)                                                            \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Left, capitalized_name##Left, capitalized_name, YGEdgeLeft)                             \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Top, capitalized_name##Top, capitalized_name, YGEdgeTop)                                \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Right, capitalized_name##Right, capitalized_name, YGEdgeRight)                          \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Bottom, capitalized_name##Bottom, capitalized_name, YGEdgeBottom)                       \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Start, capitalized_name##Start, capitalized_name, YGEdgeStart)                          \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##End, capitalized_name##End, capitalized_name, YGEdgeEnd)                                \
+#define YG_VALUE_EDGES_PROPERTIES(lowercased_name, capitalized_name)                                                  \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Left, capitalized_name##Left, capitalized_name, YGEdgeLeft)                   \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Top, capitalized_name##Top, capitalized_name, YGEdgeTop)                      \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Right, capitalized_name##Right, capitalized_name, YGEdgeRight)                \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Bottom, capitalized_name##Bottom, capitalized_name, YGEdgeBottom)             \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Start, capitalized_name##Start, capitalized_name, YGEdgeStart)                \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##End, capitalized_name##End, capitalized_name, YGEdgeEnd)                      \
 YG_VALUE_EDGE_PROPERTY(lowercased_name##Horizontal, capitalized_name##Horizontal, capitalized_name, YGEdgeHorizontal) \
 YG_VALUE_EDGE_PROPERTY(lowercased_name##Vertical, capitalized_name##Vertical, capitalized_name, YGEdgeVertical)       \
 YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, capitalized_name, YGEdgeAll)
 
+YGValue YGPointValue(CGFloat value)
+{
+  return (YGValue) { .value = value, .unit = YGUnitPoint };
+}
+
+YGValue YGPercentValue(CGFloat value)
+{
+  return (YGValue) { .value = value, .unit = YGUnitPercent };
+}
+
 static YGConfigRef globalConfig;
 
 @interface YGLayout ()
@@ -103,6 +115,7 @@ static YGConfigRef globalConfig;
 {
   globalConfig = YGConfigNew();
   YGConfigSetExperimentalFeatureEnabled(globalConfig, YGExperimentalFeatureWebFlexBasis, true);
+  YGConfigSetPointScaleFactor(globalConfig, [UIScreen mainScreen].scale);
 }
 
 - (instancetype)initWithView:(UIView*)view
@@ -245,7 +258,7 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
     size.height = YGUndefined;
   }
   [self calculateLayoutWithSize:size];
-  YGApplyLayoutToViewHierarchy(self.view, NO);
+  YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
 }
 
 
@@ -258,8 +271,6 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
   return [self calculateLayoutWithSize:constrainedSize];
 }
 
-#pragma mark - Private
-
 - (CGSize)calculateLayoutWithSize:(CGSize)size
 {
   NSAssert([NSThread isMainThread], @"Yoga calculation must be done on main.");
@@ -280,6 +291,8 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
   };
 }
 
+#pragma mark - Private
+
 static YGSize YGMeasureView(
   YGNodeRef node,
   float width,
@@ -348,7 +361,7 @@ static void YGAttachNodesFromViewHierachy(UIView *const view)
 
     NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
     for (UIView *subview in view.subviews) {
-      if (subview.yoga.isIncludedInLayout) {
+      if (subview.yoga.isEnabled && subview.yoga.isIncludedInLayout) {
         [subviewsToInclude addObject:subview];
       }
     }

YogaKit/Source/YGLayoutExtensions.swift

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

YogaKit/Tests/YogaKitTests.m

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

YogaKit/YogaKitSample/Podfile.lock

@@ -4,9 +4,9 @@ PODS:
   - IGListKit/Default (2.1.0):
     - IGListKit/Diffing
   - IGListKit/Diffing (2.1.0)
-  - Yoga (1.3.0)
-  - YogaKit (1.3.0):
-    - Yoga (~> 1.3)
+  - Yoga (1.7.0)
+  - YogaKit (1.7.0):
+    - Yoga (~> 1.7)
 
 DEPENDENCIES:
   - IGListKit (~> 2.1.0)
@@ -14,13 +14,13 @@ DEPENDENCIES:
 
 EXTERNAL SOURCES:
   YogaKit:
-    :path: "../../YogaKit.podspec"
+    :path: ../../YogaKit.podspec
 
 SPEC CHECKSUMS:
   IGListKit: b826c68ef7a4ae1626c09d4d3e1ea7a169e6c36e
   Yoga: 2ed1d7accfef3610a67f58c0cf101a0662137f2c
-  YogaKit: cddeccc6a8d2aff563e4c738d3bddb290a6de4cb
+  YogaKit: 31576530e8fcae3175469719ec3212397403330b
 
 PODFILE CHECKSUM: 216f8e7127767709e0e43f3711208d238fa5c404
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.1.1

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

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

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

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

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift

@@ -17,8 +17,8 @@ final class BasicViewController: UIViewController {
         root.backgroundColor = .white
         root.configureLayout { (layout) in
             layout.isEnabled = true
-            layout.width = containerSize.width
-            layout.height = containerSize.height
+            layout.width = YGValue(containerSize.width)
+            layout.height = YGValue(containerSize.height)
             layout.alignItems = .center
             layout.justifyContent = .center
         }

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift

@@ -29,7 +29,7 @@ final class LayoutInclusionViewController: UIViewController {
         contentView.configureLayout { (layout) in
             layout.isEnabled = true
             layout.height = 300
-            layout.width = self.view.bounds.size.width
+            layout.width = YGValue(self.view.bounds.size.width)
             layout.flexDirection = .row
             layout.justifyContent = .center
             layout.paddingHorizontal = 25

android/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'maven-publish'
 
-version = '1.4.1'
-group = 'com.facebook.yoga.android'
+version = VERSION_NAME
+group = GROUP
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
@@ -22,7 +22,7 @@ android {
 }
 
 dependencies {
-    compile project(':yoga')
+    api project(':yoga')
 }
 
 task sourcesJar(type: Jar) {
@@ -42,8 +42,4 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     from javadoc.destinationDir
 }
 
-ext {
-    bintrayName = 'com.facebook.yoga.android:yoga-layout'
-}
-
-apply from: rootProject.file('gradle/android-jcenter-install.gradle')
+apply from: rootProject.file('gradle/release.gradle')

android/gradle.properties

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

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

@@ -4,7 +4,7 @@ package com.facebook.samples.yoga;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.Fragment;
@@ -19,7 +19,7 @@ import android.support.v7.app.ActionBar;
 import com.facebook.samples.yoga.R;
 import com.facebook.yoga.android.YogaViewLayoutFactory;
 
-public class BenchmarkActivity extends ActionBarActivity {
+public class BenchmarkActivity extends AppCompatActivity {
 
   @Override
   public void onCreate(Bundle savedInstanceState) {

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

@@ -10,7 +10,7 @@ package com.facebook.samples.yoga;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -25,7 +25,7 @@ import com.facebook.yoga.android.YogaViewLayoutFactory;
  * {@code main_layout.xml}) that shows off the awesome functionality of the Yoga layout engine
  * as well as some optimisations on layout systems that it facilitates.
  */
-public class MainActivity extends ActionBarActivity {
+public class MainActivity extends AppCompatActivity {
 
   @Override
   public void onCreate(Bundle savedInstanceState) {

benchmark/BUCK

@@ -10,6 +10,8 @@ include_defs("//YOGA_DEFS")
 cxx_binary(
     name = "benchmark",
     srcs = glob(["*.c"]),
+    headers = subdir_glob([("", "*.h")]),
+    header_namespace = "",
     compiler_flags = [
         "-fno-omit-frame-pointer",
         "-fexceptions",
@@ -18,8 +20,6 @@ cxx_binary(
         "-O3",
         "-std=c11",
     ],
-    header_namespace = "",
-    headers = subdir_glob([("", "*.h")]),
     visibility = ["PUBLIC"],
     deps = [
         yoga_dep(":yoga"),

build.gradle

@@ -3,12 +3,12 @@
 buildscript {
     repositories {
         jcenter()
+        maven { url 'https://maven.google.com/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.1'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
-        classpath 'com.nabilhachicha:android-native-dependencies:0.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -22,14 +22,41 @@ allprojects {
 }
 
 ext {
-    minSdkVersion = 15
+    minSdkVersion = 14
     targetSdkVersion = 25
-    compileSdkVersion = 25
-    buildToolsVersion = '25.0.2'
+    compileSdkVersion = 26
+    buildToolsVersion = '26.0.2'
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 }
 
+// If you have an idea on how to avoid this, please get in touch or
+// answer https://stackoverflow.com/questions/43867014/how-to-use-the-gradle-ndk-build-to-compile-for-the-host-machine.
+task copyNativeLibs(type: Copy, dependsOn: ':buckBuildNative') {
+    from "${rootDir}/buck-out/gen/java/tests#default,shared-library-symlink-tree/"
+    include '*.so'
+    include '*.dylib'
+    into "$buildDir/jniLibs"
+}
+
+task buckBuildNative(type: Exec) {
+    workingDir rootDir
+    environment BUCKVERSION: 'last'
+    commandLine 'buck', 'build', '//java/...'
+}
+
+allprojects {
+    afterEvaluate {
+        tasks.withType(Test) {
+            dependsOn copyNativeLibs
+            def libDir = "${rootDir}/build/jniLibs"
+            systemProperty 'java.library.path', libDir
+            environment 'LD_LIBRARY_PATH', libDir
+            environment 'DYLD_LIBRARY_PATH', libDir
+        }
+    }
+}
+
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

csharp/.gitignore

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

csharp/.hgignore

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

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

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

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

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

csharp/Facebook.Yoga/Logger.cs

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

csharp/Facebook.Yoga/Native.cs

@@ -26,96 +26,9 @@ namespace Facebook.Yoga
         private const string DllName = "yoga";
 #endif
 
-        internal class YGNodeHandle : SafeHandle
-        {
-#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
-            private GCHandle _managed;
-#endif
-
-            private YGNodeHandle() : base(IntPtr.Zero, true)
-            {
-            }
-
-            public override bool IsInvalid
-            {
-                get
-                {
-                    return this.handle == IntPtr.Zero;
-                }
-            }
-
-            protected override bool ReleaseHandle()
-            {
-#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
-                ReleaseManaged();
-#endif
-                Native.YGNodeFree(this.handle);
-                GC.KeepAlive(this);
-                return true;
-            }
-
-#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
-            public void SetContext(YogaNode node)
-            {
-                if (!_managed.IsAllocated)
-                {
-#if ENABLE_IL2CPP
-                    // Weak causes 'GCHandle value belongs to a different domain' error
-                    _managed = GCHandle.Alloc(node);
-#else
-                    _managed = GCHandle.Alloc(node, GCHandleType.Weak);
-#endif
-                    Native.YGNodeSetContext(this.handle, GCHandle.ToIntPtr(_managed));
-                }
-            }
-
-            public void ReleaseManaged()
-            {
-                if (_managed.IsAllocated)
-                {
-                    _managed.Free();
-                }
-            }
-
-            public static YogaNode GetManaged(IntPtr ygNodePtr)
-            {
-                var node =
-                    GCHandle.FromIntPtr(Native.YGNodeGetContext(ygNodePtr)).Target as YogaNode;
-                if (node == null)
-                {
-                    throw new InvalidOperationException("YogaNode is already deallocated");
-                }
-
-                return node;
-            }
-#endif
-        }
-
-        internal class YGConfigHandle : SafeHandle
-        {
-            private YGConfigHandle() : base(IntPtr.Zero, true)
-            {
-            }
-
-            public override bool IsInvalid
-            {
-                get
-                {
-                    return this.handle == IntPtr.Zero;
-                }
-            }
-
-            protected override bool ReleaseHandle()
-            {
-                Native.YGConfigFree(this.handle);
-                GC.KeepAlive(this);
-                return true;
-            }
-        }
-
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGInteropSetLogger(
-            [MarshalAs(UnmanagedType.FunctionPtr)] YogaLogger.Func func);
+            [MarshalAs(UnmanagedType.FunctionPtr)] YogaLogger logger);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YGNodeHandle YGNodeNew();
@@ -129,6 +42,9 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeReset(YGNodeHandle node);
 
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YGConfigHandle YGConfigGetDefault();
+
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern YGConfigHandle YGConfigNew();
 
@@ -445,15 +361,19 @@ namespace Facebook.Yoga
 
 #endregion
 
-#region AOT
+#region Context
 
-#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern IntPtr YGNodeGetContext(IntPtr node);
 
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeSetContext(IntPtr node, IntPtr managed);
-#endif
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern IntPtr YGConfigGetContext(IntPtr config);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGConfigSetContext(IntPtr config, IntPtr managed);
 
 #endregion
     }

csharp/Facebook.Yoga/YGConfigHandle.cs

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

csharp/Facebook.Yoga/YGNodeHandle.cs

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

csharp/Facebook.Yoga/YogaBaselineFunc.cs

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

csharp/Facebook.Yoga/YogaConfig.cs

@@ -8,29 +8,92 @@
  */
 
 using System;
+using System.Runtime.InteropServices;
+
+#if __IOS__
+using ObjCRuntime;
+#endif
+#if ENABLE_IL2CPP
+using AOT;
+#endif
 
 namespace Facebook.Yoga
 {
     public class YogaConfig
     {
-        private Native.YGConfigHandle _ygConfig;
+        internal static readonly YogaConfig Default = new YogaConfig(YGConfigHandle.Default);
+        private static YogaLogger _managedLogger;
 
-        public YogaConfig()
+        private YGConfigHandle _ygConfig;
+        private Logger _logger;
+
+        private YogaConfig(YGConfigHandle ygConfig)
         {
-            _ygConfig = Native.YGConfigNew();
+            _ygConfig = ygConfig;
             if (_ygConfig.IsInvalid)
             {
                 throw new InvalidOperationException("Failed to allocate native memory");
             }
+
+            _ygConfig.SetContext(this);
+
+            if (_ygConfig == YGConfigHandle.Default)
+            {
+                _managedLogger = LoggerInternal;
+                Native.YGInteropSetLogger(_managedLogger);
+            }
         }
 
-        internal Native.YGConfigHandle Handle
+        public YogaConfig()
+            : this(Native.YGConfigNew())
+        {
+        }
+
+        internal YGConfigHandle Handle
         {
             get {
                 return _ygConfig;
             }
         }
 
+#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
+        [MonoPInvokeCallback(typeof(YogaLogger))]
+#endif
+        private static void LoggerInternal(
+            IntPtr unmanagedConfigPtr,
+            IntPtr unmanagedNodePtr,
+            YogaLogLevel level,
+            string message)
+        {
+            var config = YGConfigHandle.GetManaged(unmanagedConfigPtr);
+            if (config == null || config._logger == null)
+            {
+                // Default logger
+                System.Diagnostics.Debug.WriteLine(message);
+            }
+            else
+            {
+                var node = YGNodeHandle.GetManaged(unmanagedNodePtr);
+                config._logger(config, node, level, message);
+            }
+
+            if (level == YogaLogLevel.Error || level == YogaLogLevel.Fatal)
+            {
+                throw new InvalidOperationException(message);
+            }
+        }
+
+        public Logger Logger
+        {
+            get {
+                return _logger;
+            }
+
+            set {
+                _logger = value;
+            }
+        }
+
         public void SetExperimentalFeatureEnabled(
             YogaExperimentalFeature feature,
             bool enabled)
@@ -68,5 +131,10 @@ namespace Facebook.Yoga
         {
             return Native.YGConfigGetInstanceCount();
         }
+
+        public static void SetDefaultLogger(Logger logger)
+        {
+            Default.Logger = logger;
+        }
     }
 }

csharp/Facebook.Yoga/YogaExperimentalFeature.cs

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

csharp/Facebook.Yoga/YogaLogLevel.cs

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

csharp/Facebook.Yoga/YogaLogger.cs

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

csharp/Facebook.Yoga/YogaMeasureFunc.cs

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

csharp/Facebook.Yoga/YogaNode.cs

@@ -10,11 +10,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using System.Text;
 
-#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
-using System.Runtime.InteropServices;
-#endif
 #if __IOS__
 using ObjCRuntime;
 #endif
@@ -26,49 +24,26 @@ namespace Facebook.Yoga
 {
     public partial class YogaNode : IEnumerable<YogaNode>
     {
-        private readonly Native.YGNodeHandle _ygNode;
+        private readonly YGNodeHandle _ygNode;
         private readonly YogaConfig _config;
         private WeakReference _parent;
         private List<YogaNode> _children;
         private MeasureFunction _measureFunction;
         private BaselineFunction _baselineFunction;
-        private object _data;
-#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
-        private static YogaMeasureFunc _managedMeasure;
-        private static YogaBaselineFunc _managedBaseline;
-#else
         private YogaMeasureFunc _managedMeasure;
         private YogaBaselineFunc _managedBaseline;
-#endif
+        private object _data;
 
-        public YogaNode()
+        public YogaNode(YogaConfig config = null)
         {
-            YogaLogger.Initialize();
-
-            _ygNode = Native.YGNodeNew();
+            _config = config == null ? YogaConfig.Default : config;
+            _ygNode = Native.YGNodeNewWithConfig(_config.Handle);
             if (_ygNode.IsInvalid)
             {
                 throw new InvalidOperationException("Failed to allocate native memory");
             }
-        }
 
-        public YogaNode(YogaConfig config)
-        {
-            YogaLogger.Initialize();
-
-            if (config != null)
-            {
-                _config = config;
-                _ygNode = Native.YGNodeNewWithConfig(_config.Handle);
-            }
-            else
-            {
-                _ygNode = Native.YGNodeNew();
-            }
-            if (_ygNode.IsInvalid)
-            {
-                throw new InvalidOperationException("Failed to allocate native memory");
-            }
+            _ygNode.SetContext(this);
         }
 
         public YogaNode(YogaNode srcNode)
@@ -83,10 +58,9 @@ namespace Facebook.Yoga
             _baselineFunction = null;
             _data = null;
 
-            Native.YGNodeReset(_ygNode);
-#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
             _ygNode.ReleaseManaged();
-#endif
+            Native.YGNodeReset(_ygNode);
+            _ygNode.SetContext(this);
         }
 
         public bool IsDirty
@@ -609,109 +583,71 @@ namespace Facebook.Yoga
         public void SetMeasureFunction(MeasureFunction measureFunction)
         {
             _measureFunction = measureFunction;
-            if (measureFunction != null)
-            {
-#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
-                _managedMeasure = MeasureInternalAOT;
-                _ygNode.SetContext(this);
-#else
-                _managedMeasure = MeasureInternal;
-#endif
-            }
-            else
-            {
-                _managedMeasure = null;
-            }
+            _managedMeasure = measureFunction != null ? MeasureInternal : (YogaMeasureFunc)null;
             Native.YGNodeSetMeasureFunc(_ygNode, _managedMeasure);
         }
 
         public void SetBaselineFunction(BaselineFunction baselineFunction)
         {
             _baselineFunction = baselineFunction;
-            if (baselineFunction != null)
-            {
-#if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
-                _managedBaseline = BaselineInternalAOT;
-                _ygNode.SetContext(this);
-#else
-                _managedBaseline = BaselineInternal;
-#endif
-            }
-            else
-            {
-                _managedBaseline = null;
-            }
+            _managedBaseline =
+                baselineFunction != null ? BaselineInternal : (YogaBaselineFunc)null;
             Native.YGNodeSetBaselineFunc(_ygNode, _managedBaseline);
         }
 
-        public void CalculateLayout()
+        public void CalculateLayout(
+            float width = YogaConstants.Undefined, 
+            float height = YogaConstants.Undefined)
         {
             Native.YGNodeCalculateLayout(
                 _ygNode,
-                YogaConstants.Undefined,
-                YogaConstants.Undefined,
+                width,
+                height,
                 Native.YGNodeStyleGetDirection(_ygNode));
         }
 
 #if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
         [MonoPInvokeCallback(typeof(YogaMeasureFunc))]
-        private static YogaSize MeasureInternalAOT(
-            IntPtr ygNodePtr,
-            float width,
-            YogaMeasureMode widthMode,
-            float height,
-            YogaMeasureMode heightMode)
-        {
-            var node = Native.YGNodeHandle.GetManaged(ygNodePtr);
-            return node.MeasureInternal(IntPtr.Zero, width, widthMode, height, heightMode);
-        }
 #endif
-
-        private YogaSize MeasureInternal(
-            IntPtr node,
+        private static YogaSize MeasureInternal(
+            IntPtr unmanagedNodePtr,
             float width,
             YogaMeasureMode widthMode,
             float height,
             YogaMeasureMode heightMode)
         {
-            if (_measureFunction == null)
+            var node = YGNodeHandle.GetManaged(unmanagedNodePtr);
+            if (node == null || node._measureFunction == null)
             {
                 throw new InvalidOperationException("Measure function is not defined.");
             }
-
-            return _measureFunction(this, width, widthMode, height, heightMode);
+            return node._measureFunction(node, width, widthMode, height, heightMode);
         }
 
 #if (UNITY_IOS && !UNITY_EDITOR) || ENABLE_IL2CPP || __IOS__
         [MonoPInvokeCallback(typeof(YogaBaselineFunc))]
-        private static float BaselineInternalAOT(
-            IntPtr ygNodePtr,
+#endif
+        private static float BaselineInternal(
+            IntPtr unmanagedNodePtr,
             float width,
             float height)
         {
-            var node = Native.YGNodeHandle.GetManaged(ygNodePtr);
-            return node.BaselineInternal(IntPtr.Zero, width, height);
-        }
-#endif
-
-        private float BaselineInternal(IntPtr node, float width, float height)
-        {
-            if (_baselineFunction == null)
+            var node = YGNodeHandle.GetManaged(unmanagedNodePtr);
+            if (node == null || node._baselineFunction == null)
             {
                 throw new InvalidOperationException("Baseline function is not defined.");
             }
-
-            return _baselineFunction(this, width, height);
+            return node._baselineFunction(node, width, height);
         }
 
         public string Print(YogaPrintOptions options =
             YogaPrintOptions.Layout|YogaPrintOptions.Style|YogaPrintOptions.Children)
         {
             StringBuilder sb = new StringBuilder();
-            YogaLogger.Func orig = YogaLogger.Logger;
-            YogaLogger.Logger = (level, message) => {sb.Append(message);};
+            Logger orig = _config.Logger;
+            _config.Logger = (config, node, level, message) => {sb.Append(message);};
             Native.YGNodePrint(_ygNode, options);
-            YogaLogger.Logger = orig;
+            _config.Logger = orig;
             return sb.ToString();
         }
 

csharp/Facebook.Yoga/YogaNodeType.cs

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

csharp/Facebook.YogaKit/YogaLayout.cs

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Drawing;
 #if __IOS__
 using NativeView = UIKit.UIView;
+using NativeScrollView = UIKit.UIScrollView;
 #endif
 
 namespace Facebook.YogaKit
@@ -699,12 +700,12 @@ namespace Facebook.YogaKit
 		{
 			get
 			{
-				return _node.StyleAspectRatio;
+				return _node.AspectRatio;
 			}
 
 			set
 			{
-				_node.StyleAspectRatio = value;
+				_node.AspectRatio = value;
 			}
 		}
 
@@ -716,6 +717,17 @@ namespace Facebook.YogaKit
 				float width = 0;
 				float height = 0;
 				GetWidthHeightOfNativeView(view, out width, out height);
+                if (view is NativeScrollView)
+                {
+                    if (FlexDirection == YogaFlexDirection.Column || FlexDirection == YogaFlexDirection.ColumnReverse)
+                    {
+                        height = float.NaN;
+                    }
+                    else
+                    {
+                        width = float.NaN;
+                    }
+                }
 				CalculateLayoutWithSize(this, width, height);
 				ApplyLayoutToViewHierarchy(view);
 			}
@@ -743,9 +755,7 @@ namespace Facebook.YogaKit
 
 			var node = layout._node;
 
-			node.Width = width;
-			node.Height = height;
-			node.CalculateLayout();
+			node.CalculateLayout(width, height);
 
 			return new SizeF { Width = node.LayoutWidth, Height = node.LayoutHeight };
 		}
@@ -775,14 +785,14 @@ namespace Facebook.YogaKit
 			float result;
 			if (measureMode == YogaMeasureMode.Exactly)
 			{
-				result = (float)constrainedSize;
+				result = constrainedSize;
 			}
 			else if (measureMode == YogaMeasureMode.AtMost)
 			{
-				result = (float)Math.Min(constrainedSize, measuredSize);
+				result = Math.Min(constrainedSize, measuredSize);
 			}
 			else {
-				result = (float)measuredSize;
+				result = measuredSize;
 			}
 
 			return result;
@@ -820,7 +830,7 @@ namespace Facebook.YogaKit
 				var subviewsToInclude = new List<NativeView>();
 				foreach (var subview in view.Subviews)
 				{
-					if (subview.Yoga().IsIncludeInLayout)
+					if (subview.Yoga().IsEnabled && subview.Yoga().IsIncludeInLayout)
 					{
 						subviewsToInclude.Add(subview);
 					}
@@ -856,7 +866,7 @@ namespace Facebook.YogaKit
 
 		static double RoundPointValue(float value)
 		{
-			float scale = NativePointScale;
+			float scale = NativePixelScale;
 
 			return Math.Round(value * scale) / scale;
 		}

csharp/Mac/CustomBuildAction.targets

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

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

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

csharp/Mac/buck-build.sh

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

csharp/Yoga/YGInterop.cpp

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

csharp/Yoga/YGInterop.h

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

csharp/Yoga/Yoga.Universal.vcxproj

@@ -104,7 +104,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>bin\Universal\$(PlatformTarget)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(PlatformTarget)\$(Configuration)\</IntDir>
+    <IntDir>obj\Universal\$(PlatformTarget)\$(Configuration)\</IntDir>
     <TargetName>yoga</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -242,8 +242,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\yoga\YGEnums.h" />
     <ClInclude Include="..\..\yoga\Yoga.h" />
-    <ClInclude Include="..\..\yoga\YGEnums.c" />
     <ClInclude Include="..\..\yoga\YGMacros.h" />
     <ClInclude Include="..\..\yoga\YGNodeList.h" />
     <ClInclude Include="resource.h" />
@@ -252,8 +252,8 @@
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\yoga\Yoga.c" />
     <ClCompile Include="..\..\yoga\YGEnums.c" />
+    <ClCompile Include="..\..\yoga\Yoga.c" />
     <ClCompile Include="..\..\yoga\YGNodeList.c" />
     <ClCompile Include="YGInterop.cpp" />
     <ClCompile Include="dllmain.cpp">

csharp/Yoga/Yoga.Universal.vcxproj.filters

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

csharp/build-native.sh

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

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

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

csharp/iOS/Facebook.YogaKit.iOS.Tests/Facebook.YogaKit.iOS.Tests.csproj

@@ -22,8 +22,6 @@
     <MtouchDebug>true</MtouchDebug>
     <MtouchFastDev>true</MtouchFastDev>
     <MtouchProfiling>true</MtouchProfiling>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <IOSDebuggerPort>17481</IOSDebuggerPort>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
@@ -39,8 +37,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>SdkOnly</MtouchLink>
@@ -56,8 +52,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchLink>None</MtouchLink>
     <MtouchArch>x86_64</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
@@ -76,8 +70,6 @@
     <MtouchDebug>true</MtouchDebug>
     <MtouchFastDev>true</MtouchFastDev>
     <MtouchProfiling>true</MtouchProfiling>
-    <MtouchUseSGen>true</MtouchUseSGen>
-    <MtouchUseRefCounting>true</MtouchUseRefCounting>
     <MtouchFloat32>true</MtouchFloat32>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchLink>SdkOnly</MtouchLink>
@@ -102,6 +94,7 @@
   <ItemGroup>
     <Compile Include="Main.cs" />
     <Compile Include="UnitTestAppDelegate.cs" />
+    <Compile Include="YogaKitNativeTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Facebook.YogaKit.iOS\Facebook.YogaKit.iOS.csproj">

csharp/iOS/Facebook.YogaKit.iOS.Tests/YogaKitNativeTest.cs

@@ -0,0 +1,51 @@
+using System.Drawing;
+using Facebook.Yoga;
+using NUnit.Framework;
+using System;
+using UIKit;
+using CoreGraphics;
+
+namespace Facebook.YogaKit.iOS.Tests
+{
+	[TestFixture]
+	public class YogaKitNativeTest
+	{
+		[Test]
+		public void ScrollViewVertical()
+		{
+            var view = new UIScrollView() {
+                Frame = new CGRect(0, 0, 100, 100),
+            };
+
+            view.Yoga().Overflow = YogaOverflow.Scroll;
+            var subview = new UIView();
+            subview.Yoga().Height = 1000;
+            subview.Yoga().IsEnabled = true;
+
+            view.AddSubview(subview);
+            view.Yoga().IsEnabled = true;
+            view.Yoga().ApplyLayout();
+            Assert.True(view.ContentSize.Height == 1000);
+		}
+
+        [Test]
+        public void NormalViewVertical()
+        {
+            var view = new UIView() {
+                Frame = new CGRect(0,0, 100, 100),
+            };
+
+
+            var subview = new UIView();
+            subview.Yoga().Height = 1000;
+            subview.Yoga().Width = 2;
+            subview.Yoga().IsEnabled = true;
+
+            view.AddSubview(subview);
+            view.Yoga().IsEnabled = true;
+            view.Yoga().ApplyLayout();
+            Assert.True(view.Bounds.Height == 100);
+        }
+
+	}
+}

csharp/iOS/Facebook.YogaKit.iOS/YogaLayout.cs

@@ -23,14 +23,21 @@ namespace Facebook.YogaKit
 			height = (float)view.Bounds.Height;
 		}
 
-		static float NativePixelScale => (float)UIScreen.MainScreen.Scale;
+        static float NativePixelScale => (float)UIScreen.MainScreen.Scale;
 
 
 		static void ApplyLayoutToNativeView(UIView view, YogaNode node)
 		{
 			var topLeft = new CGPoint(node.LayoutX, node.LayoutY);
 			var bottomRight = new CGPoint(topLeft.X + node.LayoutWidth, topLeft.Y + node.LayoutHeight);
-			view.Frame = new CGRect(RoundPointValue((float)topLeft.X), RoundPointValue((float)topLeft.Y), RoundPointValue((float)bottomRight.X) - RoundPointValue((float)topLeft.X), RoundPointValue((float)bottomRight.Y) - RoundPointValue((float)topLeft.Y));
+            if (view is UIScrollView scrollView)
+            {
+                scrollView.ContentSize = new CGSize(RoundPointValue((float)bottomRight.X) - RoundPointValue((float)topLeft.X), RoundPointValue((float)bottomRight.Y) - RoundPointValue((float)topLeft.Y));
+            }
+            else
+            {
+                view.Frame = new CGRect(RoundPointValue((float)topLeft.X), RoundPointValue((float)topLeft.Y), RoundPointValue((float)bottomRight.X) - RoundPointValue((float)topLeft.X), RoundPointValue((float)bottomRight.Y) - RoundPointValue((float)topLeft.Y));
+            }
 		}
 
 		bool _disposed;

csharp/tests/Facebook.Yoga/YGAbsolutePositionTest.cs

@@ -285,6 +285,30 @@ namespace Facebook.Yoga
             root_child1.Width = 50;
             root_child1.Height = 50;
             root.Insert(1, root_child1);
+
+            YogaNode root_child2 = new YogaNode(config);
+            root_child2.PositionType = YogaPositionType.Absolute;
+            root_child2.Left = 0;
+            root_child2.Top = 0;
+            root_child2.MarginLeft = 10;
+            root_child2.MarginTop = 10;
+            root_child2.MarginRight = 10;
+            root_child2.MarginBottom = 10;
+            root_child2.Width = 50;
+            root_child2.Height = 50;
+            root.Insert(2, root_child2);
+
+            YogaNode root_child3 = new YogaNode(config);
+            root_child3.PositionType = YogaPositionType.Absolute;
+            root_child3.Right = 0;
+            root_child3.Bottom = 0;
+            root_child3.MarginLeft = 10;
+            root_child3.MarginTop = 10;
+            root_child3.MarginRight = 10;
+            root_child3.MarginBottom = 10;
+            root_child3.Width = 50;
+            root_child3.Height = 50;
+            root.Insert(3, root_child3);
             root.StyleDirection = YogaDirection.LTR;
             root.CalculateLayout();
 
@@ -303,6 +327,16 @@ namespace Facebook.Yoga
             Assert.AreEqual(50f, root_child1.LayoutWidth);
             Assert.AreEqual(50f, root_child1.LayoutHeight);
 
+            Assert.AreEqual(20f, root_child2.LayoutX);
+            Assert.AreEqual(20f, root_child2.LayoutY);
+            Assert.AreEqual(50f, root_child2.LayoutWidth);
+            Assert.AreEqual(50f, root_child2.LayoutHeight);
+
+            Assert.AreEqual(30f, root_child3.LayoutX);
+            Assert.AreEqual(30f, root_child3.LayoutY);
+            Assert.AreEqual(50f, root_child3.LayoutWidth);
+            Assert.AreEqual(50f, root_child3.LayoutHeight);
+
             root.StyleDirection = YogaDirection.RTL;
             root.CalculateLayout();
 
@@ -320,6 +354,16 @@ namespace Facebook.Yoga
             Assert.AreEqual(40f, root_child1.LayoutY);
             Assert.AreEqual(50f, root_child1.LayoutWidth);
             Assert.AreEqual(50f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(20f, root_child2.LayoutX);
+            Assert.AreEqual(20f, root_child2.LayoutY);
+            Assert.AreEqual(50f, root_child2.LayoutWidth);
+            Assert.AreEqual(50f, root_child2.LayoutHeight);
+
+            Assert.AreEqual(30f, root_child3.LayoutX);
+            Assert.AreEqual(30f, root_child3.LayoutY);
+            Assert.AreEqual(50f, root_child3.LayoutWidth);
+            Assert.AreEqual(50f, root_child3.LayoutHeight);
         }
 
         [Test]
@@ -745,5 +789,253 @@ namespace Facebook.Yoga
             Assert.AreEqual(52f, root.LayoutHeight);
         }
 
+        [Test]
+        public void Test_absolute_layout_percentage_bottom_based_on_parent_height()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 100;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Top = 50.Percent();
+            root_child0.Width = 10;
+            root_child0.Height = 10;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.PositionType = YogaPositionType.Absolute;
+            root_child1.Bottom = 50.Percent();
+            root_child1.Width = 10;
+            root_child1.Height = 10;
+            root.Insert(1, root_child1);
+
+            YogaNode root_child2 = new YogaNode(config);
+            root_child2.PositionType = YogaPositionType.Absolute;
+            root_child2.Top = 10.Percent();
+            root_child2.Bottom = 10.Percent();
+            root_child2.Width = 10;
+            root.Insert(2, root_child2);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(100f, root_child0.LayoutY);
+            Assert.AreEqual(10f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(90f, root_child1.LayoutY);
+            Assert.AreEqual(10f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child2.LayoutX);
+            Assert.AreEqual(20f, root_child2.LayoutY);
+            Assert.AreEqual(10f, root_child2.LayoutWidth);
+            Assert.AreEqual(160f, root_child2.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(90f, root_child0.LayoutX);
+            Assert.AreEqual(100f, root_child0.LayoutY);
+            Assert.AreEqual(10f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(90f, root_child1.LayoutX);
+            Assert.AreEqual(90f, root_child1.LayoutY);
+            Assert.AreEqual(10f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(90f, root_child2.LayoutX);
+            Assert.AreEqual(20f, root_child2.LayoutY);
+            Assert.AreEqual(10f, root_child2.LayoutWidth);
+            Assert.AreEqual(160f, root_child2.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_absolute_layout_in_wrap_reverse_column_container()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Wrap = YogaWrap.WrapReverse;
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Width = 20;
+            root_child0.Height = 20;
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(80f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_absolute_layout_in_wrap_reverse_row_container()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Wrap = YogaWrap.WrapReverse;
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Width = 20;
+            root_child0.Height = 20;
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(80f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(80f, root_child0.LayoutX);
+            Assert.AreEqual(80f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_absolute_layout_in_wrap_reverse_column_container_flex_end()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Wrap = YogaWrap.WrapReverse;
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.AlignSelf = YogaAlign.FlexEnd;
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Width = 20;
+            root_child0.Height = 20;
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(80f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_absolute_layout_in_wrap_reverse_row_container_flex_end()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Wrap = YogaWrap.WrapReverse;
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.AlignSelf = YogaAlign.FlexEnd;
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Width = 20;
+            root_child0.Height = 20;
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(80f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+        }
+
     }
 }

csharp/tests/Facebook.Yoga/YGAlignItemsTest.cs

@@ -1815,5 +1815,148 @@ namespace Facebook.Yoga
             Assert.AreEqual(72f, root_child0_child0.LayoutHeight);
         }
 
+        [Test]
+        public void Test_align_center_should_size_based_on_content()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.AlignItems = YogaAlign.Center;
+            root.MarginTop = 20;
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.JustifyContent = YogaJustify.Center;
+            root_child0.FlexShrink = 1;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child0_child0 = new YogaNode(config);
+            root_child0_child0.FlexGrow = 1;
+            root_child0_child0.FlexShrink = 1;
+            root_child0.Insert(0, root_child0_child0);
+
+            YogaNode root_child0_child0_child0 = new YogaNode(config);
+            root_child0_child0_child0.Width = 20;
+            root_child0_child0_child0.Height = 20;
+            root_child0_child0.Insert(0, root_child0_child0_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(20f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(40f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0_child0_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(20f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(40f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0_child0_child0.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_align_strech_should_size_based_on_parent()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.MarginTop = 20;
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.JustifyContent = YogaJustify.Center;
+            root_child0.FlexShrink = 1;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child0_child0 = new YogaNode(config);
+            root_child0_child0.FlexGrow = 1;
+            root_child0_child0.FlexShrink = 1;
+            root_child0.Insert(0, root_child0_child0);
+
+            YogaNode root_child0_child0_child0 = new YogaNode(config);
+            root_child0_child0_child0.Width = 20;
+            root_child0_child0_child0.Height = 20;
+            root_child0_child0.Insert(0, root_child0_child0_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(20f, 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(20f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0_child0_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(20f, 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(20f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(80f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0_child0_child0.LayoutHeight);
+        }
+
     }
 }

csharp/tests/Facebook.Yoga/YGFlexTest.cs

@@ -429,5 +429,73 @@ namespace Facebook.Yoga
             Assert.AreEqual(0f, root_child0_child0.LayoutHeight);
         }
 
+        [Test]
+        public void Test_flex_grow_less_than_factor_one()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 200;
+            root.Height = 500;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.FlexGrow = 0.2f;
+            root_child0.FlexBasis = 40;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.FlexGrow = 0.2f;
+            root.Insert(1, root_child1);
+
+            YogaNode root_child2 = new YogaNode(config);
+            root_child2.FlexGrow = 0.4f;
+            root.Insert(2, root_child2);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(132f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(132f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(92f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child2.LayoutX);
+            Assert.AreEqual(224f, root_child2.LayoutY);
+            Assert.AreEqual(200f, root_child2.LayoutWidth);
+            Assert.AreEqual(184f, root_child2.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(200f, root_child0.LayoutWidth);
+            Assert.AreEqual(132f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(132f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(92f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child2.LayoutX);
+            Assert.AreEqual(224f, root_child2.LayoutY);
+            Assert.AreEqual(200f, root_child2.LayoutWidth);
+            Assert.AreEqual(184f, root_child2.LayoutHeight);
+        }
+
     }
 }

csharp/tests/Facebook.Yoga/YGFlexWrapTest.cs

@@ -1381,5 +1381,365 @@ namespace Facebook.Yoga
             Assert.AreEqual(80f, root_child0_child1.LayoutHeight);
         }
 
+        [Test]
+        public void Test_wrapped_column_max_height()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.JustifyContent = YogaJustify.Center;
+            root.AlignContent = YogaAlign.Center;
+            root.AlignItems = YogaAlign.Center;
+            root.Wrap = YogaWrap.Wrap;
+            root.Width = 700;
+            root.Height = 500;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.Width = 100;
+            root_child0.Height = 500;
+            root_child0.MaxHeight = 200;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.MarginLeft = 20;
+            root_child1.MarginTop = 20;
+            root_child1.MarginRight = 20;
+            root_child1.MarginBottom = 20;
+            root_child1.Width = 200;
+            root_child1.Height = 200;
+            root.Insert(1, root_child1);
+
+            YogaNode root_child2 = new YogaNode(config);
+            root_child2.Width = 100;
+            root_child2.Height = 100;
+            root.Insert(2, root_child2);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(700f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(250f, root_child0.LayoutX);
+            Assert.AreEqual(30f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(200f, root_child1.LayoutX);
+            Assert.AreEqual(250f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(200f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(420f, root_child2.LayoutX);
+            Assert.AreEqual(200f, root_child2.LayoutY);
+            Assert.AreEqual(100f, root_child2.LayoutWidth);
+            Assert.AreEqual(100f, root_child2.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(700f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(350f, root_child0.LayoutX);
+            Assert.AreEqual(30f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(300f, root_child1.LayoutX);
+            Assert.AreEqual(250f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(200f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(180f, root_child2.LayoutX);
+            Assert.AreEqual(200f, root_child2.LayoutY);
+            Assert.AreEqual(100f, root_child2.LayoutWidth);
+            Assert.AreEqual(100f, root_child2.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_wrapped_column_max_height_flex()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.JustifyContent = YogaJustify.Center;
+            root.AlignContent = YogaAlign.Center;
+            root.AlignItems = YogaAlign.Center;
+            root.Wrap = YogaWrap.Wrap;
+            root.Width = 700;
+            root.Height = 500;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.FlexGrow = 1;
+            root_child0.FlexShrink = 1;
+            root_child0.FlexBasis = 0.Percent();
+            root_child0.Width = 100;
+            root_child0.Height = 500;
+            root_child0.MaxHeight = 200;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.FlexGrow = 1;
+            root_child1.FlexShrink = 1;
+            root_child1.FlexBasis = 0.Percent();
+            root_child1.MarginLeft = 20;
+            root_child1.MarginTop = 20;
+            root_child1.MarginRight = 20;
+            root_child1.MarginBottom = 20;
+            root_child1.Width = 200;
+            root_child1.Height = 200;
+            root.Insert(1, root_child1);
+
+            YogaNode root_child2 = new YogaNode(config);
+            root_child2.Width = 100;
+            root_child2.Height = 100;
+            root.Insert(2, root_child2);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(700f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(300f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(180f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(250f, root_child1.LayoutX);
+            Assert.AreEqual(200f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(180f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(300f, root_child2.LayoutX);
+            Assert.AreEqual(400f, root_child2.LayoutY);
+            Assert.AreEqual(100f, root_child2.LayoutWidth);
+            Assert.AreEqual(100f, root_child2.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(700f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(300f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(180f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(250f, root_child1.LayoutX);
+            Assert.AreEqual(200f, root_child1.LayoutY);
+            Assert.AreEqual(200f, root_child1.LayoutWidth);
+            Assert.AreEqual(180f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(300f, root_child2.LayoutX);
+            Assert.AreEqual(400f, root_child2.LayoutY);
+            Assert.AreEqual(100f, root_child2.LayoutWidth);
+            Assert.AreEqual(100f, root_child2.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_wrap_nodes_with_content_sizing_overflowing_margin()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 500;
+            root.Height = 500;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.FlexDirection = YogaFlexDirection.Row;
+            root_child0.Wrap = YogaWrap.Wrap;
+            root_child0.Width = 85;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child0_child0 = new YogaNode(config);
+            root_child0.Insert(0, root_child0_child0);
+
+            YogaNode root_child0_child0_child0 = new YogaNode(config);
+            root_child0_child0_child0.Width = 40;
+            root_child0_child0_child0.Height = 40;
+            root_child0_child0.Insert(0, root_child0_child0_child0);
+
+            YogaNode root_child0_child1 = new YogaNode(config);
+            root_child0_child1.MarginRight = 10;
+            root_child0.Insert(1, root_child0_child1);
+
+            YogaNode root_child0_child1_child0 = new YogaNode(config);
+            root_child0_child1_child0.Width = 40;
+            root_child0_child1_child0.Height = 40;
+            root_child0_child1.Insert(0, root_child0_child1_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(500f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(85f, root_child0.LayoutWidth);
+            Assert.AreEqual(80f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child1.LayoutX);
+            Assert.AreEqual(40f, root_child0_child1.LayoutY);
+            Assert.AreEqual(40f, root_child0_child1.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child1_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child1_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child1_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child1_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(500f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(415f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(85f, root_child0.LayoutWidth);
+            Assert.AreEqual(80f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(45f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(35f, root_child0_child1.LayoutX);
+            Assert.AreEqual(40f, root_child0_child1.LayoutY);
+            Assert.AreEqual(40f, root_child0_child1.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child1_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child1_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child1_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child1_child0.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_wrap_nodes_with_content_sizing_margin_cross()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 500;
+            root.Height = 500;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.FlexDirection = YogaFlexDirection.Row;
+            root_child0.Wrap = YogaWrap.Wrap;
+            root_child0.Width = 70;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child0_child0 = new YogaNode(config);
+            root_child0.Insert(0, root_child0_child0);
+
+            YogaNode root_child0_child0_child0 = new YogaNode(config);
+            root_child0_child0_child0.Width = 40;
+            root_child0_child0_child0.Height = 40;
+            root_child0_child0.Insert(0, root_child0_child0_child0);
+
+            YogaNode root_child0_child1 = new YogaNode(config);
+            root_child0_child1.MarginTop = 10;
+            root_child0.Insert(1, root_child0_child1);
+
+            YogaNode root_child0_child1_child0 = new YogaNode(config);
+            root_child0_child1_child0.Width = 40;
+            root_child0_child1_child0.Height = 40;
+            root_child0_child1.Insert(0, root_child0_child1_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(500f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(70f, root_child0.LayoutWidth);
+            Assert.AreEqual(90f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child1.LayoutX);
+            Assert.AreEqual(50f, root_child0_child1.LayoutY);
+            Assert.AreEqual(40f, root_child0_child1.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child1_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child1_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child1_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child1_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(500f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(430f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(70f, root_child0.LayoutWidth);
+            Assert.AreEqual(90f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(30f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(30f, root_child0_child1.LayoutX);
+            Assert.AreEqual(50f, root_child0_child1.LayoutY);
+            Assert.AreEqual(40f, root_child0_child1.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child1_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child1_child0.LayoutY);
+            Assert.AreEqual(40f, root_child0_child1_child0.LayoutWidth);
+            Assert.AreEqual(40f, root_child0_child1_child0.LayoutHeight);
+        }
+
     }
 }

csharp/tests/Facebook.Yoga/YGMinMaxDimensionTest.cs

@@ -366,7 +366,6 @@ namespace Facebook.Yoga
         public void Test_flex_grow_to_min()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.MinFlexFix, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 100;
@@ -422,7 +421,6 @@ namespace Facebook.Yoga
         public void Test_flex_grow_in_at_most_container()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.MinFlexFix, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -678,6 +676,203 @@ namespace Facebook.Yoga
             Assert.AreEqual(20f, root_child0_child0.LayoutHeight);
         }
 
+        [Test]
+        public void Test_flex_root_ignored()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.FlexGrow = 1;
+            root.Width = 100;
+            root.MinHeight = 100;
+            root.MaxHeight = 500;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 200;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.Height = 100;
+            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(300f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(200f, root_child1.LayoutY);
+            Assert.AreEqual(100f, 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(300f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(200f, root_child1.LayoutY);
+            Assert.AreEqual(100f, root_child1.LayoutWidth);
+            Assert.AreEqual(100f, root_child1.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_flex_grow_root_minimized()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 100;
+            root.MinHeight = 100;
+            root.MaxHeight = 500;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.FlexGrow = 1;
+            root_child0.MinHeight = 100;
+            root_child0.MaxHeight = 500;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child0_child0 = new YogaNode(config);
+            root_child0_child0.FlexGrow = 1;
+            root_child0_child0.FlexBasis = 200;
+            root_child0.Insert(0, root_child0_child0);
+
+            YogaNode root_child0_child1 = new YogaNode(config);
+            root_child0_child1.Height = 100;
+            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(100f, root.LayoutWidth);
+            Assert.AreEqual(300f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(300f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child1.LayoutX);
+            Assert.AreEqual(200f, root_child0_child1.LayoutY);
+            Assert.AreEqual(100f, 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(100f, root.LayoutWidth);
+            Assert.AreEqual(300f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(300f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(200f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child1.LayoutX);
+            Assert.AreEqual(200f, root_child0_child1.LayoutY);
+            Assert.AreEqual(100f, root_child0_child1.LayoutWidth);
+            Assert.AreEqual(100f, root_child0_child1.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_flex_grow_height_maximized()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 100;
+            root.Height = 500;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.FlexGrow = 1;
+            root_child0.MinHeight = 100;
+            root_child0.MaxHeight = 500;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child0_child0 = new YogaNode(config);
+            root_child0_child0.FlexGrow = 1;
+            root_child0_child0.FlexBasis = 200;
+            root_child0.Insert(0, root_child0_child0);
+
+            YogaNode root_child0_child1 = new YogaNode(config);
+            root_child0_child1.Height = 100;
+            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(100f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(500f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(400f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child1.LayoutX);
+            Assert.AreEqual(400f, root_child0_child1.LayoutY);
+            Assert.AreEqual(100f, 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(100f, root.LayoutWidth);
+            Assert.AreEqual(500f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0.LayoutWidth);
+            Assert.AreEqual(500f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(100f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(400f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child1.LayoutX);
+            Assert.AreEqual(400f, root_child0_child1.LayoutY);
+            Assert.AreEqual(100f, root_child0_child1.LayoutWidth);
+            Assert.AreEqual(100f, root_child0_child1.LayoutHeight);
+        }
+
         [Test]
         public void Test_flex_grow_within_constrained_min_row()
         {
@@ -907,6 +1102,64 @@ namespace Facebook.Yoga
             Assert.AreEqual(50f, root_child1.LayoutHeight);
         }
 
+        [Test]
+        public void Test_child_min_max_width_flexing()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.Width = 120;
+            root.Height = 50;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.FlexGrow = 1;
+            root_child0.FlexBasis = 0;
+            root_child0.MinWidth = 60;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.FlexGrow = 1;
+            root_child1.FlexBasis = 50.Percent();
+            root_child1.MaxWidth = 20;
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(120f, root.LayoutWidth);
+            Assert.AreEqual(50f, 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(100f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(20f, 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(120f, root.LayoutWidth);
+            Assert.AreEqual(50f, root.LayoutHeight);
+
+            Assert.AreEqual(20f, 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(0f, root_child1.LayoutY);
+            Assert.AreEqual(20f, root_child1.LayoutWidth);
+            Assert.AreEqual(50f, root_child1.LayoutHeight);
+        }
+
         [Test]
         public void Test_min_width_overrides_width()
         {

csharp/tests/Facebook.Yoga/YGPercentageTest.cs

@@ -21,7 +21,6 @@ namespace Facebook.Yoga
         public void Test_percentage_width_height()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -63,7 +62,6 @@ namespace Facebook.Yoga
         public void Test_percentage_position_left_top()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -107,7 +105,6 @@ namespace Facebook.Yoga
         public void Test_percentage_position_bottom_right()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -151,7 +148,6 @@ namespace Facebook.Yoga
         public void Test_percentage_flex_basis()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -208,7 +204,6 @@ namespace Facebook.Yoga
         public void Test_percentage_flex_basis_cross()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 200;
@@ -264,7 +259,6 @@ namespace Facebook.Yoga
         public void Test_percentage_flex_basis_cross_min_height()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 200;
@@ -320,7 +314,6 @@ namespace Facebook.Yoga
         public void Test_percentage_flex_basis_main_max_height()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -379,7 +372,6 @@ namespace Facebook.Yoga
         public void Test_percentage_flex_basis_cross_max_height()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 200;
@@ -437,7 +429,6 @@ namespace Facebook.Yoga
         public void Test_percentage_flex_basis_main_max_width()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -496,7 +487,6 @@ namespace Facebook.Yoga
         public void Test_percentage_flex_basis_cross_max_width()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 200;
@@ -554,7 +544,6 @@ namespace Facebook.Yoga
         public void Test_percentage_flex_basis_main_min_width()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -613,7 +602,6 @@ namespace Facebook.Yoga
         public void Test_percentage_flex_basis_cross_min_width()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 200;
@@ -671,7 +659,6 @@ namespace Facebook.Yoga
         public void Test_percentage_multiple_nested_with_padding_margin_and_percentage_values()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 200;
@@ -781,7 +768,6 @@ namespace Facebook.Yoga
         public void Test_percentage_margin_should_calculate_based_only_on_width()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 200;
@@ -840,7 +826,6 @@ namespace Facebook.Yoga
         public void Test_percentage_padding_should_calculate_based_only_on_width()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 200;
@@ -899,7 +884,6 @@ namespace Facebook.Yoga
         public void Test_percentage_absolute_position()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 200;
@@ -1063,7 +1047,6 @@ namespace Facebook.Yoga
         public void Test_percentage_container_in_wrapping_container()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.MinFlexFix, true);
 
             YogaNode root = new YogaNode(config);
             root.JustifyContent = YogaJustify.Center;

csharp/tests/Facebook.Yoga/YGRoundingTest.cs

@@ -21,7 +21,6 @@ namespace Facebook.Yoga
         public void Test_rounding_flex_basis_flex_grow_row_width_of_100()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -90,7 +89,6 @@ namespace Facebook.Yoga
         public void Test_rounding_flex_basis_flex_grow_row_prime_number_width()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -187,7 +185,6 @@ namespace Facebook.Yoga
         public void Test_rounding_flex_basis_flex_shrink_row()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -257,7 +254,6 @@ namespace Facebook.Yoga
         public void Test_rounding_flex_basis_overrides_main_size()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 100;
@@ -329,7 +325,6 @@ namespace Facebook.Yoga
         public void Test_rounding_total_fractial()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 87.4f;
@@ -401,7 +396,6 @@ namespace Facebook.Yoga
         public void Test_rounding_total_fractial_nested()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 87.4f;
@@ -507,7 +501,6 @@ namespace Facebook.Yoga
         public void Test_rounding_fractial_input_1()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 100;
@@ -579,7 +572,6 @@ namespace Facebook.Yoga
         public void Test_rounding_fractial_input_2()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Width = 100;
@@ -651,7 +643,6 @@ namespace Facebook.Yoga
         public void Test_rounding_fractial_input_3()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Top = 0.3f;
@@ -724,7 +715,6 @@ namespace Facebook.Yoga
         public void Test_rounding_fractial_input_4()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Top = 0.7f;
@@ -797,7 +787,6 @@ namespace Facebook.Yoga
         public void Test_rounding_inner_node_controversy_horizontal()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;
@@ -883,7 +872,6 @@ namespace Facebook.Yoga
         public void Test_rounding_inner_node_controversy_vertical()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.Height = 320;
@@ -968,7 +956,6 @@ namespace Facebook.Yoga
         public void Test_rounding_inner_node_controversy_combined()
         {
             YogaConfig config = new YogaConfig();
-            config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.Rounding, true);
 
             YogaNode root = new YogaNode(config);
             root.FlexDirection = YogaFlexDirection.Row;

csharp/tests/Facebook.Yoga/YogaConfigTest.cs

@@ -69,6 +69,7 @@ namespace Facebook.Yoga
             Assert.AreEqual(YogaFlexDirection.Row, node1.FlexDirection);
         }
 
+#if !UNITY_5_4_OR_NEWER
         public static void ForceGC()
         {
             YogaNodeTest.ForceGC();
@@ -132,5 +133,6 @@ namespace Facebook.Yoga
 
             return node;
         }
+#endif
     }
 }

csharp/tests/Facebook.Yoga/YogaNodeTest.cs

@@ -164,6 +164,14 @@ namespace Facebook.Yoga
                 return MeasureOutput.Make(123.4f, 81.7f);
             });
             node.CalculateLayout();
+            Assert.AreEqual(124.0f, node.LayoutWidth);
+            Assert.AreEqual(82.0f, node.LayoutHeight);
+
+            node = new YogaNode(new YogaConfig{PointScaleFactor = 0});
+            node.SetMeasureFunction((_, width, widthMode, height, heightMode) => {
+                return MeasureOutput.Make(123.4f, 81.7f);
+            });
+            node.CalculateLayout();
             Assert.AreEqual(123.4f, node.LayoutWidth);
             Assert.AreEqual(81.7f, node.LayoutHeight);
         }
@@ -240,6 +248,26 @@ namespace Facebook.Yoga
             Assert.AreEqual(0, child2.LayoutY);
         }
 
+        [Test]
+        public void TestPrintOneNode()
+        {
+            YogaNode node = new YogaNode();
+            node.Width = 100;
+            node.Height = 120;
+            node.CalculateLayout();
+            Assert.AreEqual("<div layout=\"width: 100; height: 120; top: 0; left: 0;\" style=\"width: 100px; height: 120px; \" ></div>", node.Print());
+        }
+
+        [Test]
+        public void TestPrintWithLogger()
+        {
+            YogaNode node = new YogaNode(new YogaConfig{Logger = (c, n, l, m) => {}});
+            node.Width = 110;
+            node.Height = 105;
+            node.CalculateLayout();
+            Assert.AreEqual("<div layout=\"width: 110; height: 105; top: 0; left: 0;\" style=\"width: 110px; height: 105px; \" ></div>", node.Print());
+        }
+
         [Test]
         public void TestPrint()
         {
@@ -301,9 +329,10 @@ namespace Facebook.Yoga
             Assert.AreEqual(90.Pt(), node4.MaxHeight);
         }
 
+#if !UNITY_5_4_OR_NEWER
         public static void ForceGC()
         {
-            GC.Collect(GC.MaxGeneration);
+            GC.Collect();
             GC.WaitForPendingFinalizers();
         }
 
@@ -430,6 +459,7 @@ namespace Facebook.Yoga
                 return MeasureOutput.Make(120, 130);
             });
         }
+#endif
 
         [Test]
         public void TestLayoutMargin() {

csharp/tests/Facebook.Yoga/test_macos.sh

@@ -24,5 +24,5 @@ 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
+mcs -debug -d:YOGA_ENABLE_GC_TEST -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

docs/Gemfile.lock

@@ -140,6 +140,3 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages (~> 104)
-
-BUNDLED WITH
-   1.14.6

docs/_docs/api/android.md

@@ -8,7 +8,7 @@ permalink: /docs/api/android/
 To include the java bindings and `.so` libraries, add to your build:
 
 ```java
-compile 'com.facebook.yoga:yoga:1.2.0'
+compile 'com.facebook.yoga:yoga:1.5.0'
 ```
 
 There is an easy interface to Yoga called `YogaLayout`.  This is a view group that lays out its children using Yoga.  We recommend looking at the sample app for details on its usage.  However, as an overview you can simply define XML layouts such as:
@@ -20,30 +20,30 @@ There is an easy interface to Yoga called `YogaLayout`.  This is a view group th
     xmlns:yoga="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    yoga:align_items="stretch"
+    yoga:yg_alignItems="stretch"
     >
   <YogaLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/sample_children_background"
-      yoga:margin_horizontal="10dp"
-      yoga:margin_top="5dp"
-      yoga:flex_direction="row"
-      yoga:align_items="center"
+      yoga:yg_marginHorizontal="10dp"
+      yoga:yg_marginTop="5dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center"
       >
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:src="@drawable/ic_launcher"
-        yoga:flex="0"
+        yoga:yg_flex="0"
         />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/child_1_text"
         android:textColor="@color/children_text"
-        yoga:flex="1"
-        yoga:margin_start="8dp"
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="8dp"
         />
   </YogaLayout>
 </YogaLayout>
@@ -54,12 +54,31 @@ Note that there are some caveats, such as requiring the custom `YogaLayoutViewFa
 To include this in your project, add to your build:
 
 ```java
-compile 'com.facebook.yoga.android:yoga-layout:1.2.0'
+compile 'com.facebook.yoga.android:yoga-layout:1.5.0'
+```
+
+## Snapshot releases
+
+> IMPORTANT: This will break and may set your house on fire. Snapshots are unsigned and automatically published by our CI system. Use them for testing purposes only.
+
+If you want to live on the bleeding edge, you can use the SNAPSHOT releases
+which represent the most recent commit on `master` by adding these targets to
+your gradle config:
+
+```gradle
+repositories {
+  maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+}
+
+dependencies {
+  compile 'com.facebook.yoga:yoga:1.5.1-SNAPSHOT'
+  compile 'com.facebook.yoga.android:yoga-layout:1.5.1-SNAPSHOT'
+}
 ```
 
 ## layout\_width and layout\_height
 
-If either are set to an actual size (in px or dp etc) then this is taken as a default for `yoga:height` or `yoga:width`.  Otherwise they are ignored.
+If either are set to an actual size (in px or dp etc) then this is taken as a default for `yoga:yg_height` or `yoga:ygWidth`.  Otherwise they are ignored.
 
 ## VirtualYogaLayout
 
@@ -67,11 +86,11 @@ Sometimes you will nest `YogaLayout`s within `YogaLayout`s in order to get your
 
 ## RTL locales
 
-RTL locales are supported by default.  That is, unless you explicitly set the `yoga:direction="ltr|rtl|inherit"` attribute on a view, it will obtain the locale direction _at runtime_.  This means that the layout will rearrange properly, even if the locale changes while your app is running!
+RTL locales are supported by default.  That is, unless you explicitly set the `yoga:yg_direction="ltr|rtl|inherit"` attribute on a view, it will obtain the locale direction At runtime_.  This means that the layout will rearrange properly, even if the locale changes while your app is running!
 
 ## Attributes
 
-The list of all attributes can be found in [attrs.xml](https://github.com/facebook/yoga/blob/master/android/sample/res/com/facebook/samples/yoga/res/values/attrs.xml), but logically map from the Yoga properties.
+The list of all attributes can be found in [attrs.xml](https://github.com/facebook/yoga/blob/master/android/src/main/res/values/attrs.xml), but logically map from the Yoga properties.
 
 ## Auto margins
 

docs/_docs/api/c.md

@@ -28,7 +28,7 @@ The following functions help manage the children of a node.
 void YGNodeInsertChild(YGNodeRef node, YGNodeRef child, uint32_t index);
 void YGNodeRemoveChild(YGNodeRef node, YGNodeRef child);
 YGNodeRef YGNodeGetChild(YGNodeRef node, uint32_t index);
-uint32_t YGNodeChildCount(YGNodeRef node);
+uint32_t YGNodeGetChildCount(YGNodeRef node);
 ```
 
 ### Style getters & setters

docs/_docs/api/csharp.md

@@ -8,36 +8,11 @@ permalink: /docs/api/csharp/
 
 ### Lifecycle
 
-Create a `YogaNode` via its default constructor or the static `Create()` builder method and use `Reset` if you want to pool and re-use nodes. The native memory of a `YogaNode` will automatically be freed when the node is garbage collected.
+Create a `YogaNode` via its default constructor and use `Reset` if you want to pool and re-use nodes. The native memory of a `YogaNode` will automatically be freed when the node is garbage collected.
 
 ```csharp
 YogaNode();
 void Reset();
-
-static YogaNode Create(
-  YogaDirection? styleDirection = null,
-  YogaFlexDirection? flexDirection = null,
-  YogaJustify? justifyContent = null,
-  YogaAlign? alignContent = null,
-  YogaAlign? alignItems = null,
-  YogaAlign? alignSelf = null,
-  YogaPositionType? positionType = null,
-  YogaWrap? wrap = null,
-  YogaOverflow? overflow = null,
-  float? flex = null,
-  float? flexGrow = null,
-  float? flexShrink = null,
-  float? flexBasis = null,
-  Spacing position = null,
-  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);
 ```
 
 ### Children
@@ -95,6 +70,9 @@ enum YogaAlign
   Center,
   FlexEnd,
   Stretch,
+  Baseline,
+  SpaceBetween,
+  SpaceAround
 }
 
 YogaAlign AlignItems {get, set};
@@ -113,6 +91,7 @@ enum YogaWrap
 {
   NoWrap,
   Wrap,
+  WrapReverse
 }
 
 YogaWrap Wrap {get, set};
@@ -197,18 +176,13 @@ enum YogaMeasureMode
   AtMost,
 }
 
-public delegate long MeasureFunction(
+public delegate YogaSize MeasureFunction(
   YogaNode node,
   float width,
   YogaMeasureMode widthMode,
   float height,
   YogaMeasureMode heightMode);
 
-class MeasureOutput
-{
-  public static long Make(int width, int height);
-}
-
 void SetMeasureFunction(MeasureFunction measureFunction);
 bool IsMeasureDefined();
 

docs/_docs/api/javascript.md

@@ -9,6 +9,27 @@ The `yoga-layout` module offers two different implementations of Yoga. The first
 
 > Because this module is compiled from a C++ codebase, the function prototypes below will use the C++-syntax. Nevertheless, the corresponding methods all exist on the JS side, with the same arguments (`Node *` being a node object).
 
+### Installing
+Installing through NPM
+```sh
+npm install yoga-layout
+```
+By default this will install the library and try to build for all platforms (node, browser asm, and standalone webpack). You may receive errors if you do not have the required platform development tools already installed. To preset the platform you'd like to build for you can set a .npmrc property first.
+```sh
+npm config set yoga-layout:platform standalone
+```
+This will now only run the standalone webpack build upon install.
+
+### Build Platforms
+
+| name           | description                                     |
+|----------------|-------------------------------------------------|
+| all (default)  | Builds all of these platforms.                  |
+| browser        | Builds asm js browser version.                  |
+| node           | Builds node js version.                         |
+| standalone     | Runs webpack.                                   |
+| none           | Does nothing. You can use the prepackaged libs. |
+
 ### Lifecycle
 
 Create a node via `Yoga.Node.create()`, and destroy it by using its `free()` or `freeRecursive()` method. Note that unlike most objects in your Javascript applications, your nodes will not get automatically garbage collected, which means that it is especially important you keep track of them so you can free them when you no longer need them.
@@ -51,3 +72,63 @@ Certain nodes need to ability to measure themselves, the most common example is
 Yoga has the concept of experiments. An experiment is a feature which is not yet stable. To enable a feature use the following functions. Once a feature has been tested and is ready to be released as a stable API we will remove its feature flag.
 
 <script src="http://gist-it.appspot.com/facebook/yoga/raw/master/javascript/sources/global.hh?slice=3:4"></script>
+
+### Example Usage
+
+```javascript
+import yoga, { Node } from 'yoga-layout';
+
+let rootNode = Node.create();
+rootNode.setWidth(1024);
+rootNode.setHeight(768);
+rootNode.setPadding(yoga.EDGE_ALL, 20);
+rootNode.setDisplay(yoga.DISPLAY_FLEX);
+rootNode.setFlexDirection(yoga.FLEX_DIRECTION_ROW);
+
+let child1 = Node.create();
+child1.setWidth(250);
+child1.setHeight(400);
+child1.setFlex(0);
+
+let child2 = Node.create();
+child2.setWidth(400);
+child2.setHeight(500);
+child2.setFlex(1);
+
+rootNode.insertChild(child1, 0);
+rootNode.insertChild(child2, 1);
+
+rootNode.calculateLayout(1024, 768, yoga.DIRECTION_LTR);
+
+console.log(`root pos: {${rootNode.getComputedLeft()}, ${rootNode.getComputedTop()}, ${rootNode.getComputedWidth()}, ${rootNode.getComputedHeight()}}`);
+for (let i = 0, l = rootNode.getChildCount(); i < l; ++i) {
+    let child = rootNode.getChild(i);
+    console.log(`child ${i} pos: {${child.getComputedLeft()}, ${child.getComputedTop()}, ${child.getComputedWidth()}, ${child.getComputedHeight()}}`);
+    console.log(child.getComputedLayout().toString());
+}
+
+rootNode.removeChild(child1);
+rootNode.removeChild(child2);
+
+console.log(`There are ${yoga.getInstanceCount()} nodes`);
+Node.destroy(child2);
+console.log(`There are ${yoga.getInstanceCount()} nodes left`);
+child1.free();
+console.log(`There are ${yoga.getInstanceCount()} nodes left`);
+rootNode.freeRecursive();
+console.log(`There are ${yoga.getInstanceCount()} nodes left`);
+
+---------------------------------
+Output:
+
+root pos: {0, 0, 1024, 768}
+child 0 pos: {20, 20, 250, 400}
+<Layout#20:0;20:0;250:400>
+child 1 pos: {270, 20, 734, 500}
+<Layout#270:0;20:0;734:500>
+There are 3 nodes
+There are 2 nodes left
+There are 1 nodes left
+There are 0 nodes left
+
+```

docs/_docs/api/yogakit.md

@@ -9,7 +9,7 @@ permalink: /docs/api/yogakit/
 
 YogaKit is a Objective-C (and Swift-compatible) wrapper for Yoga. It allows iOS Developers to manage the layout of their views using the power of Yoga.
 
-Layout configuration is done via the [YGLayout](https://github.com/facebook/yoga/blob/master/YogaKit/YGLayout.h) object. YogaKit exposes `YGLayout` via a [category](https://developer.apple.com/library/content/documentation/General/Conceptual/DevPedia-CocoaCore/Category.html) on [UIView](https://developer.apple.com/reference/uikit/uiview).
+Layout configuration is done via the [YGLayout](https://github.com/facebook/yoga/blob/master/YogaKit/Source/YGLayout.h) object. YogaKit exposes `YGLayout` via a [category](https://developer.apple.com/library/content/documentation/General/Conceptual/DevPedia-CocoaCore/Category.html) on [UIView](https://developer.apple.com/reference/uikit/uiview).
 
 ### Lifecycle
 

docs/_docs/flexbox/minmaxdimen.md

@@ -7,7 +7,7 @@ permalink: /docs/min-max-dimen/
 
 Using `MinWidth`, `MinHeight`, `MaxWidth`, and `MaxHeight` gives you increased control over the final size of items in a layout. By mixing these properties with `FlexGrow`, `FlexShrink`, and `AlignItems = Stretch`, you are able to have items with dynamic size within a range which you control.
 
-An example of when `Max` properties can be useful is if you are using `AlignItems = Stretch` but your know that your item won't look good after it increases past a certain point. In this case, your item will stretch to the size of its parent or until it is as big as specified in the `Max` property.
+An example of when `Max` properties can be useful is if you are using `AlignItems = Stretch` but you know that your item won't look good after it increases past a certain point. In this case, your item will stretch to the size of its parent or until it is as big as specified in the `Max` property.
 
 Same goes for the `Min` properties when using `FlexShrink`. For example, you may want children of a container to shrink to fit on one row, but if you specify a minimum width, they will break to the next line after a certain point (if you are using `FlexWrap = Wrap`).
 

docs/index.md

@@ -124,18 +124,20 @@ root.addChildAt(image, 1);
     <div class="blockContent">
 <div markdown="1" style="width: 700px; max-width: 100%;">
 ```csharp
-YogaNode root = YogaNode.Create(
-  width: 500,
-  height: 300,
-);
+YogaNode root = new YogaNode {
+  Width = 500,
+  Height = 300
+};
 
-YogaNode image = YogaNode.Create(flexGrow: 1);
+YogaNode image = new YogaNode { 
+  FlexGrow = 1 
+};
 
-YogaNode text = YogaNode.Create(
-  width: 300,
-  height: 25,
-  margin: new Spacing(left: 20, top: 20, right: 20, bottom: 20),
-);
+YogaNode text = new YogaNode {
+  Width = 300,
+  Height = 25,
+  Margin = 20
+};
 
 root.Insert(image, 0);
 root.Insert(text, 1);
@@ -163,25 +165,25 @@ root.Insert(text, 1);
 <YogaLayout
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    yoga:justify_content="stretch">
+    yoga:yg_justifyContent="stretch">
   <ImageView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      yoga:flex="1"/>
+      yoga:yg_flex="1"/>
   <VirtualYogaLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      yoga:padding_all="20px"
-      yoga:flex_direction="row"
-      yoga:align_items="center">
+      yoga:yg_paddingAll="20px"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center">
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"/>
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        yoga:flex="1"
-        yoga:margin_start="20px"/>
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="20px"/>
   </VirtualYogaLayout>
 </YogaLayout>
 ```

enums.py

@@ -84,18 +84,21 @@ ENUMS = {
         'Vertical',
         'All',
     ],
+    'NodeType': [
+        'Default',
+        'Text',
+    ],
     'LogLevel': [
         'Error',
         'Warn',
         'Info',
         'Debug',
         'Verbose',
+        'Fatal',
     ],
     'ExperimentalFeature': [
-        'Rounding',
         # Mimic web flex-basis behavior.
         'WebFlexBasis',
-        'MinFlexFix'
     ],
     'PrintOptions': [
         ('Layout', 1),
@@ -145,7 +148,7 @@ with open(root + '/yoga/YGEnums.h', 'w') as f:
     f.write('#include "YGMacros.h"\n\n')
     f.write('YG_EXTERN_C_BEGIN\n\n')
     for name, values in sorted(ENUMS.items()):
-        f.write('#define YG%sCount %s\n' % (name, len(values)))        
+        f.write('#define YG%sCount %s\n' % (name, len(values)))
         f.write('typedef YG_ENUM_BEGIN(YG%s) {\n' % name)
         for value in values:
             if isinstance(value, tuple):

gentest/fixtures/YGAbsolutePositionTest.html

@@ -23,6 +23,8 @@
 <div id="absolute_layout_within_border" style="height:100px; width:100px; border-width: 10px; margin: 10px; padding: 10px;">
   <div style="position: absolute; width: 50px; height: 50px; left: 0px; top: 0px;"></div>
   <div style="position: absolute; width: 50px; height: 50px; right: 0px; bottom: 0px;"></div>
+  <div style="position: absolute; width: 50px; height: 50px; left: 0px; top: 0px; margin: 10px;"></div>
+  <div style="position: absolute; width: 50px; height: 50px; right: 0px; bottom: 0px; margin: 10px;"></div>
 </div>
 
 <div id="absolute_layout_align_items_and_justify_content_center" style="height: 100px; width: 110px; flex-grow: 1; align-items: center; justify-content: center;">
@@ -63,3 +65,26 @@
 
 <div id="position_root_with_rtl_should_position_withoutdirection" style="height: 52px; width: 52px; left: 72px; ">
 </div>
+
+<div id="absolute_layout_percentage_bottom_based_on_parent_height" style="width: 100px; height: 200px;">
+    <div style="position: absolute; top: 50%; width: 10px; height: 10px;"></div>
+    <div style="position: absolute; bottom: 50%; width: 10px; height: 10px;"></div>
+    <div style="position: absolute; top: 10%; width: 10px; bottom: 10%;"></div>
+</div>
+
+<div id="absolute_layout_in_wrap_reverse_column_container" style="flex-direction:column; width:100px; height:100px; flex-wrap: wrap-reverse;">
+  <div style="width:20px; height:20px; position: absolute;"></div>
+</div>
+
+<div id="absolute_layout_in_wrap_reverse_row_container" style="flex-direction:row; width:100px; height:100px; flex-wrap: wrap-reverse;">
+  <div style="width:20px; height:20px; position: absolute;"></div>
+</div>
+
+<div id="absolute_layout_in_wrap_reverse_column_container_flex_end" style="flex-direction:column; width:100px; height:100px; flex-wrap: wrap-reverse;">
+  <div style="width:20px; height:20px; position: absolute; align-self: flex-end;"></div>
+</div>
+
+<div id="absolute_layout_in_wrap_reverse_row_container_flex_end" style="flex-direction:row; width:100px; height:100px; flex-wrap: wrap-reverse;">
+  <div style="width:20px; height:20px; position: absolute; align-self: flex-end;"></div>
+</div>
+

gentest/fixtures/YGAlignItemsTest.html

@@ -167,3 +167,20 @@
     <div style="width: 72px; height: 72px;"></div>
   </div>
 </div>
+
+<div id="align_center_should_size_based_on_content" style="width: 100px; height: 100px; align-items: center; margin-top: 20px;">
+  <div style="flex-grow: 0; flex-shrink: 1; justify-content: center;">
+    <div style="flex-grow: 1; flex-shrink: 1;">
+      <div style="width: 20px; height: 20px;"></div>
+    </div>
+  </div>
+</div>
+
+<div id="align_strech_should_size_based_on_parent" style="width: 100px; height: 100px; align-items: strech; margin-top: 20px;">
+  <div style="flex-grow: 0; flex-shrink: 1; justify-content: center;">
+    <div style="flex-grow: 1; flex-shrink: 1;">
+      <div style="width: 20px; height: 20px;"></div>
+    </div>
+  </div>
+</div>
+

gentest/fixtures/YGFlexTest.html

@@ -35,3 +35,9 @@
     <div style="flex-grow:1; flex-shrink:1;"></div>
   </div>
 </div>
+
+<div id="flex_grow_less_than_factor_one" style="height: 500px; width: 200px; flex-direction:column;">
+  <div style="flex-grow:0.2; flex-shrink:0; flex-basis: 40px;"></div>
+  <div style="flex-grow:0.2; flex-shrink:0;"></div>
+  <div style="flex-grow:0.4; flex-shrink:0;"></div>
+</div>

gentest/fixtures/YGFlexWrapTest.html

@@ -113,3 +113,37 @@
     <div style="width: 80px; height: 80px;"></div>
   </div>
 </div>
+
+<div id="wrapped_column_max_height" style="height: 500px; width: 700px; flex-direction: column;align-items: center; justify-content: center; align-content: center; flex-wrap:wrap;">
+ <div style="width: 100px; height: 500px; max-height: 200px;"></div>
+ <div style="width: 200px; height: 200px; margin: 20px;"></div>
+ <div style="width: 100px; height: 100px;"></div>
+</div>
+
+<div id="wrapped_column_max_height_flex" style="height: 500px; width: 700px; flex-direction: column;align-items: center; justify-content: center; align-content: center; flex-wrap:wrap;">
+ <div style="width: 100px; height: 500px; max-height: 200px; flex: 1;"></div>
+ <div style="width: 200px; height: 200px; margin: 20px; flex: 1"></div>
+ <div style="width: 100px; height: 100px;"></div>
+</div>
+
+<div id="wrap_nodes_with_content_sizing_overflowing_margin" style="width: 500px; height: 500px;">
+  <div style="flex-direction: row; flex-wrap: wrap; width: 85px;">
+    <div>
+      <div style="height: 40px; width: 40px;"></div>
+    </div>
+    <div style="margin-right: 10px;">
+      <div style="height: 40px; width: 40px;"></div>
+    </div>
+  </div>
+</div>
+
+<div id="wrap_nodes_with_content_sizing_margin_cross" style="width: 500px; height: 500px;">
+  <div style="flex-direction: row; flex-wrap: wrap; width: 70px;">
+    <div>
+      <div style="height: 40px; width: 40px;"></div>
+    </div>
+    <div style="margin-top: 10px;">
+      <div style="height: 40px; width: 40px;"></div>
+    </div>
+  </div>
+</div>

gentest/fixtures/YGMinMaxDimensionTest.html

@@ -30,12 +30,12 @@
   <div style="width: 50px; height: 50px;"></div>
 </div>
 
-<div id="flex_grow_to_min" experiments="MinFlexFix" style="min-height: 100px; max-height: 500px; width: 100px;">
+<div id="flex_grow_to_min" style="min-height: 100px; max-height: 500px; width: 100px;">
   <div style="flex-grow: 1; flex-shrink: 1;"></div>
   <div style="height: 50px;"></div>
 </div>
 
-<div id="flex_grow_in_at_most_container" experiments="MinFlexFix" style="width: 100px; height: 100px; background-color: white; flex-direction: row; align-items: flex-start;">
+<div id="flex_grow_in_at_most_container" style="width: 100px; height: 100px; background-color: white; flex-direction: row; align-items: flex-start;">
   <div style="flex-direction: row;">
     <div style="flex-grow: 1; flex-basis: 0px;"></div>
   </div>
@@ -62,6 +62,25 @@
   </div>
 </div>
 
+<div id="flex_root_ignored" style="width: 100px; min-height: 100px; max-height:500px;flex-grow:1">
+  <div style="flex-basis:200px; flex-grow:1;"></div>
+  <div style="height:100px; "></div>
+</div>
+
+<div id="flex_grow_root_minimized" style="width: 100px; min-height: 100px; max-height:500px">
+  <div style="min-height: 100px; max-height:500px;flex-grow:1">
+    <div style="flex-basis:200px; flex-grow:1;"></div>
+    <div style="height:100px; "></div>
+  </div>
+</div>
+
+<div id="flex_grow_height_maximized" style="width: 100px; height:500px">
+  <div style="min-height: 100px; max-height:500px;flex-grow:1">
+    <div style="flex-basis:200px; flex-grow:1;"></div>
+    <div style="height:100px; "></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>
@@ -84,6 +103,11 @@
   <div style="height: 50px;"></div>
 </div>
 
+<div id="child_min_max_width_flexing" style="width: 120px; height: 50px; flex-direction: row; align-items:stretch">
+  <div style="min-width: 60px; flex-grow:1; flex-shrink:0; flex-basis: 0px"></div>
+  <div style="max-width: 20px; flex-grow:1; flex-shrink:0; flex-basis: 50%"></div>
+</div>
+
 <div id="min_width_overrides_width" style="min-width: 100px; width: 50px;">
 </div>
 

gentest/fixtures/YGPercentageTest.html

@@ -1,61 +1,61 @@
-<div id="percentage_width_height" experiments="Rounding" style="width: 200px; height: 200px; flex-direction: row;">
+<div id="percentage_width_height" style="width: 200px; height: 200px; flex-direction: row;">
   <div style="width: 30%; height: 30%;"></div>
 </div>
 
-<div id="percentage_position_left_top" experiments="Rounding" style="width: 400px; height: 400px; flex-direction: row;">
+<div id="percentage_position_left_top" style="width: 400px; height: 400px; flex-direction: row;">
   <div style="width: 45%; height: 55%; left: 10%; top: 20%"></div>
 </div>
 
-<div id="percentage_position_bottom_right" experiments="Rounding" style="width: 500px; height: 500px; flex-direction: row;">
+<div id="percentage_position_bottom_right" style="width: 500px; height: 500px; flex-direction: row;">
   <div style="width: 55%; height: 15%; bottom: 10%; right: 20%"></div>
 </div>
 
-<div id="percentage_flex_basis" experiments="Rounding" style="width: 200px; height: 200px; flex-direction: row;">
+<div id="percentage_flex_basis" style="width: 200px; height: 200px; flex-direction: row;">
   <div style="flex-grow: 1; flex-basis: 50%;"></div>
   <div style="flex-grow: 1; flex-basis: 25%;"></div>
 </div>
 
-<div id="percentage_flex_basis_cross" experiments="Rounding" style="width: 200px; height: 200px; flex-direction: column;">
+<div id="percentage_flex_basis_cross" style="width: 200px; height: 200px; flex-direction: column;">
   <div style="flex-grow: 1; flex-basis: 50%;"></div>
   <div style="flex-grow: 1; flex-basis: 25%;"></div>
 </div>
 
-<div id="percentage_flex_basis_cross_min_height" experiments="Rounding" style="width: 200px; height: 200px; flex-direction: column;">
+<div id="percentage_flex_basis_cross_min_height" style="width: 200px; height: 200px; flex-direction: column;">
   <div style="flex-grow: 1; min-height: 60%;"></div>
   <div style="flex-grow: 2; min-height: 10%;"></div>
 </div>
 
-<div id="percentage_flex_basis_main_max_height" experiments="Rounding" style="width: 200px; height: 200px; flex-direction: row;">
+<div id="percentage_flex_basis_main_max_height" style="width: 200px; height: 200px; flex-direction: row;">
   <div style="flex-grow: 1; flex-basis: 10%; max-height: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 10%; max-height: 20%;"></div>
 </div>
 
-<div id="percentage_flex_basis_cross_max_height" experiments="Rounding" style="width: 200px; height: 200px; flex-direction: column;">
+<div id="percentage_flex_basis_cross_max_height" style="width: 200px; height: 200px; flex-direction: column;">
   <div style="flex-grow: 1; flex-basis: 10%; max-height: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 10%; max-height: 20%;"></div>
 </div>
 
-<div id="percentage_flex_basis_main_max_width" experiments="Rounding" style="width: 200px; height: 200px; flex-direction: row;">
+<div id="percentage_flex_basis_main_max_width" style="width: 200px; height: 200px; flex-direction: row;">
   <div style="flex-grow: 1; flex-basis: 15%; max-width: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 10%; max-width: 20%;"></div>
 </div>
 
-<div id="percentage_flex_basis_cross_max_width" experiments="Rounding" style="width: 200px; height: 200px; flex-direction: column;">
+<div id="percentage_flex_basis_cross_max_width" style="width: 200px; height: 200px; flex-direction: column;">
   <div style="flex-grow: 1; flex-basis: 10%; max-width: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 15%; max-width: 20%;"></div>
 </div>
 
-<div id="percentage_flex_basis_main_min_width" experiments="Rounding" style="width: 200px; height: 200px; flex-direction: row;">
+<div id="percentage_flex_basis_main_min_width" style="width: 200px; height: 200px; flex-direction: row;">
   <div style="flex-grow: 1; flex-basis: 15%; min-width: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 10%; min-width: 20%;"></div>
 </div>
 
-<div id="percentage_flex_basis_cross_min_width" experiments="Rounding" style="width: 200px; height: 200px; flex-direction: column;">
+<div id="percentage_flex_basis_cross_min_width" style="width: 200px; height: 200px; flex-direction: column;">
   <div style="flex-grow: 1; flex-basis: 10%; min-width: 60%;"></div>
   <div style="flex-grow: 4; flex-basis: 15%; min-width: 20%;"></div>
 </div>
 
-<div id="percentage_multiple_nested_with_padding_margin_and_percentage_values" experiments="Rounding" style="width: 200px; height: 200px; flex-direction: column;">
+<div id="percentage_multiple_nested_with_padding_margin_and_percentage_values" style="width: 200px; height: 200px; flex-direction: column;">
   <div style="flex-grow: 1; flex-basis: 10%; min-width: 60%; margin: 5px; padding: 3px;">
     <div style="width: 50%; margin: 5px; padding: 3%;">
       <div style="width: 45%; margin: 5%; padding: 3px;"></div>
@@ -64,19 +64,19 @@
   <div style="flex-grow: 4; flex-basis: 15%; min-width: 20%;"></div>
 </div>
 
-<div id="percentage_margin_should_calculate_based_only_on_width" experiments="Rounding" style="width: 200px; height: 100px;">
+<div id="percentage_margin_should_calculate_based_only_on_width" style="width: 200px; height: 100px;">
   <div style="flex-grow: 1; margin: 10%;">
     <div style="width: 10px; height: 10px;"></div>
   </div>
 </div>
 
-<div id="percentage_padding_should_calculate_based_only_on_width" experiments="Rounding" style="width: 200px; height: 100px;">
+<div id="percentage_padding_should_calculate_based_only_on_width" style="width: 200px; height: 100px;">
   <div style="flex-grow: 1; padding: 10%;">
     <div style="width: 10px; height: 10px;"></div>
   </div>
 </div>
 
-<div id="percentage_absolute_position" experiments="Rounding" style="width: 200px; height: 100px;">
+<div id="percentage_absolute_position" style="width: 200px; height: 100px;">
   <div style="position: absolute; top: 10%; left: 30%; width: 10px; height: 10px;"></div>
 </div>
 
@@ -92,7 +92,7 @@
   <div style="width: 100px;"></div>
 </div>
 
-<div id="percentage_container_in_wrapping_container" experiments="MinFlexFix" style="align-items: center; width: 200px; height: 200px; justify-content: center;">
+<div id="percentage_container_in_wrapping_container" style="align-items: center; width: 200px; height: 200px; justify-content: center;">
   <div>
     <div style="alignItems: center; flex-direction: row; justify-content: center; width: 100%;">
       <div style="width: 50px; height: 50px;"></div>

gentest/fixtures/YGRoundingTest.html

@@ -1,10 +1,10 @@
-<div id="rounding_flex_basis_flex_grow_row_width_of_100" experiments="Rounding" style="width: 100px; height: 100px; flex-direction: row;">
+<div id="rounding_flex_basis_flex_grow_row_width_of_100" style="width: 100px; height: 100px; flex-direction: row;">
  <div style="flex-grow: 1;"></div>
  <div style="flex-grow: 1;"></div>
  <div style="flex-grow: 1;"></div>
 </div>
 
-<div id="rounding_flex_basis_flex_grow_row_prime_number_width" experiments="Rounding" style="width: 113px; height: 100px; flex-direction: row;">
+<div id="rounding_flex_basis_flex_grow_row_prime_number_width" style="width: 113px; height: 100px; flex-direction: row;">
  <div style="flex-grow: 1;"></div>
  <div style="flex-grow: 1;"></div>
  <div style="flex-grow: 1;"></div>
@@ -12,25 +12,25 @@
  <div style="flex-grow: 1;"></div>
 </div>
 
-<div id="rounding_flex_basis_flex_shrink_row" experiments="Rounding" style="width: 101px; height: 100px; flex-direction: row;">
+<div id="rounding_flex_basis_flex_shrink_row" style="width: 101px; height: 100px; flex-direction: row;">
  <div style="flex-basis: 100px; flex-shrink: 1;"></div>
  <div style="flex-basis: 25px;"></div>
  <div style="flex-basis: 25px;"></div>
 </div>
 
-<div id="rounding_flex_basis_overrides_main_size" experiments="Rounding" style="height: 113px; width: 100px;">
+<div id="rounding_flex_basis_overrides_main_size" style="height: 113px; width: 100px;">
  <div style="height: 20px; flex-grow:1; flex-basis:50px;"></div>
  <div style="height: 10px; flex-grow:1;"></div>
  <div style="height: 10px; flex-grow:1;"></div>
 </div>
 
-<div id="rounding_total_fractial" experiments="Rounding" style="height: 113.4px; width: 87.4px;">
+<div id="rounding_total_fractial" style="height: 113.4px; width: 87.4px;">
  <div style="height: 20.3px; flex-grow:0.7; flex-basis:50.3px;"></div>
  <div style="height: 10px; flex-grow:1.6;"></div>
  <div style="height: 10.7px; flex-grow:1.1;"></div>
 </div>
 
-<div id="rounding_total_fractial_nested" experiments="Rounding" style="height: 113.4px; width: 87.4px;">
+<div id="rounding_total_fractial_nested" style="height: 113.4px; width: 87.4px;">
  <div style="height: 20.3px; flex-grow:0.7; flex-basis:50.3px;">
    <div style="bottom: 13.3px; height: 9.9px; flex-grow:1; flex-basis:0.3px;"></div>
    <div style="top: 13.3px; height: 1.1px; flex-grow:4; flex-basis:0.3px;"></div>
@@ -39,31 +39,31 @@
  <div style="height: 10.7px; flex-grow:1.1;"></div>
 </div>
 
-<div id="rounding_fractial_input_1" experiments="Rounding" style="height: 113.4px; width: 100px;">
+<div id="rounding_fractial_input_1" style="height: 113.4px; width: 100px;">
   <div style="height: 20px; flex-grow:1; flex-basis:50px;"></div>
   <div style="height: 10px; flex-grow:1;"></div>
   <div style="height: 10px; flex-grow:1;"></div>
 </div>
 
-<div id="rounding_fractial_input_2" experiments="Rounding" style="height: 113.6px; width: 100px;">
+<div id="rounding_fractial_input_2" style="height: 113.6px; width: 100px;">
   <div style="height: 20px; flex-grow:1; flex-basis:50px;"></div>
   <div style="height: 10px; flex-grow:1;"></div>
   <div style="height: 10px; flex-grow:1;"></div>
 </div>
 
-<div id="rounding_fractial_input_3" experiments="Rounding" style="top: 0.3px; height: 113.4px; width: 100px;">
+<div id="rounding_fractial_input_3" style="top: 0.3px; height: 113.4px; width: 100px;">
   <div style="height: 20px; flex-grow:1; flex-basis:50px;"></div>
   <div style="height: 10px; flex-grow:1;"></div>
   <div style="height: 10px; flex-grow:1;"></div>
 </div>
 
-<div id="rounding_fractial_input_4" experiments="Rounding" style="top: 0.7px; height: 113.4px; width: 100px;">
+<div id="rounding_fractial_input_4" style="top: 0.7px; height: 113.4px; width: 100px;">
   <div style="height: 20px; flex-grow:1; flex-basis:50px;"></div>
   <div style="height: 10px; flex-grow:1;"></div>
   <div style="height: 10px; flex-grow:1;"></div>
 </div>
 
-<div id="rounding_inner_node_controversy_horizontal" experiments="Rounding" style="width: 320px; flex-direction: row;">
+<div id="rounding_inner_node_controversy_horizontal" style="width: 320px; flex-direction: row;">
   <div style="height: 10px; flex-grow:1;"></div>
   <div style="height: 10px; flex-grow:1;">
     <div style="height: 10px; flex-grow:1;">
@@ -72,7 +72,7 @@
   <div style="height: 10px; flex-grow:1;"></div>
 </div>
 
-<div id="rounding_inner_node_controversy_vertical" experiments="Rounding" style="height: 320px;">
+<div id="rounding_inner_node_controversy_vertical" style="height: 320px;">
   <div style="width: 10px; flex-grow:1;"></div>
   <div style="width: 10px; flex-grow:1;">
     <div style="width: 10px; flex-grow:1;">
@@ -81,7 +81,7 @@
   <div style="width: 10px; flex-grow:1;"></div>
 </div>
 
-<div id="rounding_inner_node_controversy_combined" experiments="Rounding" style="width: 640px; height: 320px; flex-direction: row;">
+<div id="rounding_inner_node_controversy_combined" style="width: 640px; height: 320px; flex-direction: row;">
   <div style="height: 100%; flex-grow:1;"></div>
   <div style="height: 100%; flex-grow:1; flex-direction: column;">
     <div style="width: 100%; flex-grow:1;"></div>

gentest/gentest.js

@@ -431,11 +431,6 @@ function getRoundedSize(node) {
 function calculateTree(root, roundToPixelGrid) {
   var rootLayout = [];
 
-  // Any occurrence of "Rounding" mark during node tree traverse turns this feature on for whole subtree.
-  if ((root.getAttribute('experiments') || '').split(' ').indexOf('Rounding') != -1) {
-    roundToPixelGrid = true;
-  }
-
   for (var i = 0; i < root.children.length; i++) {
     var child = root.children[i];
     var layout = {
@@ -453,11 +448,9 @@ function calculateTree(root, roundToPixelGrid) {
           : [],
     };
 
-    if (roundToPixelGrid) {
-      var size = getRoundedSize(child);
-      layout.width = size.width;
-      layout.height = size.height;
-    }
+    var size = getRoundedSize(child);
+    layout.width = size.width;
+    layout.height = size.height;
 
     rootLayout.push(layout);
   }

gradle.properties

@@ -1,4 +1,14 @@
-bintrayUsername=
-bintrayApiKey=
-bintrayGpgPassword=
-dryRun=false
+# Project-wide Gradle settings.
+
+org.gradle.jvmargs=-Xmx1536M
+
+VERSION_NAME=1.7.0
+POM_URL=https://github.com/facebook/yoga
+POM_SCM_URL=https://github.com/facebook/yoga.git
+POM_SCM_CONNECTION=scm:git:https://github.com/facebook/yoga.git
+POM_SCM_DEV_CONNECTION=scm:git:git@github.com:facebook/yoga.git
+POM_LICENSE_NAME=BSD License
+POM_LICENSE_URL=https://github.com/facebook/yoga/blob/master/LICENSE
+POM_LICENSE_DIST=repo
+POM_DEVELOPER_ID=facebook
+POM_DEVELOPER_NAME=facebook

gradle/android-jcenter-install.gradle

@@ -1,92 +0,0 @@
-ext {
-    bintrayUserOrg = 'facebook'
-    bintrayRepo = 'maven'
-    siteURL = "https://facebook.github.io/yoga/"
-    projectLicenses = {
-        license {
-            name 'BSD License'
-            url 'https://github.com/facebook/yoga/blob/master/LICENSE'
-            distribution 'repo'
-        }
-    }
-}
-
-def getBintrayUsername() {
-    return property('bintrayUsername') || System.getenv('BINTRAY_USERNAME')
-}
-
-def getBintrayApiKey() {
-    return property('bintrayApiKey') || System.getenv('BINTRAY_API_KEY')
-}
-
-def getBintrayGpgPassword() {
-    return property('bintrayGpgPassword') || System.getenv('BINTRAY_GPG_PASSWORD')
-}
-
-def dryRunOnly() {
-    return hasProperty('dryRun') ? property('dryRun').toBoolean() : false
-}
-
-def pomConfig = {
-    licenses  {
-        // TODO Can we grab this from above?
-        license {
-            name 'BSD License'
-            url 'https://github.com/facebook/yoga/blob/master/LICENSE'
-            distribution 'repo'
-        }
-    }
-}
-
-publishing {
-    publications {
-        primaryPublication(MavenPublication) {
-            groupId group
-            artifact(sourcesJar)
-            artifact(javadocJar)
-            pom.packaging='aar'
-            pom.withXml {
-                def root = asNode()
-                root.appendNode('name', 'Yoga')
-                root.appendNode('url', siteURL)
-                root.children().last() + pomConfig
-                def dependenciesNode = root.appendNode('dependencies')
-                //Iterate over the compile dependencies (we don't want the test ones), adding a <dependency> node for each
-                configurations.compile.allDependencies.each {
-                    if(it.group != null && (it.name != null || "unspecified".equals(it.name)) && it.version != null) {
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', it.group)
-                        dependencyNode.appendNode('artifactId', it.name)
-                        dependencyNode.appendNode('version', it.version)
-                    }
-                }
-            }
-        }
-    }
-}
-
-
-bintray {
-    user = getBintrayUsername()
-    key = getBintrayApiKey()
-    publications = ['primaryPublication']
-    configurations = ['archives']
-    pkg {
-        repo = bintrayRepo
-        userOrg = bintrayUserOrg
-        name = project.bintrayName
-        dryRun = dryRunOnly()
-        licenses = projectLicenses
-        override = true
-        publish = true
-        publicDownloadNumbers = true
-        version {
-            name = project.version
-            released = new Date()
-            gpg {
-                sign = true
-                passphrase = getBintrayGpgPassword()
-            }
-        }
-    }
-}

gradle/android-maven-install.gradle

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

gradle/android-tasks.gradle

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

gradle/bintray.gradle

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

gradle/gradle-mvn-push.gradle

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

gradle/release-bintray.gradle

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

gradle/release.gradle

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

gradle/wrapper/gradle-wrapper.properties

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

java/BUCK

@@ -10,6 +10,7 @@ include_defs("//YOGA_DEFS")
 cxx_library(
     name = "jni",
     srcs = glob(["jni/*.cpp"]),
+    header_namespace = "",
     compiler_flags = [
         "-fno-omit-frame-pointer",
         "-fexceptions",
@@ -19,7 +20,6 @@ cxx_library(
         "-O3",
         "-std=c++11",
     ],
-    header_namespace = "",
     soname = "libyoga.$(ext)",
     visibility = ["PUBLIC"],
     deps = [
@@ -32,6 +32,7 @@ cxx_library(
 java_library(
     name = "java",
     srcs = glob(["com/facebook/yoga/*.java"]),
+    required_for_source_only_abi = True,
     source = "1.7",
     target = "1.7",
     tests = [
@@ -58,3 +59,11 @@ java_test(
         JUNIT_TARGET,
     ],
 )
+
+java_binary(
+    name = "yoga",
+    deps = [
+        ":java",
+        FBJNI_JAVA_TARGET,
+    ],
+)

java/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'maven-publish'
 
-version = '1.4.2'
-group = 'com.facebook.yoga'
+group = GROUP
+version = VERSION_NAME
 
 android {
     compileSdkVersion rootProject.compileSdkVersion
@@ -41,15 +41,19 @@ android {
             java.srcDir 'com'
             manifest.srcFile 'AndroidManifest.xml'
             res.srcDirs = ['res']
-            jniLibs.srcDirs = ['build/buck-out/jniLibs']
+        }
+
+        test {
+            java.srcDirs 'tests'
         }
     }
 }
 
 dependencies {
-    compile 'com.google.code.findbugs:jsr305:3.0.1'
-    compile 'com.facebook.soloader:soloader:0.2.0'
-    provided project(':yoga:proguard-annotations')
+    compileOnly 'com.google.code.findbugs:jsr305:3.0.1'
+    compileOnly project(':yoga:proguard-annotations')
+    implementation 'com.facebook.soloader:soloader:0.2.0'
+    testImplementation 'junit:junit:4.12'
 }
 
 task sourcesJar(type: Jar) {
@@ -73,4 +77,4 @@ ext {
     bintrayName = 'com.facebook.yoga:yoga'
 }
 
-apply from: rootProject.file('gradle/android-jcenter-install.gradle')
+apply from: rootProject.file('gradle/release.gradle')

java/com/facebook/yoga/YogaAlign.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014-present, Facebook, Inc.
  * All rights reserved.
  *

java/com/facebook/yoga/YogaBaselineFunction.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014-present, Facebook, Inc.
  * All rights reserved.
  *

java/com/facebook/yoga/YogaConfig.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014-present, Facebook, Inc.
  * All rights reserved.
  *
@@ -20,6 +20,7 @@ public class YogaConfig {
   }
 
   long mNativePointer;
+  private YogaLogger mLogger;
 
   private native long jni_YGConfigNew();
   public YogaConfig() {
@@ -51,4 +52,30 @@ public class YogaConfig {
   public void setUseWebDefaults(boolean useWebDefaults) {
     jni_YGConfigSetUseWebDefaults(mNativePointer, useWebDefaults);
   }
+
+  private native void jni_YGConfigSetPointScaleFactor(long nativePointer, float pixelsInPoint);
+  public void setPointScaleFactor(float pixelsInPoint) {
+    jni_YGConfigSetPointScaleFactor(mNativePointer, pixelsInPoint);
+  }
+
+  private native void jni_YGConfigSetUseLegacyStretchBehaviour(long nativePointer, boolean useLegacyStretchBehaviour);
+
+  /**
+   * Yoga previously had an error where containers would take the maximum space possible instead of the minimum
+   * like they are supposed to. In practice this resulted in implicit behaviour similar to align-self: stretch;
+   * Because this was such a long-standing bug we must allow legacy users to switch back to this behaviour.
+   */
+  public void setUseLegacyStretchBehaviour(boolean useLegacyStretchBehaviour) {
+    jni_YGConfigSetUseLegacyStretchBehaviour(mNativePointer, useLegacyStretchBehaviour);
+  }
+
+  private native void jni_YGConfigSetLogger(long nativePointer, Object logger);
+  public void setLogger(YogaLogger logger) {
+    mLogger = logger;
+    jni_YGConfigSetLogger(mNativePointer, logger);
+  }
+
+  public YogaLogger getLogger() {
+    return mLogger;
+  }
 }

java/com/facebook/yoga/YogaConstants.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014-present, Facebook, Inc.
  * All rights reserved.
  *

java/com/facebook/yoga/YogaDimension.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2014-present, Facebook, Inc.
  * All rights reserved.
  *