Set missing header_namespace

Summary: When we don't explicitly set header_namespace, we can get differing behavior between Android and iOS. Even when it is not explicitly necessary, we are going to try to enforce this properly.

Reviewed By: scottrice

Differential Revision: D7141155

fbshipit-source-id: 74d1488c3909f89ad9d6d0ee0de335b789dc2ccd

.buckconfig

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

.travis.yml

@@ -5,128 +5,28 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-os: osx
+language: node_js
-osx_image: xcode8.2
+node_js:
-language: cpp
+  - "8"
-compiler: clang
-cache:
-  directories:
-    - $HOME/Library/Caches/Homebrew
 
-env:
+install:
-  - TARGET=c
+- cd website
-  - TARGET=java
+- yarn --ignore-scripts
-  - TARGET=net
+- cd ..
-  - 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
-    fi
-
-  # JavaScript
-  - |
-    if [[ $TARGET = "js" ]]; then (
-      cd javascript &&
-      npm install &&
-      unset CC && unset CXX && unset LINK &&
-      source /tmp/emsdk-portable/emsdk_env.sh &&
-      npm run build:browser
-    ) fi
 
 script:
-  # C
+- cd website
-  - |
+- yarn build
-    if [[ $TARGET = "c" ]]; then
+- cd ..
-      buck test --verbose 0 //:yoga &&
-      buck run --verbose 0 //benchmark:benchmark &&
-      git checkout HEAD^ &&
-      buck run --verbose 0 //benchmark:benchmark
-    fi
 
-  # Java
+deploy:
-  - |
+  provider: pages
-    if [[ $TARGET = "java" ]]; then
+  skip-cleanup: true
-      buck test --verbose 0 //java:java
+  github-token: $GITHUB_TOKEN
-    fi
+  fqdn: yogalayout.com
-
+  local-dir: website/public
-  # .NET
+  email: yogabot@fb.com
-  - |
+  name: Yoga-bot
-    if [[ $TARGET = "net" ]]; then
+  keep-history: true
-      sh csharp/tests/Facebook.Yoga/test_macos.sh
+  on:
-    fi
+    branch: master
-
-  # 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

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
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
-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,37 @@ 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"]),
-    compiler_flags = COMPILER_FLAGS,
-    exported_headers = subdir_glob([("", "yoga/*.h")]),
     header_namespace = "",
+    exported_headers = subdir_glob([("", "yoga/*.h")]),
+    compiler_flags = COMPILER_FLAGS,
     soname = "libyogacore.$(ext)",
     tests = [":YogaTests"],
     visibility = ["PUBLIC"],
-    deps = [] if THIS_IS_FBOBJC else [
+    deps = [
+        yoga_dep("lib/fb:ndklog"),
+    ],
+)
+
+cxx_library(
+    name = "yogafastmath",
+    srcs = glob(["yoga/*.cpp"]),
+    header_namespace = "",
+    exported_headers = subdir_glob([("", "yoga/*.h")]),
+    compiler_flags = COMPILER_FLAGS + ["-ffast-math"],
+    soname = "libyogafastmathcore.$(ext)",
+    tests = [":YogaTests"],
+    visibility = ["PUBLIC"],
+    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
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 #
 
 cmake_minimum_required(VERSION 3.4.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-file(GLOB yogacore_SRC yoga/*.c)
+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,
+The above copyright notice and this permission notice shall be included in all
-are permitted provided that the following conditions are met:
+copies or substantial portions of the Software.
 
- * Redistributions of source code must retain the above copyright notice, this
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   list of conditions and the following disclaimer.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * Redistributions in binary form must reproduce the above copyright notice,
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   this list of conditions and the following disclaimer in the documentation
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   and/or other materials provided with the distribution.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-
+SOFTWARE.
- * 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.

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,7 +1,7 @@
 Pod::Spec.new do |spec|
   spec.name = 'Yoga'
-  spec.version = '1.6.0'
+  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/c/'
 
@@ -11,7 +11,7 @@ Pod::Spec.new do |spec|
   spec.authors = 'Facebook'
   spec.source = {
     :git => 'https://github.com/facebook/yoga.git',
-    :tag => '1.6.0',
+    :tag => '1.7.0',
   }
 
   spec.module_name = 'yoga'
@@ -21,8 +21,8 @@ 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}'
 end

YogaKit.podspec

@@ -1,7 +1,7 @@
 podspec = Pod::Spec.new do |spec|
   spec.name = 'YogaKit'
-  spec.version = '1.6.0'
+  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/'
 
@@ -11,14 +11,14 @@ podspec = Pod::Spec.new do |spec|
   spec.authors = 'Facebook'
   spec.source = {
     :git => 'https://github.com/facebook/yoga.git',
-    :tag => '1.6.0',
+    :tag => '1.7.0',
   }
 
   spec.platform = :ios
   spec.ios.deployment_target = '8.0'
   spec.ios.frameworks = 'UIKit'
 
-  spec.dependency 'Yoga', '~> 1.6'
+  spec.dependency 'Yoga', '~> 1.7'
   spec.source_files = 'YogaKit/Source/*.{h,m,swift}'
   spec.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h'
   spec.private_header_files = 'YogaKit/Source/YGLayout+Private.h'

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

YogaKit/README.md

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

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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #import "YGLayout.h"
@@ -12,7 +10,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void (^YGLayoutConfigurationBlock)(YGLayout *);
+typedef void (^YGLayoutConfigurationBlock)(YGLayout *layout);
 
 @interface UIView (Yoga)
 
@@ -20,6 +18,10 @@ typedef void (^YGLayoutConfigurationBlock)(YGLayout *);
  The YGLayout that is attached to this view. It is lazily created.
  */
 @property (nonatomic, readonly, strong) YGLayout *yoga;
+/**
+ Indicates whether or not Yoga is enabled
+ */
+@property (nonatomic, readonly, assign) BOOL isYogaEnabled;
 
 /**
  In ObjC land, every time you access `view.yoga.*` you are adding another `objc_msgSend`

YogaKit/Source/UIView+Yoga.m

@@ -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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #import "UIView+Yoga.h"
@@ -26,6 +24,11 @@ static const void *kYGYogaAssociatedKey = &kYGYogaAssociatedKey;
   return yoga;
 }
 
+- (BOOL)isYogaEnabled
+{
+  return objc_getAssociatedObject(self, kYGYogaAssociatedKey) != nil;
+}
+
 - (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block
 {
   if (block != nil) {

YogaKit/Source/YGLayout+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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #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_AUTO_VALUE_PROPERTY(width, Width)
-YG_VALUE_PROPERTY(height, Height)
+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];
@@ -361,7 +388,7 @@ static void YGAttachNodesFromViewHierachy(UIView *const view)
 
     NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
     for (UIView *subview in view.subviews) {
-      if (subview.yoga.isIncludedInLayout) {
+      if (subview.yoga.isEnabled && subview.yoga.isIncludedInLayout) {
         [subviewsToInclude addObject:subview];
       }
     }

YogaKit/Source/YGLayoutExtensions.swift

@@ -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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #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);
 }

YogaKit/YogaKitSample/Podfile.lock

@@ -4,9 +4,9 @@ PODS:
   - IGListKit/Default (2.1.0):
     - IGListKit/Diffing
   - IGListKit/Diffing (2.1.0)
-  - Yoga (1.6.0)
+  - Yoga (1.7.0)
-  - YogaKit (1.6.0):
+  - YogaKit (1.7.0):
-    - Yoga (~> 1.6)
+    - Yoga (~> 1.7)
 
 DEPENDENCIES:
   - IGListKit (~> 2.1.0)

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
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
-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/build.gradle

@@ -22,7 +22,7 @@ android {
 }
 
 dependencies {
-    compile project(':yoga')
+    api project(':yoga')
 }
 
 task sourcesJar(type: Jar) {

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

@@ -5,7 +5,7 @@
 # LICENSE file in the root directory of this source tree. An additional grant
 # of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+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 MIT license found in the
-  This source code is licensed under the BSD-style license found in the
+  LICENSE file in the root directory of this source tree.
-  LICENSE file in the root directory of this source tree. An additional grant
-  of patent rights can be found in the PATENTS file in the same directory.
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

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
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
-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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 package com.facebook.yoga.android;

android/src/main/java/com/facebook/yoga/android/YogaLayout.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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 package com.facebook.yoga.android;

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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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 MIT license found in the
-  This source code is licensed under the BSD-style license found in the
+  LICENSE file in the root directory of this source tree.
-  LICENSE file in the root directory of this source tree. An additional grant
-  of patent rights can be found in the PATENTS file in the same directory.
 -->
 
 <resources>

benchmark/BUCK

@@ -1,15 +1,15 @@
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
-include_defs("//YOGA_DEFS")
+load("//:yoga_defs.bzl", "yoga_dep")
 
 cxx_binary(
     name = "benchmark",
     srcs = glob(["*.c"]),
+    headers = subdir_glob([("", "*.h")]),
+    header_namespace = "",
     compiler_flags = [
         "-fno-omit-frame-pointer",
         "-fexceptions",
@@ -18,8 +18,6 @@ cxx_binary(
         "-O3",
         "-std=c11",
     ],
-    header_namespace = "",
-    headers = subdir_glob([("", "*.h")]),
     visibility = ["PUBLIC"],
     deps = [
         yoga_dep(":yoga"),

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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #pragma once

build.gradle

@@ -3,12 +3,12 @@
 buildscript {
     repositories {
         jcenter()
+        maven { url 'https://maven.google.com/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-        classpath 'com.nabilhachicha:android-native-dependencies:0.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -24,8 +24,8 @@ allprojects {
 ext {
     minSdkVersion = 14
     targetSdkVersion = 25
-    compileSdkVersion = 25
+    compileSdkVersion = 26
-    buildToolsVersion = '25.0.2'
+    buildToolsVersion = '26.0.2'
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 }

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

@@ -1,9 +1,8 @@
 /**
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * 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
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
-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 % 'x86_64')
-      yoga_dep(yoganet_macosx_target % 'i386'),
     ],
     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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;
@@ -595,12 +593,14 @@ namespace Facebook.Yoga
             Native.YGNodeSetBaselineFunc(_ygNode, _managedBaseline);
         }
 
-        public void CalculateLayout()
+        public void CalculateLayout(
+            float width = YogaConstants.Undefined, 
+            float height = YogaConstants.Undefined)
         {
             Native.YGNodeCalculateLayout(
                 _ygNode,
-                YogaConstants.Undefined,
+                width,
-                YogaConstants.Undefined,
+                height,
                 Native.YGNodeStyleGetDirection(_ygNode));
         }
 

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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.YogaKit/YogaLayout.cs

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

csharp/Mac/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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

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

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

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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #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.
+ * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * 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.
+ * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * 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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

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

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

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

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

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

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

csharp/tests/Facebook.Yoga/YGAbsolutePositionTest.cs

@@ -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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @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
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexTest.html