Merge branch 'master' into fix-absolute-with-padding

Summary: Yoga set as a static library also for debug+release builds in x64

Reviewed By: SidharthGuglani

Differential Revision: D27230019

fbshipit-source-id: d77e2c4130cd8303d1585723bfad927b9ddba23e

.github/workflows/ci.yml

@@ -0,0 +1,56 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  website:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 8.x
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile --ignore-scripts
+        working-directory: website
+      - name: Build
+        run: yarn build
+        working-directory: website
+      - name: Deploy
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_branch: gh-pages
+          publish_dir: website/public
+          cname: yogalayout.com
+          keep_files: true
+          user_name: 'Yoga-bot'
+          user_email: 'yogabot@fb.com'
+  android:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          if [[ -n "${{ secrets.encrypted_d27e803291ff_iv }}" ]]; then
+            openssl aes-256-cbc -K ${{ secrets.encrypted_d27e803291ff_key }} -iv {{ secrets.encrypted_d27e803291ff_iv }} -in scripts/setup-keys.enc -d >> gradle.properties;
+          fi
+          sudo apt-get update
+          sudo apt-get install -y ninja-build
+          pushd $HOME
+          git clone --depth 1 https://github.com/facebook/buck.git
+          cd buck
+          ant
+          popd
+          echo "::set-env name=PATH::$PATH:$HOME/buck/bin/"
+          export PATH=$PATH:$HOME/buck/bin/
+          buck --version
+          export TERMINAL=dumb
+          source scripts/android-setup.sh && installAndroidSDK
+          echo "::set-env name=ANDROID_SDK::$ANDROID_HOME"
+          echo "::set-env name=ANDROID_NDK_REPOSITORY::$HOME/android-ndk"
+          echo "::set-env name=ANDROID_NDK_HOME::$ANDROID_NDK_REPOSITORY/android-ndk-r15c"
+      - name: Build
+        run: ./gradlew testDebugUnit && scripts/publish-snapshot.sh

.swift-version

@@ -1 +0,0 @@
-4.0

.travis.yml

@@ -1,77 +0,0 @@
-language: java
-os: linux
-dist: trusty
-addons:
-  apt:
-    sources:
-      - llvm-toolchain-trusty-6.0
-      - ubuntu-toolchain-r-test
-    packages:
-      - clang-6.0
-
-env:
-  - TARGET: website
-  - TARGET: android
-
-install:
-- cd website
-- yarn --ignore-scripts
-- cd ..
-
-cache:
-  directories:
-    - $HOME/buck
-    - $HOME/.gradle
-
-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
-  # Android
-  - |
-    if [[ $TARGET = "android" ]]; then
-      pushd $HOME
-      git clone --depth 1 https://github.com/facebook/buck.git
-      cd buck
-      ant
-      popd
-      export PATH=$PATH:$HOME/buck/bin/
-      buck --version
-      export TERMINAL=dumb
-      source scripts/android-setup.sh && installAndroidSDK
-      export ANDROID_SDK=$ANDROID_HOME
-      export ANDROID_NDK_REPOSITORY=$HOME/android-ndk
-      export ANDROID_NDK_HOME=$ANDROID_NDK_REPOSITORY/android-ndk-r15c
-    fi
-  # Website
-  - |
-    if [[ $TARGET = "website" ]]; then
-      nvm install 8
-      nvm use 8
-    fi
-
-script:
-  - |
-    if [[ $TARGET = "android" ]]; then
-      ./gradlew testDebugUnit && scripts/publish-snapshot.sh
-    fi
-  - |
-    if [[ $TARGET = "website" ]]; then
-      pushd website
-      yarn build
-      popd
-    fi
-
-deploy:
-  provider: pages
-  skip-cleanup: true
-  github-token: $GITHUB_TOKEN
-  fqdn: yogalayout.com
-  local-dir: website/public
-  email: yogabot@fb.com
-  name: Yoga-bot
-  keep-history: true
-  on:
-    branch: master
-    condition: $TARGET = website

BUCK

@@ -2,7 +2,7 @@
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-load("//tools/build_defs/oss:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "GTEST_TARGET", "LIBRARY_COMPILER_FLAGS", "subdir_glob", "yoga_cxx_library", "yoga_cxx_test", "yoga_dep")
+load("//tools/build_defs/oss:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "GTEST_TARGET", "LIBRARY_COMPILER_FLAGS", "YOGA_ROOTS", "subdir_glob", "yoga_cxx_library", "yoga_cxx_test", "yoga_dep", "yoga_prebuilt_cxx_library")
 
 GMOCK_OVERRIDE_FLAGS = [
     # gmock does not mark mocked methods as override, ignore the warnings in tests
@@ -14,6 +14,18 @@ TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + [
     "-DYG_ENABLE_EVENTS",
 ]
 
+yoga_prebuilt_cxx_library(
+    name = "ndklog",
+    exported_platform_linker_flags = [
+        (
+            "^android.*",
+            ["-llog"],
+        ),
+    ],
+    header_only = True,
+    visibility = YOGA_ROOTS,
+)
+
 yoga_cxx_library(
     name = "yoga",
     srcs = glob(["yoga/**/*.cpp"]),
@@ -24,7 +36,21 @@ yoga_cxx_library(
     tests = [":YogaTests"],
     visibility = ["PUBLIC"],
     deps = [
-        yoga_dep("lib/fb:ndklog"),
+        ":ndklog",
+    ],
+)
+
+yoga_cxx_library(
+    name = "yoga-static",
+    srcs = glob(["yoga/**/*.cpp"]),
+    compiler_flags = LIBRARY_COMPILER_FLAGS,
+    preferred_linkage = "static",
+    public_include_directories = ["."],
+    raw_headers = glob(["yoga/**/*.h"]),
+    tests = [":YogaTests"],
+    visibility = ["PUBLIC"],
+    deps = [
+        ":ndklog",
     ],
 )
 
@@ -39,7 +65,6 @@ yoga_cxx_library(
     visibility = ["PUBLIC"],
     deps = [
         ":yoga",
-        yoga_dep("lib/fb:ndklog"),
     ],
 )
 

CMakeLists.txt

@@ -1,14 +1,21 @@
-#
 # Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-#
 
 cmake_minimum_required(VERSION 3.4.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 
+add_compile_options(
+    -fno-omit-frame-pointer
+    -fexceptions
+    -fvisibility=hidden
+    -ffunction-sections
+    -fdata-sections
+    -Wall
+    -std=c++11)
+
 file(GLOB_RECURSE yogacore_SRC yoga/*.cpp)
 add_library(yogacore STATIC ${yogacore_SRC})
 

ReactYoga.xcodeproj/project.pbxproj

@@ -191,7 +191,6 @@
 		27595AD71E575C7800CCE2B1 /* SampleCxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D41E03699D0018521A /* SampleCxxModule.h */; };
 		27595AD81E575C7800CCE2B1 /* SystraceSection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D51E03699D0018521A /* SystraceSection.h */; };
 		2D0EB9F32021067800CAF88A /* RCTUIUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = F1EFDA4E201F660F00EE6E4C /* RCTUIUtils.m */; };
-		2D16E68E1FA4FD3900B85C8A /* RCTTVNavigationEventEmitter.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */; };
 		2D1D83CE1F74E2DA00615550 /* libdouble-conversion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D383D621EBD27B9005632C8 /* libdouble-conversion.a */; };
 		2D3B5E931D9B087300451313 /* RCTErrorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */; };
 		2D3B5E941D9B087900451313 /* RCTBundleURLProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 68EFE4ED1CF6EB3900A1DE13 /* RCTBundleURLProvider.m */; };
@@ -269,8 +268,6 @@
 		3D0B842A1EC0B49400B2BD8E /* RCTTVRemoteHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0B84281EC0B49400B2BD8E /* RCTTVRemoteHandler.h */; };
 		3D0B842B1EC0B49400B2BD8E /* RCTTVRemoteHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D0B84291EC0B49400B2BD8E /* RCTTVRemoteHandler.m */; };
 		3D0B842C1EC0B4EA00B2BD8E /* RCTTVView.m in Sources */ = {isa = PBXBuildFile; fileRef = 130443D71E401AD800D93A67 /* RCTTVView.m */; };
-		3D0B842F1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */; };
-		3D0B84301EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D0B842E1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m */; };
 		3D0E378A1F1CC40000DCAC9F /* RCTWebSocketModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
 		3D0E378E1F1CC59100DCAC9F /* RCTWebSocketModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
 		3D0E378F1F1CC5CF00DCAC9F /* RCTWebSocketModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
@@ -1275,7 +1272,6 @@
 				594F0A471FD233BD007FBE96 /* RCTSurfaceView.h in Copy Headers */,
 				594F0A481FD233BD007FBE96 /* RCTSurfaceHostingView.h in Copy Headers */,
 				594F0A491FD233BD007FBE96 /* RCTSurfaceSizeMeasureMode.h in Copy Headers */,
-				2D16E68E1FA4FD3900B85C8A /* RCTTVNavigationEventEmitter.h in Copy Headers */,
 				59500D481F71C67600B122B7 /* RCTUIManagerUtils.h in Copy Headers */,
 				3D0E37901F1CC5E100DCAC9F /* RCTWebSocketModule.h in Copy Headers */,
 				5960C1BF1F0804F50066FD5B /* RCTLayoutAnimation.h in Copy Headers */,
@@ -1876,8 +1872,6 @@
 		39C50FFA2046EE3500CEE534 /* RCTVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTVersion.m; sourceTree = "<group>"; };
 		3D0B84281EC0B49400B2BD8E /* RCTTVRemoteHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVRemoteHandler.h; sourceTree = "<group>"; };
 		3D0B84291EC0B49400B2BD8E /* RCTTVRemoteHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTVRemoteHandler.m; sourceTree = "<group>"; };
-		3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVNavigationEventEmitter.h; sourceTree = "<group>"; };
-		3D0B842E1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTVNavigationEventEmitter.m; sourceTree = "<group>"; };
 		3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTWebSocketModule.h; path = WebSocket/RCTWebSocketModule.h; sourceTree = "<group>"; };
 		3D1E68D81CABD13900DD7465 /* RCTDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDisplayLink.h; sourceTree = "<group>"; };
 		3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDisplayLink.m; sourceTree = "<group>"; };
@@ -2346,8 +2340,6 @@
 				0EEEA8DE2239002200A8C82D /* RCTSurfacePresenterStub.m */,
 				13B07FED1A69327A00A75B9A /* RCTTiming.h */,
 				13B07FEE1A69327A00A75B9A /* RCTTiming.m */,
-				3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */,
-				3D0B842E1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m */,
 				13E067481A70F434002CDEE1 /* RCTUIManager.h */,
 				13E067491A70F434002CDEE1 /* RCTUIManager.m */,
 				59EB6DB91EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h */,
@@ -2945,7 +2937,6 @@
 				3D302F311DF828F800D6DDAE /* RCTBundleURLProvider.h in Headers */,
 				3D302F321DF828F800D6DDAE /* RCTConvert.h in Headers */,
 				3D302F331DF828F800D6DDAE /* RCTDefines.h in Headers */,
-				3D0B842F1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h in Headers */,
 				3D302F341DF828F800D6DDAE /* RCTDisplayLink.h in Headers */,
 				3D302F351DF828F800D6DDAE /* RCTErrorCustomizer.h in Headers */,
 				3D302F361DF828F800D6DDAE /* RCTErrorInfo.h in Headers */,
@@ -3994,7 +3985,6 @@
 				2D3B5EC81D9B095800451313 /* RCTActivityIndicatorViewManager.m in Sources */,
 				3DCD185D1DF978E7007FE5A1 /* RCTReloadCommand.m in Sources */,
 				130443DB1E401ADD00D93A67 /* RCTConvert+Transform.m in Sources */,
-				3D0B84301EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m in Sources */,
 				2D3B5EC61D9B095000451313 /* RCTProfileTrampoline-x86_64.S in Sources */,
 				2D3B5EA61D9B08CA00451313 /* RCTTouchEvent.m in Sources */,
 				2D8C2E331DA40441000EE098 /* RCTMultipartStreamReader.m in Sources */,

Yoga.podspec

@@ -1,9 +1,8 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-#  Copyright (c) Facebook, Inc. and its affiliates.
+# This source code is licensed under the MIT license found in the
-#
+# LICENSE file in the root directory of this source tree.
-#  This source code is licensed under the MIT license found in the LICENSE
+
-#  file in the root directory of this source tree.
-#
 Pod::Spec.new do |spec|
   spec.name = 'Yoga'
   spec.version = '1.14.0'
@@ -34,6 +33,6 @@ Pod::Spec.new do |spec|
       '-fPIC'
   ]
   spec.source_files = 'yoga/**/*.{c,h,cpp}'
-  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
+  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGNode,YGStyle,YGValue}.h'
 
 end

YogaKit.podspec

@@ -1,12 +1,11 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
 #
-#  Copyright (c) Facebook, Inc. and its affiliates.
+# This source code is licensed under the MIT license found in the
-#
+# LICENSE file in the root directory of this source tree.
-#  This source code is licensed under the MIT license found in the LICENSE
+
-#  file in the root directory of this source tree.
-#
 podspec = Pod::Spec.new do |spec|
   spec.name = 'YogaKit'
-  spec.version = '1.14.0'
+  spec.version = '1.18.1'
   spec.license =  { :type => 'MIT', :file => "LICENSE" }
   spec.homepage = 'https://facebook.github.io/yoga/'
   spec.documentation_url = 'https://facebook.github.io/yoga/docs/'
@@ -17,17 +16,22 @@ podspec = Pod::Spec.new do |spec|
   spec.authors = 'Facebook'
   spec.source = {
     :git => 'https://github.com/facebook/yoga.git',
-    :tag => spec.version.to_s,
+    :tag => "1.18.0",
   }
 
   spec.platform = :ios
   spec.ios.deployment_target = '8.0'
   spec.ios.frameworks = 'UIKit'
+  spec.module_name = 'YogaKit'
   spec.dependency 'Yoga', '~> 1.14'
+  # Fixes the bug related the xcode 11 not able to find swift related frameworks.
+  # https://github.com/Carthage/Carthage/issues/2825
+  # https://twitter.com/krzyzanowskim/status/1151549874653081601?s=21
+  spec.pod_target_xcconfig = {"LD_VERIFY_BITCODE": "NO"}
   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'
-  spec.swift_version = '4.0'
+  spec.swift_version = '5.1'
 end
 
 # See https://github.com/facebook/yoga/pull/366

YogaKit/BUCK

@@ -37,11 +37,14 @@ yoga_apple_library(
     ),
     compiler_flags = COMPILER_FLAGS,
     frameworks = [
+        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
         "$SDKROOT/System/Library/Frameworks/UIKit.framework",
     ],
     header_path_prefix = "",
     link_whole = True,
+    modular = True,
+    module_name = "YogaKit",
     visibility = ["PUBLIC"],
     deps = [
         yoga_dep(":yoga"),

YogaKit/Source/UIView+Yoga.h

@@ -1,31 +1,33 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
-#import "YGLayout.h"
+
 #import <UIKit/UIKit.h>
+#import "YGLayout.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void (^YGLayoutConfigurationBlock)(YGLayout *layout);
+typedef void (^YGLayoutConfigurationBlock)(YGLayout* layout);
 
 @interface UIView (Yoga)
 
 /**
  The YGLayout that is attached to this view. It is lazily created.
  */
-@property (nonatomic, readonly, strong) YGLayout *yoga;
+@property(nonatomic, readonly, strong) YGLayout* yoga;
 /**
  Indicates whether or not Yoga is enabled
  */
-@property (nonatomic, readonly, assign) BOOL isYogaEnabled;
+@property(nonatomic, readonly, assign) BOOL isYogaEnabled;
 
 /**
- In ObjC land, every time you access `view.yoga.*` you are adding another `objc_msgSend`
+ In ObjC land, every time you access `view.yoga.*` you are adding another
- to your code. If you plan on making multiple changes to YGLayout, it's more performant
+ `objc_msgSend` to your code. If you plan on making multiple changes to
- to use this method, which uses a single objc_msgSend call.
+ YGLayout, it's more performant to use this method, which uses a single
+ objc_msgSend call.
  */
 - (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block
     NS_SWIFT_NAME(configureLayout(block:));

YogaKit/Source/UIView+Yoga.m

@@ -1,36 +1,34 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+#import <objc/runtime.h>
 #import "UIView+Yoga.h"
 #import "YGLayout+Private.h"
-#import <objc/runtime.h>
 
-static const void *kYGYogaAssociatedKey = &kYGYogaAssociatedKey;
+static const void* kYGYogaAssociatedKey = &kYGYogaAssociatedKey;
 
 @implementation UIView (YogaKit)
 
-- (YGLayout *)yoga
+- (YGLayout*)yoga {
-{
+  YGLayout* yoga = objc_getAssociatedObject(self, kYGYogaAssociatedKey);
-  YGLayout *yoga = objc_getAssociatedObject(self, kYGYogaAssociatedKey);
   if (!yoga) {
     yoga = [[YGLayout alloc] initWithView:self];
-    objc_setAssociatedObject(self, kYGYogaAssociatedKey, yoga, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    objc_setAssociatedObject(
+        self, kYGYogaAssociatedKey, yoga, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
   }
 
   return yoga;
 }
 
-- (BOOL)isYogaEnabled
+- (BOOL)isYogaEnabled {
-{
   return objc_getAssociatedObject(self, kYGYogaAssociatedKey) != nil;
 }
 
-- (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block
+- (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block {
-{
   if (block != nil) {
     block(self.yoga);
   }

YogaKit/Source/YGLayout+Private.h

@@ -1,16 +1,17 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
-#import "YGLayout.h"
+
 #import <yoga/Yoga.h>
+#import "YGLayout.h"
 
 @interface YGLayout ()
 
-@property (nonatomic, assign, readonly) YGNodeRef node;
+@property(nonatomic, assign, readonly) YGNodeRef node;
 
-- (instancetype)initWithView:(UIView *)view;
+- (instancetype)initWithView:(UIView*)view;
 
 @end

YogaKit/Source/YGLayout.h

@@ -1,20 +1,21 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 #import <UIKit/UIKit.h>
 #import <yoga/YGEnums.h>
-#import <yoga/Yoga.h>
 #import <yoga/YGMacros.h>
+#import <yoga/Yoga.h>
 
 YG_EXTERN_C_BEGIN
 
-extern YGValue YGPointValue(CGFloat value)
+extern YGValue YGPointValue(CGFloat value) NS_SWIFT_UNAVAILABLE(
-    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
+    "Use the swift Int and FloatingPoint extensions instead");
-extern YGValue YGPercentValue(CGFloat value)
+extern YGValue YGPercentValue(CGFloat value) NS_SWIFT_UNAVAILABLE(
-    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
+    "Use the swift Int and FloatingPoint extensions instead");
 
 YG_EXTERN_C_END
 
@@ -43,103 +44,107 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
   The property that decides if we should include this view when calculating
   layout. Defaults to YES.
  */
-@property (nonatomic, readwrite, assign, setter=setIncludedInLayout:) BOOL isIncludedInLayout;
+@property(nonatomic, readwrite, assign, setter=setIncludedInLayout:)
+    BOOL isIncludedInLayout;
 
 /**
- The property that decides during layout/sizing whether or not styling properties should be applied.
+ The property that decides during layout/sizing whether or not styling
- Defaults to NO.
+ properties should be applied. Defaults to NO.
  */
-@property (nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;
+@property(nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;
 
-@property (nonatomic, readwrite, assign) YGDirection direction;
+@property(nonatomic, readwrite, assign) YGDirection direction;
-@property (nonatomic, readwrite, assign) YGFlexDirection flexDirection;
+@property(nonatomic, readwrite, assign) YGFlexDirection flexDirection;
-@property (nonatomic, readwrite, assign) YGJustify justifyContent;
+@property(nonatomic, readwrite, assign) YGJustify justifyContent;
-@property (nonatomic, readwrite, assign) YGAlign alignContent;
+@property(nonatomic, readwrite, assign) YGAlign alignContent;
-@property (nonatomic, readwrite, assign) YGAlign alignItems;
+@property(nonatomic, readwrite, assign) YGAlign alignItems;
-@property (nonatomic, readwrite, assign) YGAlign alignSelf;
+@property(nonatomic, readwrite, assign) YGAlign alignSelf;
-@property (nonatomic, readwrite, assign) YGPositionType position;
+@property(nonatomic, readwrite, assign) YGPositionType position;
-@property (nonatomic, readwrite, assign) YGWrap flexWrap;
+@property(nonatomic, readwrite, assign) YGWrap flexWrap;
-@property (nonatomic, readwrite, assign) YGOverflow overflow;
+@property(nonatomic, readwrite, assign) YGOverflow overflow;
-@property (nonatomic, readwrite, assign) YGDisplay display;
+@property(nonatomic, readwrite, assign) YGDisplay display;
 
-@property (nonatomic, readwrite, assign) CGFloat flex;
+@property(nonatomic, readwrite, assign) CGFloat flex;
-@property (nonatomic, readwrite, assign) CGFloat flexGrow;
+@property(nonatomic, readwrite, assign) CGFloat flexGrow;
-@property (nonatomic, readwrite, assign) CGFloat flexShrink;
+@property(nonatomic, readwrite, assign) CGFloat flexShrink;
-@property (nonatomic, readwrite, assign) YGValue flexBasis;
+@property(nonatomic, readwrite, assign) YGValue flexBasis;
 
-@property (nonatomic, readwrite, assign) YGValue left;
+@property(nonatomic, readwrite, assign) YGValue left;
-@property (nonatomic, readwrite, assign) YGValue top;
+@property(nonatomic, readwrite, assign) YGValue top;
-@property (nonatomic, readwrite, assign) YGValue right;
+@property(nonatomic, readwrite, assign) YGValue right;
-@property (nonatomic, readwrite, assign) YGValue bottom;
+@property(nonatomic, readwrite, assign) YGValue bottom;
-@property (nonatomic, readwrite, assign) YGValue start;
+@property(nonatomic, readwrite, assign) YGValue start;
-@property (nonatomic, readwrite, assign) YGValue end;
+@property(nonatomic, readwrite, assign) YGValue end;
 
-@property (nonatomic, readwrite, assign) YGValue marginLeft;
+@property(nonatomic, readwrite, assign) YGValue marginLeft;
-@property (nonatomic, readwrite, assign) YGValue marginTop;
+@property(nonatomic, readwrite, assign) YGValue marginTop;
-@property (nonatomic, readwrite, assign) YGValue marginRight;
+@property(nonatomic, readwrite, assign) YGValue marginRight;
-@property (nonatomic, readwrite, assign) YGValue marginBottom;
+@property(nonatomic, readwrite, assign) YGValue marginBottom;
-@property (nonatomic, readwrite, assign) YGValue marginStart;
+@property(nonatomic, readwrite, assign) YGValue marginStart;
-@property (nonatomic, readwrite, assign) YGValue marginEnd;
+@property(nonatomic, readwrite, assign) YGValue marginEnd;
-@property (nonatomic, readwrite, assign) YGValue marginHorizontal;
+@property(nonatomic, readwrite, assign) YGValue marginHorizontal;
-@property (nonatomic, readwrite, assign) YGValue marginVertical;
+@property(nonatomic, readwrite, assign) YGValue marginVertical;
-@property (nonatomic, readwrite, assign) YGValue margin;
+@property(nonatomic, readwrite, assign) YGValue margin;
 
-@property (nonatomic, readwrite, assign) YGValue paddingLeft;
+@property(nonatomic, readwrite, assign) YGValue paddingLeft;
-@property (nonatomic, readwrite, assign) YGValue paddingTop;
+@property(nonatomic, readwrite, assign) YGValue paddingTop;
-@property (nonatomic, readwrite, assign) YGValue paddingRight;
+@property(nonatomic, readwrite, assign) YGValue paddingRight;
-@property (nonatomic, readwrite, assign) YGValue paddingBottom;
+@property(nonatomic, readwrite, assign) YGValue paddingBottom;
-@property (nonatomic, readwrite, assign) YGValue paddingStart;
+@property(nonatomic, readwrite, assign) YGValue paddingStart;
-@property (nonatomic, readwrite, assign) YGValue paddingEnd;
+@property(nonatomic, readwrite, assign) YGValue paddingEnd;
-@property (nonatomic, readwrite, assign) YGValue paddingHorizontal;
+@property(nonatomic, readwrite, assign) YGValue paddingHorizontal;
-@property (nonatomic, readwrite, assign) YGValue paddingVertical;
+@property(nonatomic, readwrite, assign) YGValue paddingVertical;
-@property (nonatomic, readwrite, assign) YGValue padding;
+@property(nonatomic, readwrite, assign) YGValue padding;
 
-@property (nonatomic, readwrite, assign) CGFloat borderLeftWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderLeftWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderTopWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderTopWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderRightWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderRightWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderBottomWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderBottomWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderStartWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderStartWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderEndWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderEndWidth;
-@property (nonatomic, readwrite, assign) CGFloat borderWidth;
+@property(nonatomic, readwrite, assign) CGFloat borderWidth;
 
-@property (nonatomic, readwrite, assign) YGValue width;
+@property(nonatomic, readwrite, assign) YGValue width;
-@property (nonatomic, readwrite, assign) YGValue height;
+@property(nonatomic, readwrite, assign) YGValue height;
-@property (nonatomic, readwrite, assign) YGValue minWidth;
+@property(nonatomic, readwrite, assign) YGValue minWidth;
-@property (nonatomic, readwrite, assign) YGValue minHeight;
+@property(nonatomic, readwrite, assign) YGValue minHeight;
-@property (nonatomic, readwrite, assign) YGValue maxWidth;
+@property(nonatomic, readwrite, assign) YGValue maxWidth;
-@property (nonatomic, readwrite, assign) YGValue maxHeight;
+@property(nonatomic, readwrite, assign) YGValue maxHeight;
 
 // Yoga specific properties, not compatible with flexbox specification
-@property (nonatomic, readwrite, assign) CGFloat aspectRatio;
+@property(nonatomic, readwrite, assign) CGFloat aspectRatio;
 
 /**
  Get the resolved direction of this node. This won't be YGDirectionInherit
  */
-@property (nonatomic, readonly, assign) YGDirection resolvedDirection;
+@property(nonatomic, readonly, assign) YGDirection resolvedDirection;
 
 /**
- Perform a layout calculation and update the frames of the views in the hierarchy with the results.
+ Perform a layout calculation and update the frames of the views in the
- If the origin is not preserved, the root view's layout results will applied from {0,0}.
+ hierarchy with the results. If the origin is not preserved, the root view's
+ layout results will applied from {0,0}.
  */
 - (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
     NS_SWIFT_NAME(applyLayout(preservingOrigin:));
 
 /**
- Perform a layout calculation and update the frames of the views in the hierarchy with the results.
+ Perform a layout calculation and update the frames of the views in the
- If the origin is not preserved, the root view's layout results will applied from {0,0}.
+ hierarchy with the results. If the origin is not preserved, the root view's
+ layout results will applied from {0,0}.
  */
 - (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
                dimensionFlexibility:(YGDimensionFlexibility)dimensionFlexibility
     NS_SWIFT_NAME(applyLayout(preservingOrigin:dimensionFlexibility:));
 
 /**
- Returns the size of the view if no constraints were given. This could equivalent to calling [self
+ Returns the size of the view if no constraints were given. This could
- sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
+ equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
  */
-@property (nonatomic, readonly, assign) CGSize intrinsicSize;
+@property(nonatomic, readonly, assign) CGSize intrinsicSize;
 
 /**
-  Returns the size of the view based on provided constraints. Pass NaN for an unconstrained dimension.
+  Returns the size of the view based on provided constraints. Pass NaN for an
+  unconstrained dimension.
  */
 - (CGSize)calculateLayoutWithSize:(CGSize)size
     NS_SWIFT_NAME(calculateLayout(with:));
@@ -147,19 +152,19 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
 /**
  Returns the number of children that are using Flexbox.
  */
-@property (nonatomic, readonly, assign) NSUInteger numberOfChildren;
+@property(nonatomic, readonly, assign) NSUInteger numberOfChildren;
 
 /**
- Return a BOOL indiciating whether or not we this node contains any subviews that are included in
+ Return a BOOL indiciating whether or not we this node contains any subviews
- Yoga's layout.
+ that are included in Yoga's layout.
  */
-@property (nonatomic, readonly, assign) BOOL isLeaf;
+@property(nonatomic, readonly, assign) BOOL isLeaf;
 
 /**
  Return's a BOOL indicating if a view is dirty. When a node is dirty
  it usually indicates that it will be remeasured on the next layout pass.
  */
-@property (nonatomic, readonly, assign) BOOL isDirty;
+@property(nonatomic, readonly, assign) BOOL isDirty;
 
 /**
  Mark that a view's layout needs to be recalculated. Only works for leaf views.

YogaKit/Source/YGLayout.m

@@ -1,157 +1,188 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "YGLayout+Private.h"
 #import "UIView+Yoga.h"
+#import "YGLayout+Private.h"
 
-#define YG_PROPERTY(type, lowercased_name, capitalized_name)    \
+#define YG_PROPERTY(type, lowercased_name, capitalized_name)      \
-- (type)lowercased_name                                         \
+  -(type)lowercased_name {                                        \
-{                                                               \
+    return YGNodeStyleGet##capitalized_name(self.node);           \
-  return YGNodeStyleGet##capitalized_name(self.node);           \
+  }                                                               \
-}                                                               \
+                                                                  \
-                                                                \
+  -(void)set##capitalized_name : (type)lowercased_name {          \
-- (void)set##capitalized_name:(type)lowercased_name             \
+    YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
-{                                                               \
+  }
-  YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
+
+#define YG_VALUE_PROPERTY(lowercased_name, capitalized_name)                \
+  -(YGValue)lowercased_name {                                               \
+    return YGNodeStyleGet##capitalized_name(self.node);                     \
+  }                                                                         \
+                                                                            \
+  -(void)set##capitalized_name : (YGValue)lowercased_name {                 \
+    switch (lowercased_name.unit) {                                         \
+      case YGUnitUndefined:                                                 \
+        YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value); \
+        break;                                                              \
+      case YGUnitPoint:                                                     \
+        YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value); \
+        break;                                                              \
+      case YGUnitPercent:                                                   \
+        YGNodeStyleSet##capitalized_name##Percent(                          \
+            self.node, lowercased_name.value);                              \
+        break;                                                              \
+      default:                                                              \
+        NSAssert(NO, @"Not implemented");                                   \
+    }                                                                       \
+  }
+
+#define YG_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 {                                   \
+    return YGNodeStyleGet##property(self.node, edge);        \
+  }
+
+#define YG_EDGE_PROPERTY_SETTER(                                \
+    lowercased_name, capitalized_name, property, edge)          \
+  -(void)set##capitalized_name : (CGFloat)lowercased_name {     \
+    YGNodeStyleSet##property(self.node, edge, lowercased_name); \
+  }
+
+#define YG_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
+  YG_EDGE_PROPERTY_GETTER(                                                  \
+      CGFloat, lowercased_name, capitalized_name, property, edge)           \
+  YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
+
+#define YG_VALUE_EDGE_PROPERTY_SETTER(                                       \
+    objc_lowercased_name, objc_capitalized_name, c_name, 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;                                                               \
+      case YGUnitPercent:                                                    \
+        YGNodeStyleSet##c_name##Percent(                                     \
+            self.node, edge, objc_lowercased_name.value);                    \
+        break;                                                               \
+      default:                                                               \
+        NSAssert(NO, @"Not implemented");                                    \
+    }                                                                        \
+  }
+
+#define YG_VALUE_EDGE_PROPERTY(                                   \
+    lowercased_name, capitalized_name, property, edge)            \
+  YG_EDGE_PROPERTY_GETTER(                                        \
+      YGValue, lowercased_name, capitalized_name, property, edge) \
+  YG_VALUE_EDGE_PROPERTY_SETTER(                                  \
+      lowercased_name, capitalized_name, property, edge)
+
+#define YG_VALUE_EDGES_PROPERTIES(lowercased_name, capitalized_name) \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Left,                                         \
+      capitalized_name##Left,                                        \
+      capitalized_name,                                              \
+      YGEdgeLeft)                                                    \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Top,                                          \
+      capitalized_name##Top,                                         \
+      capitalized_name,                                              \
+      YGEdgeTop)                                                     \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Right,                                        \
+      capitalized_name##Right,                                       \
+      capitalized_name,                                              \
+      YGEdgeRight)                                                   \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Bottom,                                       \
+      capitalized_name##Bottom,                                      \
+      capitalized_name,                                              \
+      YGEdgeBottom)                                                  \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Start,                                        \
+      capitalized_name##Start,                                       \
+      capitalized_name,                                              \
+      YGEdgeStart)                                                   \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##End,                                          \
+      capitalized_name##End,                                         \
+      capitalized_name,                                              \
+      YGEdgeEnd)                                                     \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Horizontal,                                   \
+      capitalized_name##Horizontal,                                  \
+      capitalized_name,                                              \
+      YGEdgeHorizontal)                                              \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name##Vertical,                                     \
+      capitalized_name##Vertical,                                    \
+      capitalized_name,                                              \
+      YGEdgeVertical)                                                \
+  YG_VALUE_EDGE_PROPERTY(                                            \
+      lowercased_name, capitalized_name, capitalized_name, YGEdgeAll)
+
+YGValue YGPointValue(CGFloat value) {
+  return (YGValue){.value = value, .unit = YGUnitPoint};
 }
 
-#define YG_VALUE_PROPERTY(lowercased_name, capitalized_name)                       \
+YGValue YGPercentValue(CGFloat value) {
-- (YGValue)lowercased_name                                                         \
+  return (YGValue){.value = value, .unit = YGUnitPercent};
-{                                                                                  \
-  return YGNodeStyleGet##capitalized_name(self.node);                              \
-}                                                                                  \
-                                                                                   \
-- (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;                                                                       \
-    case YGUnitPercent:                                                            \
-      YGNodeStyleSet##capitalized_name##Percent(self.node, lowercased_name.value); \
-      break;                                                                       \
-    default:                                                                       \
-      NSAssert(NO, @"Not implemented");                                            \
-  }                                                                                \
-}
-
-#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                                                                  \
-{                                                                                        \
-  return YGNodeStyleGet##property(self.node, edge);                                      \
-}
-
-#define YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge) \
-- (void)set##capitalized_name:(CGFloat)lowercased_name                             \
-{                                                                                  \
-  YGNodeStyleSet##property(self.node, edge, lowercased_name);                      \
-}
-
-#define YG_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge)         \
-YG_EDGE_PROPERTY_GETTER(CGFloat, lowercased_name, capitalized_name, property, edge) \
-YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
-
-#define YG_VALUE_EDGE_PROPERTY_SETTER(objc_lowercased_name, objc_capitalized_name, c_name, 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;                                                                                     \
-    case YGUnitPercent:                                                                          \
-      YGNodeStyleSet##c_name##Percent(self.node, edge, objc_lowercased_name.value);              \
-      break;                                                                                     \
-    default:                                                                                     \
-      NSAssert(NO, @"Not implemented");                                                          \
-  }                                                                                              \
-}
-
-#define YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge)   \
-YG_EDGE_PROPERTY_GETTER(YGValue, lowercased_name, capitalized_name, property, edge) \
-YG_VALUE_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
-
-#define YG_VALUE_EDGES_PROPERTIES(lowercased_name, capitalized_name)                                                  \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Left, capitalized_name##Left, capitalized_name, YGEdgeLeft)                   \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Top, capitalized_name##Top, capitalized_name, YGEdgeTop)                      \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Right, capitalized_name##Right, capitalized_name, YGEdgeRight)                \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Bottom, capitalized_name##Bottom, capitalized_name, YGEdgeBottom)             \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Start, capitalized_name##Start, capitalized_name, YGEdgeStart)                \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##End, capitalized_name##End, capitalized_name, YGEdgeEnd)                      \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Horizontal, capitalized_name##Horizontal, capitalized_name, YGEdgeHorizontal) \
-YG_VALUE_EDGE_PROPERTY(lowercased_name##Vertical, capitalized_name##Vertical, capitalized_name, YGEdgeVertical)       \
-YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, capitalized_name, YGEdgeAll)
-
-YGValue YGPointValue(CGFloat value)
-{
-  return (YGValue) { .value = value, .unit = YGUnitPoint };
-}
-
-YGValue YGPercentValue(CGFloat value)
-{
-  return (YGValue) { .value = value, .unit = YGUnitPercent };
 }
 
 static YGConfigRef globalConfig;
 
 @interface YGLayout ()
 
-@property (nonatomic, weak, readonly) UIView *view;
+@property(nonatomic, weak, readonly) UIView* view;
 @property(nonatomic, assign, readonly) BOOL isUIView;
 
 @end
 
 @implementation YGLayout
 
-@synthesize isEnabled=_isEnabled;
+@synthesize isEnabled = _isEnabled;
-@synthesize isIncludedInLayout=_isIncludedInLayout;
+@synthesize isIncludedInLayout = _isIncludedInLayout;
-@synthesize node=_node;
+@synthesize node = _node;
 
-+ (void)initialize
++ (void)initialize {
-{
   globalConfig = YGConfigNew();
-  YGConfigSetExperimentalFeatureEnabled(globalConfig, YGExperimentalFeatureWebFlexBasis, true);
+  YGConfigSetExperimentalFeatureEnabled(
+      globalConfig, YGExperimentalFeatureWebFlexBasis, true);
   YGConfigSetPointScaleFactor(globalConfig, [UIScreen mainScreen].scale);
 }
 
-- (instancetype)initWithView:(UIView*)view
+- (instancetype)initWithView:(UIView*)view {
-{
   if (self = [super init]) {
     _view = view;
     _node = YGNodeNewWithConfig(globalConfig);
-    YGNodeSetContext(_node, (__bridge void *) view);
+    YGNodeSetContext(_node, (__bridge void*)view);
     _isEnabled = NO;
     _isIncludedInLayout = YES;
     _isUIView = [view isMemberOfClass:[UIView class]];
@@ -160,18 +191,15 @@ static YGConfigRef globalConfig;
   return self;
 }
 
-- (void)dealloc
+- (void)dealloc {
-{
   YGNodeFree(self.node);
 }
 
-- (BOOL)isDirty
+- (BOOL)isDirty {
-{
   return YGNodeIsDirty(self.node);
 }
 
-- (void)markDirty
+- (void)markDirty {
-{
   if (self.isDirty || !self.isLeaf) {
     return;
   }
@@ -187,17 +215,17 @@ static YGConfigRef globalConfig;
   YGNodeMarkDirty(node);
 }
 
-- (NSUInteger)numberOfChildren
+- (NSUInteger)numberOfChildren {
-{
   return YGNodeGetChildCount(self.node);
 }
 
-- (BOOL)isLeaf
+- (BOOL)isLeaf {
-{
+  NSAssert(
-  NSAssert([NSThread isMainThread], @"This method must be called on the main thread.");
+      [NSThread isMainThread],
+      @"This method must be called on the main thread.");
   if (self.isEnabled) {
-    for (UIView *subview in self.view.subviews) {
+    for (UIView* subview in self.view.subviews) {
-      YGLayout *const yoga = subview.yoga;
+      YGLayout* const yoga = subview.yoga;
       if (yoga.isEnabled && yoga.isIncludedInLayout) {
         return NO;
       }
@@ -209,13 +237,11 @@ static YGConfigRef globalConfig;
 
 #pragma mark - Style
 
-- (YGPositionType)position
+- (YGPositionType)position {
-{
   return YGNodeStyleGetPositionType(self.node);
 }
 
-- (void)setPosition:(YGPositionType)position
+- (void)setPosition:(YGPositionType)position {
-{
   YGNodeStyleSetPositionType(self.node, position);
 }
 
@@ -261,25 +287,23 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
 
 #pragma mark - Layout and Sizing
 
-- (YGDirection)resolvedDirection
+- (YGDirection)resolvedDirection {
-{
   return YGNodeLayoutGetDirection(self.node);
 }
 
-- (void)applyLayout
+- (void)applyLayout {
-{
   [self calculateLayoutWithSize:self.view.bounds.size];
   YGApplyLayoutToViewHierarchy(self.view, NO);
 }
 
-- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin {
-{
   [self calculateLayoutWithSize:self.view.bounds.size];
   YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
 }
 
-- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin dimensionFlexibility:(YGDimensionFlexibility)dimensionFlexibility
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
-{
+               dimensionFlexibility:
+                   (YGDimensionFlexibility)dimensionFlexibility {
   CGSize size = self.view.bounds.size;
   if (dimensionFlexibility & YGDimensionFlexibilityFlexibleWidth) {
     size.width = YGUndefined;
@@ -291,18 +315,15 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
   YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
 }
 
-
+- (CGSize)intrinsicSize {
-- (CGSize)intrinsicSize
-{
   const CGSize constrainedSize = {
-    .width = YGUndefined,
+      .width = YGUndefined,
-    .height = YGUndefined,
+      .height = YGUndefined,
   };
   return [self calculateLayoutWithSize:constrainedSize];
 }
 
-- (CGSize)calculateLayoutWithSize:(CGSize)size
+- (CGSize)calculateLayoutWithSize:(CGSize)size {
-{
   NSAssert([NSThread isMainThread], @"Yoga calculation must be done on main.");
   NSAssert(self.isEnabled, @"Yoga is not enabled for this view.");
 
@@ -310,30 +331,28 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
 
   const YGNodeRef node = self.node;
   YGNodeCalculateLayout(
-    node,
+      node, size.width, size.height, YGNodeStyleGetDirection(node));
-    size.width,
-    size.height,
-    YGNodeStyleGetDirection(node));
 
-  return (CGSize) {
+  return (CGSize){
-    .width = YGNodeLayoutGetWidth(node),
+      .width = YGNodeLayoutGetWidth(node),
-    .height = YGNodeLayoutGetHeight(node),
+      .height = YGNodeLayoutGetHeight(node),
   };
 }
 
 #pragma mark - Private
 
 static YGSize YGMeasureView(
-  YGNodeRef node,
+    YGNodeRef node,
-  float width,
+    float width,
-  YGMeasureMode widthMode,
+    YGMeasureMode widthMode,
-  float height,
+    float height,
-  YGMeasureMode heightMode)
+    YGMeasureMode heightMode) {
-{
+  const CGFloat constrainedWidth =
-  const CGFloat constrainedWidth = (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
+      (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
-  const CGFloat constrainedHeight = (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX: height;
+  const CGFloat constrainedHeight =
+      (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : height;
 
-  UIView *view = (__bridge UIView*) YGNodeGetContext(node);
+  UIView* view = (__bridge UIView*)YGNodeGetContext(node);
   CGSize sizeThatFits = CGSizeZero;
 
   // The default implementation of sizeThatFits: returns the existing size of
@@ -349,17 +368,18 @@ static YGSize YGMeasureView(
                                       }];
   }
 
-  return (YGSize) {
+  return (YGSize){
-    .width = YGSanitizeMeasurement(constrainedWidth, sizeThatFits.width, widthMode),
+      .width = YGSanitizeMeasurement(
-    .height = YGSanitizeMeasurement(constrainedHeight, sizeThatFits.height, heightMode),
+          constrainedWidth, sizeThatFits.width, widthMode),
+      .height = YGSanitizeMeasurement(
+          constrainedHeight, sizeThatFits.height, heightMode),
   };
 }
 
 static CGFloat YGSanitizeMeasurement(
-  CGFloat constrainedSize,
+    CGFloat constrainedSize,
-  CGFloat measuredSize,
+    CGFloat measuredSize,
-  YGMeasureMode measureMode)
+    YGMeasureMode measureMode) {
-{
   CGFloat result;
   if (measureMode == YGMeasureModeExactly) {
     result = constrainedSize;
@@ -372,13 +392,14 @@ static CGFloat YGSanitizeMeasurement(
   return result;
 }
 
-static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *subviews)
+static BOOL YGNodeHasExactSameChildren(
-{
+    const YGNodeRef node,
+    NSArray<UIView*>* subviews) {
   if (YGNodeGetChildCount(node) != subviews.count) {
     return NO;
   }
 
-  for (int i=0; i<subviews.count; i++) {
+  for (int i = 0; i < subviews.count; i++) {
     if (YGNodeGetChild(node, i) != subviews[i].yoga.node) {
       return NO;
     }
@@ -387,9 +408,8 @@ static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *
   return YES;
 }
 
-static void YGAttachNodesFromViewHierachy(UIView *const view)
+static void YGAttachNodesFromViewHierachy(UIView* const view) {
-{
+  YGLayout* const yoga = view.yoga;
-  YGLayout *const yoga = view.yoga;
   const YGNodeRef node = yoga.node;
 
   // Only leaf nodes should have a measure function
@@ -399,8 +419,9 @@ static void YGAttachNodesFromViewHierachy(UIView *const view)
   } else {
     YGNodeSetMeasureFunc(node, NULL);
 
-    NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
+    NSMutableArray<UIView*>* subviewsToInclude =
-    for (UIView *subview in view.subviews) {
+        [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
+    for (UIView* subview in view.subviews) {
       if (subview.yoga.isEnabled && subview.yoga.isIncludedInLayout) {
         [subviewsToInclude addObject:subview];
       }
@@ -408,19 +429,18 @@ static void YGAttachNodesFromViewHierachy(UIView *const view)
 
     if (!YGNodeHasExactSameChildren(node, subviewsToInclude)) {
       YGRemoveAllChildren(node);
-      for (int i=0; i<subviewsToInclude.count; i++) {
+      for (int i = 0; i < subviewsToInclude.count; i++) {
         YGNodeInsertChild(node, subviewsToInclude[i].yoga.node, i);
       }
     }
 
-    for (UIView *const subview in subviewsToInclude) {
+    for (UIView* const subview in subviewsToInclude) {
       YGAttachNodesFromViewHierachy(subview);
     }
   }
 }
 
-static void YGRemoveAllChildren(const YGNodeRef node)
+static void YGRemoveAllChildren(const YGNodeRef node) {
-{
   if (node == NULL) {
     return;
   }
@@ -428,52 +448,56 @@ static void YGRemoveAllChildren(const YGNodeRef node)
   YGNodeRemoveAllChildren(node);
 }
 
-static CGFloat YGRoundPixelValue(CGFloat value)
+static CGFloat YGRoundPixelValue(CGFloat value) {
-{
   static CGFloat scale;
   static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^(){
+  dispatch_once(&onceToken, ^() {
     scale = [UIScreen mainScreen].scale;
   });
 
   return roundf(value * scale) / scale;
 }
 
-static void YGApplyLayoutToViewHierarchy(UIView *view, BOOL preserveOrigin)
+static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
-{
+  NSCAssert(
-  NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
+      [NSThread isMainThread],
+      @"Framesetting should only be done on the main thread.");
 
-  const YGLayout *yoga = view.yoga;
+  const YGLayout* yoga = view.yoga;
 
   if (!yoga.isIncludedInLayout) {
-     return;
+    return;
   }
 
   YGNodeRef node = yoga.node;
   const CGPoint topLeft = {
-    YGNodeLayoutGetLeft(node),
+      YGNodeLayoutGetLeft(node),
-    YGNodeLayoutGetTop(node),
+      YGNodeLayoutGetTop(node),
   };
 
   const CGPoint bottomRight = {
-    topLeft.x + YGNodeLayoutGetWidth(node),
+      topLeft.x + YGNodeLayoutGetWidth(node),
-    topLeft.y + YGNodeLayoutGetHeight(node),
+      topLeft.y + YGNodeLayoutGetHeight(node),
   };
 
   const CGPoint origin = preserveOrigin ? view.frame.origin : CGPointZero;
-  view.frame = (CGRect) {
+  view.frame = (CGRect){
-    .origin = {
+      .origin =
-      .x = YGRoundPixelValue(topLeft.x + origin.x),
+          {
-      .y = YGRoundPixelValue(topLeft.y + origin.y),
+              .x = YGRoundPixelValue(topLeft.x + origin.x),
-    },
+              .y = YGRoundPixelValue(topLeft.y + origin.y),
-    .size = {
+          },
-      .width = YGRoundPixelValue(bottomRight.x) - YGRoundPixelValue(topLeft.x),
+      .size =
-      .height = YGRoundPixelValue(bottomRight.y) - YGRoundPixelValue(topLeft.y),
+          {
-    },
+              .width = YGRoundPixelValue(bottomRight.x) -
+                  YGRoundPixelValue(topLeft.x),
+              .height = YGRoundPixelValue(bottomRight.y) -
+                  YGRoundPixelValue(topLeft.y),
+          },
   };
 
   if (!yoga.isLeaf) {
-    for (NSUInteger i=0; i<view.subviews.count; i++) {
+    for (NSUInteger i = 0; i < view.subviews.count; i++) {
       YGApplyLayoutToViewHierarchy(view.subviews[i], NO);
     }
   }

YogaKit/Source/YGLayoutExtensions.swift

@@ -1,10 +1,11 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+import yoga;
 postfix operator %
 
 extension Int {
@@ -29,15 +30,15 @@ extension YGValue : ExpressibleByIntegerLiteral, ExpressibleByFloatLiteral {
     public init(integerLiteral value: Int) {
         self = YGValue(value: Float(value), unit: .point)
     }
-	
+
     public init(floatLiteral value: Float) {
         self = YGValue(value: value, unit: .point)
     }
-  
+
     public init(_ value: Float) {
         self = YGValue(value: value, unit: .point)
     }
-  
+
     public init(_ value: CGFloat) {
         self = YGValue(value: Float(value), unit: .point)
     }

YogaKit/Tests/YogaKitTests.m

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -16,17 +16,15 @@
 
 @implementation YogaKitTests
 
-- (void)testConfigureLayoutIsNoOpWithNilBlock
+- (void)testConfigureLayoutIsNoOpWithNilBlock {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   id block = nil;
   XCTAssertNoThrow([view configureLayoutWithBlock:block]);
 }
 
-- (void)testConfigureLayoutBlockWorksWithValidBlock
+- (void)testConfigureLayoutBlockWorksWithValidBlock {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  [view configureLayoutWithBlock:^(YGLayout* layout) {
-  [view configureLayoutWithBlock:^(YGLayout *layout){
     XCTAssertNotNil(layout);
     layout.isEnabled = YES;
     layout.width = YGPointValue(25);
@@ -36,12 +34,11 @@
   XCTAssertEqual(view.yoga.width.value, 25);
 }
 
-- (void)testNodesAreDeallocedWithSingleView
+- (void)testNodesAreDeallocedWithSingleView {
-{
+  __weak YGLayout* layoutRef = nil;
-  __weak YGLayout *layoutRef = nil;
 
   @autoreleasepool {
-    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
     view.yoga.flexBasis = YGPointValue(1);
 
     layoutRef = view.yoga;
@@ -53,17 +50,16 @@
   XCTAssertNil(layoutRef);
 }
 
-- (void)testNodesAreDeallocedCascade
+- (void)testNodesAreDeallocedCascade {
-{
+  __weak YGLayout* topLayout = nil;
-  __weak YGLayout *topLayout = nil;
+  __weak YGLayout* subviewLayout = nil;
-  __weak YGLayout *subviewLayout = nil;
 
   @autoreleasepool {
-    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
     topLayout = view.yoga;
     topLayout.flexBasis = YGPointValue(1);
 
-    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
     subviewLayout = subview.yoga;
     subviewLayout.flexBasis = YGPointValue(1);
 
@@ -74,9 +70,8 @@
   XCTAssertNil(subviewLayout);
 }
 
-- (void)testIsEnabled
+- (void)testIsEnabled {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   XCTAssertFalse(view.yoga.isEnabled);
 
   view.yoga.isEnabled = YES;
@@ -86,30 +81,31 @@
   XCTAssertFalse(view.yoga.isEnabled);
 }
 
-- (void)testSizeThatFitsAsserts
+- (void)testSizeThatFitsAsserts {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  dispatch_sync(
-  dispatch_sync(dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL), ^(void){
+      dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL),
-    XCTAssertThrows(view.yoga.intrinsicSize);
+      ^(void) {
-  });
+        XCTAssertThrows(view.yoga.intrinsicSize);
+      });
 }
 
-- (void)testSizeThatFitsSmoke
+- (void)testSizeThatFitsSmoke {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
   container.yoga.alignItems = YGAlignFlexStart;
 
-  UILabel *longTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+  UILabel* longTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
-  longTextLabel.text = @"This is a very very very very very very very very long piece of text.";
+  longTextLabel.text =
+      @"This is a very very very very very very very very long piece of text.";
   longTextLabel.lineBreakMode = NSLineBreakByTruncatingTail;
   longTextLabel.numberOfLines = 1;
   longTextLabel.yoga.isEnabled = YES;
   longTextLabel.yoga.flexShrink = 1;
   [container addSubview:longTextLabel];
 
-  UIView *textBadgeView = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* textBadgeView = [[UIView alloc] initWithFrame:CGRectZero];
   textBadgeView.yoga.isEnabled = YES;
   textBadgeView.yoga.margin = YGPointValue(0);
   textBadgeView.yoga.width = YGPointValue(10);
@@ -124,7 +120,9 @@
   const CGSize longTextLabelSize = longTextLabel.yoga.intrinsicSize;
 
   XCTAssertEqual(longTextLabelSize.height, containerSize.height);
-  XCTAssertEqual(longTextLabelSize.width + textBadgeView.yoga.intrinsicSize.width, containerSize.width);
+  XCTAssertEqual(
+      longTextLabelSize.width + textBadgeView.yoga.intrinsicSize.width,
+      containerSize.width);
 }
 
 - (void)testSizeThatFitsEmptyView {
@@ -136,18 +134,17 @@
   XCTAssertEqual(viewSize.width, 0);
 }
 
-- (void)testPreservingOrigin
+- (void)testPreservingOrigin {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 50, 75)];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,50,75)];
   container.yoga.isEnabled = YES;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
   view.yoga.isEnabled = YES;
   view.yoga.flexBasis = YGPointValue(0);
   view.yoga.flexGrow = 1;
   [container addSubview:view];
 
-  UIView *view2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* view2 = [[UIView alloc] initWithFrame:CGRectZero];
   view2.yoga.isEnabled = YES;
   view2.yoga.marginTop = YGPointValue(25);
   view2.yoga.flexBasis = YGPointValue(0);
@@ -161,28 +158,28 @@
   XCTAssertEqual(25, view2.frame.origin.y);
 }
 
-- (void)testContainerWithFlexibleWidthGetsCorrectlySized
+- (void)testContainerWithFlexibleWidthGetsCorrectlySized {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
   container.yoga.isEnabled = YES;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
   view.yoga.isEnabled = YES;
   view.yoga.width = YGPointValue(100);
   view.yoga.height = YGPointValue(100);
   [container addSubview:view];
 
-  [container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth];
+  [container.yoga
+      applyLayoutPreservingOrigin:YES
+             dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth];
   XCTAssertEqual(100, container.frame.size.width);
   XCTAssertEqual(200, container.frame.size.height);
 }
 
-- (void)testContainerWithFlexibleHeightGetsCorrectlySized
+- (void)testContainerWithFlexibleHeightGetsCorrectlySized {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
   container.yoga.isEnabled = YES;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
   view.yoga.isEnabled = YES;
   view.yoga.width = YGPointValue(100);
   view.yoga.height = YGPointValue(100);
@@ -195,12 +192,11 @@
   XCTAssertEqual(100, container.frame.size.height);
 }
 
-- (void)testContainerWithFlexibleWidthAndHeightGetsCorrectlySized
+- (void)testContainerWithFlexibleWidthAndHeightGetsCorrectlySized {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
   container.yoga.isEnabled = YES;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
   view.yoga.isEnabled = YES;
   view.yoga.width = YGPointValue(100);
   view.yoga.height = YGPointValue(100);
@@ -214,12 +210,11 @@
   XCTAssertEqual(100, container.frame.size.height);
 }
 
-- (void)testMarkingDirtyOnlyWorksOnLeafNodes
+- (void)testMarkingDirtyOnlyWorksOnLeafNodes {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
   container.yoga.isEnabled = YES;
 
-  UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
   subview.yoga.isEnabled = YES;
   [container addSubview:subview];
 
@@ -232,14 +227,13 @@
   XCTAssertTrue(subview.yoga.isDirty);
 }
 
-- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation
+- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 50)];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 50)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
   container.yoga.alignItems = YGAlignFlexStart;
 
-  UILabel *view = [[UILabel alloc] initWithFrame:CGRectZero];
+  UILabel* view = [[UILabel alloc] initWithFrame:CGRectZero];
   view.text = @"This is a short text.";
   view.numberOfLines = 1;
   view.yoga.isEnabled = YES;
@@ -257,61 +251,70 @@
   XCTAssertFalse(CGSizeEqualToSize(view.frame.size, viewSizeAfterFirstPass));
 }
 
-- (void)testFrameAndOriginPlacement
+- (void)testFrameAndOriginPlacement {
-{
   const CGSize containerSize = CGSizeMake(320, 50);
 
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
+  UIView* container = [[UIView alloc]
+      initWithFrame:CGRectMake(
+                        0, 0, containerSize.width, containerSize.height)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
   [container.yoga applyLayoutPreservingOrigin:YES];
 
-  XCTAssertEqualWithAccuracy(subview2.frame.origin.x, CGRectGetMaxX(subview1.frame), FLT_EPSILON);
+  XCTAssertEqualWithAccuracy(
-  XCTAssertEqualWithAccuracy(subview3.frame.origin.x, CGRectGetMaxX(subview2.frame), FLT_EPSILON);
+      subview2.frame.origin.x, CGRectGetMaxX(subview1.frame), FLT_EPSILON);
+  XCTAssertEqualWithAccuracy(
+      subview3.frame.origin.x, CGRectGetMaxX(subview2.frame), FLT_EPSILON);
 
   CGFloat totalWidth = 0;
-  for (UIView *view in container.subviews) {
+  for (UIView* view in container.subviews) {
     totalWidth += view.bounds.size.width;
   }
 
-  XCTAssertEqual(containerSize.width, totalWidth, @"The container's width is %.6f, the subviews take up %.6f", containerSize.width, totalWidth);
+  XCTAssertEqual(
+      containerSize.width,
+      totalWidth,
+      @"The container's width is %.6f, the subviews take up %.6f",
+      containerSize.width,
+      totalWidth);
 }
 
-- (void)testThatLayoutIsCorrectWhenWeSwapViewOrder
+- (void)testThatLayoutIsCorrectWhenWeSwapViewOrder {
-{
   const CGSize containerSize = CGSizeMake(300, 50);
 
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
+  UIView* container = [[UIView alloc]
+      initWithFrame:CGRectMake(
+                        0, 0, containerSize.width, containerSize.height)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
@@ -333,32 +336,33 @@
   XCTAssertTrue(CGRectEqualToRect(subview2.frame, CGRectMake(100, 0, 100, 50)));
 }
 
-- (void)testThatWeRespectIncludeInLayoutFlag
+- (void)testThatWeRespectIncludeInLayoutFlag {
-{
   const CGSize containerSize = CGSizeMake(300, 50);
 
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
+  UIView* container = [[UIView alloc]
+      initWithFrame:CGRectMake(
+                        0, 0, containerSize.width, containerSize.height)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
   [container.yoga applyLayoutPreservingOrigin:YES];
 
-  for (UIView *subview in container.subviews) {
+  for (UIView* subview in container.subviews) {
     XCTAssertEqual(subview.bounds.size.width, 100);
   }
 
@@ -368,27 +372,27 @@
   XCTAssertEqual(subview1.bounds.size.width, 150);
   XCTAssertEqual(subview2.bounds.size.width, 150);
 
-  // We don't set the frame to zero, so, it should be set to what it was previously at.
+  // We don't set the frame to zero, so, it should be set to what it was
+  // previously at.
   XCTAssertEqual(subview3.bounds.size.width, 100);
 }
 
-- (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews
+- (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.isIncludedInLayout = NO;
   [container addSubview:subview1];
 
-  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.isIncludedInLayout = NO;
   [container addSubview:subview2];
 
-  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.isIncludedInLayout = YES;
   [container addSubview:subview3];
@@ -401,23 +405,22 @@
   XCTAssertEqual(container.yoga.numberOfChildren, 2);
 }
 
-- (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond
+- (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   subview3.yoga.isIncludedInLayout = NO;
@@ -437,13 +440,12 @@
   XCTAssertEqual(subview3.bounds.size.width, 100);
 }
 
-- (void)testIsLeafFlag
+- (void)testIsLeafFlag {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   XCTAssertTrue(view.yoga.isLeaf);
 
-  for (int i=0; i<10; i++) {
+  for (int i = 0; i < 10; i++) {
-    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
     [view addSubview:subview];
   }
   XCTAssertTrue(view.yoga.isLeaf);
@@ -452,99 +454,95 @@
   view.yoga.width = YGPointValue(50);
   XCTAssertTrue(view.yoga.isLeaf);
 
-  UIView *const subview = view.subviews[0];
+  UIView* const subview = view.subviews[0];
   subview.yoga.isEnabled = YES;
   subview.yoga.width = YGPointValue(50);
   XCTAssertFalse(view.yoga.isLeaf);
 }
 
-- (void)testThatWeCorrectlyAttachNestedViews
+- (void)testThatWeCorrectlyAttachNestedViews {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+  container.yoga.isEnabled = YES;
-    container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionColumn;
-    container.yoga.flexDirection = YGFlexDirectionColumn;
 
-    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview1.yoga.isEnabled = YES;
+  subview1.yoga.isEnabled = YES;
-    subview1.yoga.width = YGPointValue(100);
+  subview1.yoga.width = YGPointValue(100);
-    subview1.yoga.flexGrow = 1;
+  subview1.yoga.flexGrow = 1;
-    subview1.yoga.flexDirection = YGFlexDirectionColumn;
+  subview1.yoga.flexDirection = YGFlexDirectionColumn;
-    [container addSubview:subview1];
+  [container addSubview:subview1];
 
-    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview2.yoga.isEnabled = YES;
+  subview2.yoga.isEnabled = YES;
-    subview2.yoga.width = YGPointValue(150);
+  subview2.yoga.width = YGPointValue(150);
-    subview2.yoga.flexGrow = 1;
+  subview2.yoga.flexGrow = 1;
-    subview2.yoga.flexDirection = YGFlexDirectionColumn;
+  subview2.yoga.flexDirection = YGFlexDirectionColumn;
-    [container addSubview:subview2];
+  [container addSubview:subview2];
 
-    for (UIView *view in @[subview1, subview2]) {
+  for (UIView* view in @[ subview1, subview2 ]) {
-        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* someView = [[UIView alloc] initWithFrame:CGRectZero];
-        someView.yoga.isEnabled = YES;
+    someView.yoga.isEnabled = YES;
-        someView.yoga.flexGrow = 1;
+    someView.yoga.flexGrow = 1;
-        [view addSubview:someView];
+    [view addSubview:someView];
-    }
+  }
-    [container.yoga applyLayoutPreservingOrigin:YES];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 
-    // Add the same amount of new views, reapply layout.
+  // Add the same amount of new views, reapply layout.
-    for (UIView *view in @[subview1, subview2]) {
+  for (UIView* view in @[ subview1, subview2 ]) {
-        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView* someView = [[UIView alloc] initWithFrame:CGRectZero];
-        someView.yoga.isEnabled = YES;
+    someView.yoga.isEnabled = YES;
-        someView.yoga.flexGrow = 1;
+    someView.yoga.flexGrow = 1;
-        [view addSubview:someView];
+    [view addSubview:someView];
-    }
+  }
-    [container.yoga applyLayoutPreservingOrigin:YES];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 
-    XCTAssertEqual(subview1.bounds.size.width, 100);
+  XCTAssertEqual(subview1.bounds.size.width, 100);
-    XCTAssertEqual(subview1.bounds.size.height, 25);
+  XCTAssertEqual(subview1.bounds.size.height, 25);
-    for (UIView *subview in subview1.subviews) {
+  for (UIView* subview in subview1.subviews) {
-        const CGSize subviewSize = subview.bounds.size;
+    const CGSize subviewSize = subview.bounds.size;
-        XCTAssertNotEqual(subviewSize.width, 0);
+    XCTAssertNotEqual(subviewSize.width, 0);
-        XCTAssertNotEqual(subviewSize.height, 0);
+    XCTAssertNotEqual(subviewSize.height, 0);
-        XCTAssertFalse(isnan(subviewSize.height));
+    XCTAssertFalse(isnan(subviewSize.height));
-        XCTAssertFalse(isnan(subviewSize.width));
+    XCTAssertFalse(isnan(subviewSize.width));
-    }
+  }
 
-    XCTAssertEqual(subview2.bounds.size.width, 150);
+  XCTAssertEqual(subview2.bounds.size.width, 150);
-    XCTAssertEqual(subview2.bounds.size.height, 25);
+  XCTAssertEqual(subview2.bounds.size.height, 25);
-    for (UIView *subview in subview2.subviews) {
+  for (UIView* subview in subview2.subviews) {
-        const CGSize subviewSize = subview.bounds.size;
+    const CGSize subviewSize = subview.bounds.size;
-        XCTAssertNotEqual(subviewSize.width, 0);
+    XCTAssertNotEqual(subviewSize.width, 0);
-        XCTAssertNotEqual(subviewSize.height, 0);
+    XCTAssertNotEqual(subviewSize.height, 0);
-        XCTAssertFalse(isnan(subviewSize.height));
+    XCTAssertFalse(isnan(subviewSize.height));
-        XCTAssertFalse(isnan(subviewSize.width));
+    XCTAssertFalse(isnan(subviewSize.width));
-    }
+  }
 }
 
-- (void)testThatANonLeafNodeCanBecomeALeafNode
+- (void)testThatANonLeafNodeCanBecomeALeafNode {
-{
+  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+  container.yoga.isEnabled = YES;
-    container.yoga.isEnabled = YES;
 
-    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview1.yoga.isEnabled = YES;
+  subview1.yoga.isEnabled = YES;
-    [container addSubview:subview1];
+  [container addSubview:subview1];
 
-    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-    subview2.yoga.isEnabled = YES;
+  subview2.yoga.isEnabled = YES;
-    [subview1 addSubview:subview2];
+  [subview1 addSubview:subview2];
 
-    [container.yoga applyLayoutPreservingOrigin:YES];
+  [container.yoga applyLayoutPreservingOrigin:YES];
-    [subview2 removeFromSuperview];
+  [subview2 removeFromSuperview];
-    [container.yoga applyLayoutPreservingOrigin:YES];
+  [container.yoga applyLayoutPreservingOrigin:YES];
 }
 
-- (void)testPointPercent
+- (void)testPointPercent {
-{
   XCTAssertEqual(YGPointValue(1).value, 1);
   XCTAssertEqual(YGPointValue(1).unit, YGUnitPoint);
   XCTAssertEqual(YGPercentValue(2).value, 2);
   XCTAssertEqual(YGPercentValue(2).unit, YGUnitPercent);
 }
 
-- (void)testPositionalPropertiesWork
+- (void)testPositionalPropertiesWork {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.left = YGPointValue(1);
   XCTAssertEqual(view.yoga.left.value, 1);
@@ -589,9 +587,8 @@
   XCTAssertEqual(view.yoga.end.unit, YGUnitPercent);
 }
 
-- (void)testMarginPropertiesWork
+- (void)testMarginPropertiesWork {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.margin = YGPointValue(1);
   XCTAssertEqual(view.yoga.margin.value, 1);
@@ -657,9 +654,8 @@
   XCTAssertEqual(view.yoga.marginEnd.unit, YGUnitPercent);
 }
 
-- (void)testPaddingPropertiesWork
+- (void)testPaddingPropertiesWork {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.padding = YGPointValue(1);
   XCTAssertEqual(view.yoga.padding.value, 1);
@@ -725,9 +721,8 @@
   XCTAssertEqual(view.yoga.paddingEnd.unit, YGUnitPercent);
 }
 
-- (void)testBorderWidthPropertiesWork
+- (void)testBorderWidthPropertiesWork {
-{
+  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.borderWidth = 1;
   XCTAssertEqual(view.yoga.borderWidth, 1);

YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 import Foundation

YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 #import "ViewController.h"
@@ -12,45 +11,41 @@
 
 @implementation ViewController
 
-- (void)viewDidLoad
+- (void)viewDidLoad {
-{
+  UIView* root = self.view;
-    UIView *root = self.view;
+  root.backgroundColor = [UIColor redColor];
-    root.backgroundColor = [UIColor redColor];
+  root.yoga.isEnabled = YES;
-    root.yoga.isEnabled = YES;
+  root.yoga.width = YGPointValue(self.view.bounds.size.width);
-    root.yoga.width = YGPointValue(self.view.bounds.size.width);
+  root.yoga.height = YGPointValue(self.view.bounds.size.height);
-    root.yoga.height = YGPointValue(self.view.bounds.size.height);
+  root.yoga.alignItems = YGAlignCenter;
-    root.yoga.alignItems = YGAlignCenter;
+  root.yoga.justifyContent = YGJustifyCenter;
-    root.yoga.justifyContent = YGJustifyCenter;
 
-    UIView *child1 = [UIView new];
+  UIView* child1 = [UIView new];
-    child1.backgroundColor = [UIColor blueColor];
+  child1.backgroundColor = [UIColor blueColor];
-    child1.yoga.isEnabled = YES;
+  child1.yoga.isEnabled = YES;
-    child1.yoga.width = YGPointValue(100);
+  child1.yoga.width = YGPointValue(100);
-    child1.yoga.height = YGPointValue(100);
+  child1.yoga.height = YGPointValue(100);
 
-    UIView *child2 = [UIView new];
+  UIView* child2 = [UIView new];
-    child2.backgroundColor = [UIColor greenColor];
+  child2.backgroundColor = [UIColor greenColor];
-    child2.frame = (CGRect) {
+  child2.frame = (CGRect){
-        .size = {
+      .size = {
-            .width = 200,
+          .width = 200,
-            .height = 100,
+          .height = 100,
-        }
+      }};
-    };
 
-    UIView *child3 = [UIView new];
+  UIView* child3 = [UIView new];
-    child3.backgroundColor = [UIColor yellowColor];
+  child3.backgroundColor = [UIColor yellowColor];
-    child3.frame = (CGRect) {
+  child3.frame = (CGRect){
-        .size = {
+      .size = {
-            .width = 100,
+          .width = 100,
-            .height = 100,
+          .height = 100,
-        }
+      }};
-    };
 
-    [child2 addSubview:child3];
+  [child2 addSubview:child3];
-    [root addSubview:child1];
+  [root addSubview:child1];
-    [root addSubview:child2];
+  [root addSubview:child2];
-    [root.yoga applyLayoutPreservingOrigin:NO];
+  [root.yoga applyLayoutPreservingOrigin:NO];
 }
 
-
 @end

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 import UIKit

android/BUCK

@@ -3,10 +3,11 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "JAVA_TARGET", "PROGUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")
 
 yoga_android_aar(
     name = "android",
+    enable_relinker = True,
     manifest_skeleton = "src/main/AndroidManifest.xml",
     visibility = [
         "PUBLIC",
@@ -14,9 +15,8 @@ yoga_android_aar(
     deps = [
         ANDROID_JAVA_TARGET,
         ANDROID_RES_TARGET,
-        INFER_ANNOTATIONS_TARGET,
         JAVA_TARGET,
-        PROGRUARD_ANNOTATIONS_TARGET,
+        PROGUARD_ANNOTATIONS_TARGET,
     ],
 )
 

android/build.gradle

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

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

@@ -8,6 +8,7 @@ load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_SAM
 yoga_android_library(
     name = "yoga",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],

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

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.samples.yoga;
 
 import android.content.Intent;

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

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.samples.yoga;
 
 import java.io.File;

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

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.samples.yoga;
 
 

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

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.samples.yoga;
 
 import android.os.Bundle;

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

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.samples.yoga;
 
 import android.os.Bundle;

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

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.samples.yoga;
 
 import android.os.Bundle;

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

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.samples.yoga;
 
 import android.content.Intent;

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

@@ -8,6 +8,7 @@ load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_RES_TARGET", "INFER_ANNOTA
 yoga_android_library(
     name = "android",
     srcs = glob(["**/*.java"]),
+    autoglob = False,
     visibility = [
         "PUBLIC",
     ],

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

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga.android;
 
 import java.util.HashMap;
@@ -17,6 +18,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.facebook.yoga.YogaNode;
+import com.facebook.yoga.YogaNodeFactory;
 
 /**
  * Much like a {@link YogaLayout}, except this class does not render itself (the container) to the
@@ -32,7 +34,7 @@ public class VirtualYogaLayout extends ViewGroup {
 
   final private List<View> mChildren = new LinkedList<>();
   final private Map<View, YogaNode> mYogaNodes = new HashMap<>();
-  final private YogaNode mYogaNode = YogaNode.create();
+  final private YogaNode mYogaNode = YogaNodeFactory.create();
 
   public VirtualYogaLayout(Context context) {
     super(context);
@@ -72,7 +74,7 @@ public class VirtualYogaLayout extends ViewGroup {
       return;
     }
 
-    YogaNode node = YogaNode.create();
+    YogaNode node = YogaNodeFactory.create();
     YogaLayout.LayoutParams lp = new YogaLayout.LayoutParams(params);
     YogaLayout.applyLayoutParams(lp, node, child);
     node.setData(child);

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

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga.android;
 
 import android.content.Context;
@@ -28,6 +29,7 @@ import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
 import com.facebook.yoga.YogaNode;
+import com.facebook.yoga.YogaNodeFactory;
 import com.facebook.yoga.YogaOverflow;
 import com.facebook.yoga.YogaPositionType;
 import com.facebook.yoga.YogaWrap;
@@ -77,7 +79,7 @@ public class YogaLayout extends ViewGroup {
   public YogaLayout(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
 
-    mYogaNode = YogaNode.create();
+    mYogaNode = YogaNodeFactory.create();
     mYogaNodes = new HashMap<>();
 
     mYogaNode.setData(this);
@@ -154,7 +156,7 @@ public class YogaLayout extends ViewGroup {
       if(mYogaNodes.containsKey(child)) {
         childNode = mYogaNodes.get(child);
       } else {
-        childNode = YogaNode.create();
+        childNode = YogaNodeFactory.create();
       }
 
       childNode.setData(child);

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

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga.android;
 
 import android.content.Context;

benchmark/YGBenchmark.c

@@ -1,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include <math.h>
 #include <stdint.h>
 #include <stdio.h>

build.gradle

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -34,7 +34,7 @@ ext {
     minSdkVersion = 14
     targetSdkVersion = 25
     compileSdkVersion = 26
-    buildToolsVersion = '26.0.2'
+    buildToolsVersion = '28.0.3'
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 }

csharp/Facebook.Yoga/MeasureOutput.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/Native.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YGConfigHandle.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YGNodeHandle.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaAlign.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaConfig.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaConstants.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaDimension.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaDirection.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaDisplay.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaEdge.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaExperimentalFeature.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaFlexDirection.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaJustify.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaLogLevel.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaMeasureMode.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaNode.Spacing.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaNode.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaNodeType.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaOverflow.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaPositionType.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaPrintOptions.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaUnit.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaValue.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaValueExtensions.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Facebook.Yoga/YogaWrap.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/Mac/run-tests.sh

@@ -1,10 +1,7 @@
 #!/bin/sh
-
-#
 # Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-#
 
 ./csharp/Mac/Facebook.Yoga.Mac.Tests/bin/Release/Facebook.Yoga.Mac.Tests.app/Contents/MacOS/Facebook.Yoga.Mac.Tests

csharp/Windows/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 using System;
 using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 using Facebook.Yoga;

csharp/Yoga/YGInterop.cpp

@@ -1,18 +1,20 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include "YGInterop.h"
 
 static YGInteropLogger gManagedLogger;
 
-static int unmanagedLogger(const YGConfigRef config,
+static int unmanagedLogger(
-                           const YGNodeRef node,
+    const YGConfigRef config,
-                           YGLogLevel level,
+    const YGNodeRef node,
-                           const char *format,
+    YGLogLevel level,
-                           va_list args) {
+    const char* format,
+    va_list args) {
   int result = 0;
   if (gManagedLogger) {
     char message[8192];

csharp/Yoga/YGInterop.h

@@ -1,19 +1,21 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 
 #include <yoga/Yoga.h>
 
 YG_EXTERN_C_BEGIN
 
-typedef int (*YGInteropLogger)(const void *unmanagedConfigPtr,
+typedef int (*YGInteropLogger)(
-                               const void *unmanagedNodePtr,
+    const void* unmanagedConfigPtr,
-                               YGLogLevel level,
+    const void* unmanagedNodePtr,
-                               const char *message);
+    YGLogLevel level,
+    const char* message);
 
 WIN_EXPORT YGConfigRef YGConfigGetDefault();
 

csharp/Yoga/Yoga.vcxproj

@@ -36,7 +36,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
@@ -48,7 +48,7 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -62,13 +62,13 @@
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -227,6 +227,8 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\yoga\event\event.h" />
+    <ClInclude Include="..\..\yoga\log.h" />
     <ClInclude Include="..\..\yoga\Utils.h" />
     <ClInclude Include="..\..\yoga\YGConfig.h" />
     <ClInclude Include="..\..\yoga\YGEnums.h" />
@@ -236,6 +238,7 @@
     <ClInclude Include="..\..\yoga\YGNode.h" />
     <ClInclude Include="..\..\yoga\YGNodePrint.h" />
     <ClInclude Include="..\..\yoga\YGStyle.h" />
+    <ClInclude Include="..\..\yoga\YGValue.h" />
     <ClInclude Include="..\..\yoga\Yoga-internal.h" />
     <ClInclude Include="..\..\yoga\Yoga.h" />
     <ClInclude Include="resource.h" />
@@ -243,14 +246,16 @@
     <ClInclude Include="targetver.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\yoga\event\event.cpp" />
+    <ClCompile Include="..\..\yoga\log.cpp" />
     <ClCompile Include="..\..\yoga\Utils.cpp" />
     <ClCompile Include="..\..\yoga\YGConfig.cpp" />
     <ClCompile Include="..\..\yoga\YGEnums.cpp" />
-    <ClCompile Include="..\..\yoga\YGFloatOptional.cpp" />
     <ClCompile Include="..\..\yoga\YGLayout.cpp" />
     <ClCompile Include="..\..\yoga\YGNode.cpp" />
     <ClCompile Include="..\..\yoga\YGNodePrint.cpp" />
     <ClCompile Include="..\..\yoga\YGStyle.cpp" />
+    <ClCompile Include="..\..\yoga\YGValue.cpp" />
     <ClCompile Include="..\..\yoga\Yoga.cpp" />
     <ClCompile Include="YGInterop.cpp" />
     <ClCompile Include="dllmain.cpp">

csharp/Yoga/Yoga.vcxproj.filters

@@ -1,104 +1,119 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
+  <ItemGroup>
-    <Filter Include="Source Files">
+    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Header Files">
+    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
+    </Filter>
-    <Filter Include="Resource Files">
+    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
+    </Filter>
-  </ItemGroup>
+  </ItemGroup>
-  <ItemGroup>
+  <ItemGroup>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="targetver.h">
+    <ClInclude Include="targetver.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\Utils.h">
+    <ClInclude Include="..\..\yoga\Utils.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGEnums.h">
+    <ClInclude Include="..\..\yoga\YGEnums.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGFloatOptional.h">
+    <ClInclude Include="..\..\yoga\YGFloatOptional.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGLayout.h">
+    <ClInclude Include="..\..\yoga\YGLayout.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGMacros.h">
+    <ClInclude Include="..\..\yoga\YGMacros.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGNode.h">
+    <ClInclude Include="..\..\yoga\YGNode.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGNodePrint.h">
+    <ClInclude Include="..\..\yoga\YGNodePrint.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGStyle.h">
+    <ClInclude Include="..\..\yoga\YGStyle.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\Yoga.h">
+    <ClInclude Include="..\..\yoga\Yoga.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\Yoga-internal.h">
+    <ClInclude Include="..\..\yoga\Yoga-internal.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-    <ClInclude Include="..\..\yoga\YGConfig.h">
+    <ClInclude Include="..\..\yoga\YGConfig.h">
-      <Filter>Header Files</Filter>
+      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
-  </ItemGroup>
+    <ClInclude Include="..\..\yoga\YGValue.h">
-  <ItemGroup>
+      <Filter>Header Files</Filter>
-    <ClCompile Include="stdafx.cpp">
+    </ClInclude>
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\..\yoga\log.h">
-    </ClCompile>
+      <Filter>Header Files</Filter>
-    <ClCompile Include="dllmain.cpp">
+    </ClInclude>
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\..\yoga\event\event.h">
-    </ClCompile>
+      <Filter>Header Files</Filter>
-    <ClCompile Include="YGInterop.cpp">
+    </ClInclude>
-      <Filter>Source Files</Filter>
+  </ItemGroup>
-    </ClCompile>
+  <ItemGroup>
-    <ClCompile Include="..\..\yoga\Utils.cpp">
+    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGEnums.cpp">
+    <ClCompile Include="dllmain.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGFloatOptional.cpp">
+    <ClCompile Include="YGInterop.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGLayout.cpp">
+    <ClCompile Include="..\..\yoga\Utils.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGNode.cpp">
+    <ClCompile Include="..\..\yoga\YGEnums.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGNodePrint.cpp">
+    <ClCompile Include="..\..\yoga\YGLayout.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGStyle.cpp">
+    <ClCompile Include="..\..\yoga\YGNode.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\Yoga.cpp">
+    <ClCompile Include="..\..\yoga\YGNodePrint.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGConfig.cpp">
+    <ClCompile Include="..\..\yoga\YGStyle.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
-  </ItemGroup>
+    <ClCompile Include="..\..\yoga\Yoga.cpp">
-  <ItemGroup>
+      <Filter>Source Files</Filter>
-    <ResourceCompile Include="Yoga.rc">
+    </ClCompile>
-      <Filter>Resource Files</Filter>
+    <ClCompile Include="..\..\yoga\YGConfig.cpp">
-    </ResourceCompile>
+      <Filter>Source Files</Filter>
-  </ItemGroup>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\YGValue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\event\event.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\log.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="Yoga.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>

csharp/Yoga/dllmain.cpp

@@ -1,13 +1,15 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 // dllmain.cpp : Defines the entry point for the DLL application.
 #include "stdafx.h"
 
-BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
+BOOL APIENTRY
+DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
   switch (ul_reason_for_call) {
     case DLL_PROCESS_ATTACH:
     case DLL_THREAD_ATTACH:

csharp/Yoga/resource.h

@@ -1,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by Yoga.rc

csharp/Yoga/stdafx.cpp

@@ -1,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 // stdafx.cpp : source file that includes just the standard includes
 // Yoga.pch will be the pre-compiled header
 // stdafx.obj will contain the pre-compiled type information

csharp/Yoga/stdafx.h

@@ -1,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 // stdafx.h : include file for standard system include files,
 // or project specific include files that are used frequently, but
 // are changed infrequently

csharp/Yoga/targetver.h

@@ -1,14 +1,16 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 
 // Including SDKDDKVer.h defines the highest available Windows platform.
 
-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
+// If you wish to build your application for a previous Windows platform,
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+// include WinSDKVer.h and set the _WIN32_WINNT macro to the platform you wish
+// to support before including SDKDDKVer.h.
 
 #include <SDKDDKVer.h>

csharp/build-native.sh

@@ -1,11 +1,8 @@
 #!/bin/sh
-
-#
 # Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-#
 
 cd `dirname "$0"`
 echo $ANDROID_SDK

csharp/tests/Facebook.Yoga/YGAlignBaselineTest.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/tests/Facebook.Yoga/YGDisplayTest.cs

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGDisplayTest.html
 
 using System;
@@ -333,5 +334,47 @@ namespace Facebook.Yoga
             Assert.AreEqual(0f, root_child1.LayoutHeight);
         }
 
+        [Test]
+        public void Test_display_none_with_position_absolute()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Width = 100;
+            root_child0.Height = 100;
+            root_child0.Display = YogaDisplay.None;
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+        }
+
     }
 }

csharp/tests/Facebook.Yoga/YogaConfigTest.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/tests/Facebook.Yoga/YogaNodeSpacingTest.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/tests/Facebook.Yoga/YogaNodeTest.cs

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

csharp/tests/Facebook.Yoga/test_macos.sh

@@ -1,4 +1,9 @@
 #!/bin/sh
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
 if mcs --version >/dev/null 2>&1 && mono --version >/dev/null 2>&1; then true; else
   echo "ERROR: Need to install Mono (brew install mono, or http://www.mono-project.com/download/)"
   exit 1

gentest/fixtures/YGAbsolutePositionTest.html

@@ -88,3 +88,7 @@
   <div style="width:20px; height:20px; position: absolute; align-self: flex-end;"></div>
 </div>
 
+<div id="absolute_layout_percentage_from_padded_parent" style="flex-direction:column; width:750px; height:1000px; padding-top: 100px; border-top: 100px;">
+  <div style="width:750px; height:50%; position: absolute;"></div>
+</div>
+

gentest/fixtures/YGDisplayTest.html

@@ -25,3 +25,7 @@
  <div style="flex-grow: 1;"></div>
  <div style="flex-grow: 1; display:none; top: 10px;"></div>
 </div>
+
+<div id="display_none_with_position_absolute" style="width: 100px; height: 100px;">
+  <div style="display:none; position: absolute; width: 100px; height: 100px"></div>
+</div>

gentest/gentest-cs.js

@@ -120,8 +120,9 @@ CSEmitter.prototype = Object.create(Emitter.prototype, {
   YGOverflowHidden:{value:'YogaOverflow.Hidden'},
   YGOverflowVisible:{value:'YogaOverflow.Visible'},
 
-  YGPositionTypeAbsolute:{value:'YogaPositionType.Absolute'},
+  YGPositionTypeAbsolute:{value:'YogaPositionType.Static'},
   YGPositionTypeRelative:{value:'YogaPositionType.Relative'},
+  YGPositionTypeAbsolute:{value:'YogaPositionType.Absolute'},
 
   YGUndefined:{value:'YogaConstants.Undefined'},
 

gentest/gentest-java.js

@@ -72,7 +72,7 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
     this.push('public void test_' + name + '() {');
     this.pushIndent();
 
-    this.push("YogaConfig config = new YogaConfig();")
+    this.push("YogaConfig config = YogaConfigFactory.create();")
     for (var i in experiments) {
       this.push('config.setExperimentalFeatureEnabled(YogaExperimentalFeature.' + toJavaUpper(experiments[i]) +', true);');
     }

gentest/gentest.js

@@ -41,11 +41,11 @@ function assert(condition, message) {
 
 function printTest(e, LTRContainer, RTLContainer, genericContainer) {
   e.push([
-    '/**',
+    '/*',
     ' * Copyright (c) Facebook, Inc. and its affiliates.',
     ' *',
-    ' * This source code is licensed under the MIT license found in the LICENSE',
+    ' * This source code is licensed under the MIT license found in the',
-    ' * file in the root directory of this source tree.',
+    ' * LICENSE file in the root directory of this source tree.',
     ' */',
     '// @Generated by gentest/gentest.rb from gentest/fixtures/' + document.title + '.html',
     '',

gentest/gentest.rb

@@ -1,15 +1,20 @@
 #!/usr/bin/env ruby
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
 
 require 'watir'
 require 'fileutils'
 
-caps = Selenium::WebDriver::Remote::Capabilities.chrome(
+browser = Watir::Browser.new(:chrome, "goog:loggingPrefs" => {
-  "loggingPrefs"=>{
+    "browser" => "ALL",
-    "browser"=>"ALL",
+    "performance" => "ALL"
-    "performance"=>"ALL"
+  },
-  }
+  "chromeOptions" => {
-)
+    "w3c" => "false"
-browser = Watir::Browser.new(:chrome, :desired_capabilities => caps, :switches => ['--force-device-scale-factor=1', '--window-position=0,0'])
+  },
+  :switches => ['--force-device-scale-factor=1', '--window-position=0,0'])
 
 Dir.chdir(File.dirname($0))
 

gradle.properties

@@ -9,7 +9,7 @@
 
 org.gradle.jvmargs=-Xmx1536M
 
-VERSION_NAME=1.16.0
+VERSION_NAME=1.17.0-SNAPSHOT
 POM_URL=https://github.com/facebook/yoga
 POM_SCM_URL=https://github.com/facebook/yoga.git
 POM_SCM_CONNECTION=scm:git:https://github.com/facebook/yoga.git

gradle/android-maven-install.gradle

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 // Configure the Android maven publication
 
 apply plugin: 'com.github.dcendents.android-maven'

gradle/android-tasks.gradle

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 // Android tasks for Javadoc and sources.jar generation
 
 afterEvaluate { project ->

gradle/bintray.gradle

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 // Upload to Bintray
 apply plugin: 'com.jfrog.bintray'
 

gradle/release-bintray.gradle

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 // Set up everything required for releasing on Bintray
 ext {
     bintrayRepo = 'maven'

gradle/release.gradle

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 // Common Android tasks for all releases that generate Javadocs, sources, etc.
 apply from: rootProject.file('gradle/android-tasks.gradle')
 

java/BUCK

@@ -3,13 +3,31 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "FBJNI_JAVA_TARGET", "FBJNI_TARGET", "INFER_ANNOTATIONS_TARGET", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "yoga_cxx_lib", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "YOGA_ROOTS", "yoga_cxx_lib", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test", "yoga_prebuilt_cxx_library")
 
 CXX_LIBRARY_WHITELIST_FOR_TESTS = CXX_LIBRARY_WHITELIST + [
     yoga_cxx_lib("testutil:jni"),
-    yoga_cxx_lib("testutil:testutil"),
+    yoga_cxx_lib("testutil:testutil-jni"),
 ]
 
+YOGA_JAVA_IMPLEMENTATION_FILES = [
+    "com/facebook/yoga/*JNI*.java",
+    "com/facebook/yoga/*Factory.java",
+    "com/facebook/yoga/YogaNative.java",
+]
+
+yoga_prebuilt_cxx_library(
+    name = "ndklog",
+    exported_platform_linker_flags = [
+        (
+            "^android.*",
+            ["-llog"],
+        ),
+    ],
+    header_only = True,
+    visibility = YOGA_ROOTS,
+)
+
 yoga_cxx_library(
     name = "jni",
     srcs = glob(["jni/*.cpp"]),
@@ -19,6 +37,9 @@ yoga_cxx_library(
     compiler_flags = [
         "-fno-omit-frame-pointer",
         "-fexceptions",
+        "-fvisibility=hidden",
+        "-ffunction-sections",
+        "-fdata-sections",
         "-fPIC",
         "-Wall",
         "-Werror",
@@ -32,15 +53,45 @@ yoga_cxx_library(
     soname = "libyoga.$(ext)",
     visibility = ["PUBLIC"],
     deps = [
-        FBJNI_TARGET,
         JNI_TARGET,
-        yoga_dep(":yoga"),
+        yoga_dep(":yoga-static"),
+        ":ndklog",
+    ],
+)
+
+yoga_java_library(
+    name = "java-interface",
+    srcs = glob(
+        ["com/facebook/yoga/*.java"],
+        exclude = YOGA_JAVA_IMPLEMENTATION_FILES,
+    ),
+    required_for_source_only_abi = True,
+    source = "1.7",
+    target = "1.7",
+    visibility = ["PUBLIC"],
+    deps = [
+        JSR_305_TARGET,
+        PROGUARD_ANNOTATIONS_TARGET,
+    ],
+)
+
+yoga_java_library(
+    name = "java-impl",
+    srcs = glob(YOGA_JAVA_IMPLEMENTATION_FILES),
+    required_for_source_only_abi = True,
+    source = "1.7",
+    target = "1.7",
+    deps = [
+        ":java-interface",
+        ":jni",
+        JSR_305_TARGET,
+        PROGUARD_ANNOTATIONS_TARGET,
+        SOLOADER_TARGET,
     ],
 )
 
 yoga_java_library(
     name = "java",
-    srcs = glob(["com/facebook/yoga/*.java"]),
     required_for_source_only_abi = True,
     source = "1.7",
     target = "1.7",
@@ -48,19 +99,16 @@ yoga_java_library(
         yoga_dep("java:tests"),
     ],
     visibility = ["PUBLIC"],
-    deps = [
+    exported_deps = [
-        ":jni",
+        ":java-impl",
-        FBJNI_JAVA_TARGET,
+        ":java-interface",
-        INFER_ANNOTATIONS_TARGET,
-        JSR_305_TARGET,
-        PROGRUARD_ANNOTATIONS_TARGET,
-        SOLOADER_TARGET,
     ],
 )
 
 yoga_java_test(
     name = "tests",
     srcs = glob(["tests/**/*.java"]),
+    contacts = ["oncall+yoga@xmail.facebook.com"],
     cxx_library_whitelist = CXX_LIBRARY_WHITELIST_FOR_TESTS,
     use_cxx_libraries = True,
     visibility = ["PUBLIC"],
@@ -75,6 +123,5 @@ yoga_java_binary(
     name = "yoga",
     deps = [
         ":java",
-        FBJNI_JAVA_TARGET,
     ],
 )

java/CMakeLists.txt

@@ -1,38 +1,40 @@
-#
 # Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-#
 
 cmake_minimum_required(VERSION 3.4.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 
 # configure import libs
-set(libfb_DIR ${CMAKE_SOURCE_DIR}/../lib/fb/src/main/cpp)
 set(yogacore_DIR ${CMAKE_SOURCE_DIR}/..)
-
 set(build_DIR ${CMAKE_SOURCE_DIR}/build)
 
-set(libfb_build_DIR ${build_DIR}/libfb/${ANDROID_ABI})
 set(yogacore_build_DIR ${build_DIR}/yogacore/${ANDROID_ABI})
 
 file(MAKE_DIRECTORY ${build_DIR})
 
-add_subdirectory(${libfb_DIR} ${libfb_build_DIR})
 add_subdirectory(${yogacore_DIR} ${yogacore_build_DIR})
 
 add_compile_options(
     -fno-omit-frame-pointer
     -fexceptions
+    -fvisibility=hidden
+    -ffunction-sections
+    -fdata-sections
     -Wall
     -std=c++11)
 
-add_library(yoga SHARED jni/YGJNI.cpp jni/YGJTypes.cpp)
+file(GLOB jni_SRC
+        jni/*.cpp)
+
+file(GLOB yogajni_version_script
+        yogajni.version)
+
+add_library(yoga SHARED ${jni_SRC})
 
 target_include_directories(yoga PRIVATE
-    ${libfb_DIR}/include
     ${yogacore_DIR})
 
-target_link_libraries(yoga yogacore fb)
+target_link_libraries(yoga -Wl,--gc-sections,--version-script=${yogajni_version_script} yogacore)

java/build.gradle

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -58,11 +58,11 @@ android {
 }
 
 dependencies {
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.1'
+    implementation 'com.google.code.findbugs:jsr305:3.0.1'
-    compileOnly project(':yoga:proguard-annotations')
+    implementation project(':yoga:proguard-annotations')
     implementation 'com.facebook.soloader:soloader:0.5.1'
     testImplementation 'junit:junit:4.12'
-    testCompile project(':testutil')
+    testImplementation project(':testutil')
 }
 
 task sourcesJar(type: Jar) {

java/com/facebook/yoga/LayoutPassReason.java

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
 public enum LayoutPassReason {

java/com/facebook/yoga/YogaAlign.java

@@ -1,14 +1,12 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public enum YogaAlign {
   AUTO(0),
   FLEX_START(1),