1.8.0

Summary: New release.

Reviewed By: marco-cova

Differential Revision: D7550852

fbshipit-source-id: eac5662179daa88d9d62c55566b3a31428c4117a

.travis.yml

@@ -1,136 +1,25 @@
-# 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.
+language: node_js
+node_js:
+  - "8"
 
-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
-  - TARGET=java
-  - TARGET=net
-  - TARGET=ios
-  - TARGET=js
-  - 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 install --HEAD facebook/fb/buck
-
-  # Java
-  - |
-    if [[ $TARGET = "java" ]]; then
-      brew cask install java &&
-      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) &&
-      export PATH=$JAVA_HOME/bin:$PATH
-    fi
-
-  # .NET
-  - |
-    if [[ $TARGET = "net" ]]; then
-      brew install mono
-    fi
-
-  # iOS
-  - |
-    if [[ $TARGET = "ios" ]]; then
-      brew outdated xctool || brew upgrade xctool;
-      gem install xcpretty --no-document --quiet;
-      gem install cocoapods --pre --no-document --quiet;
-      pod repo update --silent;
-      pod install --project-directory=YogaKit/YogaKitSample/;
-    fi
-
-  # Emscripten (used for js tests)
-  # Note: cannot be ran on Linux (because it will compile Clang from its sources :|)
-  - |
-    if [[ $TARGET = "js" ]]; then
-      wget -O /tmp/emsdk-portable.tar.gz https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz &&
-      tar xf /tmp/emsdk-portable.tar.gz -C /tmp/ &&
-      /tmp/emsdk-portable/emsdk install latest 2>&1 | grep -v '^x ' &&
-      /tmp/emsdk-portable/emsdk activate latest
-    fi
-
-  # Android
-  - |
-    if [[ $TARGET = "android" ]]; then
-      brew cask install java;
-      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8);
-      export PATH=$JAVA_HOME/bin:$PATH;
-      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
-  - |
-    if [[ $TARGET = "js" ]]; then (
-      cd javascript &&
-      npm install &&
-      unset CC && unset CXX && unset LINK &&
-      source /tmp/emsdk-portable/emsdk_env.sh &&
-      npm run build:browser
-    ) fi
+install:
+- cd website
+- yarn --ignore-scripts
+- cd ..
 
 script:
-  # C
-  - |
-    if [[ $TARGET = "c" ]]; then
-      buck test --verbose 0 //:yoga &&
-      buck run --verbose 0 //benchmark:benchmark &&
-      git checkout HEAD^ &&
-      buck run --verbose 0 //benchmark:benchmark
-    fi
+- cd website
+- yarn build
+- cd ..
 
-  # Java
-  - |
-    if [[ $TARGET = "java" ]]; then
-      buck test --verbose 0 //java:java
-    fi
-
-  # .NET
-  - |
-    if [[ $TARGET = "net" ]]; then
-      sh csharp/tests/Facebook.Yoga/test_macos.sh
-    fi
-
-  # iOS
-  - |
-    if [[ $TARGET = "ios" ]]; then
-      buck test --verbose 0 //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64 &&
-      set -o pipefail &&
-      xcodebuild build -workspace YogaKit/YogaKitSample/YogaKitSample.xcworkspace -scheme YogaKitSample -sdk iphonesimulator | xcpretty -c
-    fi
-
-  # Android
-  - |
-    if [[ $TARGET = "android" ]]; then
-      buck build --verbose 0 //android/sample:sample &&
-      ./gradlew testDebugUnit &&
-      scripts/publish-snapshot.sh
-    fi
-
-  # JavaScript
-  - |
-    if [[ $TARGET = "js" ]]; then (
-      cd javascript &&
-      npm run test:all &&
-      npm run bench
-    ) fi
+deploy:
+  provider: pages
+  skip-cleanup: true
+  github-token: $GITHUB_TOKEN
+  fqdn: yogalayout.com
+  local-dir: website/public
+  email: yogabot@fb.com
+  name: Yoga-bot
+  keep-history: true
+  on:
+    branch: master

BUCK

@@ -1,11 +1,9 @@
 # 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.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "LIBRARY_COMPILER_FLAGS", "BASE_COMPILER_FLAGS", "GTEST_TARGET", "yoga_dep", "cxx_library", "cxx_test")
 
 GMOCK_OVERRIDE_FLAGS = [
     # gmock does not mark mocked methods as override, ignore the warnings in tests
@@ -13,21 +11,23 @@ GMOCK_OVERRIDE_FLAGS = [
 ]
 
 COMPILER_FLAGS = LIBRARY_COMPILER_FLAGS + [
-    "-std=c11",
+    "-std=c++1y",
 ]
 
-TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + ["-std=c++11"]
+TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + [
+    "-std=c++1y",
+]
 
 cxx_library(
     name = "yoga",
-    srcs = glob(["yoga/*.c"]),
+    srcs = glob(["yoga/*.cpp"]),
     header_namespace = "",
     exported_headers = subdir_glob([("", "yoga/*.h")]),
     compiler_flags = COMPILER_FLAGS,
     soname = "libyogacore.$(ext)",
     tests = [":YogaTests"],
     visibility = ["PUBLIC"],
-    deps = [] if THIS_IS_FBOBJC else [
+    deps = [
         yoga_dep("lib/fb:ndklog"),
     ],
 )

CMakeLists.txt

@@ -1,17 +1,15 @@
 #
 # 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.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 #
 
 cmake_minimum_required(VERSION 3.4.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-file(GLOB yogacore_SRC yoga/*.c)
+file(GLOB yogacore_SRC yoga/*.cpp)
 add_library(yogacore STATIC ${yogacore_SRC})
 
 target_link_libraries(yogacore android log)

CODE_OF_CONDUCT.md

@@ -0,0 +1,3 @@
+# Code of Conduct
+
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.facebook.com/pages/876921332402685/open-source-code-of-conduct) so that you can understand what actions will and will not be tolerated.

CONTRIBUTING.md

@@ -2,6 +2,10 @@
 We want to make contributing to this project as easy and transparent as
 possible.
 
+## Code of Conduct
+
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.facebook.com/pages/876921332402685/open-source-code-of-conduct) so that you can understand what actions will and will not be tolerated.
+
 ## Pull Requests
 We actively welcome your pull requests.
 1. Fork the repo and create your branch from `master`.
@@ -25,9 +29,6 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
 disclosure of security bugs. In those cases, please go through the process
 outlined on that page and do not file a public issue.
 
-## Coding Style
-* format.sh
-
 ## License
 By contributing to yoga, you agree that your contributions will be licensed
-under its BSD license.
+under its MIT license.

LICENSE

@@ -1,30 +1,21 @@
-BSD License
+MIT License
 
-For yoga software
+Copyright (c) 2014-present, Facebook, Inc.
 
-Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

PATENTS

@@ -1,33 +0,0 @@
-Additional Grant of Patent Rights Version 2
-
-"Software" means the yoga software distributed by Facebook, Inc.
-
-Facebook, Inc. (“Facebook”) hereby grants to each recipient of the Software
-(“you”) a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
-(subject to the termination provision below) license under any Necessary
-Claims, to make, have made, use, sell, offer to sell, import, and otherwise
-transfer the Software. For avoidance of doubt, no license is granted under
-Facebook's rights in any patent claims that are infringed by (i) modifications
-to the Software made by you or any third party or (ii) the Software in
-combination with any software or other technology.
-
-The license granted hereunder will terminate, automatically and without notice,
-if you (or any of your subsidiaries, corporate affiliates or agents) initiate
-directly or indirectly, or take a direct financial interest in, any Patent
-Assertion: (i) against Facebook or any of its subsidiaries or corporate
-affiliates, (ii) against any party if such Patent Assertion arises in whole or
-in part from any software, technology, product or service of Facebook or any of
-its subsidiaries or corporate affiliates, or (iii) against any party relating
-to the Software. Notwithstanding the foregoing, if Facebook or any of its
-subsidiaries or corporate affiliates files a lawsuit alleging patent
-infringement against you in the first instance, and you respond by filing a
-patent infringement counterclaim in that lawsuit against that party that is
-unrelated to the Software, the license granted hereunder will not terminate
-under section (i) of this paragraph due to such counterclaim.
-
-A "Necessary Claim" is a claim of a patent owned by Facebook that is
-necessarily infringed by the Software standing alone.
-
-A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
-or contributory infringement or inducement to infringe any patent, including a
-cross-claim or counterclaim.

README.md

@@ -1,15 +1,5 @@
 # Yoga [![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![bintray](https://img.shields.io/bintray/v/facebook/maven/com.facebook.yoga:yoga.svg)](https://bintray.com/facebook/maven/com.facebook.yoga%3Ayoga/_latestVersion) [![NuGet](https://img.shields.io/nuget/v/Facebook.Yoga.svg)](https://www.nuget.org/packages/Facebook.Yoga)
 
-[![C Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=c&label=C)](https://travis-ci.org/facebook/yoga)
-[![Java Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=java&label=Java)](https://travis-ci.org/facebook/yoga)
-[![iOS Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=ios&label=iOS)](https://travis-ci.org/facebook/yoga)
-[![.NET Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=net&label=.NET)](https://travis-ci.org/facebook/yoga)
-[![JavaScript Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=js&label=JavaScript)](https://travis-ci.org/facebook/yoga)
-[![Android Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=android&label=Android)](https://travis-ci.org/facebook/yoga)
-
-[![Visual Studio Team services](https://img.shields.io/vso/build/rumar/fe6d27b5-e424-4f61-b8f6-e2ec2f8755fb/1.svg?label=vsts-windows)]()
-[![Visual Studio Team services](https://img.shields.io/vso/build/rumar/fe6d27b5-e424-4f61-b8f6-e2ec2f8755fb/2.svg?label=vsts-osx)]()
-
 ## Building
 Yoga builds with [buck](https://buckbuild.com). Make sure you install buck before contributing to Yoga. Yoga's main implementation is in C, with bindings to supported languages and frameworks. When making changes to Yoga please ensure the changes are also propagated to these bindings when applicable.
 
@@ -33,9 +23,6 @@ You may need to install the latest watir-webdriver gem (`gem install watir-webdr
 ### .NET
 .NET testing is not integrated in buck yet, you might need to set up .NET testing environment. We have a script which to launch C# test on macOS, `csharp/tests/Facebook.Yoga/test_macos.sh`.
 
-## Code style
-For the main C implementation of Yoga clang-format is used to ensure a consistent code style. Please run `bash format.sh` before submitting a pull request. For other languages just try to follow the current code style.
-
 ## Benchmarks
 Benchmarks are located in `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.
 
@@ -59,5 +46,3 @@ This will now only run the standalone webpack build upon install.
 | node           | Builds node js version.                         |
 | standalone     | Runs webpack.                                   |
 | none           | Does nothing. You can use the prepackaged libs. |
-
-

YOGA_DEFS

@@ -1,47 +0,0 @@
-
-YOGA_ROOTS = ['//...']
-JAVA_TARGET = '//java:java'
-INFER_ANNOTATIONS_TARGET = '//lib/infer-annotations:infer-annotations'
-JSR_305_TARGET = '//lib/jsr-305:jsr-305'
-JUNIT_TARGET = '//lib/junit:junit'
-PROGRUARD_ANNOTATIONS_TARGET = '//java/proguard-annotations/src/main/java/com/facebook/proguard/annotations:annotations'
-SOLOADER_TARGET = '//lib/soloader:soloader'
-GTEST_TARGET = '//lib/gtest:gtest'
-JNI_TARGET = '//lib/jni:jni'
-FBJNI_TARGET = '//lib/fb:fbjni'
-FBJNI_JAVA_TARGET = '//lib/fb/src/main/java/com/facebook/jni:jni'
-APPCOMPAT_TARGET = '//lib/appcompat:appcompat'
-ANDROID_SUPPORT_TARGET = '//lib/android-support:android-support'
-ANDROID_TARGET = '//android:android'
-ANDROID_JAVA_TARGET = '//android/src/main/java/com/facebook/yoga/android:android'
-ANDROID_RES_TARGET = '//android:res'
-ANDROID_SAMPLE_JAVA_TARGET = '//android/sample/java/com/facebook/samples/yoga:yoga'
-ANDROID_SAMPLE_RES_TARGET = '//android/sample:res'
-
-THIS_IS_FBOBJC = False
-
-CXX_LIBRARY_WHITELIST = [
-  '//:yoga',
-  '//lib/fb:fbjni',
-  '//java:jni',
-]
-
-BASE_COMPILER_FLAGS = [
-  '-fno-omit-frame-pointer',
-  '-fexceptions',
-  '-Wall',
-  '-Werror',
-  '-O3',
-]
-
-LIBRARY_COMPILER_FLAGS = BASE_COMPILER_FLAGS + [
-  '-fPIC',
-]
-
-def yoga_dep(dep):
-  return '//' + dep
-
-with allow_unsafe_import():
-  import os.path
-def isdir(filename):
-  return os.path.isdir(filename)

Yoga.podspec

@@ -1,9 +1,9 @@
 Pod::Spec.new do |spec|
   spec.name = 'Yoga'
-  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/'
+  spec.version = '1.8.0'
+  spec.license =  { :type => 'MIT', :file => "LICENSE" }
+  spec.homepage = 'https://yogalayout.com/'
+  spec.documentation_url = 'https://yogalayout.com/docs'
 
   spec.summary = 'Yoga is a cross-platform layout engine which implements Flexbox.'
   spec.description = 'Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.'
@@ -11,9 +11,9 @@ Pod::Spec.new do |spec|
   spec.authors = 'Facebook'
   spec.source = {
     :git => 'https://github.com/facebook/yoga.git',
-    :tag => '1.7.0',
+    :tag => '1.8.0',
   }
-
+  spec.osx.deployment_target  = '10.13'
   spec.module_name = 'yoga'
   spec.requires_arc = false
   spec.compiler_flags = [
@@ -21,8 +21,10 @@ Pod::Spec.new do |spec|
       '-fexceptions',
       '-Wall',
       '-Werror',
-      '-std=c11',
+      '-std=c++1y',
       '-fPIC'
   ]
-  spec.source_files = 'yoga/**/*.{c,h}'
+  spec.source_files = 'yoga/**/*.{c,h,cpp}'
+  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros}.h'
+
 end

YogaKit.podspec

@@ -1,7 +1,7 @@
 podspec = Pod::Spec.new do |spec|
   spec.name = 'YogaKit'
   spec.version = '1.7.0'
-  spec.license =  { :type => 'BSD', :file => "LICENSE" }
+  spec.license =  { :type => 'MIT', :file => "LICENSE" }
   spec.homepage = 'https://facebook.github.io/yoga/'
   spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/yogakit/'
 

YogaKit/BUCK

@@ -1,11 +1,9 @@
 # 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.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "yoga_dep", "apple_library", "apple_test")
 
 COMPILER_FLAGS = [
     "-fobjc-arc",
@@ -30,12 +28,20 @@ COMPILER_FLAGS = [
 apple_library(
     name = "YogaKit",
     srcs = glob(["Source/**/*.m"]),
-    exported_headers = glob(["Source/**/*.h"]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "Source/**/*.h"),
+            ("Source", "**/*.h"),
+        ],
+        prefix = "YogaKit",
+    ),
     compiler_flags = COMPILER_FLAGS,
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
         "$SDKROOT/System/Library/Frameworks/UIKit.framework",
     ],
+    header_path_prefix = "",
     link_whole = True,
     visibility = ["PUBLIC"],
     deps = [

YogaKit/Source/UIView+Yoga.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "YGLayout.h"
@@ -12,7 +10,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void (^YGLayoutConfigurationBlock)(YGLayout *);
+typedef void (^YGLayoutConfigurationBlock)(YGLayout *layout);
 
 @interface UIView (Yoga)
 

YogaKit/Source/UIView+Yoga.m

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "UIView+Yoga.h"

YogaKit/Source/YGLayout+Private.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "YGLayout.h"

YogaKit/Source/YGLayout.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <UIKit/UIKit.h>
@@ -23,13 +21,21 @@ YG_EXTERN_C_END
 
 typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
   YGDimensionFlexibilityFlexibleWidth = 1 << 0,
-  YGDimensionFlexibilityFlexibleHeigth = 1 << 1,
+  YGDimensionFlexibilityFlexibleHeight = 1 << 1,
 };
 
 @interface YGLayout : NSObject
 
 /**
-  The property that decides if we should include this view when calculating layout. Defaults to YES.
+ Make default init unavailable, as it will not initialise YGNode which is
+ required for the setters and getters of YGLayout's properties to work properly.
+*/
+- (instancetype)init
+    __attribute__((unavailable("you are not meant to initialise YGLayout")));
+
+/**
+  The property that decides if we should include this view when calculating
+  layout. Defaults to YES.
  */
 @property (nonatomic, readwrite, assign, setter=setIncludedInLayout:) BOOL isIncludedInLayout;
 

YogaKit/Source/YGLayout.m

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import "YGLayout+Private.h"
@@ -30,6 +28,9 @@
 - (void)set##capitalized_name:(YGValue)lowercased_name                             \
 {                                                                                  \
   switch (lowercased_name.unit) {                                                  \
+     case YGUnitUndefined:                                                         \
+      YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value);          \
+      break;                                                                       \
     case YGUnitPoint:                                                              \
       YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value);          \
       break;                                                                       \
@@ -41,6 +42,29 @@
   }                                                                                \
 }
 
+#define YG_AUTO_VALUE_PROPERTY(lowercased_name, capitalized_name)                  \
+- (YGValue)lowercased_name                                                         \
+{                                                                                  \
+  return YGNodeStyleGet##capitalized_name(self.node);                              \
+}                                                                                  \
+                                                                                   \
+- (void)set##capitalized_name:(YGValue)lowercased_name                             \
+{                                                                                  \
+  switch (lowercased_name.unit) {                                                  \
+    case YGUnitPoint:                                                              \
+      YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value);          \
+      break;                                                                       \
+    case YGUnitPercent:                                                            \
+      YGNodeStyleSet##capitalized_name##Percent(self.node, lowercased_name.value); \
+      break;                                                                       \
+    case YGUnitAuto:                                                               \
+      YGNodeStyleSet##capitalized_name##Auto(self.node);                           \
+      break;                                                                       \
+    default:                                                                       \
+      NSAssert(NO, @"Not implemented");                                            \
+  }                                                                                \
+}
+
 #define YG_EDGE_PROPERTY_GETTER(type, lowercased_name, capitalized_name, property, edge) \
 - (type)lowercased_name                                                                  \
 {                                                                                        \
@@ -61,6 +85,9 @@ YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
 - (void)set##objc_capitalized_name:(YGValue)objc_lowercased_name                                 \
 {                                                                                                \
   switch (objc_lowercased_name.unit) {                                                           \
+    case YGUnitUndefined:                                                                        \
+      YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name.value);                       \
+      break;                                                                                     \
     case YGUnitPoint:                                                                            \
       YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name.value);                       \
       break;                                                                                     \
@@ -202,7 +229,7 @@ YG_PROPERTY(YGDisplay, display, Display)
 
 YG_PROPERTY(CGFloat, flexGrow, FlexGrow)
 YG_PROPERTY(CGFloat, flexShrink, FlexShrink)
-YG_VALUE_PROPERTY(flexBasis, FlexBasis)
+YG_AUTO_VALUE_PROPERTY(flexBasis, FlexBasis)
 
 YG_VALUE_EDGE_PROPERTY(left, Left, Position, YGEdgeLeft)
 YG_VALUE_EDGE_PROPERTY(top, Top, Position, YGEdgeTop)
@@ -221,8 +248,8 @@ YG_EDGE_PROPERTY(borderStartWidth, BorderStartWidth, Border, YGEdgeStart)
 YG_EDGE_PROPERTY(borderEndWidth, BorderEndWidth, Border, YGEdgeEnd)
 YG_EDGE_PROPERTY(borderWidth, BorderWidth, Border, YGEdgeAll)
 
-YG_VALUE_PROPERTY(width, Width)
-YG_VALUE_PROPERTY(height, Height)
+YG_AUTO_VALUE_PROPERTY(width, Width)
+YG_AUTO_VALUE_PROPERTY(height, Height)
 YG_VALUE_PROPERTY(minWidth, MinWidth)
 YG_VALUE_PROPERTY(minHeight, MinHeight)
 YG_VALUE_PROPERTY(maxWidth, MaxWidth)
@@ -254,7 +281,7 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
   if (dimensionFlexibility & YGDimensionFlexibilityFlexibleWidth) {
     size.width = YGUndefined;
   }
-  if (dimensionFlexibility & YGDimensionFlexibilityFlexibleHeigth) {
+  if (dimensionFlexibility & YGDimensionFlexibilityFlexibleHeight) {
     size.height = YGUndefined;
   }
   [self calculateLayoutWithSize:size];

YogaKit/Source/YGLayoutExtensions.swift

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 postfix operator %

YogaKit/Tests/YogaKitTests.m

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #import <XCTest/XCTest.h>
@@ -181,7 +179,9 @@
   view.yoga.height = YGPointValue(100);
   [container addSubview:view];
 
-  [container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleHeigth];
+  [container.yoga
+      applyLayoutPreservingOrigin:YES
+             dimensionFlexibility:YGDimensionFlexibilityFlexibleHeight];
   XCTAssertEqual(200, container.frame.size.width);
   XCTAssertEqual(100, container.frame.size.height);
 }
@@ -197,7 +197,10 @@
   view.yoga.height = YGPointValue(100);
   [container addSubview:view];
 
-  [container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth | YGDimensionFlexibilityFlexibleHeigth];
+  [container.yoga
+      applyLayoutPreservingOrigin:YES
+             dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth |
+             YGDimensionFlexibilityFlexibleHeight];
   XCTAssertEqual(100, container.frame.size.width);
   XCTAssertEqual(100, container.frame.size.height);
 }

android/BUCK

@@ -1,11 +1,9 @@
 # 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.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "android_aar", "android_resource")
 
 android_aar(
     name = "android",

android/sample/BUCK

@@ -4,7 +4,7 @@
 # This source code is licensed under the license found in the
 # LICENSE-examples file in the root directory of this source tree.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "ANDROID_SAMPLE_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "ANDROID_RES_TARGET", "android_binary", "android_resource")
 
 android_binary(
     name = "sample",

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

@@ -1,11 +1,9 @@
 # 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.
+# This source code is licensed under the license found in the
+# LICENSE-examples file in the root directory of this source tree.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "ANDROID_SUPPORT_TARGET", "APPCOMPAT_TARGET", "SOLOADER_TARGET", "android_library")
 
 android_library(
     name = "yoga",

android/src/main/AndroidManifest.xml

@@ -2,11 +2,9 @@
 
 <!--
   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.
+  
+  This source code is licensed under the MIT license found in the
+  LICENSE file in the root directory of this source tree.
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

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

@@ -1,11 +1,9 @@
 # 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.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "JSR_305_TARGET", "SOLOADER_TARGET", "android_library")
 
 android_library(
     name = "android",

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

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga.android;

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

@@ -1,17 +1,12 @@
 /**
  * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga.android;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
@@ -23,9 +18,6 @@ import android.util.SparseArray;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
-import android.util.Log;
-
-import com.facebook.yoga.android.R;
 import com.facebook.yoga.YogaAlign;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaDirection;
@@ -37,10 +29,11 @@ import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
 import com.facebook.yoga.YogaNode;
-import com.facebook.yoga.YogaNode;
 import com.facebook.yoga.YogaOverflow;
 import com.facebook.yoga.YogaPositionType;
 import com.facebook.yoga.YogaWrap;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A {@code ViewGroup} based on the Yoga layout engine.
@@ -53,14 +46,14 @@ import com.facebook.yoga.YogaWrap;
  * <YogaLayout
  *     xmlns:android="http://schemas.android.com/apk/res/android"
  *     xmlns:yoga="http://schemas.android.com/apk/com.facebook.yoga.android"
- *     android:layout_width="match_parent"
- *     android:layout_height="match_parent"
+ *     android:layout_width="match_owner"
+ *     android:layout_height="match_owner"
  *     yoga:flex_direction="row"
  *     yoga:padding_all="10dp"
  *     >
  *     <TextView
- *         android:layout_width="match_parent"
- *         android:layout_height="match_parent"
+ *         android:layout_width="match_owner"
+ *         android:layout_height="match_owner"
  *         android:text="Hello, World!"
  *         yoga:flex="1"
  *         />
@@ -269,11 +262,11 @@ public class YogaLayout extends ViewGroup {
       return;
     }
 
-    final YogaNode parent = node.getParent();
+    final YogaNode owner = node.getOwner();
 
-    for (int i = 0; i < parent.getChildCount(); i++) {
-      if (parent.getChildAt(i).equals(node)) {
-        parent.removeChildAt(i);
+    for (int i = 0; i < owner.getChildCount(); i++) {
+      if (owner.getChildAt(i).equals(node)) {
+        owner.removeChildAt(i);
         break;
       }
     }
@@ -293,6 +286,8 @@ public class YogaLayout extends ViewGroup {
       if (view.getVisibility() == GONE) {
         return;
       }
+      int left = Math.round(xOffset + node.getLayoutX());
+      int top = Math.round(yOffset + node.getLayoutY());
       view.measure(
           View.MeasureSpec.makeMeasureSpec(
               Math.round(node.getLayoutWidth()),
@@ -300,11 +295,7 @@ public class YogaLayout extends ViewGroup {
           View.MeasureSpec.makeMeasureSpec(
               Math.round(node.getLayoutHeight()),
               View.MeasureSpec.EXACTLY));
-      view.layout(
-          Math.round(xOffset + node.getLayoutX()),
-          Math.round(yOffset + node.getLayoutY()),
-          Math.round(xOffset + node.getLayoutX() + node.getLayoutWidth()),
-          Math.round(yOffset + node.getLayoutY() + node.getLayoutHeight()));
+      view.layout(left, top, left + view.getMeasuredWidth(), top + view.getMeasuredHeight());
     }
 
     final int childrenCount = node.getChildCount();
@@ -324,7 +315,7 @@ public class YogaLayout extends ViewGroup {
 
   @Override
   protected void onLayout(boolean changed, int l, int t, int r, int b) {
-    // Either we are a root of a tree, or this function is called by our parent's onLayout, in which
+    // Either we are a root of a tree, or this function is called by our owner's onLayout, in which
     // case our r-l and b-t are the size of our node.
     if (!(getParent() instanceof YogaLayout)) {
         createLayout(
@@ -708,7 +699,7 @@ public class YogaLayout extends ViewGroup {
     /**
      * Constructs a set of layout params, given width and height specs.  In this case, we can set
      * the {@code yoga:width} and {@code yoga:height} if we are given them explicitly.  If other
-     * options (such as {@code match_parent} or {@code wrap_content} are given, then the parent
+     * options (such as {@code match_owner} or {@code wrap_content} are given, then the owner
      * LayoutParams will store them, and we deal with them during layout. (see
      * {@link YogaLayout#createLayout})
      *
@@ -782,9 +773,9 @@ public class YogaLayout extends ViewGroup {
      * {@code View}'s measure function.
      *
      * @param node The yoga node to measure
-     * @param width The suggested width from the parent
+     * @param width The suggested width from the owner
      * @param widthMode The type of suggestion for the width
-     * @param height The suggested height from the parent
+     * @param height The suggested height from the owner
      * @param heightMode The type of suggestion for the height
      * @return A measurement output ({@code YogaMeasureOutput}) for the node
      */

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

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 package com.facebook.yoga.android;

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

@@ -2,11 +2,9 @@
 
 <!--
   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.
+  
+  This source code is licensed under the MIT license found in the
+  LICENSE file in the root directory of this source tree.
 -->
 
 <resources>

benchmark/BUCK

@@ -1,11 +1,9 @@
 # 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.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "yoga_dep")
 
 cxx_binary(
     name = "benchmark",

benchmark/YGBenchmark.c

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "YGBenchmark.h"

benchmark/YGBenchmark.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once

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

@@ -1,9 +1,8 @@
 /**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) 2014-present, Facebook, Inc.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System.Reflection;

csharp/BUCK

@@ -1,11 +1,9 @@
 # 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.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "yoga_dep", "cxx_library", "is_apple_platform")
 
 COMPILER_FLAGS = BASE_COMPILER_FLAGS + ["-std=c++11"]
 
@@ -34,10 +32,10 @@ cxx_library(
     deps = [yoga_dep(":yoga")],
 )
 
-if isdir('/Applications/Xcode.app'):
+if is_apple_platform():
   yoganet_ios_srcs = []
   for arch in [
-    'iphonesimulator-x86_64', 'iphonesimulator-i386', 'iphoneos-arm64', 'iphoneos-armv7'
+    'iphonesimulator-x86_64', 'iphoneos-arm64'
   ]:
     name = 'yoganet-' + arch
     yoganet_ios_srcs.append(':' + name)
@@ -65,8 +63,7 @@ if isdir('/Applications/Xcode.app'):
   genrule(
     name = 'yoganet-macosx',
     srcs = [
-      yoga_dep(yoganet_macosx_target % 'x86_64'),
-      yoga_dep(yoganet_macosx_target % 'i386'),
+      yoga_dep(yoganet_macosx_target % 'x86_64')
     ],
     out = 'libyoga.dylib',
     cmd = 'lipo $SRCS -create -output $OUT',

csharp/Facebook.Yoga/BaselineFunction.cs

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

csharp/Facebook.Yoga/Logger.cs

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

csharp/Facebook.Yoga/MeasureFunction.cs

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

csharp/Facebook.Yoga/MeasureOutput.cs

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

csharp/Facebook.Yoga/Native.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/Facebook.Yoga/YGConfigHandle.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/Facebook.Yoga/YGNodeHandle.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/Facebook.Yoga/YogaAlign.cs

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

csharp/Facebook.Yoga/YogaBaselineFunc.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/Facebook.Yoga/YogaConfig.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/Facebook.Yoga/YogaConstants.cs

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

csharp/Facebook.Yoga/YogaDimension.cs

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

csharp/Facebook.Yoga/YogaDirection.cs

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

csharp/Facebook.Yoga/YogaDisplay.cs

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

csharp/Facebook.Yoga/YogaEdge.cs

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

csharp/Facebook.Yoga/YogaExperimentalFeature.cs

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

csharp/Facebook.Yoga/YogaFlexDirection.cs

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

csharp/Facebook.Yoga/YogaJustify.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 namespace Facebook.Yoga
@@ -16,5 +14,6 @@ namespace Facebook.Yoga
         FlexEnd,
         SpaceBetween,
         SpaceAround,
+        SpaceEvenly,
     }
 }

csharp/Facebook.Yoga/YogaLogLevel.cs

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

csharp/Facebook.Yoga/YogaLogger.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/Facebook.Yoga/YogaMeasureFunc.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/Facebook.Yoga/YogaMeasureMode.cs

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

csharp/Facebook.Yoga/YogaNode.Spacing.cs

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

csharp/Facebook.Yoga/YogaNode.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/Facebook.Yoga/YogaNodeType.cs

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

csharp/Facebook.Yoga/YogaOverflow.cs

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

csharp/Facebook.Yoga/YogaPositionType.cs

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

csharp/Facebook.Yoga/YogaPrintOptions.cs

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

csharp/Facebook.Yoga/YogaSize.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System.Runtime.InteropServices;

csharp/Facebook.Yoga/YogaUnit.cs

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

csharp/Facebook.Yoga/YogaValue.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/Facebook.Yoga/YogaValueExtensions.cs

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

csharp/Facebook.Yoga/YogaWrap.cs

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

csharp/Mac/ApiDefinition.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

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

@@ -1,9 +1,8 @@
 /**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) 2014-present, Facebook, Inc.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/Unity/pack.sh

@@ -1,10 +1,8 @@
 #!/bin/sh
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 set -e
 

csharp/Windows/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System.Reflection;

csharp/Windows/Facebook.Yoga/Properties/AssemblyInfo.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System.Reflection;

csharp/Yoga/YGInterop.cpp

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include "YGInterop.h"

csharp/Yoga/YGInterop.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once

csharp/Yoga/Yoga.vcxproj

@@ -227,19 +227,31 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\yoga\Yoga.h" />
+    <ClInclude Include="..\..\yoga\Utils.h" />
+    <ClInclude Include="..\..\yoga\YGConfig.h" />
     <ClInclude Include="..\..\yoga\YGEnums.h" />
+    <ClInclude Include="..\..\yoga\YGFloatOptional.h" />
+    <ClInclude Include="..\..\yoga\YGLayout.h" />
     <ClInclude Include="..\..\yoga\YGMacros.h" />
-    <ClInclude Include="..\..\yoga\YGNodeList.h" />
+    <ClInclude Include="..\..\yoga\YGNode.h" />
+    <ClInclude Include="..\..\yoga\YGNodePrint.h" />
+    <ClInclude Include="..\..\yoga\YGStyle.h" />
+    <ClInclude Include="..\..\yoga\Yoga-internal.h" />
+    <ClInclude Include="..\..\yoga\Yoga.h" />
     <ClInclude Include="resource.h" />
-    <ClInclude Include="YGInterop.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\yoga\Yoga.c" />
-    <ClCompile Include="..\..\yoga\YGEnums.c" />
-    <ClCompile Include="..\..\yoga\YGNodeList.c" />
+    <ClCompile Include="..\..\yoga\Utils.cpp" />
+    <ClCompile Include="..\..\yoga\YGConfig.cpp" />
+    <ClCompile Include="..\..\yoga\YGEnums.cpp" />
+    <ClCompile Include="..\..\yoga\YGFloatOptional.cpp" />
+    <ClCompile Include="..\..\yoga\YGLayout.cpp" />
+    <ClCompile Include="..\..\yoga\YGNode.cpp" />
+    <ClCompile Include="..\..\yoga\YGNodePrint.cpp" />
+    <ClCompile Include="..\..\yoga\YGStyle.cpp" />
+    <ClCompile Include="..\..\yoga\Yoga.cpp" />
     <ClCompile Include="YGInterop.cpp" />
     <ClCompile Include="dllmain.cpp">
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>

csharp/Yoga/Yoga.vcxproj.filters

@@ -21,19 +21,40 @@
     <ClInclude Include="targetver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\yoga\Yoga.h">
+    <ClInclude Include="resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\yoga\Utils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\yoga\YGEnums.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\yoga\YGFloatOptional.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\yoga\YGLayout.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\yoga\YGMacros.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\yoga\YGNodeList.h">
+    <ClInclude Include="..\..\yoga\YGNode.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="YGInterop.h">
+    <ClInclude Include="..\..\yoga\YGNodePrint.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="..\..\yoga\YGStyle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\yoga\Yoga.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\yoga\Yoga-internal.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\yoga\YGConfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
@@ -44,15 +65,36 @@
     <ClCompile Include="dllmain.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\yoga\Yoga.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGNodeList.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="YGInterop.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\yoga\Utils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\YGEnums.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\YGFloatOptional.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\YGLayout.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\YGNode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\YGNodePrint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\YGStyle.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\Yoga.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\YGConfig.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Yoga.rc">

csharp/Yoga/dllmain.cpp

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // dllmain.cpp : Defines the entry point for the DLL application.

csharp/Yoga/stdafx.cpp

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // stdafx.cpp : source file that includes just the standard includes

csharp/Yoga/stdafx.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // stdafx.h : include file for standard system include files,

csharp/Yoga/targetver.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #pragma once

csharp/build-native.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd `dirname "$0"`
 echo $ANDROID_SDK
-BUCK_RELEASE=2017.05.09.01
+BUCK_RELEASE=2018.02.16.01
 echo "buck $BUCK_RELEASE"
 BUCK=lib/buck-$BUCK_RELEASE/bin/buck
 if $BUCK --version >/dev/null 2>&1; then true; else

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

@@ -1,9 +1,8 @@
 /**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) 2014-present, Facebook, Inc.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/iOS/Facebook.Yoga.iOS.Tests/UnitTestAppDelegate.cs

@@ -1,9 +1,8 @@
 /**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+ * Copyright (c) 2014-present, Facebook, Inc.
  *
- * This source code is licensed under the license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/iOS/Facebook.Yoga.iOS/ApiDefinition.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/tests/Facebook.Yoga/YGAbsolutePositionTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAbsolutePositionTest.html

csharp/tests/Facebook.Yoga/YGAlignContentTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignContentTest.html

csharp/tests/Facebook.Yoga/YGAlignItemsTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignItemsTest.html
@@ -1958,5 +1956,211 @@ namespace Facebook.Yoga
             Assert.AreEqual(20f, root_child0_child0_child0.LayoutHeight);
         }
 
+        [Test]
+        public void Test_align_flex_start_with_shrinking_children()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 500;
+            root.Height = 500;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.AlignItems = YogaAlign.FlexStart;
+            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.FlexGrow = 1;
+            root_child0_child0_child0.FlexShrink = 1;
+            root_child0_child0.Insert(0, root_child0_child0_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(500f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_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(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(500f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(500f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_align_flex_start_with_stretching_children()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 500;
+            root.Height = 500;
+
+            YogaNode root_child0 = new YogaNode(config);
+            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.FlexGrow = 1;
+            root_child0_child0_child0.FlexShrink = 1;
+            root_child0_child0.Insert(0, root_child0_child0_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(500f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(500f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(500f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_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(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(500f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(500f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(500f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_align_flex_start_with_shrinking_children_with_stretch()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 500;
+            root.Height = 500;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.AlignItems = YogaAlign.FlexStart;
+            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.FlexGrow = 1;
+            root_child0_child0_child0.FlexShrink = 1;
+            root_child0_child0.Insert(0, root_child0_child0_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(500f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_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(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(500f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(500f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutHeight);
+        }
+
     }
 }

csharp/tests/Facebook.Yoga/YGAlignSelfTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignSelfTest.html

csharp/tests/Facebook.Yoga/YGAndroidNewsFeed.cs

@@ -0,0 +1,299 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// @Generated by gentest/gentest.rb from gentest/fixtures/YGAndroidNewsFeed.html
+
+using System;
+using NUnit.Framework;
+
+namespace Facebook.Yoga
+{
+    [TestFixture]
+    public class YGAndroidNewsFeed
+    {
+        [Test]
+        public void Test_android_news_feed()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.AlignContent = YogaAlign.Stretch;
+            root.Width = 1080;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root.Insert(0, root_child0);
+
+            YogaNode root_child0_child0 = new YogaNode(config);
+            root_child0_child0.AlignContent = YogaAlign.Stretch;
+            root_child0.Insert(0, root_child0_child0);
+
+            YogaNode root_child0_child0_child0 = new YogaNode(config);
+            root_child0_child0_child0.AlignContent = YogaAlign.Stretch;
+            root_child0_child0.Insert(0, root_child0_child0_child0);
+
+            YogaNode root_child0_child0_child0_child0 = new YogaNode(config);
+            root_child0_child0_child0_child0.FlexDirection = YogaFlexDirection.Row;
+            root_child0_child0_child0_child0.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child0_child0.AlignItems = YogaAlign.FlexStart;
+            root_child0_child0_child0_child0.MarginStart = 36;
+            root_child0_child0_child0_child0.MarginTop = 24;
+            root_child0_child0_child0.Insert(0, root_child0_child0_child0_child0);
+
+            YogaNode root_child0_child0_child0_child0_child0 = new YogaNode(config);
+            root_child0_child0_child0_child0_child0.FlexDirection = YogaFlexDirection.Row;
+            root_child0_child0_child0_child0_child0.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child0_child0.Insert(0, root_child0_child0_child0_child0_child0);
+
+            YogaNode root_child0_child0_child0_child0_child0_child0 = new YogaNode(config);
+            root_child0_child0_child0_child0_child0_child0.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child0_child0_child0_child0.Width = 120;
+            root_child0_child0_child0_child0_child0_child0.Height = 120;
+            root_child0_child0_child0_child0_child0.Insert(0, root_child0_child0_child0_child0_child0_child0);
+
+            YogaNode root_child0_child0_child0_child0_child1 = new YogaNode(config);
+            root_child0_child0_child0_child0_child1.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child0_child0_child1.FlexShrink = 1;
+            root_child0_child0_child0_child0_child1.MarginRight = 36;
+            root_child0_child0_child0_child0_child1.PaddingLeft = 36;
+            root_child0_child0_child0_child0_child1.PaddingTop = 21;
+            root_child0_child0_child0_child0_child1.PaddingRight = 36;
+            root_child0_child0_child0_child0_child1.PaddingBottom = 18;
+            root_child0_child0_child0_child0.Insert(1, root_child0_child0_child0_child0_child1);
+
+            YogaNode root_child0_child0_child0_child0_child1_child0 = new YogaNode(config);
+            root_child0_child0_child0_child0_child1_child0.FlexDirection = YogaFlexDirection.Row;
+            root_child0_child0_child0_child0_child1_child0.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child0_child0_child1_child0.FlexShrink = 1;
+            root_child0_child0_child0_child0_child1.Insert(0, root_child0_child0_child0_child0_child1_child0);
+
+            YogaNode root_child0_child0_child0_child0_child1_child1 = new YogaNode(config);
+            root_child0_child0_child0_child0_child1_child1.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child0_child0_child1_child1.FlexShrink = 1;
+            root_child0_child0_child0_child0_child1.Insert(1, root_child0_child0_child0_child0_child1_child1);
+
+            YogaNode root_child0_child0_child1 = new YogaNode(config);
+            root_child0_child0_child1.AlignContent = YogaAlign.Stretch;
+            root_child0_child0.Insert(1, root_child0_child0_child1);
+
+            YogaNode root_child0_child0_child1_child0 = new YogaNode(config);
+            root_child0_child0_child1_child0.FlexDirection = YogaFlexDirection.Row;
+            root_child0_child0_child1_child0.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child1_child0.AlignItems = YogaAlign.FlexStart;
+            root_child0_child0_child1_child0.MarginStart = 174;
+            root_child0_child0_child1_child0.MarginTop = 24;
+            root_child0_child0_child1.Insert(0, root_child0_child0_child1_child0);
+
+            YogaNode root_child0_child0_child1_child0_child0 = new YogaNode(config);
+            root_child0_child0_child1_child0_child0.FlexDirection = YogaFlexDirection.Row;
+            root_child0_child0_child1_child0_child0.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child1_child0.Insert(0, root_child0_child0_child1_child0_child0);
+
+            YogaNode root_child0_child0_child1_child0_child0_child0 = new YogaNode(config);
+            root_child0_child0_child1_child0_child0_child0.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child1_child0_child0_child0.Width = 72;
+            root_child0_child0_child1_child0_child0_child0.Height = 72;
+            root_child0_child0_child1_child0_child0.Insert(0, root_child0_child0_child1_child0_child0_child0);
+
+            YogaNode root_child0_child0_child1_child0_child1 = new YogaNode(config);
+            root_child0_child0_child1_child0_child1.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child1_child0_child1.FlexShrink = 1;
+            root_child0_child0_child1_child0_child1.MarginRight = 36;
+            root_child0_child0_child1_child0_child1.PaddingLeft = 36;
+            root_child0_child0_child1_child0_child1.PaddingTop = 21;
+            root_child0_child0_child1_child0_child1.PaddingRight = 36;
+            root_child0_child0_child1_child0_child1.PaddingBottom = 18;
+            root_child0_child0_child1_child0.Insert(1, root_child0_child0_child1_child0_child1);
+
+            YogaNode root_child0_child0_child1_child0_child1_child0 = new YogaNode(config);
+            root_child0_child0_child1_child0_child1_child0.FlexDirection = YogaFlexDirection.Row;
+            root_child0_child0_child1_child0_child1_child0.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child1_child0_child1_child0.FlexShrink = 1;
+            root_child0_child0_child1_child0_child1.Insert(0, root_child0_child0_child1_child0_child1_child0);
+
+            YogaNode root_child0_child0_child1_child0_child1_child1 = new YogaNode(config);
+            root_child0_child0_child1_child0_child1_child1.AlignContent = YogaAlign.Stretch;
+            root_child0_child0_child1_child0_child1_child1.FlexShrink = 1;
+            root_child0_child0_child1_child0_child1.Insert(1, root_child0_child0_child1_child0_child1_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(1080f, root.LayoutWidth);
+            Assert.AreEqual(240f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(1080f, root_child0.LayoutWidth);
+            Assert.AreEqual(240f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(1080f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(240f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(1080f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(144f, root_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(36f, root_child0_child0_child0_child0.LayoutX);
+            Assert.AreEqual(24f, root_child0_child0_child0_child0.LayoutY);
+            Assert.AreEqual(1044f, root_child0_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(120f, root_child0_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child0.LayoutY);
+            Assert.AreEqual(120f, root_child0_child0_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(120f, root_child0_child0_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child0_child0.LayoutY);
+            Assert.AreEqual(120f, root_child0_child0_child0_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(120f, root_child0_child0_child0_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(120f, root_child0_child0_child0_child0_child1.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child1.LayoutY);
+            Assert.AreEqual(72f, root_child0_child0_child0_child0_child1.LayoutWidth);
+            Assert.AreEqual(39f, root_child0_child0_child0_child0_child1.LayoutHeight);
+
+            Assert.AreEqual(36f, root_child0_child0_child0_child0_child1_child0.LayoutX);
+            Assert.AreEqual(21f, root_child0_child0_child0_child0_child1_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child1_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child1_child0.LayoutHeight);
+
+            Assert.AreEqual(36f, root_child0_child0_child0_child0_child1_child1.LayoutX);
+            Assert.AreEqual(21f, root_child0_child0_child0_child0_child1_child1.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child1_child1.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child1_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child1.LayoutX);
+            Assert.AreEqual(144f, root_child0_child0_child1.LayoutY);
+            Assert.AreEqual(1080f, root_child0_child0_child1.LayoutWidth);
+            Assert.AreEqual(96f, root_child0_child0_child1.LayoutHeight);
+
+            Assert.AreEqual(174f, root_child0_child0_child1_child0.LayoutX);
+            Assert.AreEqual(24f, root_child0_child0_child1_child0.LayoutY);
+            Assert.AreEqual(906f, root_child0_child0_child1_child0.LayoutWidth);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child0.LayoutY);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0_child0.LayoutWidth);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child0_child0.LayoutY);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(72f, root_child0_child0_child1_child0_child1.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child1.LayoutY);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0_child1.LayoutWidth);
+            Assert.AreEqual(39f, root_child0_child0_child1_child0_child1.LayoutHeight);
+
+            Assert.AreEqual(36f, root_child0_child0_child1_child0_child1_child0.LayoutX);
+            Assert.AreEqual(21f, root_child0_child0_child1_child0_child1_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child1_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child1_child0.LayoutHeight);
+
+            Assert.AreEqual(36f, root_child0_child0_child1_child0_child1_child1.LayoutX);
+            Assert.AreEqual(21f, root_child0_child0_child1_child0_child1_child1.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child1_child1.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child1_child1.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(1080f, root.LayoutWidth);
+            Assert.AreEqual(240f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(1080f, root_child0.LayoutWidth);
+            Assert.AreEqual(240f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0.LayoutY);
+            Assert.AreEqual(1080f, root_child0_child0.LayoutWidth);
+            Assert.AreEqual(240f, root_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
+            Assert.AreEqual(1080f, root_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(144f, root_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0_child0.LayoutX);
+            Assert.AreEqual(24f, root_child0_child0_child0_child0.LayoutY);
+            Assert.AreEqual(1044f, root_child0_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(120f, root_child0_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(924f, root_child0_child0_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child0.LayoutY);
+            Assert.AreEqual(120f, root_child0_child0_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(120f, root_child0_child0_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child0_child0.LayoutY);
+            Assert.AreEqual(120f, root_child0_child0_child0_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(120f, root_child0_child0_child0_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(816f, root_child0_child0_child0_child0_child1.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child1.LayoutY);
+            Assert.AreEqual(72f, root_child0_child0_child0_child0_child1.LayoutWidth);
+            Assert.AreEqual(39f, root_child0_child0_child0_child0_child1.LayoutHeight);
+
+            Assert.AreEqual(36f, root_child0_child0_child0_child0_child1_child0.LayoutX);
+            Assert.AreEqual(21f, root_child0_child0_child0_child0_child1_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child1_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child1_child0.LayoutHeight);
+
+            Assert.AreEqual(36f, root_child0_child0_child0_child0_child1_child1.LayoutX);
+            Assert.AreEqual(21f, root_child0_child0_child0_child0_child1_child1.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child1_child1.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_child0_child0_child1_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child1.LayoutX);
+            Assert.AreEqual(144f, root_child0_child0_child1.LayoutY);
+            Assert.AreEqual(1080f, root_child0_child0_child1.LayoutWidth);
+            Assert.AreEqual(96f, root_child0_child0_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child1_child0.LayoutX);
+            Assert.AreEqual(24f, root_child0_child0_child1_child0.LayoutY);
+            Assert.AreEqual(906f, root_child0_child0_child1_child0.LayoutWidth);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0.LayoutHeight);
+
+            Assert.AreEqual(834f, root_child0_child0_child1_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child0.LayoutY);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0_child0.LayoutWidth);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child0_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child0_child0.LayoutY);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0_child0_child0.LayoutWidth);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0_child0_child0.LayoutHeight);
+
+            Assert.AreEqual(726f, root_child0_child0_child1_child0_child1.LayoutX);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child1.LayoutY);
+            Assert.AreEqual(72f, root_child0_child0_child1_child0_child1.LayoutWidth);
+            Assert.AreEqual(39f, root_child0_child0_child1_child0_child1.LayoutHeight);
+
+            Assert.AreEqual(36f, root_child0_child0_child1_child0_child1_child0.LayoutX);
+            Assert.AreEqual(21f, root_child0_child0_child1_child0_child1_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child1_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child1_child0.LayoutHeight);
+
+            Assert.AreEqual(36f, root_child0_child0_child1_child0_child1_child1.LayoutX);
+            Assert.AreEqual(21f, root_child0_child0_child1_child0_child1_child1.LayoutY);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child1_child1.LayoutWidth);
+            Assert.AreEqual(0f, root_child0_child0_child1_child0_child1_child1.LayoutHeight);
+        }
+
+    }
+}

csharp/tests/Facebook.Yoga/YGBorderTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGBorderTest.html

csharp/tests/Facebook.Yoga/YGDimensionTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGDimensionTest.html

csharp/tests/Facebook.Yoga/YGDisplayTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGDisplayTest.html

csharp/tests/Facebook.Yoga/YGFlexDirectionTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexDirectionTest.html

csharp/tests/Facebook.Yoga/YGFlexTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexTest.html

csharp/tests/Facebook.Yoga/YGFlexWrapTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexWrapTest.html

csharp/tests/Facebook.Yoga/YGJustifyContentTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGJustifyContentTest.html
@@ -375,6 +373,7 @@ namespace Facebook.Yoga
             root.Insert(0, root_child0);
 
             YogaNode root_child1 = new YogaNode(config);
+            root_child1.Height = 10;
             root.Insert(1, root_child1);
 
             YogaNode root_child2 = new YogaNode(config);
@@ -396,10 +395,10 @@ namespace Facebook.Yoga
             Assert.AreEqual(0f, root_child1.LayoutX);
             Assert.AreEqual(10f, root_child1.LayoutY);
             Assert.AreEqual(102f, root_child1.LayoutWidth);
-            Assert.AreEqual(0f, root_child1.LayoutHeight);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
 
             Assert.AreEqual(0f, root_child2.LayoutX);
-            Assert.AreEqual(10f, root_child2.LayoutY);
+            Assert.AreEqual(20f, root_child2.LayoutY);
             Assert.AreEqual(102f, root_child2.LayoutWidth);
             Assert.AreEqual(10f, root_child2.LayoutHeight);
 
@@ -419,10 +418,10 @@ namespace Facebook.Yoga
             Assert.AreEqual(0f, root_child1.LayoutX);
             Assert.AreEqual(10f, root_child1.LayoutY);
             Assert.AreEqual(102f, root_child1.LayoutWidth);
-            Assert.AreEqual(0f, root_child1.LayoutHeight);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
 
             Assert.AreEqual(0f, root_child2.LayoutX);
-            Assert.AreEqual(10f, root_child2.LayoutY);
+            Assert.AreEqual(20f, root_child2.LayoutY);
             Assert.AreEqual(102f, root_child2.LayoutWidth);
             Assert.AreEqual(10f, root_child2.LayoutHeight);
         }
@@ -699,5 +698,310 @@ namespace Facebook.Yoga
             Assert.AreEqual(10f, root_child2.LayoutHeight);
         }
 
+        [Test]
+        public void Test_justify_content_row_min_width_and_margin()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.JustifyContent = YogaJustify.Center;
+            root.MarginLeft = 100;
+            root.MinWidth = 50;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.Width = 20;
+            root_child0.Height = 20;
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(100f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(50f, root.LayoutWidth);
+            Assert.AreEqual(20f, root.LayoutHeight);
+
+            Assert.AreEqual(15f, 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(100f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(50f, root.LayoutWidth);
+            Assert.AreEqual(20f, root.LayoutHeight);
+
+            Assert.AreEqual(15f, 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_justify_content_row_max_width_and_margin()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.JustifyContent = YogaJustify.Center;
+            root.MarginLeft = 100;
+            root.Width = 100;
+            root.MaxWidth = 80;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.Width = 20;
+            root_child0.Height = 20;
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(100f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(80f, root.LayoutWidth);
+            Assert.AreEqual(20f, root.LayoutHeight);
+
+            Assert.AreEqual(30f, 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(100f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(80f, root.LayoutWidth);
+            Assert.AreEqual(20f, root.LayoutHeight);
+
+            Assert.AreEqual(30f, 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_justify_content_column_min_height_and_margin()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.JustifyContent = YogaJustify.Center;
+            root.MarginTop = 100;
+            root.MinHeight = 50;
+
+            YogaNode root_child0 = new YogaNode(config);
+            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(100f, root.LayoutY);
+            Assert.AreEqual(20f, root.LayoutWidth);
+            Assert.AreEqual(50f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(15f, 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(100f, root.LayoutY);
+            Assert.AreEqual(20f, root.LayoutWidth);
+            Assert.AreEqual(50f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(15f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_justify_content_colunn_max_height_and_margin()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.JustifyContent = YogaJustify.Center;
+            root.MarginTop = 100;
+            root.Height = 100;
+            root.MaxHeight = 80;
+
+            YogaNode root_child0 = new YogaNode(config);
+            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(100f, root.LayoutY);
+            Assert.AreEqual(20f, root.LayoutWidth);
+            Assert.AreEqual(80f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(30f, 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(100f, root.LayoutY);
+            Assert.AreEqual(20f, root.LayoutWidth);
+            Assert.AreEqual(80f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(30f, root_child0.LayoutY);
+            Assert.AreEqual(20f, root_child0.LayoutWidth);
+            Assert.AreEqual(20f, root_child0.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_justify_content_column_space_evenly()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.JustifyContent = YogaJustify.SpaceEvenly;
+            root.Width = 102;
+            root.Height = 102;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.Height = 10;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.Height = 10;
+            root.Insert(1, root_child1);
+
+            YogaNode root_child2 = new YogaNode(config);
+            root_child2.Height = 10;
+            root.Insert(2, root_child2);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(102f, root.LayoutWidth);
+            Assert.AreEqual(102f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(18f, root_child0.LayoutY);
+            Assert.AreEqual(102f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(46f, root_child1.LayoutY);
+            Assert.AreEqual(102f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child2.LayoutX);
+            Assert.AreEqual(74f, root_child2.LayoutY);
+            Assert.AreEqual(102f, root_child2.LayoutWidth);
+            Assert.AreEqual(10f, root_child2.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(102f, root.LayoutWidth);
+            Assert.AreEqual(102f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(18f, root_child0.LayoutY);
+            Assert.AreEqual(102f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child1.LayoutX);
+            Assert.AreEqual(46f, root_child1.LayoutY);
+            Assert.AreEqual(102f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child2.LayoutX);
+            Assert.AreEqual(74f, root_child2.LayoutY);
+            Assert.AreEqual(102f, root_child2.LayoutWidth);
+            Assert.AreEqual(10f, root_child2.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_justify_content_row_space_evenly()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.FlexDirection = YogaFlexDirection.Row;
+            root.JustifyContent = YogaJustify.SpaceEvenly;
+            root.Width = 102;
+            root.Height = 102;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.Height = 10;
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.Height = 10;
+            root.Insert(1, root_child1);
+
+            YogaNode root_child2 = new YogaNode(config);
+            root_child2.Height = 10;
+            root.Insert(2, root_child2);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(102f, root.LayoutWidth);
+            Assert.AreEqual(102f, root.LayoutHeight);
+
+            Assert.AreEqual(26f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(51f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(0f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(77f, root_child2.LayoutX);
+            Assert.AreEqual(0f, root_child2.LayoutY);
+            Assert.AreEqual(0f, root_child2.LayoutWidth);
+            Assert.AreEqual(10f, root_child2.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(102f, root.LayoutWidth);
+            Assert.AreEqual(102f, root.LayoutHeight);
+
+            Assert.AreEqual(77f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(10f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(51f, root_child1.LayoutX);
+            Assert.AreEqual(0f, root_child1.LayoutY);
+            Assert.AreEqual(0f, root_child1.LayoutWidth);
+            Assert.AreEqual(10f, root_child1.LayoutHeight);
+
+            Assert.AreEqual(26f, root_child2.LayoutX);
+            Assert.AreEqual(0f, root_child2.LayoutY);
+            Assert.AreEqual(0f, root_child2.LayoutWidth);
+            Assert.AreEqual(10f, root_child2.LayoutHeight);
+        }
+
     }
 }

csharp/tests/Facebook.Yoga/YGMarginTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGMarginTest.html
@@ -1607,5 +1605,121 @@ namespace Facebook.Yoga
             Assert.AreEqual(72f, root_child0.LayoutHeight);
         }
 
+        [Test]
+        public void Test_margin_auto_top_stretching_child()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.AlignItems = YogaAlign.Center;
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.FlexGrow = 1;
+            root_child0.FlexShrink = 1;
+            root_child0.FlexBasis = 0.Percent();
+            root_child0.MarginTop = YogaValue.Auto();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.Width = 50;
+            root_child1.Height = 50;
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(100f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(150f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(75f, root_child1.LayoutX);
+            Assert.AreEqual(150f, root_child1.LayoutY);
+            Assert.AreEqual(50f, 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(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(100f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(150f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(75f, root_child1.LayoutX);
+            Assert.AreEqual(150f, root_child1.LayoutY);
+            Assert.AreEqual(50f, root_child1.LayoutWidth);
+            Assert.AreEqual(50f, root_child1.LayoutHeight);
+        }
+
+        [Test]
+        public void Test_margin_auto_left_stretching_child()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.AlignItems = YogaAlign.Center;
+            root.Width = 200;
+            root.Height = 200;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.FlexGrow = 1;
+            root_child0.FlexShrink = 1;
+            root_child0.FlexBasis = 0.Percent();
+            root_child0.MarginLeft = YogaValue.Auto();
+            root.Insert(0, root_child0);
+
+            YogaNode root_child1 = new YogaNode(config);
+            root_child1.Width = 50;
+            root_child1.Height = 50;
+            root.Insert(1, root_child1);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(200f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(150f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(75f, root_child1.LayoutX);
+            Assert.AreEqual(150f, root_child1.LayoutY);
+            Assert.AreEqual(50f, 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(200f, root.LayoutWidth);
+            Assert.AreEqual(200f, root.LayoutHeight);
+
+            Assert.AreEqual(200f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(150f, root_child0.LayoutHeight);
+
+            Assert.AreEqual(75f, root_child1.LayoutX);
+            Assert.AreEqual(150f, root_child1.LayoutY);
+            Assert.AreEqual(50f, root_child1.LayoutWidth);
+            Assert.AreEqual(50f, root_child1.LayoutHeight);
+        }
+
     }
 }

csharp/tests/Facebook.Yoga/YGMinMaxDimensionTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGMinMaxDimensionTest.html

csharp/tests/Facebook.Yoga/YGPaddingTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGPaddingTest.html

csharp/tests/Facebook.Yoga/YGPercentageTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGPercentageTest.html

csharp/tests/Facebook.Yoga/YGRoundingTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGRoundingTest.html