Revert D4456312: Fix for Yoga test failure for flexing with min stack dimension

Summary: This reverts commit 82a39bc93cf3bf2374b968e9f7403397e752908e

Differential Revision: D4456312

fbshipit-source-id: 6b396f0a8b67619308456599377238b75d0c1ab3

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,17 @@
+# Report
+
+- [ ] I have searched [existing issues](https://github.com/facebook/yoga/issues) and this is not a duplicate
+
+# Issues and Steps to Reproduce
+***Replaces this with steps to repro your issue.***
+
+# Expected Behavior
+***Describe what you expected would happen.***
+
+# Actual Behavior
+***Describe what actually happened.***
+
+# Link to Code
+***If you have some code that maintainers can clone/test for themselves, bugs can be resolved much faster. Please paste a link here.***
+
+***When applicable, use this [fiddle](https://jsfiddle.net/emilsjolander/jckmwztt/) to post a web repro.***

.gitignore

@@ -5,6 +5,58 @@
 /.buckconfig.local
 /.buckd
 /gentest/test.html
+.buckversion
+
+# Jekyll
+/.sass-cache/
+/_site/
 
 # Visual studio code
 .vscode
+*.pdb
+*.tlog
+*.obj
+*.pch
+*.log
+*.orig
+
+# Xcode
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xcuserstate
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build

.hgignore

@@ -1,10 +0,0 @@
-.DS_STORE
-
-/buck-cache/
-/buck-out/
-/.buckconfig.local
-/.buckd
-/gentest/test.html
-
-# Visual studio code
-.vscode

.swift-version

@@ -0,0 +1 @@
+3.0

.travis.yml

@@ -6,7 +6,7 @@
 # of patent rights can be found in the PATENTS file in the same directory.
 
 os: osx
-osx_image: xcode7.3
+osx_image: xcode8.2
 language: cpp
 compiler: clang
 
@@ -17,14 +17,26 @@ before_install:
   - brew cask install java
   - brew outdated xctool || brew upgrade xctool
   - brew install mono
+
   - export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)
   - export PATH=$JAVA_HOME/bin:$PATH
 
+install:
+  - cd javascript
+  - npm install
+  - cd $TRAVIS_BUILD_DIR
+
 script:
   - buck test //:yoga
   - buck test //java:java
-  - buck test //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64 --config cxx.cflags=-DTRAVIS_CI
+  - buck test //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64
   - sh csharp/tests/Facebook.Yoga/test_macos.sh
+
+  - cd javascript
+  - npm run test:all
+  - npm run bench
+  - cd $TRAVIS_BUILD_DIR
+
   - buck run //benchmark:benchmark
   - git checkout HEAD^
   - buck run //benchmark:benchmark

README.md

@@ -1,9 +1,11 @@
-# Yoga [![Build Status](https://travis-ci.org/facebook/yoga.svg?branch=master)](https://travis-ci.org/facebook/yoga)
+# Yoga [![Build Status](https://travis-ci.org/facebook/yoga.svg?branch=master)](https://travis-ci.org/facebook/yoga) [![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout)
 
 ## Building
 Yoga builds with [buck](https://buckbuild.com). Make sure you install buck before contributing to Yoga. Yoga's main implementation is in C, with bindings to supported languages and frameworks. When making changes to Yoga please ensure the changes are also propagated to these bindings when applicable.
 
 ## Testing
+For testing we rely on [gtest](https://github.com/google/googletest) as a submodule. After cloning Yoga run `git submodule init` followed by `git submodule update`.
+
 For any changes you make you should ensure that all the tests are passing. In case you make any fixes or additions to the library please also add tests for that change to ensure we don't break anything in the future. Tests are located in the `tests` directory. Run the tests by executing `buck test //:yoga`.
 
 Instead of manually writing a test which ensures parity with web implementations of Flexbox you can run `gentest/gentest.rb` to generated a test for you. You can write html which you want to verify in Yoga, in `gentest/fixtures` folder, such as the following.
@@ -25,4 +27,4 @@ You may need to install the latest watir-webdriver gem (`gem install watir-webdr
 For the main C implementation of Yoga clang-format is used to ensure a consistent code style. Please run `bash format.sh` before submitting a pull request. For other languages just try to follow the current code style.
 
 ## Benchmarks
-Benchmarks are located in `benchmarks/YGBenchmark.c` and can be run with `buck run //benchmarks:benchmarks`. If you think your change has affected performance please run this before and after your change to validate that nothing has regressed. Benchmarks are run on every commit in CI.
+Benchmarks are located in `benchmark/YGBenchmark.c` and can be run with `buck run //benchmark:benchmark`. If you think your change has affected performance please run this before and after your change to validate that nothing has regressed. Benchmarks are run on every commit in CI.

Yoga.podspec

@@ -0,0 +1,28 @@
+Pod::Spec.new do |spec|
+  spec.name = 'Yoga'
+  spec.version = '1.0.2'
+  spec.license =  { :type => 'BSD', :file => "LICENSE" }
+  spec.homepage = 'https://facebook.github.io/yoga/'
+  spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/c/'
+
+  spec.summary = 'Yoga is a cross-platform layout engine which implements Flexbox.'
+  spec.description = 'Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.'
+
+  spec.authors = 'Facebook'
+  spec.source = {
+    :git => 'https://github.com/facebook/yoga.git',
+    :tag => 'v2017.01.27.00',
+  }
+
+  spec.module_name = 'yoga'
+  spec.requires_arc = false
+  spec.compiler_flags = [
+      '-fno-omit-frame-pointer',
+      '-fexceptions',
+      '-Wall',
+      '-Werror',
+      '-std=c11',
+      '-fPIC'
+  ]
+  spec.source_files = 'yoga/**/*.{c,h}'
+end

YogaKit.podspec

@@ -0,0 +1,29 @@
+podspec = Pod::Spec.new do |spec|
+  spec.name = 'YogaKit'
+  spec.version = '1.0.3'
+  spec.license =  { :type => 'BSD', :file => "LICENSE" }
+  spec.homepage = 'https://facebook.github.io/yoga/'
+  spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/yogakit/'
+
+  spec.summary = 'Yoga is a cross-platform layout engine which implements Flexbox.'
+  spec.description = 'Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.'
+
+  spec.authors = 'Facebook'
+  spec.source = {
+    :git => 'https://github.com/facebook/yoga.git',
+    :tag => 'v2017.01.27.00',
+  }
+
+  spec.platform = :ios
+  spec.ios.deployment_target = '8.0'
+  spec.ios.frameworks = 'UIKit'
+
+  spec.dependency 'Yoga', '~> 1.0'
+  spec.source_files = 'YogaKit/Source/*.{h,m}'
+  spec.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h'
+  spec.private_header_files = 'YogaKit/Source/YGLayout+Private.h'
+end
+
+# See https://github.com/facebook/yoga/pull/366
+podspec.attributes_hash["readme"] = "YogaKit/README.md"
+podspec

YogaKit/.swift-version

@@ -0,0 +1 @@
+3.0.2

YogaKit/BUCK

@@ -30,8 +30,8 @@ COMPILER_FLAGS = [
 apple_library(
   name = 'YogaKit',
   compiler_flags = COMPILER_FLAGS,
-  srcs = glob(['*.m']),
-  exported_headers = glob(['*.h']),
+  srcs = glob(['Source/**/*.m']),
+  exported_headers = glob(['Source/**/*.h']),
   frameworks = [
     '$SDKROOT/System/Library/Frameworks/Foundation.framework',
     '$SDKROOT/System/Library/Frameworks/UIKit.framework',

YogaKit/README.md

@@ -0,0 +1,22 @@
+# YogaKit
+
+[![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg?style=flat)](https://cocoapods.org/pods/YogaKit)
+[![Platform](https://img.shields.io/badge/platforms-iOS-orange.svg)](https://facebook.github.io/yoga/docs/api/yogakit/)
+[![Languages](https://img.shields.io/badge/languages-ObjC%20%7C%20Swift-orange.svg)](https://facebook.github.io/yoga/docs/api/yogakit/)
+
+## Installation
+YogaKit is available to install via [CocoaPods](https://cocoapods.org/).
+
+```
+pod 'YogaKit', '~> 1.0.2'
+```
+
+## Getting Started
+Checkout the docs [here](https://facebook.github.io/yoga/docs/api/yogakit/).
+
+We also have a sample project. To try it out, clone this repo and open `YogaKitSample.xcodeproj` in the [YogaKitSample](https://github.com/facebook/yoga/tree/master/YogaKit/YogaKitSample) directory.
+
+## Contributing
+We welcome all pull-requests! At Facebook we sync the open source version of `YogaKit` daily, so we're always testing the latest changes.
+
+See the [CONTRIBUTING](https://github.com/facebook/yoga/blob/master/CONTRIBUTING) file for how to help out.

YogaKit/Source/UIView+Yoga.h

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "YGLayout.h"
+#import <UIKit/UIKit.h>
+
+@interface UIView (Yoga)
+
+@property (nonatomic, readonly, strong) YGLayout *yoga;
+
+@end

YogaKit/Source/UIView+Yoga.m

@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "UIView+Yoga.h"
+#import "YGLayout+Private.h"
+#import <objc/runtime.h>
+
+static const void *kYGYogaAssociatedKey = &kYGYogaAssociatedKey;
+
+@implementation UIView (YogaKit)
+
+- (YGLayout *)yoga
+{
+  YGLayout *yoga = objc_getAssociatedObject(self, kYGYogaAssociatedKey);
+  if (!yoga) {
+    yoga = [[YGLayout alloc] initWithView:self];
+    objc_setAssociatedObject(self, kYGYogaAssociatedKey, yoga, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+  }
+
+  return yoga;
+}
+
+
+@end

YogaKit/Source/YGLayout+Private.h

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "YGLayout.h"
+#import <yoga/Yoga.h>
+
+@interface YGLayout ()
+
+@property (nonatomic, assign, readonly) YGNodeRef node;
+
+- (instancetype)initWithView:(UIView *)view;
+
+@end

YogaKit/Source/YGLayout.h

@@ -0,0 +1,118 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <UIKit/UIKit.h>
+#import <yoga/YGEnums.h>
+
+@interface YGLayout : NSObject
+
+/**
+  The property that decides if we should include this view when calculating layout. Defaults to YES.
+ */
+@property (nonatomic, readwrite, assign, setter=setIncludedInLayout:) BOOL isIncludedInLayout;
+
+/**
+ The property that decides during layout/sizing whether or not styling properties should be applied.
+ Defaults to NO.
+ */
+@property (nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;
+
+@property (nonatomic, readwrite, assign) YGDirection direction;
+@property (nonatomic, readwrite, assign) YGFlexDirection flexDirection;
+@property (nonatomic, readwrite, assign) YGJustify justifyContent;
+@property (nonatomic, readwrite, assign) YGAlign alignContent;
+@property (nonatomic, readwrite, assign) YGAlign alignItems;
+@property (nonatomic, readwrite, assign) YGAlign alignSelf;
+@property (nonatomic, readwrite, assign) YGPositionType position;
+@property (nonatomic, readwrite, assign) YGWrap flexWrap;
+@property (nonatomic, readwrite, assign) YGOverflow overflow;
+@property (nonatomic, readwrite, assign) YGDisplay display;
+
+@property (nonatomic, readwrite, assign) CGFloat flexGrow;
+@property (nonatomic, readwrite, assign) CGFloat flexShrink;
+@property (nonatomic, readwrite, assign) CGFloat flexBasis;
+
+@property (nonatomic, readwrite, assign) CGFloat left;
+@property (nonatomic, readwrite, assign) CGFloat top;
+@property (nonatomic, readwrite, assign) CGFloat right;
+@property (nonatomic, readwrite, assign) CGFloat bottom;
+@property (nonatomic, readwrite, assign) CGFloat start;
+@property (nonatomic, readwrite, assign) CGFloat end;
+
+@property (nonatomic, readwrite, assign) CGFloat marginLeft;
+@property (nonatomic, readwrite, assign) CGFloat marginTop;
+@property (nonatomic, readwrite, assign) CGFloat marginRight;
+@property (nonatomic, readwrite, assign) CGFloat marginBottom;
+@property (nonatomic, readwrite, assign) CGFloat marginStart;
+@property (nonatomic, readwrite, assign) CGFloat marginEnd;
+@property (nonatomic, readwrite, assign) CGFloat marginHorizontal;
+@property (nonatomic, readwrite, assign) CGFloat marginVertical;
+@property (nonatomic, readwrite, assign) CGFloat margin;
+
+@property (nonatomic, readwrite, assign) CGFloat paddingLeft;
+@property (nonatomic, readwrite, assign) CGFloat paddingTop;
+@property (nonatomic, readwrite, assign) CGFloat paddingRight;
+@property (nonatomic, readwrite, assign) CGFloat paddingBottom;
+@property (nonatomic, readwrite, assign) CGFloat paddingStart;
+@property (nonatomic, readwrite, assign) CGFloat paddingEnd;
+@property (nonatomic, readwrite, assign) CGFloat paddingHorizontal;
+@property (nonatomic, readwrite, assign) CGFloat paddingVertical;
+@property (nonatomic, readwrite, assign) CGFloat padding;
+
+@property (nonatomic, readwrite, assign) CGFloat borderLeftWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderTopWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderRightWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderBottomWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderStartWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderEndWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderWidth;
+
+@property (nonatomic, readwrite, assign) CGFloat width;
+@property (nonatomic, readwrite, assign) CGFloat height;
+@property (nonatomic, readwrite, assign) CGFloat minWidth;
+@property (nonatomic, readwrite, assign) CGFloat minHeight;
+@property (nonatomic, readwrite, assign) CGFloat maxWidth;
+@property (nonatomic, readwrite, assign) CGFloat maxHeight;
+
+// Yoga specific properties, not compatible with flexbox specification
+@property (nonatomic, readwrite, assign) CGFloat aspectRatio;
+
+/**
+ Get the resolved direction of this node. This won't be YGDirectionInherit
+ */
+@property (nonatomic, readonly, assign) YGDirection resolvedDirection;
+
+/**
+ Perform a layout calculation and update the frames of the views in the hierarchy with the results
+ */
+- (void)applyLayout NS_SWIFT_NAME(applyLayout());
+
+/**
+ Returns the size of the view if no constraints were given. This could equivalent to calling [self
+ sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
+ */
+@property (nonatomic, readonly, assign) CGSize intrinsicSize;
+
+/**
+ Returns the number of children that are using Flexbox.
+ */
+@property (nonatomic, readonly, assign) NSUInteger numberOfChildren;
+
+/**
+ Return a BOOL indiciating whether or not we this node contains any subviews that are included in
+ Yoga's layout.
+ */
+@property (nonatomic, readonly, assign) BOOL isLeaf;
+
+/**
+ Mark that a view's layout needs to be recalculated. Only works for leaf views.
+ */
+- (void)markDirty;
+
+@end

YogaKit/Source/YGLayout.m

@@ -0,0 +1,406 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "YGLayout+Private.h"
+#import "UIView+Yoga.h"
+
+#define YG_PROPERTY(type, lowercased_name, capitalized_name)    \
+- (type)lowercased_name                                         \
+{                                                               \
+  return YGNodeStyleGet##capitalized_name(self.node);           \
+}                                                               \
+                                                                \
+- (void)set##capitalized_name:(type)lowercased_name             \
+{                                                               \
+  YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
+}
+
+#define YG_VALUE_PROPERTY(lowercased_name, capitalized_name)    \
+- (CGFloat)lowercased_name                                      \
+{                                                               \
+  YGValue value = YGNodeStyleGet##capitalized_name(self.node);  \
+  if (value.unit == YGUnitPixel) {                              \
+    return value.value;                                         \
+  } else {                                                      \
+    return YGUndefined;                                         \
+  }                                                             \
+}                                                               \
+                                                                \
+- (void)set##capitalized_name:(CGFloat)lowercased_name          \
+{                                                               \
+  YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
+}
+
+#define YG_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge) \
+- (CGFloat)lowercased_name                                                         \
+{                                                                                  \
+  return YGNodeStyleGet##property(self.node, edge);                                \
+}
+
+#define YG_SHORTHAND_EDGE_PROPERTY_GETTER(lowercased_name) \
+- (CGFloat)lowercased_name                                 \
+{                                                          \
+  return YGUndefined;                                      \
+}
+
+#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(lowercased_name, capitalized_name, property, edge)  \
+YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
+
+#define YG_SHORTHAND_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
+YG_SHORTHAND_EDGE_PROPERTY_GETTER(lowercased_name)                                    \
+YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
+
+#define YG_VALUE_EDGE_PROPERTY_GETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
+- (CGFloat)objc_lowercased_name                                                                  \
+{                                                                                                \
+  YGValue value = YGNodeStyleGet##c_name(self.node, edge);                                       \
+  if (value.unit == YGUnitPixel) {                                                               \
+    return value.value;                                                                          \
+  } else {                                                                                       \
+    return YGUndefined;                                                                          \
+  }                                                                                              \
+}
+
+#define YG_VALUE_EDGE_PROPERTY_SETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
+- (void)set##objc_capitalized_name:(CGFloat)objc_lowercased_name                                 \
+{                                                                                                \
+  YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name);                                 \
+}
+
+#define YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
+YG_VALUE_EDGE_PROPERTY_GETTER(lowercased_name, capitalized_name, property, edge)  \
+YG_VALUE_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
+
+#define YG_VALUE_SHORTHAND_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
+YG_SHORTHAND_EDGE_PROPERTY_GETTER(lowercased_name)                                          \
+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_SHORTHAND_EDGE_PROPERTY(lowercased_name##Horizontal, capitalized_name##Horizontal, capitalized_name, YGEdgeHorizontal) \
+YG_VALUE_SHORTHAND_EDGE_PROPERTY(lowercased_name##Vertical, capitalized_name##Vertical, capitalized_name, YGEdgeVertical)       \
+YG_VALUE_SHORTHAND_EDGE_PROPERTY(lowercased_name, capitalized_name, capitalized_name, YGEdgeAll)
+
+@interface YGLayout ()
+
+@property (nonatomic, weak, readonly) UIView *view;
+
+@end
+
+@implementation YGLayout
+
+@synthesize isEnabled=_isEnabled;
+@synthesize isIncludedInLayout=_isIncludedInLayout;
+@synthesize node=_node;
+
++ (void)initialize
+{
+  YGSetExperimentalFeatureEnabled(YGExperimentalFeatureWebFlexBasis, true);
+}
+
+- (instancetype)initWithView:(UIView*)view
+{
+  if (self = [super init]) {
+    _view = view;
+    _node = YGNodeNew();
+    YGNodeSetContext(_node, (__bridge void *) view);
+    _isEnabled = NO;
+    _isIncludedInLayout = YES;
+  }
+
+  return self;
+}
+
+- (void)dealloc
+{
+  YGNodeFree(self.node);
+}
+
+- (void)markDirty
+{
+  if (self.isLeaf) {
+    YGNodeMarkDirty(self.node);
+  }
+}
+
+- (NSUInteger)numberOfChildren
+{
+  return YGNodeGetChildCount(self.node);
+}
+
+- (BOOL)isLeaf
+{
+  NSAssert([NSThread isMainThread], @"This method must be called on the main thread.");
+  if (self.isEnabled) {
+    for (UIView *subview in self.view.subviews) {
+      YGLayout *const yoga = subview.yoga;
+      if (yoga.isEnabled && yoga.isIncludedInLayout) {
+        return NO;
+      }
+    }
+  }
+
+  return YES;
+}
+
+#pragma mark - Style
+
+- (YGPositionType)position
+{
+  return YGNodeStyleGetPositionType(self.node);
+}
+
+- (void)setPosition:(YGPositionType)position
+{
+  YGNodeStyleSetPositionType(self.node, position);
+}
+
+YG_PROPERTY(YGDirection, direction, Direction)
+YG_PROPERTY(YGFlexDirection, flexDirection, FlexDirection)
+YG_PROPERTY(YGJustify, justifyContent, JustifyContent)
+YG_PROPERTY(YGAlign, alignContent, AlignContent)
+YG_PROPERTY(YGAlign, alignItems, AlignItems)
+YG_PROPERTY(YGAlign, alignSelf, AlignSelf)
+YG_PROPERTY(YGWrap, flexWrap, FlexWrap)
+YG_PROPERTY(YGOverflow, overflow, Overflow)
+YG_PROPERTY(YGDisplay, display, Display)
+
+YG_PROPERTY(CGFloat, flexGrow, FlexGrow)
+YG_PROPERTY(CGFloat, flexShrink, FlexShrink)
+YG_VALUE_PROPERTY(flexBasis, FlexBasis)
+
+YG_VALUE_EDGE_PROPERTY(left, Left, Position, YGEdgeLeft)
+YG_VALUE_EDGE_PROPERTY(top, Top, Position, YGEdgeTop)
+YG_VALUE_EDGE_PROPERTY(right, Right, Position, YGEdgeRight)
+YG_VALUE_EDGE_PROPERTY(bottom, Bottom, Position, YGEdgeBottom)
+YG_VALUE_EDGE_PROPERTY(start, Start, Position, YGEdgeStart)
+YG_VALUE_EDGE_PROPERTY(end, End, Position, YGEdgeEnd)
+YG_VALUE_EDGES_PROPERTIES(margin, Margin)
+YG_VALUE_EDGES_PROPERTIES(padding, Padding)
+
+YG_EDGE_PROPERTY(borderLeftWidth, BorderLeftWidth, Border, YGEdgeLeft)
+YG_EDGE_PROPERTY(borderTopWidth, BorderTopWidth, Border, YGEdgeTop)
+YG_EDGE_PROPERTY(borderRightWidth, BorderRightWidth, Border, YGEdgeRight)
+YG_EDGE_PROPERTY(borderBottomWidth, BorderBottomWidth, Border, YGEdgeBottom)
+YG_EDGE_PROPERTY(borderStartWidth, BorderStartWidth, Border, YGEdgeStart)
+YG_EDGE_PROPERTY(borderEndWidth, BorderEndWidth, Border, YGEdgeEnd)
+YG_SHORTHAND_EDGE_PROPERTY(borderWidth, BorderWidth, Border, YGEdgeAll)
+
+YG_VALUE_PROPERTY(width, Width)
+YG_VALUE_PROPERTY(height, Height)
+YG_VALUE_PROPERTY(minWidth, MinWidth)
+YG_VALUE_PROPERTY(minHeight, MinHeight)
+YG_VALUE_PROPERTY(maxWidth, MaxWidth)
+YG_VALUE_PROPERTY(maxHeight, MaxHeight)
+YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
+
+#pragma mark - Layout and Sizing
+
+- (YGDirection)resolvedDirection
+{
+  return YGNodeLayoutGetDirection(self.node);
+}
+
+- (void)applyLayout
+{
+  [self calculateLayoutWithSize:self.view.bounds.size];
+  YGApplyLayoutToViewHierarchy(self.view);
+}
+
+- (CGSize)intrinsicSize
+{
+  const CGSize constrainedSize = {
+    .width = YGUndefined,
+    .height = YGUndefined,
+  };
+  return [self calculateLayoutWithSize:constrainedSize];
+}
+
+#pragma mark - Private
+
+- (CGSize)calculateLayoutWithSize:(CGSize)size
+{
+  NSAssert([NSThread isMainThread], @"Yoga calculation must be done on main.");
+  NSAssert(self.isEnabled, @"Yoga is not enabled for this view.");
+
+  YGAttachNodesFromViewHierachy(self.view);
+
+  const YGNodeRef node = self.node;
+  YGNodeCalculateLayout(
+    node,
+    size.width,
+    size.height,
+    YGNodeStyleGetDirection(node));
+
+  return (CGSize) {
+    .width = YGNodeLayoutGetWidth(node),
+    .height = YGNodeLayoutGetHeight(node),
+  };
+}
+
+static YGSize YGMeasureView(
+  YGNodeRef node,
+  float width,
+  YGMeasureMode widthMode,
+  float height,
+  YGMeasureMode heightMode)
+{
+  const CGFloat constrainedWidth = (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
+  const CGFloat constrainedHeight = (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX: height;
+
+  UIView *view = (__bridge UIView*) YGNodeGetContext(node);
+  const CGSize sizeThatFits = [view sizeThatFits:(CGSize) {
+    .width = constrainedWidth,
+    .height = constrainedHeight,
+  }];
+
+  return (YGSize) {
+    .width = YGSanitizeMeasurement(constrainedWidth, sizeThatFits.width, widthMode),
+    .height = YGSanitizeMeasurement(constrainedHeight, sizeThatFits.height, heightMode),
+  };
+}
+
+static CGFloat YGSanitizeMeasurement(
+  CGFloat constrainedSize,
+  CGFloat measuredSize,
+  YGMeasureMode measureMode)
+{
+  CGFloat result;
+  if (measureMode == YGMeasureModeExactly) {
+    result = constrainedSize;
+  } else if (measureMode == YGMeasureModeAtMost) {
+    result = MIN(constrainedSize, measuredSize);
+  } else {
+    result = measuredSize;
+  }
+
+  return result;
+}
+
+static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *subviews)
+{
+  if (YGNodeGetChildCount(node) != subviews.count) {
+    return NO;
+  }
+
+  for (int i=0; i<subviews.count; i++) {
+    if (YGNodeGetChild(node, i) != subviews[i].yoga.node) {
+      return NO;
+    }
+  }
+
+  return YES;
+}
+
+static void YGAttachNodesFromViewHierachy(UIView *const view)
+{
+  YGLayout *const yoga = view.yoga;
+  const YGNodeRef node = yoga.node;
+
+  // Only leaf nodes should have a measure function
+  if (yoga.isLeaf) {
+    YGRemoveAllChildren(node);
+    YGNodeSetMeasureFunc(node, YGMeasureView);
+  } else {
+    YGNodeSetMeasureFunc(node, NULL);
+
+    NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
+    for (UIView *subview in view.subviews) {
+      if (subview.yoga.isIncludedInLayout) {
+        [subviewsToInclude addObject:subview];
+      }
+    }
+
+    if (!YGNodeHasExactSameChildren(node, subviewsToInclude)) {
+      YGRemoveAllChildren(node);
+      for (int i=0; i<subviewsToInclude.count; i++) {
+        YGNodeInsertChild(node, subviewsToInclude[i].yoga.node, i);
+      }
+    }
+
+    for (UIView *const subview in subviewsToInclude) {
+      YGAttachNodesFromViewHierachy(subview);
+    }
+  }
+}
+
+static void YGRemoveAllChildren(const YGNodeRef node)
+{
+  if (node == NULL) {
+    return;
+  }
+
+  while (YGNodeGetChildCount(node) > 0) {
+    YGNodeRemoveChild(node, YGNodeGetChild(node, YGNodeGetChildCount(node) - 1));
+  }
+}
+
+static CGFloat YGRoundPixelValue(CGFloat value)
+{
+  static CGFloat scale;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^(){
+    scale = [UIScreen mainScreen].scale;
+  });
+
+  return round(value * scale) / scale;
+}
+
+static void YGApplyLayoutToViewHierarchy(UIView *view)
+{
+  NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
+
+  const YGLayout *yoga = view.yoga;
+
+  if (!yoga.isIncludedInLayout) {
+     return;
+  }
+
+  YGNodeRef node = yoga.node;
+  const CGPoint topLeft = {
+    YGNodeLayoutGetLeft(node),
+    YGNodeLayoutGetTop(node),
+  };
+
+  const CGPoint bottomRight = {
+    topLeft.x + YGNodeLayoutGetWidth(node),
+    topLeft.y + YGNodeLayoutGetHeight(node),
+  };
+
+  view.frame = (CGRect) {
+    .origin = {
+      .x = YGRoundPixelValue(topLeft.x),
+      .y = YGRoundPixelValue(topLeft.y),
+    },
+    .size = {
+      .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++) {
+      YGApplyLayoutToViewHierarchy(view.subviews[i]);
+    }
+  }
+}
+
+@end

YogaKit/Tests/YogaKitTests.m

@@ -10,90 +10,128 @@
 #import <XCTest/XCTest.h>
 
 #import <YogaKit/UIView+Yoga.h>
+#import <YogaKit/YGLayout+Private.h>
+#import <yoga/Yoga.h>
 
 @interface YogaKitTests : XCTestCase
 @end
 
 @implementation YogaKitTests
 
-#ifndef TRAVIS_CI
-
 - (void)testNodesAreDeallocedWithSingleView
 {
-  XCTAssertEqual(0, YGNodeGetInstanceCount());
+  __weak YGLayout *layoutRef = nil;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  [view yg_setFlexBasis:1];
-  XCTAssertEqual(1, YGNodeGetInstanceCount());
-  view = nil;
+  @autoreleasepool {
+    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+    view.yoga.flexBasis = 1;
 
-  XCTAssertEqual(0, YGNodeGetInstanceCount());
+    layoutRef = view.yoga;
+    XCTAssertNotNil(layoutRef);
+
+    view = nil;
+  }
+
+  XCTAssertNil(layoutRef);
 }
 
 - (void)testNodesAreDeallocedCascade
 {
-  XCTAssertEqual(0, YGNodeGetInstanceCount());
+  __weak YGLayout *topLayout = nil;
+  __weak YGLayout *subviewLayout = nil;
 
-  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  [view yg_setFlexBasis:1];
+  @autoreleasepool {
+    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+    topLayout = view.yoga;
+    topLayout.flexBasis = 1;
 
-  for (int i=0; i<10; i++) {
     UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
-    [subview yg_setFlexBasis:1];
-    [view addSubview:subview];
-  }
-  XCTAssertEqual(11, YGNodeGetInstanceCount());
-  view = nil;
+    subviewLayout = subview.yoga;
+    subviewLayout.flexBasis = 1;
 
-  XCTAssertEqual(0, YGNodeGetInstanceCount());
+    view = nil;
+  }
+
+  XCTAssertNil(topLayout);
+  XCTAssertNil(subviewLayout);
 }
 
-#endif
-
-- (void)testUsesYoga
+- (void)testIsEnabled
 {
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-  XCTAssertFalse([view yg_usesYoga]);
+  XCTAssertFalse(view.yoga.isEnabled);
 
-  [view yg_setUsesYoga:YES];
-  XCTAssertTrue([view yg_usesYoga]);
+  view.yoga.isEnabled = YES;
+  XCTAssertTrue(view.yoga.isEnabled);
 
-  [view yg_setUsesYoga:NO];
-  XCTAssertFalse([view yg_usesYoga]);
+  view.yoga.isEnabled = NO;
+  XCTAssertFalse(view.yoga.isEnabled);
 }
 
 - (void)testSizeThatFitsAsserts
 {
   UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   dispatch_sync(dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL), ^(void){
-    XCTAssertThrows([view yg_intrinsicSize]);
+    XCTAssertThrows(view.yoga.intrinsicSize);
   });
 }
 
 - (void)testSizeThatFitsSmoke
 {
   UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
-  [container yg_setAlignItems:YGAlignFlexStart];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
+  container.yoga.alignItems = YGAlignFlexStart;
 
   UILabel *longTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
   longTextLabel.text = @"This is a very very very very very very very very long piece of text.";
   longTextLabel.lineBreakMode = NSLineBreakByTruncatingTail;
   longTextLabel.numberOfLines = 1;
-  [longTextLabel yg_setUsesYoga:YES];
-  [longTextLabel yg_setFlexShrink:1];
+  longTextLabel.yoga.isEnabled = YES;
+  longTextLabel.yoga.flexShrink = 1;
   [container addSubview:longTextLabel];
 
   UIView *textBadgeView = [[UIView alloc] initWithFrame:CGRectZero];
-  [textBadgeView yg_setUsesYoga:YES];
-  [textBadgeView yg_setMargin:3.0 forEdge:YGEdgeLeft];
-  [textBadgeView yg_setWidth:10];
-  [textBadgeView yg_setHeight:10];
+  textBadgeView.yoga.isEnabled = YES;
+  textBadgeView.yoga.margin = 0;
+  textBadgeView.yoga.width = 10;
+  textBadgeView.yoga.height = 10;
   [container addSubview:textBadgeView];
 
-  const CGSize containerSize = [container yg_intrinsicSize];
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(514,21), containerSize), @"Size is actually %@", NSStringFromCGSize(containerSize));
+  const CGSize textBadgeViewSize = textBadgeView.yoga.intrinsicSize;
+  XCTAssertEqual(textBadgeViewSize.height, 10);
+  XCTAssertEqual(textBadgeViewSize.width, 10);
+
+  const CGSize containerSize = container.yoga.intrinsicSize;
+  const CGSize longTextLabelSize = longTextLabel.yoga.intrinsicSize;
+
+  XCTAssertEqual(longTextLabelSize.height, containerSize.height);
+  XCTAssertEqual(longTextLabelSize.width + textBadgeView.yoga.intrinsicSize.width, containerSize.width);
+}
+
+- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 50)];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
+  container.yoga.alignItems = YGAlignFlexStart;
+
+  UILabel *label = [[UILabel alloc] initWithFrame:CGRectZero];
+  label.text = @"This is a short text.";
+  label.numberOfLines = 1;
+  label.yoga.isEnabled = YES;
+  [container addSubview:label];
+
+  [container.yoga applyLayout];
+  CGSize const labelSizeAfterFirstPass = label.frame.size;
+
+  label.text = @"This is a slightly longer text.";
+  XCTAssertTrue(CGSizeEqualToSize(label.frame.size, labelSizeAfterFirstPass));
+
+  [label.yoga markDirty];
+
+  [container.yoga applyLayout];
+  XCTAssertFalse(CGSizeEqualToSize(label.frame.size, labelSizeAfterFirstPass));
 }
 
 - (void)testFrameAndOriginPlacement
@@ -101,21 +139,28 @@
   const CGSize containerSize = CGSizeMake(320, 50);
 
   UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
 
-  for (int i = 0; i < 3; i++) {
-    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
-    [subview yg_setUsesYoga:YES];
-    [subview yg_setFlexGrow:1];
+  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  subview1.yoga.isEnabled = YES;
+  subview1.yoga.flexGrow = 1;
+  [container addSubview:subview1];
 
-    [container addSubview:subview];
-  }
-  [container yg_applyLayout];
+  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  subview2.yoga.isEnabled = YES;
+  subview2.yoga.flexGrow = 1;
+  [container addSubview:subview2];
 
-  XCTAssertFalse(CGRectIntersectsRect([container.subviews objectAtIndex:0].frame, [container.subviews objectAtIndex:1].frame));
-  XCTAssertFalse(CGRectIntersectsRect([container.subviews objectAtIndex:1].frame, [container.subviews objectAtIndex:2].frame));
-  XCTAssertFalse(CGRectIntersectsRect([container.subviews objectAtIndex:0].frame, [container.subviews objectAtIndex:2].frame));
+  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  subview3.yoga.isEnabled = YES;
+  subview3.yoga.flexGrow = 1;
+  [container addSubview:subview3];
+
+  [container.yoga applyLayout];
+
+  XCTAssertEqualWithAccuracy(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) {
@@ -130,33 +175,33 @@
   const CGSize containerSize = CGSizeMake(300, 50);
 
   UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
 
   UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview1 yg_setUsesYoga:YES];
-  [subview1 yg_setFlexGrow:1];
+  subview1.yoga.isEnabled = YES;
+  subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
   UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview2 yg_setUsesYoga:YES];
-  [subview2 yg_setFlexGrow:1];
+  subview2.yoga.isEnabled = YES;
+  subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
   UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview3 yg_setUsesYoga:YES];
-  [subview3 yg_setFlexGrow:1];
+  subview3.yoga.isEnabled = YES;
+  subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
-  [container yg_applyLayout];
+  [container.yoga applyLayout];
 
   XCTAssertTrue(CGRectEqualToRect(subview1.frame, CGRectMake(0, 0, 100, 50)));
-  XCTAssertTrue(CGRectEqualToRect(subview2.frame, CGRectMake(100, 0, 100, 50)), @"It's actually %@", NSStringFromCGRect(subview2.frame));
+  XCTAssertTrue(CGRectEqualToRect(subview2.frame, CGRectMake(100, 0, 100, 50)));
   XCTAssertTrue(CGRectEqualToRect(subview3.frame, CGRectMake(200, 0, 100, 50)));
 
   [container exchangeSubviewAtIndex:2 withSubviewAtIndex:0];
-  [subview2 yg_setIncludeInLayout:NO];
-  [container yg_applyLayout];
+  subview2.yoga.isIncludedInLayout = NO;
+  [container.yoga applyLayout];
 
   XCTAssertTrue(CGRectEqualToRect(subview3.frame, CGRectMake(0, 0, 150, 50)));
   XCTAssertTrue(CGRectEqualToRect(subview1.frame, CGRectMake(150, 0, 150, 50)));
@@ -170,102 +215,407 @@
   const CGSize containerSize = CGSizeMake(300, 50);
 
   UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
 
   UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview1 yg_setUsesYoga:YES];
-  [subview1 yg_setFlexGrow:1];
+  subview1.yoga.isEnabled = YES;
+  subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
   UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview2 yg_setUsesYoga:YES];
-  [subview2 yg_setFlexGrow:1];
+  subview2.yoga.isEnabled = YES;
+  subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
   UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview3 yg_setUsesYoga:YES];
-  [subview3 yg_setFlexGrow:1];
+  subview3.yoga.isEnabled = YES;
+  subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
-  [container yg_applyLayout];
+  [container.yoga applyLayout];
 
-  for (UIView *view in container.subviews) {
-    XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(100, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(view.bounds.size));
+  for (UIView *subview in container.subviews) {
+    XCTAssertEqual(subview.bounds.size.width, 100);
   }
 
-  [subview3 yg_setIncludeInLayout:NO];
-  [container yg_applyLayout];
+  subview3.yoga.isIncludedInLayout = NO;
+  [container.yoga applyLayout];
 
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview1.bounds.size));
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview2.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview2.bounds.size));
+  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.
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(100, 50), subview3.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview3.bounds.size));
+  XCTAssertEqual(subview3.bounds.size.width, 100);
 }
 
 - (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews
 {
   UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
 
   UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview1 yg_setUsesYoga:YES];
-  [subview1 yg_setIncludeInLayout:NO];
+  subview1.yoga.isEnabled = YES;
+  subview1.yoga.isIncludedInLayout = NO;
   [container addSubview:subview1];
 
   UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview2 yg_setUsesYoga:YES];
-  [subview2 yg_setIncludeInLayout:NO];
+  subview2.yoga.isEnabled = YES;
+  subview2.yoga.isIncludedInLayout = NO;
   [container addSubview:subview2];
 
   UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview3 yg_setUsesYoga:YES];
-  [subview3 yg_setIncludeInLayout:YES];
+  subview3.yoga.isEnabled = YES;
+  subview3.yoga.isIncludedInLayout = YES;
   [container addSubview:subview3];
 
-  [container yg_applyLayout];
-  XCTAssertEqual(1, [container yg_numberOfChildren]);
+  [container.yoga applyLayout];
+  XCTAssertEqual(container.yoga.numberOfChildren, 1);
 
-  [subview2 yg_setIncludeInLayout:YES];
-  [container yg_applyLayout];
-  XCTAssertEqual(2, [container yg_numberOfChildren]);
+  subview2.yoga.isIncludedInLayout = YES;
+  [container.yoga applyLayout];
+  XCTAssertEqual(container.yoga.numberOfChildren, 2);
 }
 
 - (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond
 {
   UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-  [container yg_setUsesYoga:YES];
-  [container yg_setFlexDirection:YGFlexDirectionRow];
+  container.yoga.isEnabled = YES;
+  container.yoga.flexDirection = YGFlexDirectionRow;
 
   UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview1 yg_setUsesYoga:YES];
-  [subview1 yg_setFlexGrow:1];
+  subview1.yoga.isEnabled = YES;
+  subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
   UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview2 yg_setUsesYoga:YES];
-  [subview2 yg_setFlexGrow:1];
+  subview2.yoga.isEnabled = YES;
+  subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
   UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
-  [subview3 yg_setUsesYoga:YES];
-  [subview3 yg_setFlexGrow:1];
-  [subview3 yg_setIncludeInLayout:NO];
+  subview3.yoga.isEnabled = YES;
+  subview3.yoga.flexGrow = 1;
+  subview3.yoga.isIncludedInLayout = NO;
   [container addSubview:subview3];
 
-  [container yg_applyLayout];
+  [container.yoga applyLayout];
 
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview1.bounds.size));
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(150, 50), subview2.bounds.size), @"Actual size is %@", NSStringFromCGSize(subview2.bounds.size));
-  XCTAssertTrue(CGSizeEqualToSize(CGSizeZero, subview3.bounds.size), @"Actual size %@", NSStringFromCGSize(subview3.bounds.size));
+  XCTAssertEqual(subview1.bounds.size.width, 150);
+  XCTAssertEqual(subview2.bounds.size.width, 150);
+  XCTAssertEqual(subview3.bounds.size.width, 0);
 
-  [subview3 yg_setIncludeInLayout:YES];
-  [container yg_applyLayout];
-  for (UIView *view in container.subviews) {
-    XCTAssertTrue(CGSizeEqualToSize(CGSizeMake(100, 50), subview1.bounds.size), @"Actual size is %@", NSStringFromCGSize(view.bounds.size));
+  subview3.yoga.isIncludedInLayout = YES;
+  [container.yoga applyLayout];
+
+  XCTAssertEqual(subview1.bounds.size.width, 100);
+  XCTAssertEqual(subview2.bounds.size.width, 100);
+  XCTAssertEqual(subview3.bounds.size.width, 100);
+}
+
+- (void)testIsLeafFlag
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  XCTAssertTrue(view.yoga.isLeaf);
+
+  for (int i=0; i<10; i++) {
+    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
+    [view addSubview:subview];
   }
+  XCTAssertTrue(view.yoga.isLeaf);
+
+  view.yoga.isEnabled = YES;
+  view.yoga.width = 50.0;
+  XCTAssertTrue(view.yoga.isLeaf);
+
+  UIView *const subview = view.subviews[0];
+  subview.yoga.isEnabled = YES;
+  subview.yoga.width = 50.0;
+  XCTAssertFalse(view.yoga.isLeaf);
+}
+
+- (void)testThatWeCorrectlyAttachNestedViews
+{
+    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+    container.yoga.isEnabled = YES;
+    container.yoga.flexDirection = YGFlexDirectionColumn;
+
+    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+    subview1.yoga.isEnabled = YES;
+    subview1.yoga.width = 100;
+    subview1.yoga.flexGrow = 1;
+    subview1.yoga.flexDirection = YGFlexDirectionColumn;
+    [container addSubview:subview1];
+
+    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+    subview2.yoga.isEnabled = YES;
+    subview2.yoga.width = 150;
+    subview2.yoga.flexGrow = 1;
+    subview2.yoga.flexDirection = YGFlexDirectionColumn;
+    [container addSubview:subview2];
+
+    for (UIView *view in @[subview1, subview2]) {
+        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
+        someView.yoga.isEnabled = YES;
+        someView.yoga.flexGrow = 1;
+        [view addSubview:someView];
+    }
+    [container.yoga applyLayout];
+
+    // Add the same amount of new views, reapply layout.
+    for (UIView *view in @[subview1, subview2]) {
+        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
+        someView.yoga.isEnabled = YES;
+        someView.yoga.flexGrow = 1;
+        [view addSubview:someView];
+    }
+    [container.yoga applyLayout];
+
+    XCTAssertEqual(subview1.bounds.size.width, 100);
+    XCTAssertEqual(subview1.bounds.size.height, 25);
+    for (UIView *subview in subview1.subviews) {
+        const CGSize subviewSize = subview.bounds.size;
+        XCTAssertNotEqual(subviewSize.width, 0);
+        XCTAssertNotEqual(subviewSize.height, 0);
+        XCTAssertFalse(isnan(subviewSize.height));
+        XCTAssertFalse(isnan(subviewSize.width));
+    }
+
+    XCTAssertEqual(subview2.bounds.size.width, 150);
+    XCTAssertEqual(subview2.bounds.size.height, 25);
+    for (UIView *subview in subview2.subviews) {
+        const CGSize subviewSize = subview.bounds.size;
+        XCTAssertNotEqual(subviewSize.width, 0);
+        XCTAssertNotEqual(subviewSize.height, 0);
+        XCTAssertFalse(isnan(subviewSize.height));
+        XCTAssertFalse(isnan(subviewSize.width));
+    }
+}
+
+- (void)testThatANonLeafNodeCanBecomeALeafNode
+{
+    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+    container.yoga.isEnabled = YES;
+
+    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+    subview1.yoga.isEnabled = YES;
+    [container addSubview:subview1];
+
+    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+    subview2.yoga.isEnabled = YES;
+    [subview1 addSubview:subview2];
+
+    [container.yoga applyLayout];
+    [subview2 removeFromSuperview];
+    [container.yoga applyLayout];
+}
+
+- (void)testPositionalPropertiesWork
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+
+  view.yoga.left = 1;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeLeft).value, 1);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeLeft).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.left, 1);
+
+  view.yoga.right = 2;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeRight).value, 2);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeRight).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.right, 2);
+
+  view.yoga.top = 3;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeTop).value, 3);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeTop).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.top, 3);
+
+  view.yoga.bottom = 4;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeBottom).value, 4);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeBottom).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.bottom, 4);
+
+  view.yoga.start = 5;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeStart).value, 5);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeStart).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.start, 5);
+
+  view.yoga.end = 6;
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeEnd).value, 6);
+  XCTAssertEqual(YGNodeStyleGetPosition(view.yoga.node, YGEdgeEnd).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.end, 6);
+}
+
+- (void)testMarginPropertiesWork
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+
+  view.yoga.margin = 1;
+  XCTAssertEqual(view.yoga.marginLeft, 1);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeLeft).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginRight, 1);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeRight).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginStart, 1);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeStart).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginEnd, 1);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeEnd).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginTop, 1);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeTop).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginBottom, 1);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeBottom).unit, YGUnitPixel);
+  XCTAssertTrue(isnan(view.yoga.marginHorizontal));
+  XCTAssertTrue(isnan(view.yoga.marginVertical));
+  XCTAssertTrue(isnan(view.yoga.margin));
+
+  view.yoga.marginHorizontal = 2;
+  XCTAssertEqual(view.yoga.marginLeft, 2);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeLeft).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginRight, 2);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeRight).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginStart, 2);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeStart).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginEnd, 2);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeEnd).unit, YGUnitPixel);
+  XCTAssertTrue(isnan(view.yoga.marginHorizontal));
+
+  view.yoga.marginVertical = 3;
+  XCTAssertEqual(view.yoga.marginTop, 3);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeTop).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginBottom, 3);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeBottom).unit, YGUnitPixel);
+  XCTAssertTrue(isnan(view.yoga.marginVertical));
+
+  view.yoga.marginLeft = 4;
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeLeft).value, 4);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeLeft).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginLeft, 4);
+
+  view.yoga.marginRight = 5;
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeRight).value, 5);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeRight).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginRight, 5);
+
+  view.yoga.marginTop = 6;
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeTop).value, 6);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeTop).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginTop, 6);
+
+  view.yoga.marginBottom = 7;
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeBottom).value, 7);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeBottom).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginBottom, 7);
+
+  view.yoga.marginStart = 8;
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeStart).value, 8);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeStart).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginStart, 8);
+
+  view.yoga.marginEnd = 9;
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeEnd).value, 9);
+  XCTAssertEqual(YGNodeStyleGetMargin(view.yoga.node, YGEdgeEnd).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.marginEnd, 9);
+}
+
+- (void)testPaddingPropertiesWork
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+
+  view.yoga.padding = 1;
+  XCTAssertEqual(view.yoga.paddingLeft, 1);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeLeft).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingRight, 1);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeRight).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingStart, 1);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeStart).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingEnd, 1);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeEnd).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingTop, 1);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeTop).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingBottom, 1);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeBottom).unit, YGUnitPixel);
+  XCTAssertTrue(isnan(view.yoga.paddingHorizontal));
+  XCTAssertTrue(isnan(view.yoga.paddingVertical));
+  XCTAssertTrue(isnan(view.yoga.padding));
+
+  view.yoga.paddingHorizontal = 2;
+  XCTAssertEqual(view.yoga.paddingLeft, 2);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeLeft).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingRight, 2);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeRight).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingStart, 2);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeStart).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingEnd, 2);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeEnd).unit, YGUnitPixel);
+  XCTAssertTrue(isnan(view.yoga.paddingHorizontal));
+
+  view.yoga.paddingVertical = 3;
+  XCTAssertEqual(view.yoga.paddingTop, 3);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeTop).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingBottom, 3);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeBottom).unit, YGUnitPixel);
+  XCTAssertTrue(isnan(view.yoga.paddingVertical));
+
+  view.yoga.paddingLeft = 4;
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeLeft).value, 4);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeLeft).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingLeft, 4);
+
+  view.yoga.paddingRight = 5;
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeRight).value, 5);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeRight).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingRight, 5);
+
+  view.yoga.paddingTop = 6;
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeTop).value, 6);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeTop).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingTop, 6);
+
+  view.yoga.paddingBottom = 7;
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeBottom).value, 7);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeBottom).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingBottom, 7);
+
+  view.yoga.paddingStart = 8;
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeStart).value, 8);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeStart).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingStart, 8);
+
+  view.yoga.paddingEnd = 9;
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeEnd).value, 9);
+  XCTAssertEqual(YGNodeStyleGetPadding(view.yoga.node, YGEdgeEnd).unit, YGUnitPixel);
+  XCTAssertEqual(view.yoga.paddingEnd, 9);
+}
+
+- (void)testBorderWidthPropertiesWork
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+
+  view.yoga.borderWidth = 1;
+  XCTAssertEqual(view.yoga.borderLeftWidth, 1);
+  XCTAssertEqual(view.yoga.borderRightWidth, 1);
+  XCTAssertEqual(view.yoga.borderStartWidth, 1);
+  XCTAssertEqual(view.yoga.borderEndWidth, 1);
+  XCTAssertEqual(view.yoga.borderTopWidth, 1);
+  XCTAssertEqual(view.yoga.borderBottomWidth, 1);
+  XCTAssertTrue(isnan(view.yoga.borderWidth));
+
+  view.yoga.borderLeftWidth = 2;
+  XCTAssertEqual(view.yoga.borderLeftWidth, 2);
+
+  view.yoga.borderRightWidth = 3;
+  XCTAssertEqual(view.yoga.borderRightWidth, 3);
+
+  view.yoga.borderTopWidth = 4;
+  XCTAssertEqual(view.yoga.borderTopWidth, 4);
+
+  view.yoga.borderBottomWidth = 5;
+  XCTAssertEqual(view.yoga.borderBottomWidth, 5);
+
+  view.yoga.borderStartWidth = 6;
+  XCTAssertEqual(view.yoga.borderStartWidth, 6);
+
+  view.yoga.borderEndWidth = 7;
+  XCTAssertEqual(view.yoga.borderEndWidth, 7);
 }
 
 @end

YogaKit/UIView+Yoga.h

@@ -1,72 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import <UIKit/UIKit.h>
-#import <yoga/Yoga.h>
-
-@interface UIView (Yoga)
-
-/**
-  The property that decides if we should include this view when calculating layout. Defaults to YES.
- */
-@property (nonatomic, readwrite, assign, setter=yg_setIncludeInLayout:) BOOL yg_includeInLayout;
-
-/**
- The property that decides during layout/sizing whether or not yg_* properties should be applied. Defaults to NO.
- */
-@property (nonatomic, readwrite, assign, setter=yg_setUsesYoga:) BOOL yg_usesYoga;
-
-- (void)yg_setDirection:(YGDirection)direction;
-- (void)yg_setFlexDirection:(YGFlexDirection)flexDirection;
-- (void)yg_setJustifyContent:(YGJustify)justifyContent;
-- (void)yg_setAlignContent:(YGAlign)alignContent;
-- (void)yg_setAlignItems:(YGAlign)alignItems;
-- (void)yg_setAlignSelf:(YGAlign)alignSelf;
-- (void)yg_setPositionType:(YGPositionType)positionType;
-- (void)yg_setFlexWrap:(YGWrap)flexWrap;
-
-- (void)yg_setFlexGrow:(CGFloat)flexGrow;
-- (void)yg_setFlexShrink:(CGFloat)flexShrink;
-- (void)yg_setFlexBasis:(CGFloat)flexBasis;
-
-- (void)yg_setPosition:(CGFloat)position forEdge:(YGEdge)edge;
-- (void)yg_setMargin:(CGFloat)margin forEdge:(YGEdge)edge;
-- (void)yg_setPadding:(CGFloat)padding forEdge:(YGEdge)edge;
-
-- (void)yg_setWidth:(CGFloat)width;
-- (void)yg_setHeight:(CGFloat)height;
-- (void)yg_setMinWidth:(CGFloat)minWidth;
-- (void)yg_setMinHeight:(CGFloat)minHeight;
-- (void)yg_setMaxWidth:(CGFloat)maxWidth;
-- (void)yg_setMaxHeight:(CGFloat)maxHeight;
-
-// Yoga specific properties, not compatible with flexbox specification
-- (void)yg_setAspectRatio:(CGFloat)aspectRatio;
-
-/**
- Get the resolved direction of this node. This won't be YGDirectionInherit
- */
-- (YGDirection)yg_resolvedDirection;
-
-/**
- Perform a layout calculation and update the frames of the views in the hierarchy with the results
- */
-- (void)yg_applyLayout;
-
-/**
- Returns the size of the view if no constraints were given. This could equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
- */
-- (CGSize)yg_intrinsicSize;
-
-/**
- Returns the number of children that are using Flexbox.
- */
-- (NSUInteger)yg_numberOfChildren;
-
-@end

YogaKit/UIView+Yoga.m

@@ -1,379 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#import "UIView+Yoga.h"
-
-#import <objc/runtime.h>
-
-@interface YGNodeBridge : NSObject
-@property (nonatomic, assign, readonly) YGNodeRef cnode;
-@end
-
-@implementation YGNodeBridge
-
-+ (void)initialize
-{
-  YGSetExperimentalFeatureEnabled(YGExperimentalFeatureWebFlexBasis, true);
-}
-
-- (instancetype)init
-{
-  if ([super init]) {
-    _cnode = YGNodeNew();
-  }
-
-  return self;
-}
-
-- (void)dealloc
-{
-  YGNodeFree(_cnode);
-}
-@end
-
-@implementation UIView (Yoga)
-
-- (BOOL)yg_usesYoga
-{
-  NSNumber *usesYoga = objc_getAssociatedObject(self, @selector(yg_usesYoga));
-  return [usesYoga boolValue];
-}
-
-- (BOOL)yg_includeInLayout
-{
-  NSNumber *includeInLayout = objc_getAssociatedObject(self, @selector(yg_includeInLayout));
-  return (includeInLayout != nil) ? [includeInLayout boolValue] : YES;
-}
-
-- (NSUInteger)yg_numberOfChildren
-{
-  return YGNodeGetChildCount([self ygNode]);
-}
-
-#pragma mark - Setters
-
-- (void)yg_setIncludeInLayout:(BOOL)includeInLayout
-{
-  objc_setAssociatedObject(
-    self,
-    @selector(yg_includeInLayout),
-    @(includeInLayout),
-    OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (void)yg_setUsesYoga:(BOOL)enabled
-{
-  objc_setAssociatedObject(
-    self,
-    @selector(yg_usesYoga),
-    @(enabled),
-    OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-}
-
-- (void)yg_setDirection:(YGDirection)direction
-{
-  YGNodeStyleSetDirection([self ygNode], direction);
-}
-
-- (void)yg_setFlexDirection:(YGFlexDirection)flexDirection
-{
-  YGNodeStyleSetFlexDirection([self ygNode], flexDirection);
-}
-
-- (void)yg_setJustifyContent:(YGJustify)justifyContent
-{
-  YGNodeStyleSetJustifyContent([self ygNode], justifyContent);
-}
-
-- (void)yg_setAlignContent:(YGAlign)alignContent
-{
-  YGNodeStyleSetAlignContent([self ygNode], alignContent);
-}
-
-- (void)yg_setAlignItems:(YGAlign)alignItems
-{
-  YGNodeStyleSetAlignItems([self ygNode], alignItems);
-}
-
-- (void)yg_setAlignSelf:(YGAlign)alignSelf
-{
-  YGNodeStyleSetAlignSelf([self ygNode], alignSelf);
-}
-
-- (void)yg_setPositionType:(YGPositionType)positionType
-{
-  YGNodeStyleSetPositionType([self ygNode], positionType);
-}
-
-- (void)yg_setFlexWrap:(YGWrap)flexWrap
-{
-  YGNodeStyleSetFlexWrap([self ygNode], flexWrap);
-}
-
-- (void)yg_setFlexGrow:(CGFloat)flexGrow
-{
-  YGNodeStyleSetFlexGrow([self ygNode], flexGrow);
-}
-
-- (void)yg_setFlexShrink:(CGFloat)flexShrink
-{
-  YGNodeStyleSetFlexShrink([self ygNode], flexShrink);
-}
-
-- (void)yg_setFlexBasis:(CGFloat)flexBasis
-{
-  YGNodeStyleSetFlexBasis([self ygNode], flexBasis);
-}
-
-- (void)yg_setPosition:(CGFloat)position forEdge:(YGEdge)edge
-{
-  YGNodeStyleSetPosition([self ygNode], edge, position);
-}
-
-- (void)yg_setMargin:(CGFloat)margin forEdge:(YGEdge)edge
-{
-  YGNodeStyleSetMargin([self ygNode], edge, margin);
-}
-
-- (void)yg_setPadding:(CGFloat)padding forEdge:(YGEdge)edge
-{
-  YGNodeStyleSetPadding([self ygNode], edge, padding);
-}
-
-- (void)yg_setWidth:(CGFloat)width
-{
-  YGNodeStyleSetWidth([self ygNode], width);
-}
-
-- (void)yg_setHeight:(CGFloat)height
-{
-  YGNodeStyleSetHeight([self ygNode], height);
-}
-
-- (void)yg_setMinWidth:(CGFloat)minWidth
-{
-  YGNodeStyleSetMinWidth([self ygNode], minWidth);
-}
-
-- (void)yg_setMinHeight:(CGFloat)minHeight
-{
-  YGNodeStyleSetMinHeight([self ygNode], minHeight);
-}
-
-- (void)yg_setMaxWidth:(CGFloat)maxWidth
-{
-  YGNodeStyleSetMaxWidth([self ygNode], maxWidth);
-}
-
-- (void)yg_setMaxHeight:(CGFloat)maxHeight
-{
-  YGNodeStyleSetMaxHeight([self ygNode], maxHeight);
-}
-
-- (void)yg_setAspectRatio:(CGFloat)aspectRatio
-{
-  YGNodeStyleSetAspectRatio([self ygNode], aspectRatio);
-}
-
-#pragma mark - Layout and Sizing
-
-- (YGDirection)yg_resolvedDirection
-{
-  return YGNodeLayoutGetDirection([self ygNode]);
-}
-
-- (void)yg_applyLayout
-{
-  [self calculateLayoutWithSize:self.bounds.size];
-  YGApplyLayoutToViewHierarchy(self);
-}
-
-- (CGSize)yg_intrinsicSize
-{
-  const CGSize constrainedSize = {
-      .width = YGUndefined,
-      .height = YGUndefined,
-  };
-  return [self calculateLayoutWithSize:constrainedSize];
-}
-
-#pragma mark - Private
-
-- (YGNodeRef)ygNode
-{
-  YGNodeBridge *node = objc_getAssociatedObject(self, @selector(ygNode));
-  if (!node) {
-    node = [YGNodeBridge new];
-    YGNodeSetContext(node.cnode, (__bridge void *) self);
-    objc_setAssociatedObject(self, @selector(ygNode), node, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-  }
-
-  return node.cnode;
-}
-
-- (CGSize)calculateLayoutWithSize:(CGSize)size
-{
-  NSAssert([NSThread isMainThread], @"YG Layout calculation must be done on main.");
-  NSAssert([self yg_usesYoga], @"YG Layout is not enabled for this view.");
-
-  YGAttachNodesFromViewHierachy(self);
-
-  const YGNodeRef node = [self ygNode];
-  YGNodeCalculateLayout(
-    node,
-    size.width,
-    size.height,
-    YGNodeStyleGetDirection(node));
-
-  return (CGSize) {
-    .width = YGNodeLayoutGetWidth(node),
-    .height = YGNodeLayoutGetHeight(node),
-  };
-}
-
-static YGSize YGMeasureView(
-  YGNodeRef node,
-  float width,
-  YGMeasureMode widthMode,
-  float height,
-  YGMeasureMode heightMode)
-{
-  const CGFloat constrainedWidth = (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
-  const CGFloat constrainedHeight = (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX: height;
-
-  UIView *view = (__bridge UIView*) YGNodeGetContext(node);
-  const CGSize sizeThatFits = [view sizeThatFits:(CGSize) {
-    .width = constrainedWidth,
-    .height = constrainedHeight,
-  }];
-
-  return (YGSize) {
-    .width = YGSanitizeMeasurement(constrainedWidth, sizeThatFits.width, widthMode),
-    .height = YGSanitizeMeasurement(constrainedHeight, sizeThatFits.height, heightMode),
-  };
-}
-
-static CGFloat YGSanitizeMeasurement(
-  CGFloat constrainedSize,
-  CGFloat measuredSize,
-  YGMeasureMode measureMode)
-{
-  CGFloat result;
-  if (measureMode == YGMeasureModeExactly) {
-    result = constrainedSize;
-  } else if (measureMode == YGMeasureModeAtMost) {
-    result = MIN(constrainedSize, measuredSize);
-  } else {
-    result = measuredSize;
-  }
-
-  return result;
-}
-
-static void YGAttachNodesFromViewHierachy(UIView *view) {
-  YGNodeRef node = [view ygNode];
-
-  // Only leaf nodes should have a measure function
-  if (![view yg_usesYoga] || view.subviews.count == 0) {
-    YGNodeSetMeasureFunc(node, YGMeasureView);
-    YGRemoveAllChildren(node);
-  } else {
-    YGNodeSetMeasureFunc(node, NULL);
-
-    // Create a list of all the subviews that we are going to use for layout.
-    NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
-    for (UIView *subview in view.subviews) {
-      if ([subview yg_includeInLayout]) {
-        [subviewsToInclude addObject:subview];
-      }
-    }
-
-    BOOL shouldReconstructChildList = NO;
-    if (YGNodeGetChildCount(node) != subviewsToInclude.count) {
-      shouldReconstructChildList = YES;
-    } else {
-      for (int i = 0; i < subviewsToInclude.count; i++) {
-        if (YGNodeGetChild(node, i) != [subviewsToInclude[i] ygNode]) {
-          shouldReconstructChildList = YES;
-          break;
-        }
-      }
-    }
-
-    if (shouldReconstructChildList) {
-      YGRemoveAllChildren(node);
-
-      for (int i = 0 ; i < subviewsToInclude.count; i++) {
-        UIView *const subview = subviewsToInclude[i];
-        YGNodeInsertChild(node, [subview ygNode], i);
-        YGAttachNodesFromViewHierachy(subview);
-      }
-    }
-  }
-}
-
-static void YGRemoveAllChildren(const YGNodeRef node)
-{
-  if (node == NULL) {
-      return;
-  }
-
-  while (YGNodeGetChildCount(node) > 0) {
-    YGNodeRemoveChild(node, YGNodeGetChild(node, YGNodeGetChildCount(node) - 1));
-  }
-}
-
-static CGFloat YGRoundPixelValue(CGFloat value)
-{
-  static CGFloat scale;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^(){
-    scale = [UIScreen mainScreen].scale;
-  });
-
-  return round(value * scale) / scale;
-}
-
-static void YGApplyLayoutToViewHierarchy(UIView *view) {
-  NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
-  if (![view yg_includeInLayout]) {
-     return;
-  }
-
-  YGNodeRef node = [view ygNode];
-  const CGPoint topLeft = {
-    YGNodeLayoutGetLeft(node),
-    YGNodeLayoutGetTop(node),
-  };
-
-  const CGPoint bottomRight = {
-    topLeft.x + YGNodeLayoutGetWidth(node),
-    topLeft.y + YGNodeLayoutGetHeight(node),
-  };
-
-  view.frame = (CGRect) {
-    .origin = {
-      .x = YGRoundPixelValue(topLeft.x),
-      .y = YGRoundPixelValue(topLeft.y),
-    },
-    .size = {
-      .width = YGRoundPixelValue(bottomRight.x) - YGRoundPixelValue(topLeft.x),
-      .height = YGRoundPixelValue(bottomRight.y) - YGRoundPixelValue(topLeft.y),
-    },
-  };
-
-  const BOOL isLeaf = ![view yg_usesYoga] || view.subviews.count == 0;
-  if (!isLeaf) {
-    for (NSUInteger i = 0; i < view.subviews.count; i++) {
-      YGApplyLayoutToViewHierarchy(view.subviews[i]);
-    }
-  }
-}
-
-@end

YogaKit/YogaKitSample/Podfile

@@ -0,0 +1,5 @@
+use_frameworks!
+
+target 'YogaKitSample' do
+  pod 'YogaKit', :path => '../../YogaKit.podspec'
+end

YogaKit/YogaKitSample/Podfile.lock

@@ -0,0 +1,19 @@
+PODS:
+  - Yoga (1.0.2)
+  - YogaKit (1.0.3):
+    - Yoga (~> 1.0)
+
+DEPENDENCIES:
+  - YogaKit (from `../../YogaKit.podspec`)
+
+EXTERNAL SOURCES:
+  YogaKit:
+    :path: "../../YogaKit.podspec"
+
+SPEC CHECKSUMS:
+  Yoga: ef42f88b9bcbd7daf7267c0f19d8636ce3a50618
+  YogaKit: 6d9826a015c029b13731a33bf96fe6c1e33748a6
+
+PODFILE CHECKSUM: 9db3bdea7f1b4b715ad859a449b2dc87fb6226cc
+
+COCOAPODS: 1.2.0

YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj

@@ -11,17 +11,22 @@
 		13687D4B1DF8748400E7C260 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13687D4A1DF8748400E7C260 /* AppDelegate.m */; };
 		13687D4E1DF8748400E7C260 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 13687D4D1DF8748400E7C260 /* ViewController.m */; };
 		13687D531DF8748400E7C260 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13687D521DF8748400E7C260 /* Assets.xcassets */; };
-		13687D781DF878C600E7C260 /* YGEnums.h in yoga */ = {isa = PBXBuildFile; fileRef = 13687D5E1DF8778F00E7C260 /* YGEnums.h */; };
-		13687D791DF878C600E7C260 /* YGMacros.h in yoga */ = {isa = PBXBuildFile; fileRef = 13687D5F1DF8778F00E7C260 /* YGMacros.h */; };
-		13687D7A1DF878C600E7C260 /* Yoga.h in yoga */ = {isa = PBXBuildFile; fileRef = 13687D631DF8778F00E7C260 /* Yoga.h */; };
-		13687D7C1DF878DD00E7C260 /* UIView+Yoga.h in YogaKit */ = {isa = PBXBuildFile; fileRef = 13687D691DF8778F00E7C260 /* UIView+Yoga.h */; };
-		13687D801DF87CEC00E7C260 /* UIView+Yoga.m in Sources */ = {isa = PBXBuildFile; fileRef = 13687D6A1DF8778F00E7C260 /* UIView+Yoga.m */; };
-		13687D811DF87CF200E7C260 /* YGNodeList.c in Sources */ = {isa = PBXBuildFile; fileRef = 13687D601DF8778F00E7C260 /* YGNodeList.c */; };
-		13687D821DF87CF200E7C260 /* Yoga.c in Sources */ = {isa = PBXBuildFile; fileRef = 13687D621DF8778F00E7C260 /* Yoga.c */; };
 		13687D851DF87D1E00E7C260 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 13687D841DF87D1E00E7C260 /* UIKit.framework */; };
 		13687D871DF87D2400E7C260 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 13687D861DF87D2400E7C260 /* Foundation.framework */; };
+		15A7CB5995C9DAB1C8803834 /* Pods_YogaKitSample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C80A931E90C7F3088CB86822 /* Pods_YogaKitSample.framework */; };
+		638A94481E1F06D100A726AD /* SwiftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 638A94471E1F06D100A726AD /* SwiftViewController.swift */; };
 /* End PBXBuildFile section */
 
+/* Begin PBXContainerItemProxy section */
+		638A94541E215CC800A726AD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 13687D3B1DF8748300E7C260 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 13687D421DF8748300E7C260;
+			remoteInfo = YogaKitSample;
+		};
+/* End PBXContainerItemProxy section */
+
 /* Begin PBXCopyFilesBuildPhase section */
 		13687D771DF878A000E7C260 /* yoga */ = {
 			isa = PBXCopyFilesBuildPhase;
@@ -29,9 +34,6 @@
 			dstPath = include/yoga;
 			dstSubfolderSpec = 16;
 			files = (
-				13687D781DF878C600E7C260 /* YGEnums.h in yoga */,
-				13687D791DF878C600E7C260 /* YGMacros.h in yoga */,
-				13687D7A1DF878C600E7C260 /* Yoga.h in yoga */,
 			);
 			name = yoga;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -42,7 +44,6 @@
 			dstPath = include/YogaKit;
 			dstSubfolderSpec = 16;
 			files = (
-				13687D7C1DF878DD00E7C260 /* UIView+Yoga.h in YogaKit */,
 			);
 			name = YogaKit;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -58,16 +59,13 @@
 		13687D4D1DF8748400E7C260 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		13687D521DF8748400E7C260 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		13687D571DF8748400E7C260 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		13687D5E1DF8778F00E7C260 /* YGEnums.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YGEnums.h; sourceTree = "<group>"; };
-		13687D5F1DF8778F00E7C260 /* YGMacros.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YGMacros.h; sourceTree = "<group>"; };
-		13687D601DF8778F00E7C260 /* YGNodeList.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = YGNodeList.c; sourceTree = "<group>"; };
-		13687D611DF8778F00E7C260 /* YGNodeList.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YGNodeList.h; sourceTree = "<group>"; };
-		13687D621DF8778F00E7C260 /* Yoga.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = Yoga.c; sourceTree = "<group>"; };
-		13687D631DF8778F00E7C260 /* Yoga.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Yoga.h; sourceTree = "<group>"; };
-		13687D691DF8778F00E7C260 /* UIView+Yoga.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+Yoga.h"; sourceTree = "<group>"; };
-		13687D6A1DF8778F00E7C260 /* UIView+Yoga.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIView+Yoga.m"; sourceTree = "<group>"; };
 		13687D841DF87D1E00E7C260 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		13687D861DF87D2400E7C260 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		1D2FF4D5FCA6A8C54A4074A3 /* Pods-YogaKitSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YogaKitSample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample.debug.xcconfig"; sourceTree = "<group>"; };
+		638A94471E1F06D100A726AD /* SwiftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftViewController.swift; sourceTree = "<group>"; };
+		638A944F1E215CC800A726AD /* YogaKitSampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = YogaKitSampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		82F0896A88112E957EF37C7F /* Pods-YogaKitSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-YogaKitSample.release.xcconfig"; path = "Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample.release.xcconfig"; sourceTree = "<group>"; };
+		C80A931E90C7F3088CB86822 /* Pods_YogaKitSample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_YogaKitSample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -77,6 +75,14 @@
 			files = (
 				13687D871DF87D2400E7C260 /* Foundation.framework in Frameworks */,
 				13687D851DF87D1E00E7C260 /* UIKit.framework in Frameworks */,
+				15A7CB5995C9DAB1C8803834 /* Pods_YogaKitSample.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		638A944C1E215CC800A726AD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -86,11 +92,10 @@
 		13687D3A1DF8748300E7C260 = {
 			isa = PBXGroup;
 			children = (
-				13687D5D1DF8778F00E7C260 /* yoga */,
-				13687D641DF8778F00E7C260 /* YogaKit */,
 				13687D451DF8748400E7C260 /* YogaKitSample */,
 				13687D441DF8748400E7C260 /* Products */,
 				13687D831DF87D1E00E7C260 /* Frameworks */,
+				E1C759E3C8E84821213ECE8D /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -98,6 +103,7 @@
 			isa = PBXGroup;
 			children = (
 				13687D431DF8748400E7C260 /* YogaKitSample.app */,
+				638A944F1E215CC800A726AD /* YogaKitSampleTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -109,6 +115,7 @@
 				13687D4A1DF8748400E7C260 /* AppDelegate.m */,
 				13687D4C1DF8748400E7C260 /* ViewController.h */,
 				13687D4D1DF8748400E7C260 /* ViewController.m */,
+				638A94471E1F06D100A726AD /* SwiftViewController.swift */,
 				13687D521DF8748400E7C260 /* Assets.xcassets */,
 				13687D571DF8748400E7C260 /* Info.plist */,
 				13687D461DF8748400E7C260 /* Supporting Files */,
@@ -124,39 +131,25 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		13687D5D1DF8778F00E7C260 /* yoga */ = {
-			isa = PBXGroup;
-			children = (
-				13687D5E1DF8778F00E7C260 /* YGEnums.h */,
-				13687D5F1DF8778F00E7C260 /* YGMacros.h */,
-				13687D601DF8778F00E7C260 /* YGNodeList.c */,
-				13687D611DF8778F00E7C260 /* YGNodeList.h */,
-				13687D621DF8778F00E7C260 /* Yoga.c */,
-				13687D631DF8778F00E7C260 /* Yoga.h */,
-			);
-			name = yoga;
-			path = ../../yoga;
-			sourceTree = "<group>";
-		};
-		13687D641DF8778F00E7C260 /* YogaKit */ = {
-			isa = PBXGroup;
-			children = (
-				13687D691DF8778F00E7C260 /* UIView+Yoga.h */,
-				13687D6A1DF8778F00E7C260 /* UIView+Yoga.m */,
-			);
-			name = YogaKit;
-			path = ..;
-			sourceTree = "<group>";
-		};
 		13687D831DF87D1E00E7C260 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
 				13687D861DF87D2400E7C260 /* Foundation.framework */,
 				13687D841DF87D1E00E7C260 /* UIKit.framework */,
+				C80A931E90C7F3088CB86822 /* Pods_YogaKitSample.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		E1C759E3C8E84821213ECE8D /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				1D2FF4D5FCA6A8C54A4074A3 /* Pods-YogaKitSample.debug.xcconfig */,
+				82F0896A88112E957EF37C7F /* Pods-YogaKitSample.release.xcconfig */,
+			);
+			name = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -164,11 +157,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13687D5A1DF8748400E7C260 /* Build configuration list for PBXNativeTarget "YogaKitSample" */;
 			buildPhases = (
+				513B543F92B2E4F4D1EE1CE7 /* [CP] Check Pods Manifest.lock */,
 				13687D771DF878A000E7C260 /* yoga */,
 				13687D7B1DF878CE00E7C260 /* YogaKit */,
 				13687D3F1DF8748300E7C260 /* Sources */,
 				13687D401DF8748300E7C260 /* Frameworks */,
 				13687D411DF8748300E7C260 /* Resources */,
+				FA2FB9DD6471BDD3FBCE503B /* [CP] Embed Pods Frameworks */,
+				6E01EB987F1564F3D71EBE5A /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -179,19 +175,43 @@
 			productReference = 13687D431DF8748400E7C260 /* YogaKitSample.app */;
 			productType = "com.apple.product-type.application";
 		};
+		638A944E1E215CC800A726AD /* YogaKitSampleTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 638A94561E215CC800A726AD /* Build configuration list for PBXNativeTarget "YogaKitSampleTests" */;
+			buildPhases = (
+				638A944B1E215CC800A726AD /* Sources */,
+				638A944C1E215CC800A726AD /* Frameworks */,
+				638A944D1E215CC800A726AD /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				638A94551E215CC800A726AD /* PBXTargetDependency */,
+			);
+			name = YogaKitSampleTests;
+			productName = YogaKitSampleTests;
+			productReference = 638A944F1E215CC800A726AD /* YogaKitSampleTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		13687D3B1DF8748300E7C260 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0810;
+				LastUpgradeCheck = 0820;
 				ORGANIZATIONNAME = facebook;
 				TargetAttributes = {
 					13687D421DF8748300E7C260 = {
 						CreatedOnToolsVersion = 8.1;
+						LastSwiftMigration = 0820;
 						ProvisioningStyle = Automatic;
 					};
+					638A944E1E215CC800A726AD = {
+						CreatedOnToolsVersion = 8.2.1;
+						ProvisioningStyle = Automatic;
+						TestTargetID = 13687D421DF8748300E7C260;
+					};
 				};
 			};
 			buildConfigurationList = 13687D3E1DF8748300E7C260 /* Build configuration list for PBXProject "YogaKitSample" */;
@@ -208,6 +228,7 @@
 			projectRoot = "";
 			targets = (
 				13687D421DF8748300E7C260 /* YogaKitSample */,
+				638A944E1E215CC800A726AD /* YogaKitSampleTests */,
 			);
 		};
 /* End PBXProject section */
@@ -221,24 +242,92 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		638A944D1E215CC800A726AD /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXResourcesBuildPhase section */
 
+/* Begin PBXShellScriptBuildPhase section */
+		513B543F92B2E4F4D1EE1CE7 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+		6E01EB987F1564F3D71EBE5A /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		FA2FB9DD6471BDD3FBCE503B /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		13687D3F1DF8748300E7C260 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				13687D801DF87CEC00E7C260 /* UIView+Yoga.m in Sources */,
+				638A94481E1F06D100A726AD /* SwiftViewController.swift in Sources */,
 				13687D4E1DF8748400E7C260 /* ViewController.m in Sources */,
 				13687D4B1DF8748400E7C260 /* AppDelegate.m in Sources */,
-				13687D821DF87CF200E7C260 /* Yoga.c in Sources */,
-				13687D811DF87CF200E7C260 /* YGNodeList.c in Sources */,
 				13687D481DF8748400E7C260 /* main.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		638A944B1E215CC800A726AD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXSourcesBuildPhase section */
 
+/* Begin PBXTargetDependency section */
+		638A94551E215CC800A726AD /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 13687D421DF8748300E7C260 /* YogaKitSample */;
+			targetProxy = 638A94541E215CC800A726AD /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
 /* Begin XCBuildConfiguration section */
 		13687D581DF8748400E7C260 /* Debug */ = {
 			isa = XCBuildConfiguration;
@@ -258,6 +347,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -305,6 +395,7 @@
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -330,23 +421,60 @@
 		};
 		13687D5B1DF8748400E7C260 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 1D2FF4D5FCA6A8C54A4074A3 /* Pods-YogaKitSample.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				INFOPLIST_FILE = YogaKitSample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_INSTALL_OBJC_HEADER = NO;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
 		13687D5C1DF8748400E7C260 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 82F0896A88112E957EF37C7F /* Pods-YogaKitSample.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				INFOPLIST_FILE = YogaKitSample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_INSTALL_OBJC_HEADER = NO;
+				SWIFT_VERSION = 3.0;
+			};
+			name = Release;
+		};
+		638A94571E215CC800A726AD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				INFOPLIST_FILE = YogaKitSampleTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSampleTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/YogaKitSample.app/YogaKitSample";
+			};
+			name = Debug;
+		};
+		638A94581E215CC800A726AD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				INFOPLIST_FILE = YogaKitSampleTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSampleTests;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/YogaKitSample.app/YogaKitSample";
 			};
 			name = Release;
 		};
@@ -369,6 +497,16 @@
 				13687D5C1DF8748400E7C260 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		638A94561E215CC800A726AD /* Build configuration list for PBXNativeTarget "YogaKitSampleTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				638A94571E215CC800A726AD /* Debug */,
+				638A94581E215CC800A726AD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};

YogaKit/YogaKitSample/YogaKitSample.xcodeproj/xcuserdata/emilsj.xcuserdatad/xcschemes/YogaKitSample.xcscheme

@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0810"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "13687D421DF8748300E7C260"
-               BuildableName = "YogaKitSample.app"
-               BlueprintName = "YogaKitSample"
-               ReferencedContainer = "container:YogaKitSample.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13687D421DF8748300E7C260"
-            BuildableName = "YogaKitSample.app"
-            BlueprintName = "YogaKitSample"
-            ReferencedContainer = "container:YogaKitSample.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13687D421DF8748300E7C260"
-            BuildableName = "YogaKitSample.app"
-            BlueprintName = "YogaKitSample"
-            ReferencedContainer = "container:YogaKitSample.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "13687D421DF8748300E7C260"
-            BuildableName = "YogaKitSample.app"
-            BlueprintName = "YogaKitSample"
-            ReferencedContainer = "container:YogaKitSample.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

YogaKit/YogaKitSample/YogaKitSample.xcodeproj/xcuserdata/emilsj.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>YogaKitSample.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>13687D421DF8748300E7C260</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>

YogaKit/YogaKitSample/YogaKitSample.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:YogaKitSample.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>

YogaKit/YogaKitSample/YogaKitSample/AppDelegate.h

@@ -13,4 +13,3 @@
 @property (strong, nonatomic) UIWindow *window;
 
 @end
-

YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,43 +1,69 @@
 {
   "images" : [
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Yoga-20x20@2x.png",
       "scale" : "2x"
     },
     {
-      "idiom" : "iphone",
       "size" : "20x20",
+      "idiom" : "iphone",
+      "filename" : "Yoga-20x20@3x.png",
       "scale" : "3x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
-      "scale" : "2x"
+      "idiom" : "iphone",
+      "filename" : "Yoga-29x29@1x.png",
+      "scale" : "1x"
     },
     {
-      "idiom" : "iphone",
       "size" : "29x29",
-      "scale" : "3x"
-    },
-    {
       "idiom" : "iphone",
-      "size" : "40x40",
+      "filename" : "Yoga-29x29@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "29x29",
       "idiom" : "iphone",
-      "size" : "40x40",
+      "filename" : "Yoga-29x29@3x.png",
       "scale" : "3x"
     },
     {
+      "size" : "40x40",
       "idiom" : "iphone",
-      "size" : "60x60",
+      "filename" : "Yoga-40x40@2x.png",
       "scale" : "2x"
     },
     {
+      "size" : "40x40",
       "idiom" : "iphone",
+      "filename" : "Yoga-40x40@3x.png",
+      "scale" : "3x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Yoga-57x57@1x.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "57x57",
+      "idiom" : "iphone",
+      "filename" : "Yoga-57x57@2x.png",
+      "scale" : "2x"
+    },
+    {
       "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Yoga-60x60@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "60x60",
+      "idiom" : "iphone",
+      "filename" : "Yoga-60x60@3x.png",
       "scale" : "3x"
     }
   ],

YogaKit/YogaKitSample/YogaKitSample/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

@@ -0,0 +1,41 @@
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the license found in the
+ * LICENSE-examples file in the root directory of this source tree.
+ */
+
+import UIKit
+import YogaKit
+
+class SwiftViewController: UIViewController {
+  override func viewDidLoad() {
+    let root = self.view!
+    root.backgroundColor = .red
+    root.yoga.isEnabled = true
+    root.yoga.width = self.view.bounds.size.width
+    root.yoga.height = self.view.bounds.size.height
+    root.yoga.alignItems = .center
+    root.yoga.justifyContent = .center
+
+    let child1 = UIView()
+    child1.backgroundColor = .blue
+    child1.yoga.isEnabled = true
+    child1.yoga.width = 100
+    child1.yoga.height = 10
+
+    let child2 = UIView()
+    child2.backgroundColor = .green
+    child2.frame = CGRect(x: 0, y: 0, width: 200, height: 100)
+
+    let child3 = UIView()
+    child3.backgroundColor = .yellow
+    child3.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
+
+    child2.addSubview(child3)
+    root.addSubview(child1)
+    root.addSubview(child2)
+    root.yoga.applyLayout()
+  }
+}

YogaKit/YogaKitSample/YogaKitSample/ViewController.h

@@ -10,6 +10,4 @@
 
 @interface ViewController : UIViewController
 
-
 @end
-

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -20,17 +20,17 @@
 {
     UIView *root = self.view;
     root.backgroundColor = [UIColor redColor];
-    [root yg_setUsesYoga:YES];
-    [root yg_setWidth:self.view.bounds.size.width];
-    [root yg_setHeight:self.view.bounds.size.height];
-    [root yg_setAlignItems:YGAlignCenter];
-    [root yg_setJustifyContent:YGJustifyCenter];
+    root.yoga.isEnabled = YES;
+    root.yoga.width = self.view.bounds.size.width;
+    root.yoga.height = self.view.bounds.size.height;
+    root.yoga.alignItems = YGAlignCenter;
+    root.yoga.justifyContent = YGJustifyCenter;
 
     UIView *child1 = [UIView new];
     child1.backgroundColor = [UIColor blueColor];
-    [child1 yg_setUsesYoga:YES];
-    [child1 yg_setWidth:100];
-    [child1 yg_setHeight:100];
+    child1.yoga.isEnabled = YES;
+    child1.yoga.width = 100;
+    child1.yoga.height = 100;
 
     UIView *child2 = [UIView new];
     child2.backgroundColor = [UIColor greenColor];
@@ -53,7 +53,7 @@
     [child2 addSubview:child3];
     [root addSubview:child1];
     [root addSubview:child2];
-    [root yg_applyLayout];
+    [root.yoga applyLayout];
 }
 
 

benchmark/YGBenchmark.c

@@ -12,10 +12,10 @@
 #include <yoga/Yoga.h>
 
 static YGSize _measure(YGNodeRef node,
-                        float width,
-                        YGMeasureMode widthMode,
-                        float height,
-                        YGMeasureMode heightMode) {
+                       float width,
+                       YGMeasureMode widthMode,
+                       float height,
+                       YGMeasureMode heightMode) {
   return (YGSize){
       .width = widthMode == YGMeasureModeUndefined ? 10 : width,
       .height = heightMode == YGMeasureModeUndefined ? 10 : width,

benchmark/YGBenchmark.h

@@ -17,7 +17,7 @@
 
 #define NUM_REPETITIONS 1000
 
-#define YGBENCHMARKS(BLOCK)              \
+#define YGBENCHMARKS(BLOCK)                \
   int main(int argc, char const *argv[]) { \
     clock_t __start;                       \
     clock_t __endTimes[NUM_REPETITIONS];   \
@@ -25,7 +25,7 @@
     return 0;                              \
   }
 
-#define YGBENCHMARK(NAME, BLOCK)                       \
+#define YGBENCHMARK(NAME, BLOCK)                         \
   __start = clock();                                     \
   for (uint32_t __i = 0; __i < NUM_REPETITIONS; __i++) { \
     { BLOCK }                                            \

csharp/.gitignore

@@ -30,15 +30,14 @@ bld/
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
-csharp/tests/Facebook.Yoga/NUnit-[0-9\.]+/
-csharp/tests/Facebook.Yoga/YogaTest.dll
-csharp/tests/Facebook.Yoga/YogaTest.dll.mdb
-csharp/tests/Facebook.Yoga/libyoga.dylib
-csharp/tests/Facebook.Yoga/libyoga.dylib.dSYM/
 
 # NUNIT
 *.VisualState.xml
 TestResult.xml
+tests/Facebook.Yoga/NUnit-[0-9\.]*/
+tests/Facebook.Yoga/YogaTest.dll
+tests/Facebook.Yoga/YogaTest.dll.mdb
+tests/Facebook.Yoga/libyoga.dylib
 
 # Build Results of an ATL Project
 [Dd]ebugPS/

csharp/.hgignore

@@ -34,11 +34,10 @@ bld/
 # NUNIT
 *.VisualState.xml
 TestResult.xml
-csharp/tests/Facebook.Yoga/NUnit-[0-9\.]+/
-csharp/tests/Facebook.Yoga/YogaTest.dll
-csharp/tests/Facebook.Yoga/YogaTest.dll.mdb
-csharp/tests/Facebook.Yoga/libyoga.dylib
-csharp/tests/Facebook.Yoga/libyoga.dylib.dSYM/
+tests/Facebook.Yoga/NUnit-[0-9\.]*/
+tests/Facebook.Yoga/YogaTest.dll
+tests/Facebook.Yoga/YogaTest.dll.mdb
+tests/Facebook.Yoga/libyoga.dylib
 
 # Build Results of an ATL Project
 [Dd]ebugPS/

csharp/Android/.gitignore

@@ -0,0 +1 @@
+lib/

csharp/Android/Facebook.Yoga.Android.Tests/Facebook.Yoga.Android.Tests.csproj

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{2021459E-8FB1-44A4-89F1-E291769CD2C6}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Facebook.Yoga.Android.Tests</RootNamespace>
+    <AssemblyName>Facebook.Yoga.Android.Tests</AssemblyName>
+    <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
+    <AndroidApplication>True</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+    <AndroidResgenClass>Resource</AndroidResgenClass>
+    <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+    <AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core" />
+    <Reference Include="Mono.Android" />
+    <Reference Include="Xamarin.Android.NUnitLite" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MainActivity.cs" />
+    <Compile Include="Resources\Resource.designer.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AndroidManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Facebook.Yoga.Android\Facebook.Yoga.Android.csproj">
+      <Project>{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}</Project>
+      <Name>Facebook.Yoga.Android</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems" Label="Shared" Condition="Exists('..\..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems')" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+</Project>

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

@@ -0,0 +1,25 @@
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the license found in the
+ * LICENSE-examples file in the root directory of this source tree.
+ */
+
+using System.Reflection;
+using Android.App;
+using Android.OS;
+using Xamarin.Android.NUnitLite;
+
+namespace Facebook.Yoga.Android.Tests
+{
+	[Activity(Label = "Facebook.Yoga.Android.Tests", MainLauncher = true)]
+	public class MainActivity : TestSuiteActivity
+	{
+		protected override void OnCreate(Bundle bundle)
+		{
+			AddTest(Assembly.GetExecutingAssembly());
+			base.OnCreate(bundle);
+		}
+	}
+}

csharp/Android/Facebook.Yoga.Android.Tests/Properties/AndroidManifest.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="1"
+    android:versionName="1.0"
+    package="Facebook.Yoga.Android.Tests">
+
+    <uses-sdk
+        android:minSdkVersion="19" />
+
+    <application
+        android:label="Facebook.Yoga.Android.Tests">
+    </application>
+
+</manifest>

csharp/Android/Facebook.Yoga.Android.sln

@@ -0,0 +1,33 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Android.Tests", "Facebook.Yoga.Android.Tests\Facebook.Yoga.Android.Tests.csproj", "{2021459E-8FB1-44A4-89F1-E291769CD2C6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Android", "Facebook.Yoga.Android\Facebook.Yoga.Android.csproj", "{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{4804A8E6-E7B7-4F9E-A446-3DE8E73DB38A}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{4EDC82D9-A201-4831-8FE0-98F468F8E4AE}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2021459E-8FB1-44A4-89F1-E291769CD2C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{91C42D32-291D-4B72-90B4-551663D60B8B} = {4804A8E6-E7B7-4F9E-A446-3DE8E73DB38A}
+		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {4804A8E6-E7B7-4F9E-A446-3DE8E73DB38A}
+	EndGlobalSection
+EndGlobal

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <BuildDependsOn>NativeLibraryARMV7;NativeLibraryX86;$(BuildDependsOn)</BuildDependsOn>
+    </PropertyGroup>
+    <Target Name="NativeLibraryARMV7" Outputs="$(ProjectDir)/lib/armeabi-v7a/libyoga.so">
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet#android-armv7,shared" />
+        <Copy SourceFiles="$(ProjectDir)../../../buck-out/gen/csharp/yoganet#android-armv7,shared/libyoga.so" DestinationFiles="$(ProjectDir)/lib/armeabi-v7a/libyoga.so" SkipUnchangedFiles="true" />
+    </Target>
+    <!--
+    <Target Name="NativeLibraryARM64" Outputs="$(ProjectDir)/lib/arm64-v8a/libyoga.so">
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet#android-arm64,shared" />
+        <Copy SourceFiles="$(ProjectDir)../../../buck-out/gen/csharp/yoganet#android-arm64,shared/libyoga.so" DestinationFiles="$(ProjectDir)/lib/arm64-v8/libyoga.so" SkipUnchangedFiles="true" />
+    </Target>
+    -->
+    <Target Name="NativeLibraryX86" Outputs="$(ProjectDir)/lib/x86/libyoga.so">
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)../../Mac/buck-build.sh //csharp:yoganet#android-x86,shared" />
+        <Copy SourceFiles="$(ProjectDir)../../../buck-out/gen/csharp/yoganet#android-x86,shared/libyoga.so" DestinationFiles="$(ProjectDir)/lib/x86/libyoga.so" SkipUnchangedFiles="true" />
+    </Target>
+</Project>

csharp/Android/Facebook.Yoga.Android/Facebook.Yoga.Android.csproj

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<ProjectGuid>{EDF7CF8B-5640-4E1D-A2C7-E4BC8BE44363}</ProjectGuid>
+		<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+		<OutputType>Library</OutputType>
+		<RootNamespace>Facebook.Yoga.Android</RootNamespace>
+		<AssemblyName>Facebook.Yoga.Android</AssemblyName>
+		<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
+		<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
+		<AndroidResgenClass>Resource</AndroidResgenClass>
+		<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
+		<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+		<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>full</DebugType>
+		<Optimize>false</Optimize>
+		<OutputPath>bin\Debug</OutputPath>
+		<DefineConstants>DEBUG;</DefineConstants>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<AndroidLinkMode>None</AndroidLinkMode>
+		<AndroidSupportedAbis>arm64-v8a;armeabi;armeabi-v7a;x86</AndroidSupportedAbis>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>pdbonly</DebugType>
+		<Optimize>true</Optimize>
+		<OutputPath>bin\Release</OutputPath>
+		<ErrorReport>prompt</ErrorReport>
+		<WarningLevel>4</WarningLevel>
+		<AndroidManagedSymbols>true</AndroidManagedSymbols>
+		<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+	</PropertyGroup>
+	<ItemGroup>
+		<Reference Include="System" />
+		<Reference Include="System.Xml" />
+		<Reference Include="System.Core" />
+		<Reference Include="Mono.Android" />
+	</ItemGroup>
+	<ItemGroup>
+		<None Include="CustomBuildAction.targets" />
+	</ItemGroup>
+	<ItemGroup>
+	  <Folder Include="lib\x86\" />
+	  <Folder Include="lib\armeabi-v7a\" />
+	</ItemGroup>
+	<ItemGroup>
+	  <EmbeddedNativeLibrary Include="lib\x86\libyoga.so">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </EmbeddedNativeLibrary>
+	  <EmbeddedNativeLibrary Include="lib\armeabi-v7a\libyoga.so">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </EmbeddedNativeLibrary>
+	</ItemGroup>
+	<Import Project="..\..\Facebook.Yoga\Facebook.Yoga.Shared.projitems" Label="Shared" Condition="Exists('..\..\Facebook.Yoga\Facebook.Yoga.Shared.projitems')" />
+	<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+	<Import Project="CustomBuildAction.targets" />
+</Project>

csharp/Facebook.Yoga.sln

@@ -1,46 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.xproj", "{75BB7605-E54B-4EDE-8F5A-FF1F24464236}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.Build.0 = Debug|x64
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.ActiveCfg = Release|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.Build.0 = Release|x64
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.ActiveCfg = Release|Win32
-		{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.Build.0 = Release|Win32
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|x64.Build.0 = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Debug|x86.Build.0 = Debug|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|x64.ActiveCfg = Release|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|x64.Build.0 = Release|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|x86.ActiveCfg = Release|Any CPU
-		{75BB7605-E54B-4EDE-8F5A-FF1F24464236}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

csharp/Facebook.Yoga/BaselineFunction.cs

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

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>91c42d32-291d-4b72-90b4-551663d60b8b</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Facebook.Yoga.Shared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)BaselineFunction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MeasureFunction.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MeasureOutput.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Native.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaAlign.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaBaselineFunc.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaConstants.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaDimension.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaDirection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaEdge.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaExperimentalFeature.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaFlexDirection.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaJustify.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaLogger.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaLogLevel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaMeasureFunc.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaMeasureMode.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaNode.Spacing.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaNode.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaOverflow.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaPositionType.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaPrintOptions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaSize.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaUnit.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaValue.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaValueExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaWrap.cs" />
+  </ItemGroup>
+</Project>

csharp/Facebook.Yoga/Facebook.Yoga.Shared.shproj

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>91c42d32-291d-4b72-90b4-551663d60b8b</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Facebook.Yoga.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

csharp/Facebook.Yoga/Facebook.Yoga.xproj

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>75bb7605-e54b-4ede-8f5a-ff1f24464236</ProjectGuid>
-    <RootNamespace>Facebook.Yoga</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

csharp/Facebook.Yoga/MeasureFunction.cs

@@ -9,7 +9,7 @@
 
 namespace Facebook.Yoga
 {
-    public delegate long MeasureFunction(
+    public delegate YogaSize MeasureFunction(
         YogaNode node,
         float width,
         YogaMeasureMode widthMode,

csharp/Facebook.Yoga/MeasureOutput.cs

@@ -11,24 +11,9 @@ namespace Facebook.Yoga
 {
     public class MeasureOutput
     {
-        public static long Make(double width, double height)
+        public static YogaSize Make(float width, float height)
         {
-            return Make((int) width, (int) height);
-        }
-
-        public static long Make(int width, int height)
-        {
-            return (long)(((ulong) width) << 32 | ((uint) height));
-        }
-
-        public static int GetWidth(long measureOutput)
-        {
-            return (int) (0xFFFFFFFF & (measureOutput >> 32));
-        }
-
-        public static int GetHeight(long measureOutput)
-        {
-            return (int) (0xFFFFFFFF & measureOutput);
+            return new YogaSize { width = width, height = height};
         }
     }
 }

csharp/Facebook.Yoga/Native.cs

@@ -1,4 +1,4 @@
-/**
+/**
  * Copyright (c) 2014-present, Facebook, Inc.
  * All rights reserved.
  *
@@ -20,263 +20,312 @@ namespace Facebook.Yoga
         private const string DllName = "yoga";
 #endif
 
-        [DllImport(DllName)]
+        internal class YGNodeHandle : SafeHandle
+        {
+            private YGNodeHandle() : base(IntPtr.Zero, true)
+            {
+            }
+
+            public override bool IsInvalid
+            {
+                get
+                {
+                    return this.handle == IntPtr.Zero;
+                }
+            }
+
+            protected override bool ReleaseHandle()
+            {
+                Native.YGNodeFree(this.handle);
+                GC.KeepAlive(this);
+                return true;
+            }
+        }
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGInteropSetLogger(
             [MarshalAs(UnmanagedType.FunctionPtr)] YogaLogger.Func func);
 
-        [DllImport(DllName)]
-        public static extern IntPtr YGNodeNew();
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YGNodeHandle YGNodeNew();
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeFree(IntPtr node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeReset(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeReset(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern int YGNodeGetInstanceCount();
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGSetExperimentalFeatureEnabled(
             YogaExperimentalFeature feature,
             bool enabled);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern bool YGIsExperimentalFeatureEnabled(
             YogaExperimentalFeature feature);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeInsertChild(IntPtr node, IntPtr child, uint index);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeInsertChild(YGNodeHandle node, YGNodeHandle child, uint index);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeRemoveChild(IntPtr node, IntPtr child);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeRemoveChild(YGNodeHandle node, YGNodeHandle child);
 
-        [DllImport(DllName)]
-        public static extern IntPtr YGNodeGetChild(IntPtr node, uint index);
-
-        [DllImport(DllName)]
-        public static extern uint YGNodeGetChildCount(IntPtr node);
-
-        [DllImport(DllName)]
-        public static extern void YGNodeCalculateLayout(IntPtr node,
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeCalculateLayout(YGNodeHandle node,
                             float availableWidth,
                             float availableHeight,
                             YogaDirection parentDirection);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeMarkDirty(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeMarkDirty(YGNodeHandle node);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         [return: MarshalAs(UnmanagedType.I1)]
-        public static extern bool YGNodeIsDirty(IntPtr node);
+        public static extern bool YGNodeIsDirty(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodePrint(IntPtr node, YogaPrintOptions options);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodePrint(YGNodeHandle node, YogaPrintOptions options);
 
-        [DllImport(DllName)]
-        [return: MarshalAs(UnmanagedType.I1)]
-        public static extern bool YGValueIsUndefined(float value);
-
-        [DllImport(DllName)]
-        public static extern void YGNodeCopyStyle(IntPtr dstNode, IntPtr srcNode);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeCopyStyle(YGNodeHandle dstNode, YGNodeHandle srcNode);
 
         #region YG_NODE_PROPERTY
 
-        [DllImport(DllName)]
-        public static extern void YGNodeSetContext(IntPtr node, IntPtr context);
-
-        [DllImport(DllName)]
-        public static extern IntPtr YGNodeGetContext(IntPtr node);
-
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern void YGNodeSetMeasureFunc(
-            IntPtr node,
+            YGNodeHandle node,
             [MarshalAs(UnmanagedType.FunctionPtr)] YogaMeasureFunc measureFunc);
 
-        [DllImport(DllName)]
-        [return: MarshalAs(UnmanagedType.FunctionPtr)]
-        public static extern YogaMeasureFunc YGNodeGetMeasureFunc(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeSetBaselineFunc(
+            YGNodeHandle node,
+            [MarshalAs(UnmanagedType.FunctionPtr)] YogaBaselineFunc baselineFunc);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeSetHasNewLayout(IntPtr node, [MarshalAs(UnmanagedType.I1)] bool hasNewLayout);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeSetHasNewLayout(YGNodeHandle node, [MarshalAs(UnmanagedType.I1)] bool hasNewLayout);
 
-        [DllImport(DllName)]
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         [return: MarshalAs(UnmanagedType.I1)]
-        public static extern bool YGNodeGetHasNewLayout(IntPtr node);
+        public static extern bool YGNodeGetHasNewLayout(YGNodeHandle node);
 
         #endregion
 
         #region YG_NODE_STYLE_PROPERTY
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetDirection(IntPtr node, YogaDirection direction);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetDirection(YGNodeHandle node, YogaDirection direction);
 
-        [DllImport(DllName)]
-        public static extern YogaDirection YGNodeStyleGetDirection(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaDirection YGNodeStyleGetDirection(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlexDirection(IntPtr node, YogaFlexDirection flexDirection);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetFlexDirection(YGNodeHandle node, YogaFlexDirection flexDirection);
 
-        [DllImport(DllName)]
-        public static extern YogaFlexDirection YGNodeStyleGetFlexDirection(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaFlexDirection YGNodeStyleGetFlexDirection(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetJustifyContent(IntPtr node, YogaJustify justifyContent);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetJustifyContent(YGNodeHandle node, YogaJustify justifyContent);
 
-        [DllImport(DllName)]
-        public static extern YogaJustify YGNodeStyleGetJustifyContent(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaJustify YGNodeStyleGetJustifyContent(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetAlignContent(IntPtr node, YogaAlign alignContent);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetAlignContent(YGNodeHandle node, YogaAlign alignContent);
 
-        [DllImport(DllName)]
-        public static extern YogaAlign YGNodeStyleGetAlignContent(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaAlign YGNodeStyleGetAlignContent(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetAlignItems(IntPtr node, YogaAlign alignItems);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetAlignItems(YGNodeHandle node, YogaAlign alignItems);
 
-        [DllImport(DllName)]
-        public static extern YogaAlign YGNodeStyleGetAlignItems(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaAlign YGNodeStyleGetAlignItems(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetAlignSelf(IntPtr node, YogaAlign alignSelf);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetAlignSelf(YGNodeHandle node, YogaAlign alignSelf);
 
-        [DllImport(DllName)]
-        public static extern YogaAlign YGNodeStyleGetAlignSelf(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaAlign YGNodeStyleGetAlignSelf(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetPositionType(IntPtr node, YogaPositionType positionType);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetPositionType(YGNodeHandle node, YogaPositionType positionType);
 
-        [DllImport(DllName)]
-        public static extern YogaPositionType YGNodeStyleGetPositionType(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaPositionType YGNodeStyleGetPositionType(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlexWrap(IntPtr node, YogaWrap flexWrap);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetFlexWrap(YGNodeHandle node, YogaWrap flexWrap);
 
-        [DllImport(DllName)]
-        public static extern YogaWrap YGNodeStyleGetFlexWrap(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaWrap YGNodeStyleGetFlexWrap(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetOverflow(IntPtr node, YogaOverflow flexWrap);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetOverflow(YGNodeHandle node, YogaOverflow flexWrap);
 
-        [DllImport(DllName)]
-        public static extern YogaOverflow YGNodeStyleGetOverflow(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaOverflow YGNodeStyleGetOverflow(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlex(IntPtr node, float flex);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetDisplay(YGNodeHandle node, YogaDisplay display);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlexGrow(IntPtr node, float flexGrow);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaDisplay YGNodeStyleGetDisplay(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetFlexGrow(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetFlex(YGNodeHandle node, float flex);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlexShrink(IntPtr node, float flexShrink);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetFlexGrow(YGNodeHandle node, float flexGrow);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetFlexShrink(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeStyleGetFlexGrow(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetFlexBasis(IntPtr node, float flexBasis);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetFlexShrink(YGNodeHandle node, float flexShrink);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetFlexBasis(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeStyleGetFlexShrink(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetWidth(IntPtr node, float width);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetFlexBasis(YGNodeHandle node, float flexBasis);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetWidth(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetFlexBasisPercent(YGNodeHandle node, float flexBasis);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetHeight(IntPtr node, float height);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetFlexBasis(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetHeight(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetWidth(YGNodeHandle node, float width);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetMinWidth(IntPtr node, float minWidth);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetWidthPercent(YGNodeHandle node, float width);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMinWidth(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetWidth(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetMinHeight(IntPtr node, float minHeight);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetHeight(YGNodeHandle node, float height);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMinHeight(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetHeightPercent(YGNodeHandle node, float height);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetMaxWidth(IntPtr node, float maxWidth);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetHeight(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMaxWidth(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMinWidth(YGNodeHandle node, float minWidth);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetMaxHeight(IntPtr node, float maxHeight);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMinWidthPercent(YGNodeHandle node, float minWidth);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMaxHeight(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetMinWidth(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetAspectRatio(IntPtr node, float aspectRatio);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMinHeight(YGNodeHandle node, float minHeight);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetAspectRatio(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMinHeightPercent(YGNodeHandle node, float minHeight);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetMinHeight(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMaxWidth(YGNodeHandle node, float maxWidth);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMaxWidthPercent(YGNodeHandle node, float maxWidth);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetMaxWidth(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMaxHeight(YGNodeHandle node, float maxHeight);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMaxHeightPercent(YGNodeHandle node, float maxHeight);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetMaxHeight(YGNodeHandle node);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetAspectRatio(YGNodeHandle node, float aspectRatio);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeStyleGetAspectRatio(YGNodeHandle node);
 
         #endregion
 
         #region YG_NODE_STYLE_EDGE_PROPERTY
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetPosition(IntPtr node, YogaEdge edge, float position);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetPosition(YGNodeHandle node, YogaEdge edge, float position);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetPosition(IntPtr node, YogaEdge edge);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetPositionPercent(YGNodeHandle node, YogaEdge edge, float position);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetMargin(IntPtr node, YogaEdge edge, float margin);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetPosition(YGNodeHandle node, YogaEdge edge);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetMargin(IntPtr node, YogaEdge edge);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMargin(YGNodeHandle node, YogaEdge edge, float margin);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetPadding(IntPtr node, YogaEdge edge, float padding);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetMarginPercent(YGNodeHandle node, YogaEdge edge, float margin);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetPadding(IntPtr node, YogaEdge edge);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetMargin(YGNodeHandle node, YogaEdge edge);
 
-        [DllImport(DllName)]
-        public static extern void YGNodeStyleSetBorder(IntPtr node, YogaEdge edge, float border);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetPadding(YGNodeHandle node, YogaEdge edge, float padding);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeStyleGetBorder(IntPtr node, YogaEdge edge);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetPaddingPercent(YGNodeHandle node, YogaEdge edge, float padding);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaValue YGNodeStyleGetPadding(YGNodeHandle node, YogaEdge edge);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetBorder(YGNodeHandle node, YogaEdge edge, float border);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeStyleGetBorder(YGNodeHandle node, YogaEdge edge);
 
         #endregion
 
         #region YG_NODE_LAYOUT_PROPERTY
 
-        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetLeft(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeLayoutGetLeft(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetTop(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeLayoutGetTop(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetRight(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeLayoutGetRight(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetBottom(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeLayoutGetBottom(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetWidth(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeLayoutGetWidth(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern float YGNodeLayoutGetHeight(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeLayoutGetHeight(YGNodeHandle node);
 
-        [DllImport(DllName)]
-        public static extern YogaDirection YGNodeLayoutGetDirection(IntPtr node);
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeLayoutGetMargin(YGNodeHandle node, YogaEdge edge);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeLayoutGetPadding(YGNodeHandle node, YogaEdge edge);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern YogaDirection YGNodeLayoutGetDirection(YGNodeHandle node);
 
         #endregion
     }

csharp/Facebook.Yoga/Spacing.cs

@@ -1,31 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-namespace Facebook.Yoga
-{
-    public class Spacing
-    {
-        public float? Top;
-        public float? Bottom;
-        public float? Left;
-        public float? Right;
-
-        public Spacing(
-            float? top = null,
-            float? bottom = null,
-            float? left = null,
-            float? right = null)
-        {
-            Top = top;
-            Bottom = bottom;
-            Left = left;
-            Right = right;
-        }
-    }
-}

csharp/Facebook.Yoga/YogaAlign.cs

@@ -16,5 +16,6 @@ namespace Facebook.Yoga
         Center,
         FlexEnd,
         Stretch,
+        Baseline,
     }
 }

csharp/Facebook.Yoga/YogaBaselineFunc.cs

@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace Facebook.Yoga
+{
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    public delegate float YogaBaselineFunc(IntPtr node, float width, float height);
+}

csharp/Facebook.Yoga/YogaConstants.cs

@@ -17,5 +17,10 @@ namespace Facebook.Yoga
         {
             return float.IsNaN(value);
         }
+
+        public static bool IsUndefined(YogaValue value)
+        {
+            return value.Unit == YogaUnit.Undefined;
+        }
     }
 }

csharp/Facebook.Yoga/YogaDisplay.cs

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

csharp/Facebook.Yoga/YogaNode.Create.cs

@@ -1,233 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-using System;
-
-namespace Facebook.Yoga
-{
-    public partial class YogaNode
-    {
-        public static YogaNode Create(
-            YogaDirection? styleDirection = null,
-            YogaFlexDirection? flexDirection = null,
-            YogaJustify? justifyContent = null,
-            YogaAlign? alignContent = null,
-            YogaAlign? alignItems = null,
-            YogaAlign? alignSelf = null,
-            YogaPositionType? positionType = null,
-            YogaWrap? wrap = null,
-            YogaOverflow? overflow = null,
-            float? flex = null,
-            float? flexGrow = null,
-            float? flexShrink = null,
-            float? flexBasis = null,
-            Spacing position = null,
-            Spacing margin = null,
-            Spacing padding = null,
-            Spacing border = null,
-            float? width = null,
-            float? height = null,
-            float? maxWidth = null,
-            float? maxHeight = null,
-            float? minWidth = null,
-            float? minHeight = null)
-        {
-            YogaNode node = new YogaNode();
-
-            if (styleDirection.HasValue)
-            {
-                node.StyleDirection = styleDirection.Value;
-            }
-
-            if (flexDirection.HasValue)
-            {
-                node.FlexDirection = flexDirection.Value;
-            }
-
-            if (justifyContent.HasValue)
-            {
-                node.JustifyContent = justifyContent.Value;
-            }
-
-            if (alignContent.HasValue)
-            {
-                node.AlignContent = alignContent.Value;
-            }
-
-            if (alignItems.HasValue)
-            {
-                node.AlignItems = alignItems.Value;
-            }
-
-            if (alignSelf.HasValue)
-            {
-                node.AlignSelf = alignSelf.Value;
-            }
-
-            if (positionType.HasValue)
-            {
-                node.PositionType = positionType.Value;
-            }
-
-            if (wrap.HasValue)
-            {
-                node.Wrap = wrap.Value;
-            }
-
-            if (overflow.HasValue)
-            {
-                node.Overflow = overflow.Value;
-            }
-
-            if (flex.HasValue)
-            {
-                node.Flex = flex.Value;
-            }
-
-            if (flexGrow.HasValue)
-            {
-                node.FlexGrow = flexGrow.Value;
-            }
-
-            if (flexShrink.HasValue)
-            {
-                node.FlexShrink = flexShrink.Value;
-            }
-
-            if (flexBasis.HasValue)
-            {
-                node.FlexBasis = flexBasis.Value;
-            }
-
-            if (position != null)
-            {
-                if (position.Top.HasValue)
-                {
-                    node.SetPosition(YogaEdge.Top, position.Top.Value);
-                }
-
-                if (position.Bottom.HasValue)
-                {
-                    node.SetPosition(YogaEdge.Bottom, position.Bottom.Value);
-                }
-
-                if (position.Left.HasValue)
-                {
-                    node.SetPosition(YogaEdge.Left, position.Left.Value);
-                }
-
-                if (position.Right.HasValue)
-                {
-                    node.SetPosition(YogaEdge.Right, position.Right.Value);
-                }
-            }
-
-            if (margin != null)
-            {
-                if (margin.Top.HasValue)
-                {
-                    node.SetMargin(YogaEdge.Top, margin.Top.Value);
-                }
-
-                if (margin.Bottom.HasValue)
-                {
-                    node.SetMargin(YogaEdge.Bottom, margin.Bottom.Value);
-                }
-
-                if (margin.Left.HasValue)
-                {
-                    node.SetMargin(YogaEdge.Left, margin.Left.Value);
-                }
-
-                if (margin.Right.HasValue)
-                {
-                    node.SetMargin(YogaEdge.Right, margin.Right.Value);
-                }
-            }
-
-            if (padding != null)
-            {
-                if (padding.Top.HasValue)
-                {
-                    node.SetPadding(YogaEdge.Top, padding.Top.Value);
-                }
-
-                if (padding.Bottom.HasValue)
-                {
-                    node.SetPadding(YogaEdge.Bottom, padding.Bottom.Value);
-                }
-
-                if (padding.Left.HasValue)
-                {
-                    node.SetPadding(YogaEdge.Left, padding.Left.Value);
-                }
-
-                if (padding.Right.HasValue)
-                {
-                    node.SetPadding(YogaEdge.Right, padding.Right.Value);
-                }
-            }
-
-            if (border != null)
-            {
-                if (border.Top.HasValue)
-                {
-                    node.SetBorder(YogaEdge.Top, border.Top.Value);
-                }
-
-                if (border.Bottom.HasValue)
-                {
-                    node.SetBorder(YogaEdge.Bottom, border.Bottom.Value);
-                }
-
-                if (border.Left.HasValue)
-                {
-                    node.SetBorder(YogaEdge.Left, border.Left.Value);
-                }
-
-                if (border.Right.HasValue)
-                {
-                    node.SetBorder(YogaEdge.Right, border.Right.Value);
-                }
-            }
-
-            if (width.HasValue)
-            {
-                node.Width = width.Value;
-            }
-
-            if (height.HasValue)
-            {
-                node.Height = height.Value;
-            }
-
-            if (minWidth.HasValue)
-            {
-                node.MinWidth = minWidth.Value;
-            }
-
-            if (minHeight.HasValue)
-            {
-                node.MinHeight = minHeight.Value;
-            }
-
-            if (maxWidth.HasValue)
-            {
-                node.MaxWidth = maxWidth.Value;
-            }
-
-            if (maxHeight.HasValue)
-            {
-                node.MaxHeight = maxHeight.Value;
-            }
-
-            return node;
-        }
-    }
-}

csharp/Facebook.Yoga/YogaNode.Spacing.cs

@@ -0,0 +1,551 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+
+namespace Facebook.Yoga
+{
+    public partial class YogaNode
+    {
+        public YogaValue Left
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Left);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.Left, value);
+            }
+        }
+
+        public YogaValue Top
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Top);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.Top, value);
+            }
+        }
+
+        public YogaValue Right
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Right);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.Right, value);
+            }
+        }
+
+        public YogaValue Bottom
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Bottom);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.Bottom, value);
+            }
+        }
+
+        public YogaValue Start
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.Start);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.Start, value);
+            }
+        }
+
+        public YogaValue End
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPosition(_ygNode, YogaEdge.End);
+            }
+
+            set
+            {
+                SetStylePosition(YogaEdge.End, value);
+            }
+        }
+
+        private void SetStylePosition(YogaEdge edge, YogaValue value)
+        {
+            if (value.Unit == YogaUnit.Percent)
+            {
+                Native.YGNodeStyleSetPositionPercent(_ygNode, edge, value.Value);
+            }
+            else
+            {
+                Native.YGNodeStyleSetPosition(_ygNode, edge, value.Value);
+            }
+        }
+
+        public YogaValue MarginLeft
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Left);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Left, value);
+            }
+        }
+
+        public YogaValue MarginTop
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Top);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Top, value);
+            }
+        }
+
+        public YogaValue MarginRight
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Right);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Right, value);
+            }
+        }
+
+        public YogaValue MarginBottom
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Bottom);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Bottom, value);
+            }
+        }
+
+        public YogaValue MarginStart
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Start);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Start, value);
+            }
+        }
+
+        public YogaValue MarginEnd
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.End);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.End, value);
+            }
+        }
+
+        public YogaValue MarginHorizontal
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Horizontal);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Horizontal, value);
+            }
+        }
+
+        public YogaValue MarginVertical
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.Vertical);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.Vertical, value);
+            }
+        }
+
+        public YogaValue Margin
+        {
+            get
+            {
+                return Native.YGNodeStyleGetMargin(_ygNode, YogaEdge.All);
+            }
+
+            set
+            {
+                SetStyleMargin(YogaEdge.All, value);
+            }
+        }
+
+        private void SetStyleMargin(YogaEdge edge, YogaValue value)
+        {
+            if (value.Unit == YogaUnit.Percent)
+            {
+                Native.YGNodeStyleSetMarginPercent(_ygNode, edge, value.Value);
+            }
+            else
+            {
+                Native.YGNodeStyleSetMargin(_ygNode, edge, value.Value);
+            }
+        }
+
+        public YogaValue PaddingLeft
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Left);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Left, value);
+            }
+        }
+
+        public YogaValue PaddingTop
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Top);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Top, value);
+            }
+        }
+
+        public YogaValue PaddingRight
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Right);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Right, value);
+            }
+        }
+
+        public YogaValue PaddingBottom
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Bottom);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Bottom, value);
+            }
+        }
+
+        public YogaValue PaddingStart
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Start);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Start, value);
+            }
+        }
+
+        public YogaValue PaddingEnd
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.End);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.End, value);
+            }
+        }
+
+        public YogaValue PaddingHorizontal
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Horizontal);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Horizontal, value);
+            }
+        }
+
+        public YogaValue PaddingVertical
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.Vertical);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.Vertical, value);
+            }
+        }
+
+        public YogaValue Padding
+        {
+            get
+            {
+                return Native.YGNodeStyleGetPadding(_ygNode, YogaEdge.All);
+            }
+
+            set
+            {
+                SetStylePadding(YogaEdge.All, value);
+            }
+        }
+
+        private void SetStylePadding(YogaEdge edge, YogaValue value)
+        {
+            if (value.Unit == YogaUnit.Percent)
+            {
+                Native.YGNodeStyleSetPaddingPercent(_ygNode, edge, value.Value);
+            }
+            else
+            {
+                Native.YGNodeStyleSetPadding(_ygNode, edge, value.Value);
+            }
+        }
+
+        public float BorderLeftWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Left);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Left, value);
+            }
+        }
+
+        public float BorderTopWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Top);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Top, value);
+            }
+        }
+
+        public float BorderRightWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Right);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Right, value);
+            }
+        }
+
+        public float BorderBottomWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Bottom);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Bottom, value);
+            }
+        }
+
+        public float BorderStartWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.Start);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.Start, value);
+            }
+        }
+
+        public float BorderEndWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.End);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.End, value);
+            }
+        }
+
+        public float BorderWidth
+        {
+            get
+            {
+                return Native.YGNodeStyleGetBorder(_ygNode, YogaEdge.All);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetBorder(_ygNode, YogaEdge.All, value);
+            }
+        }
+
+        public float LayoutMarginLeft
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Left);
+            }
+        }
+
+        public float LayoutMarginTop
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Top);
+            }
+        }
+
+        public float LayoutMarginRight
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Right);
+            }
+        }
+
+        public float LayoutMarginBottom
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Bottom);
+            }
+        }
+
+        public float LayoutMarginStart
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.Start);
+            }
+        }
+
+        public float LayoutMarginEnd
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetMargin(_ygNode, YogaEdge.End);
+            }
+        }
+
+        public float LayoutPaddingLeft
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Left);
+            }
+        }
+
+        public float LayoutPaddingTop
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Top);
+            }
+        }
+
+        public float LayoutPaddingRight
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Right);
+            }
+        }
+
+        public float LayoutPaddingBottom
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Bottom);
+            }
+        }
+
+        public float LayoutPaddingStart
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.Start);
+            }
+        }
+
+        public float LayoutPaddingEnd
+        {
+            get
+            {
+                return Native.YGNodeLayoutGetPadding(_ygNode, YogaEdge.End);
+            }
+        }
+    }
+}

csharp/Facebook.Yoga/YogaNode.cs

@@ -10,18 +10,19 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Runtime.InteropServices;
 using System.Text;
 
 namespace Facebook.Yoga
 {
     public partial class YogaNode : IEnumerable<YogaNode>
     {
-        private IntPtr _ygNode;
+        private Native.YGNodeHandle _ygNode;
         private WeakReference _parent;
         private List<YogaNode> _children;
         private MeasureFunction _measureFunction;
         private YogaMeasureFunc _ygMeasureFunc;
+        private BaselineFunction _baselineFunction;
+        private YogaBaselineFunc _ygBaselineFunc;
         private object _data;
 
         public YogaNode()
@@ -29,20 +30,22 @@ namespace Facebook.Yoga
             YogaLogger.Initialize();
 
             _ygNode = Native.YGNodeNew();
-            if (_ygNode == IntPtr.Zero)
+            if (_ygNode.IsInvalid)
             {
                 throw new InvalidOperationException("Failed to allocate native memory");
             }
         }
 
-        ~YogaNode()
+        public YogaNode(YogaNode srcNode)
+            : this()
         {
-            Native.YGNodeFree(_ygNode);
+            CopyStyle(srcNode);
         }
 
         public void Reset()
         {
             _measureFunction = null;
+            _baselineFunction = null;
             _data = null;
 
             Native.YGNodeReset(_ygNode);
@@ -90,6 +93,14 @@ namespace Facebook.Yoga
             }
         }
 
+        public bool IsBaselineDefined
+        {
+            get
+            {
+                return _baselineFunction != null;
+            }
+        }
+
         public void CopyStyle(YogaNode srcNode)
         {
             Native.YGNodeCopyStyle(_ygNode, srcNode._ygNode);
@@ -134,6 +145,19 @@ namespace Facebook.Yoga
             }
         }
 
+        public YogaDisplay Display
+        {
+            get
+            {
+                return Native.YGNodeStyleGetDisplay(_ygNode);
+            }
+
+            set
+            {
+                Native.YGNodeStyleSetDisplay(_ygNode, value);
+            }
+        }
+
         public YogaAlign AlignItems
         {
             get
@@ -233,7 +257,7 @@ namespace Facebook.Yoga
             }
         }
 
-        public float FlexBasis
+        public YogaValue FlexBasis
         {
             get
             {
@@ -242,51 +266,18 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetFlexBasis(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetFlexBasisPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetFlexBasis(_ygNode, value.Value);
+                }
             }
         }
 
-        public float GetMargin(YogaEdge edge)
-        {
-            return Native.YGNodeStyleGetMargin(_ygNode, edge);
-        }
-
-        public void SetMargin(YogaEdge edge, float value)
-        {
-            Native.YGNodeStyleSetMargin(_ygNode, edge, value);
-        }
-
-        public float GetPadding(YogaEdge edge)
-        {
-            return Native.YGNodeStyleGetPadding(_ygNode, edge);
-        }
-
-        public void SetPadding(YogaEdge edge, float padding)
-        {
-            Native.YGNodeStyleSetPadding(_ygNode, edge, padding);
-        }
-
-        public float GetBorder(YogaEdge edge)
-        {
-            return Native.YGNodeStyleGetBorder(_ygNode, edge);
-        }
-
-        public void SetBorder(YogaEdge edge, float border)
-        {
-            Native.YGNodeStyleSetBorder(_ygNode, edge, border);
-        }
-
-        public float GetPosition(YogaEdge edge)
-        {
-            return Native.YGNodeStyleGetPosition(_ygNode, edge);
-        }
-
-        public void SetPosition(YogaEdge edge, float position)
-        {
-            Native.YGNodeStyleSetPosition(_ygNode, edge, position);
-        }
-
-        public float Width
+        public YogaValue Width
         {
             get
             {
@@ -295,11 +286,18 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetWidth(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetWidthPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetWidth(_ygNode, value.Value);
+                }
             }
         }
 
-        public float Height
+        public YogaValue Height
         {
             get
             {
@@ -308,11 +306,18 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetHeight(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetHeightPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetHeight(_ygNode, value.Value);
+                }
             }
         }
 
-        public float MaxWidth
+        public YogaValue MaxWidth
         {
             get
             {
@@ -321,11 +326,18 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetMaxWidth(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetMaxWidthPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetMaxWidth(_ygNode, value.Value);
+                }
             }
         }
 
-        public float MaxHeight
+        public YogaValue MaxHeight
         {
             get
             {
@@ -334,11 +346,18 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetMaxHeight(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetMaxHeightPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetMaxHeight(_ygNode, value.Value);
+                }
             }
         }
 
-        public float MinWidth
+        public YogaValue MinWidth
         {
             get
             {
@@ -347,11 +366,18 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetMinWidth(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetMinWidthPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetMinWidth(_ygNode, value.Value);
+                }
             }
         }
 
-        public float MinHeight
+        public YogaValue MinHeight
         {
             get
             {
@@ -360,7 +386,14 @@ namespace Facebook.Yoga
 
             set
             {
-                Native.YGNodeStyleSetMinHeight(_ygNode, value);
+                if (value.Unit == YogaUnit.Percent)
+                {
+                    Native.YGNodeStyleSetMinHeightPercent(_ygNode, value.Value);
+                }
+                else
+                {
+                    Native.YGNodeStyleSetMinHeight(_ygNode, value.Value);
+                }
             }
         }
 
@@ -516,6 +549,13 @@ namespace Facebook.Yoga
             Native.YGNodeSetMeasureFunc(_ygNode, _ygMeasureFunc);
         }
 
+        public void SetBaselineFunction(BaselineFunction baselineFunction)
+        {
+            _baselineFunction = baselineFunction;
+            _ygBaselineFunc = baselineFunction != null ? BaselineInternal : (YogaBaselineFunc)null;
+            Native.YGNodeSetBaselineFunc(_ygNode, _ygBaselineFunc);
+        }
+
         public void CalculateLayout()
         {
             Native.YGNodeCalculateLayout(
@@ -537,8 +577,17 @@ namespace Facebook.Yoga
                 throw new InvalidOperationException("Measure function is not defined.");
             }
 
-            long output = _measureFunction(this, width, widthMode, height, heightMode);
-            return new YogaSize { width = MeasureOutput.GetWidth(output), height = MeasureOutput.GetHeight(output) };
+            return _measureFunction(this, width, widthMode, height, heightMode);
+        }
+
+        private float BaselineInternal(IntPtr node, float width, float height)
+        {
+            if (_baselineFunction == null)
+            {
+                throw new InvalidOperationException("Baseline function is not defined.");
+            }
+
+            return _baselineFunction(this, width, height);
         }
 
         public string Print(YogaPrintOptions options =

csharp/Facebook.Yoga/YogaUnit.cs

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

csharp/Facebook.Yoga/YogaValue.cs

@@ -0,0 +1,87 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System.Runtime.InteropServices;
+
+namespace Facebook.Yoga
+{
+    [StructLayout(LayoutKind.Sequential)]
+    public struct YogaValue
+    {
+        private float value;
+        private YogaUnit unit;
+
+        public YogaUnit Unit
+        {
+            get
+            {
+                return unit;
+            }
+        }
+
+        public float Value
+        {
+            get
+            {
+                return value;
+            }
+        }
+
+        public static YogaValue Pixel(float value)
+        {
+            return new YogaValue
+            {
+                value = value,
+                unit = YogaConstants.IsUndefined(value) ? YogaUnit.Undefined : YogaUnit.Pixel
+            };
+        }
+
+        public bool Equals(YogaValue other)
+        {
+            return Unit == other.Unit && (Value.Equals(other.Value) || Unit == YogaUnit.Undefined);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            return obj is YogaValue && Equals((YogaValue) obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                return (Value.GetHashCode() * 397) ^ (int) Unit;
+            }
+        }
+
+        public static YogaValue Undefined()
+        {
+            return new YogaValue
+            {
+                value = YogaConstants.Undefined,
+                unit = YogaUnit.Undefined
+            };
+        }
+
+        public static YogaValue Percent(float value)
+        {
+            return new YogaValue
+            {
+                value = value,
+                unit = YogaConstants.IsUndefined(value) ? YogaUnit.Undefined : YogaUnit.Percent
+            };
+        }
+
+        public static implicit operator YogaValue(float pixelValue)
+        {
+            return Pixel(pixelValue);
+        }
+    }
+}

csharp/Facebook.Yoga/YogaValueExtensions.cs

@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+namespace Facebook.Yoga
+{
+    public static class YogaValueExtensions
+    {
+        public static YogaValue Percent(this float value)
+        {
+            return YogaValue.Percent(value);
+        }
+
+        public static YogaValue Px(this float value)
+        {
+            return YogaValue.Pixel(value);
+        }
+
+        public static YogaValue Percent(this int value)
+        {
+            return YogaValue.Percent(value);
+        }
+
+        public static YogaValue Px(this int value)
+        {
+            return YogaValue.Pixel(value);
+        }
+    }
+}

csharp/Facebook.Yoga/project.json

@@ -3,7 +3,8 @@
   "version": "3.0.0-*",
 
   "dependencies": {
-    "NETStandard.Library": "1.6.0"
+    "NETStandard.Library": "1.6.0",
+    "System.Runtime.Handles": "4.3.0"
   },
 
   "frameworks": {

csharp/Facebook.YogaKit/Facebook.YogaKit.Shared.shproj

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{A24B3BA6-3143-4FFF-B8B8-1EDF166F5F4A}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <Import Project="Facebook.YogaKit.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

csharp/Facebook.YogaKit/Facebook.YogaKit.projitems

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>{A24B3BA6-3143-4FFF-B8B8-1EDF166F5F4A}</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Facebook.YogaKit</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)YogaLayout.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IYogaLayout.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)YogaKit.cs" />
+  </ItemGroup>
+</Project>

csharp/Facebook.YogaKit/IYogaLayout.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Drawing;
+using Facebook.Yoga;
+
+namespace Facebook.YogaKit
+{
+	public interface IYogaLayout : IDisposable
+	{
+		bool IsEnabled { get; set; }
+		bool IsIncludeInLayout { get; set; }
+
+		//YogaDirection Direction { get; set; }
+		YogaFlexDirection FlexDirection { get; set; }
+		YogaJustify JustifyContent { get; set; }
+		YogaAlign AlignContent { get; set; }
+		YogaAlign AlignSelf { get; set; }
+		YogaAlign AlignItems { get; set; }
+		YogaPositionType Position { get; set; }
+		YogaWrap FlexWrap { get; set; }
+		YogaOverflow Overflow { get; set; }
+
+
+		float FlexGrow { get; set; }
+		float FlexShrink { get; set; }
+		float FlexBasis { get; set; }
+
+		float Left { get; set; }
+		float Top { get; set; }
+		float Right { get; set; }
+		float Bottom { get; set; }
+		float Start { get; set; }
+		float End { get; set; }
+
+		float MarginLeft { get; set; }
+		float MarginTop { get; set; }
+		float MarginRight { get; set; }
+		float MarginBottom { get; set; }
+		float MarginStart { get; set; }
+		float MarginEnd { get; set; }
+		float MarginHorizontal { get; set; }
+		float MarginVertical { get; set; }
+		float Margin { get; set; }
+
+		float PaddingLeft { get; set; }
+		float PaddingTop { get; set; }
+		float PaddingRight { get; set; }
+		float PaddingBottom { get; set; }
+		float PaddingStart { get; set; }
+		float PaddingEnd { get; set; }
+		float PaddingHorizontal { get; set; }
+		float PaddingVertical { get; set; }
+		float Padding { get; set; }
+
+		float BorderLeftWidth { get; set; }
+		float BorderTopWidth { get; set; }
+		float BorderRightWidth { get; set; }
+		float BorderBottomWidth { get; set; }
+		float BorderStartWidth { get; set; }
+		float BorderEndWidth { get; set; }
+		float BorderWidth { get; set; }
+
+		float Width { get; set; }
+		float Height { get; set; }
+		float MinWidth { get; set; }
+		float MinHeight { get; set; }
+		float MaxWidth { get; set; }
+		float MaxHeight { get; set; }
+
+		// Yoga specific properties, not compatible with flexbox specification
+
+		// Returns the size of the view if no constraints were given. This could equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
+		SizeF IntrinsicSize { get; }
+		float AspectRatio { get; set; }
+		// Get the resolved direction of this node. This won't be YGDirectionInherit
+		YogaDirection ResolvedDirection { get; }
+		// Returns the number of children that are using Flexbox.
+		int NumberOfChildren { get; }
+		// Return a BOOL indiciating whether or not we this node contains any subviews that are included in Yoga's layout.
+		bool IsLeaf { get; }
+		// Perform a layout calculation and update the frames of the views in the hierarchy with the results
+		void ApplyLayout();
+		// Mark that a view's layout needs to be recalculated. Only works for leaf views.
+		void MarkDirty();
+	}
+}

csharp/Facebook.YogaKit/YogaKit.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Facebook.Yoga;
+
+namespace Facebook.YogaKit
+{
+	public static partial class YogaKit
+	{
+		internal static Dictionary<YogaNode, object> Bridges = new Dictionary<YogaNode, object>();
+	}
+}

csharp/Facebook.YogaKit/YogaLayout.cs

@@ -0,0 +1,888 @@
+using System;
+using Facebook.Yoga;
+using System.Collections.Generic;
+using System.Drawing;
+#if __IOS__
+using NativeView = UIKit.UIView;
+#endif
+
+namespace Facebook.YogaKit
+{
+	public partial class YogaLayout : IYogaLayout
+	{
+		WeakReference<NativeView> _viewRef;
+		YogaNode _node;
+
+		internal YogaLayout(NativeView view)
+		{
+			_viewRef = new WeakReference<NativeView>(view);
+			_node = new YogaNode();
+			YogaKit.Bridges.Add(_node, view);
+
+			IsEnabled = false;
+			IsIncludeInLayout = true;
+		}
+
+		public new void MarkDirty()
+		{
+			if (IsLeaf)
+				_node.MarkDirty();
+		}
+
+		public bool IsLeaf
+		{
+			get
+			{
+				if (IsEnabled)
+				{
+					NativeView view = null;
+					if (_viewRef.TryGetTarget(out view))
+					{
+						foreach (NativeView subview in GetChildren(view))
+						{
+							var layout = subview.Yoga();
+							if (layout.IsEnabled && layout.IsIncludeInLayout)
+							{
+								return false;
+							}
+						}
+					}
+
+				}
+				return true;
+			}
+		}
+
+
+
+		public bool IsEnabled
+		{
+			get;
+			set;
+		}
+
+		public bool IsIncludeInLayout
+		{
+			get;
+			set;
+		}
+
+		public int NumberOfChildren => _node.Count;
+
+		public YogaDirection ResolvedDirection => _node.LayoutDirection;
+
+		public YogaFlexDirection FlexDirection
+		{
+			get
+			{
+				return _node.FlexDirection;
+			}
+
+			set
+			{
+				_node.FlexDirection = value;
+			}
+		}
+
+		public YogaAlign AlignItems
+		{
+			get
+			{
+				return _node.AlignItems;
+			}
+
+			set
+			{
+				_node.AlignItems = value;
+			}
+		}
+
+		public YogaJustify JustifyContent
+		{
+			get
+			{
+				return _node.JustifyContent;
+			}
+
+			set
+			{
+				_node.JustifyContent = value;
+			}
+		}
+
+		public YogaAlign AlignContent
+		{
+			get
+			{
+				return _node.AlignContent;
+			}
+
+			set
+			{
+				_node.AlignContent = value;
+			}
+		}
+
+		public YogaAlign AlignSelf
+		{
+			get
+			{
+				return _node.AlignSelf;
+			}
+
+			set
+			{
+				_node.AlignSelf = value;
+			}
+		}
+
+		public YogaPositionType Position
+		{
+			get
+			{
+				return _node.PositionType;
+			}
+
+			set
+			{
+				_node.PositionType = value;
+			}
+		}
+
+		public YogaWrap FlexWrap
+		{
+			get
+			{
+				return _node.Wrap;
+			}
+
+			set
+			{
+				_node.Wrap = value;
+			}
+		}
+
+		public YogaOverflow Overflow
+		{
+			get
+			{
+				return _node.Overflow;
+			}
+
+			set
+			{
+				_node.Overflow = value;
+			}
+		}
+
+		public float FlexGrow
+		{
+			get
+			{
+				return _node.FlexGrow;
+			}
+
+			set
+			{
+				_node.FlexGrow = value;
+			}
+		}
+
+		public float FlexShrink
+		{
+			get
+			{
+				return _node.FlexShrink;
+			}
+
+			set
+			{
+				_node.FlexShrink = value;
+			}
+		}
+
+		public float FlexBasis
+		{
+			get
+			{
+				return (float)_node.FlexBasis.Value;
+			}
+
+			set
+			{
+				_node.FlexBasis = value;
+			}
+		}
+
+		public float Left
+		{
+			get
+			{
+				return _node.Left.Value;
+			}
+
+			set
+			{
+				_node.Left = value;
+			}
+		}
+
+		public float Top
+		{
+			get
+			{
+				return _node.Top.Value;
+			}
+
+			set
+			{
+				_node.Top = value;
+			}
+		}
+
+		public float Right
+		{
+			get
+			{
+				return _node.Right.Value;
+			}
+
+			set
+			{
+				_node.Right = value;
+			}
+		}
+
+		public float Bottom
+		{
+			get
+			{
+				return _node.Bottom.Value;
+			}
+
+			set
+			{
+				_node.Bottom = value;
+			}
+		}
+
+		public float Start
+		{
+			get
+			{
+				return _node.Start.Value;
+			}
+
+			set
+			{
+				_node.Start = value;
+			}
+		}
+
+		public float End
+		{
+			get
+			{
+				return _node.End.Value;
+			}
+
+			set
+			{
+				_node.End = value;
+			}
+		}
+
+		public float MarginLeft
+		{
+			get
+			{
+				return _node.MarginLeft.Value;
+			}
+
+			set
+			{
+				_node.MarginLeft = value;
+			}
+		}
+
+		public float MarginTop
+		{
+			get
+			{
+				return _node.MarginTop.Value;
+			}
+
+			set
+			{
+				_node.MarginTop = value;
+			}
+		}
+
+		public float MarginRight
+		{
+			get
+			{
+				return _node.MarginRight.Value;
+			}
+
+			set
+			{
+				_node.MarginRight = value;
+			}
+		}
+
+		public float MarginBottom
+		{
+			get
+			{
+				return _node.MarginBottom.Value;
+			}
+
+			set
+			{
+				_node.MarginBottom = value;
+			}
+		}
+
+		public float MarginStart
+		{
+			get
+			{
+				return _node.MarginStart.Value;
+			}
+
+			set
+			{
+				_node.MarginStart = value;
+			}
+		}
+
+		public float MarginEnd
+		{
+			get
+			{
+				return _node.MarginEnd.Value;
+			}
+
+			set
+			{
+				_node.MarginEnd = value;
+			}
+		}
+
+		public float MarginHorizontal
+		{
+			get
+			{
+				return _node.MarginHorizontal.Value;
+			}
+
+			set
+			{
+				_node.MarginHorizontal = value;
+			}
+		}
+
+		public float MarginVertical
+		{
+			get
+			{
+				return _node.MarginVertical.Value;
+			}
+
+			set
+			{
+				_node.MarginVertical = value;
+			}
+		}
+
+		public float Margin
+		{
+			get
+			{
+				return _node.Margin.Value;
+			}
+
+			set
+			{
+				_node.Margin = value;
+			}
+		}
+
+		public float PaddingLeft
+		{
+			get
+			{
+				return _node.PaddingLeft.Value;
+			}
+
+			set
+			{
+				_node.PaddingLeft = value;
+			}
+		}
+
+		public float PaddingTop
+		{
+			get
+			{
+				return _node.PaddingTop.Value;
+			}
+
+			set
+			{
+				_node.PaddingTop = value;
+			}
+		}
+
+		public float PaddingRight
+		{
+			get
+			{
+				return _node.PaddingRight.Value;
+			}
+
+			set
+			{
+				_node.PaddingRight = value;
+			}
+		}
+
+		public float PaddingBottom
+		{
+			get
+			{
+				return _node.PaddingBottom.Value;
+			}
+
+			set
+			{
+				_node.PaddingBottom = value;
+			}
+		}
+
+		public float PaddingStart
+		{
+			get
+			{
+				return _node.PaddingStart.Value;
+			}
+
+			set
+			{
+				_node.PaddingStart = value;
+			}
+		}
+
+		public float PaddingEnd
+		{
+			get
+			{
+				return _node.PaddingEnd.Value;
+			}
+
+			set
+			{
+				_node.PaddingEnd = value;
+			}
+		}
+
+		public float PaddingHorizontal
+		{
+			get
+			{
+				return _node.PaddingHorizontal.Value;
+			}
+
+			set
+			{
+				_node.PaddingHorizontal = value;
+			}
+		}
+
+		public float PaddingVertical
+		{
+			get
+			{
+				return _node.PaddingVertical.Value;
+			}
+
+			set
+			{
+				_node.PaddingHorizontal = value;
+			}
+		}
+
+		public float Padding
+		{
+			get
+			{
+				return _node.Padding.Value;
+			}
+
+			set
+			{
+				_node.Padding = value;
+			}
+		}
+
+		public float BorderLeftWidth
+		{
+			get
+			{
+				return _node.BorderLeftWidth;
+			}
+
+			set
+			{
+				_node.BorderLeftWidth = value;
+			}
+		}
+
+		public float BorderTopWidth
+		{
+			get
+			{
+				return _node.BorderTopWidth;
+			}
+
+			set
+			{
+				_node.BorderTopWidth = value;
+			}
+		}
+
+		public float BorderRightWidth
+		{
+			get
+			{
+				return _node.BorderRightWidth;
+			}
+
+			set
+			{
+				_node.BorderRightWidth = value;
+			}
+		}
+
+		public float BorderBottomWidth
+		{
+			get
+			{
+				return _node.BorderBottomWidth;
+			}
+
+			set
+			{
+				_node.BorderBottomWidth = value;
+			}
+		}
+
+		public float BorderStartWidth
+		{
+			get
+			{
+				return _node.BorderStartWidth;
+			}
+
+			set
+			{
+				_node.BorderStartWidth = value;
+			}
+		}
+
+		public float BorderEndWidth
+		{
+			get
+			{
+				return _node.BorderEndWidth;
+			}
+
+			set
+			{
+				_node.BorderEndWidth = value;
+			}
+		}
+
+		public float BorderWidth
+		{
+			get
+			{
+				return _node.BorderWidth;
+			}
+
+			set
+			{
+				_node.BorderWidth = value;
+			}
+		}
+
+		public float Height
+		{
+			get
+			{
+				return _node.Height.Value;
+			}
+
+			set
+			{
+				_node.Height = value;
+			}
+		}
+
+		public float Width
+		{
+			get
+			{
+				return _node.Width.Value;
+			}
+
+			set
+			{
+				_node.Width = value;
+			}
+		}
+
+		public float MinWidth
+		{
+			get
+			{
+				return _node.MinWidth.Value;
+			}
+
+			set
+			{
+				_node.MinWidth = value;
+			}
+		}
+
+		public float MinHeight
+		{
+			get
+			{
+				return _node.MinHeight.Value;
+			}
+
+			set
+			{
+				_node.MinHeight = value;
+			}
+		}
+
+		public float MaxWidth
+		{
+			get
+			{
+				return _node.MaxWidth.Value;
+			}
+
+			set
+			{
+				_node.MaxWidth = value;
+			}
+		}
+
+		public float MaxHeight
+		{
+			get
+			{
+				return _node.MaxHeight.Value;
+			}
+
+			set
+			{
+				_node.MaxHeight = value;
+			}
+		}
+
+		public float AspectRatio
+		{
+			get
+			{
+				return _node.StyleAspectRatio;
+			}
+
+			set
+			{
+				_node.StyleAspectRatio = value;
+			}
+		}
+
+		public void ApplyLayout()
+		{
+			NativeView view = null;
+			if (_viewRef.TryGetTarget(out view))
+			{
+				float width = 0;
+				float height = 0;
+				GetWidthHeightOfNativeView(view, out width, out height);
+				CalculateLayoutWithSize(this, width, height);
+				ApplyLayoutToViewHierarchy(view);
+			}
+		}
+		public SizeF IntrinsicSize
+		{
+			get
+			{
+				return CalculateLayoutWithSize(this, float.NaN, float.NaN);
+			}
+		}
+
+		SizeF CalculateLayoutWithSize(YogaLayout layout, float width, float height)
+		{
+			//TODO : Check thread access 
+			if (!layout.IsEnabled)
+			{
+				System.Diagnostics.Debug.WriteLine("Doesn't use Yoga");
+			}
+			NativeView view = null;
+			if (_viewRef.TryGetTarget(out view))
+			{
+				AttachNodesFromViewHierachy(view);
+			}
+
+			var node = layout._node;
+
+			node.Width = width;
+			node.Height = height;
+			node.CalculateLayout();
+
+			return new SizeF { Width = node.LayoutWidth, Height = node.LayoutHeight };
+		}
+
+		static YogaSize MeasureView(YogaNode node, float width, YogaMeasureMode widthMode, float height, YogaMeasureMode heightMode)
+		{
+			var constrainedWidth = (widthMode == YogaMeasureMode.Undefined) ? float.MaxValue : width;
+			var constrainedHeight = (heightMode == YogaMeasureMode.Undefined) ? float.MaxValue : height;
+
+			NativeView view = null;
+			if (YogaKit.Bridges.ContainsKey(node))
+				view = YogaKit.Bridges[node] as NativeView;
+
+			float sizeThatFitsWidth = 0;
+			float sizeThatFitsHeight = 0;
+
+			MeasureNativeView(view, constrainedWidth, constrainedHeight, out sizeThatFitsWidth, out sizeThatFitsHeight);
+
+			var finalWidth = SanitizeMeasurement(constrainedWidth, sizeThatFitsWidth, widthMode);
+			var finalHeight = SanitizeMeasurement(constrainedHeight, sizeThatFitsHeight, heightMode);
+
+			return MeasureOutput.Make(finalWidth, finalHeight);
+		}
+
+		static float SanitizeMeasurement(float constrainedSize, float measuredSize, YogaMeasureMode measureMode)
+		{
+			float result;
+			if (measureMode == YogaMeasureMode.Exactly)
+			{
+				result = (float)constrainedSize;
+			}
+			else if (measureMode == YogaMeasureMode.AtMost)
+			{
+				result = (float)Math.Min(constrainedSize, measuredSize);
+			}
+			else {
+				result = (float)measuredSize;
+			}
+
+			return result;
+		}
+
+		static bool NodeHasExactSameChildren(YogaNode node, NativeView[] subviews)
+		{
+			if (node.Count != subviews.Length)
+				return false;
+			for (int i = 0; i < subviews.Length; i++)
+			{
+				YogaLayout yoga = subviews[i].Yoga() as YogaLayout;
+				if (node[i] != yoga._node)
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+
+		static void AttachNodesFromViewHierachy(NativeView view)
+		{
+			YogaLayout yoga = view.Yoga() as YogaLayout;
+			var node = yoga._node;
+			// Only leaf nodes should have a measure function
+			if (yoga.IsLeaf)
+			{
+				RemoveAllChildren(node);
+				node.SetMeasureFunction(MeasureView);
+			}
+			else
+			{
+				node.SetMeasureFunction(null);
+				// Create a list of all the subviews that we are going to use for layout.
+				var subviewsToInclude = new List<NativeView>();
+				foreach (var subview in view.Subviews)
+				{
+					if (subview.Yoga().IsIncludeInLayout)
+					{
+						subviewsToInclude.Add(subview);
+					}
+				}
+
+				if (!NodeHasExactSameChildren(node, subviewsToInclude.ToArray()))
+				{
+					RemoveAllChildren(node);
+					for (int i = 0; i < subviewsToInclude.Count; i++)
+					{
+						YogaLayout yogaSubview = subviewsToInclude[i].Yoga() as YogaLayout;
+						node.Insert(i, yogaSubview._node);
+					}
+				}
+
+				foreach (var subView in subviewsToInclude)
+				{
+					AttachNodesFromViewHierachy(subView);
+				}
+			}
+		}
+
+		static void RemoveAllChildren(YogaNode node)
+		{
+			if (node == null)
+				return;
+
+			if (node.Count > 0)
+			{
+				node.Clear();
+			}
+		}
+
+		static double RoundPixelValue(float value)
+		{
+			float scale = NativePixelScale;
+
+			return Math.Round(value * scale) / scale;
+		}
+
+		static void ApplyLayoutToViewHierarchy(NativeView view)
+		{
+			//TODO : "Framesetting should only be done on the main thread."
+			YogaLayout yoga = view.Yoga() as YogaLayout;
+
+			if (!yoga.IsIncludeInLayout)
+				return;
+
+			var node = yoga._node;
+
+			ApplyLayoutToNativeView(view, node);
+
+			if (!yoga.IsLeaf)
+			{
+				for (int i = 0; i < view.Subviews.Length; i++)
+				{
+					ApplyLayoutToViewHierarchy(view.Subviews[i]);
+				}
+			}
+		}
+
+
+	}
+}
+

csharp/Mac/.gitignore

@@ -0,0 +1,2 @@
+libyoga.dylib
+*.userprefs

csharp/Mac/ApiDefinition.cs

@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using System;
+
+using AppKit;
+using Foundation;
+using ObjCRuntime;
+using CoreGraphics;
+
+namespace Facebook.Yoga.Mac
+{
+    // Xamarin.Mac binding projects allow you to include native libraries inside C# DLLs for easy consumption
+    // later. However, the binding project build files currently assume you are binding some objective-c API
+    // and that you need an ApiDefinition.cs for that. yoga is all C APIs, so just include this "blank" file so
+    // the dylib gets packaged
+}

csharp/Mac/CustomBuildAction.targets

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <CompileDependsOn>NativeLibrary;$(CompileDependsOn)</CompileDependsOn>
+    </PropertyGroup>
+    <Target Name="NativeLibrary" Outputs="$(ProjectDir)libyoga.dylib">
+        <Exec WorkingDirectory="$(ProjectDir)" Command="$(ProjectDir)buck-build.sh //csharp:yoganet#default,shared" />
+        <Copy SourceFiles="$(ProjectDir)..\..\buck-out\gen\csharp\yoganet#default,shared\libyoga.dylib" DestinationFiles="$(ProjectDir)libyoga.dylib" SkipUnchangedFiles="true" />
+    </Target>
+</Project>

csharp/Mac/Facebook.Yoga.Mac.Sample/AppDelegate.cs

@@ -0,0 +1,30 @@
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the license found in the
+ * LICENSE-examples file in the root directory of this source tree.
+ */
+
+using AppKit;
+using Foundation;
+
+namespace Facebook.Yoga.Mac.Sample
+{
+    [Register("AppDelegate")]
+    public class AppDelegate : NSApplicationDelegate
+    {
+        public AppDelegate()
+        {
+        }
+
+        public override void DidFinishLaunching(NSNotification notification)
+        {
+        }
+
+        public override void WillTerminate(NSNotification notification)
+        {
+            // Insert code here to tear down your application
+        }
+    }
+}

csharp/Mac/Facebook.Yoga.Mac.Sample/Entitlements.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

csharp/Mac/Facebook.Yoga.Mac.Sample/Facebook.Yoga.Mac.Sample.csproj

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{64E0AB97-A904-4607-A535-EEA5A966C09E}</ProjectGuid>
+    <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Facebook.Yoga.Mac.Sample</RootNamespace>
+    <AssemblyName>Facebook.Yoga.Mac.Sample</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
+    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <EnableCodeSigning>false</EnableCodeSigning>
+    <CodeSigningKey>Mac Developer</CodeSigningKey>
+    <CreatePackage>false</CreatePackage>
+    <EnablePackageSigning>false</EnablePackageSigning>
+    <IncludeMonoRuntime>false</IncludeMonoRuntime>
+    <UseSGen>true</UseSGen>
+    <UseRefCounting>true</UseRefCounting>
+    <Profiling>true</Profiling>
+    <HttpClientHandler>HttpClientHandler</HttpClientHandler>
+    <TlsProvider>Default</TlsProvider>
+    <LinkMode>None</LinkMode>
+    <XamMacArch>x86_64</XamMacArch>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <DefineConstants></DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <EnableCodeSigning>false</EnableCodeSigning>
+    <CreatePackage>true</CreatePackage>
+    <EnablePackageSigning>false</EnablePackageSigning>
+    <IncludeMonoRuntime>true</IncludeMonoRuntime>
+    <UseSGen>true</UseSGen>
+    <UseRefCounting>true</UseRefCounting>
+    <LinkMode>SdkOnly</LinkMode>
+    <HttpClientHandler>HttpClientHandler</HttpClientHandler>
+    <TlsProvider>Default</TlsProvider>
+    <XamMacArch></XamMacArch>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Xamarin.Mac" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Info.plist" />
+    <None Include="Entitlements.plist" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+    <Compile Include="AppDelegate.cs" />
+    <Compile Include="ViewController.cs" />
+    <Compile Include="ViewController.designer.cs">
+      <DependentUpon>ViewController.cs</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <InterfaceDefinition Include="Main.storyboard" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Facebook.Yoga.Mac.csproj">
+      <Project>{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}</Project>
+      <Name>Facebook.Yoga.Mac</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
+</Project>

csharp/Mac/Facebook.Yoga.Mac.Sample/Info.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleName</key>
+	<string>Facebook.Yoga.Mac.Sample</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.facebook.facebook-yoga-mac-sample</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.11</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>${AuthorCopyright}</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSMainStoryboardFile</key>
+	<string>Main</string>
+</dict>
+</plist>

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

@@ -0,0 +1,21 @@
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the license found in the
+ * LICENSE-examples file in the root directory of this source tree.
+ */
+
+using AppKit;
+
+namespace Facebook.Yoga.Mac.Sample
+{
+    static class MainClass
+    {
+        static void Main(string[] args)
+        {
+            NSApplication.Init();
+            NSApplication.Main(args);
+        }
+    }
+}

csharp/Mac/Facebook.Yoga.Mac.Sample/Main.storyboard

@@ -0,0 +1,681 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="6198" systemVersion="14A297b" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+	<dependencies>
+		<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6198" />
+	</dependencies>
+	<scenes>
+		<!--Application-->
+		<scene sceneID="JPo-4y-FX3">
+			<objects>
+				<application id="hnw-xV-0zn" sceneMemberID="viewController">
+					<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
+						<items>
+							<menuItem title="Facebook.Yoga.Mac.Sample" id="1Xt-HY-uBw">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="Facebook.Yoga.Mac.Sample" systemMenu="apple" id="uQy-DD-JDr">
+									<items>
+										<menuItem title="About Facebook.Yoga.Mac.Sample" id="5kV-Vb-QxS">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="VOq-y0-SEH" />
+										<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW" />
+										<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ" />
+										<menuItem title="Services" id="NMo-om-nkz">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5" />
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="4je-JR-u6R" />
+										<menuItem title="Hide Facebook.Yoga.Mac.Sample" keyEquivalent="h" id="Olw-nP-bQN">
+											<connections>
+												<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68" />
+											</connections>
+										</menuItem>
+										<menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
+											<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+											<connections>
+												<action selector="hideOtherApplications:" target="Ady-hI-5gd" id="VT4-aY-XCT" />
+											</connections>
+										</menuItem>
+										<menuItem title="Show All" id="Kd2-mp-pUS">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="unhideAllApplications:" target="Ady-hI-5gd" id="Dhg-Le-xox" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="kCx-OE-vgT" />
+										<menuItem title="Quit Facebook.Yoga.Mac.Sample" keyEquivalent="q" id="4sb-4s-VLi">
+											<connections>
+												<action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF" />
+											</connections>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="File" id="dMs-cI-mzQ">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="File" id="bib-Uj-vzu">
+									<items>
+										<menuItem title="New" keyEquivalent="n" id="Was-JA-tGl">
+											<connections>
+												<action selector="newDocument:" target="Ady-hI-5gd" id="4Si-XN-c54" />
+											</connections>
+										</menuItem>
+										<menuItem title="Open…" keyEquivalent="o" id="IAo-SY-fd9">
+											<connections>
+												<action selector="openDocument:" target="Ady-hI-5gd" id="bVn-NM-KNZ" />
+											</connections>
+										</menuItem>
+										<menuItem title="Open Recent" id="tXI-mr-wws">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="oas-Oc-fiZ">
+												<items>
+													<menuItem title="Clear Menu" id="vNY-rz-j42">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="clearRecentDocuments:" target="Ady-hI-5gd" id="Daa-9d-B3U" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="m54-Is-iLE" />
+										<menuItem title="Close" keyEquivalent="w" id="DVo-aG-piG">
+											<connections>
+												<action selector="performClose:" target="Ady-hI-5gd" id="HmO-Ls-i7Q" />
+											</connections>
+										</menuItem>
+										<menuItem title="Save…" keyEquivalent="s" id="pxx-59-PXV">
+											<connections>
+												<action selector="saveDocument:" target="Ady-hI-5gd" id="teZ-XB-qJY" />
+											</connections>
+										</menuItem>
+										<menuItem title="Save As…" keyEquivalent="S" id="Bw7-FT-i3A">
+											<connections>
+												<action selector="saveDocumentAs:" target="Ady-hI-5gd" id="mDf-zr-I0C" />
+											</connections>
+										</menuItem>
+										<menuItem title="Revert to Saved" id="KaW-ft-85H">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="revertDocumentToSaved:" target="Ady-hI-5gd" id="iJ3-Pv-kwq" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="aJh-i4-bef" />
+										<menuItem title="Page Setup…" keyEquivalent="P" id="qIS-W8-SiK">
+											<modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES" />
+											<connections>
+												<action selector="runPageLayout:" target="Ady-hI-5gd" id="Din-rz-gC5" />
+											</connections>
+										</menuItem>
+										<menuItem title="Print…" keyEquivalent="p" id="aTl-1u-JFS">
+											<connections>
+												<action selector="print:" target="Ady-hI-5gd" id="qaZ-4w-aoO" />
+											</connections>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="Edit" id="5QF-Oa-p0T">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="Edit" id="W48-6f-4Dl">
+									<items>
+										<menuItem title="Undo" keyEquivalent="z" id="dRJ-4n-Yzg">
+											<connections>
+												<action selector="undo:" target="Ady-hI-5gd" id="M6e-cu-g7V" />
+											</connections>
+										</menuItem>
+										<menuItem title="Redo" keyEquivalent="Z" id="6dh-zS-Vam">
+											<connections>
+												<action selector="redo:" target="Ady-hI-5gd" id="oIA-Rs-6OD" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="WRV-NI-Exz" />
+										<menuItem title="Cut" keyEquivalent="x" id="uRl-iY-unG">
+											<connections>
+												<action selector="cut:" target="Ady-hI-5gd" id="YJe-68-I9s" />
+											</connections>
+										</menuItem>
+										<menuItem title="Copy" keyEquivalent="c" id="x3v-GG-iWU">
+											<connections>
+												<action selector="copy:" target="Ady-hI-5gd" id="G1f-GL-Joy" />
+											</connections>
+										</menuItem>
+										<menuItem title="Paste" keyEquivalent="v" id="gVA-U4-sdL">
+											<connections>
+												<action selector="paste:" target="Ady-hI-5gd" id="UvS-8e-Qdg" />
+											</connections>
+										</menuItem>
+										<menuItem title="Paste and Match Style" keyEquivalent="V" id="WeT-3V-zwk">
+											<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+											<connections>
+												<action selector="pasteAsPlainText:" target="Ady-hI-5gd" id="cEh-KX-wJQ" />
+											</connections>
+										</menuItem>
+										<menuItem title="Delete" id="pa3-QI-u2k">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="delete:" target="Ady-hI-5gd" id="0Mk-Ml-PaM" />
+											</connections>
+										</menuItem>
+										<menuItem title="Select All" keyEquivalent="a" id="Ruw-6m-B2m">
+											<connections>
+												<action selector="selectAll:" target="Ady-hI-5gd" id="VNm-Mi-diN" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="uyl-h8-XO2" />
+										<menuItem title="Find" id="4EN-yA-p0u">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Find" id="1b7-l0-nxx">
+												<items>
+													<menuItem title="Find…" tag="1" keyEquivalent="f" id="Xz5-n4-O0W">
+														<connections>
+															<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="cD7-Qs-BN4" />
+														</connections>
+													</menuItem>
+													<menuItem title="Find and Replace…" tag="12" keyEquivalent="f" id="YEy-JH-Tfz">
+														<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+														<connections>
+															<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="WD3-Gg-5AJ" />
+														</connections>
+													</menuItem>
+													<menuItem title="Find Next" tag="2" keyEquivalent="g" id="q09-fT-Sye">
+														<connections>
+															<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="NDo-RZ-v9R" />
+														</connections>
+													</menuItem>
+													<menuItem title="Find Previous" tag="3" keyEquivalent="G" id="OwM-mh-QMV">
+														<connections>
+															<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="HOh-sY-3ay" />
+														</connections>
+													</menuItem>
+													<menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="buJ-ug-pKt">
+														<connections>
+															<action selector="performFindPanelAction:" target="Ady-hI-5gd" id="U76-nv-p5D" />
+														</connections>
+													</menuItem>
+													<menuItem title="Jump to Selection" keyEquivalent="j" id="S0p-oC-mLd">
+														<connections>
+															<action selector="centerSelectionInVisibleArea:" target="Ady-hI-5gd" id="IOG-6D-g5B" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem title="Spelling and Grammar" id="Dv1-io-Yv7">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Spelling" id="3IN-sU-3Bg">
+												<items>
+													<menuItem title="Show Spelling and Grammar" keyEquivalent=":" id="HFo-cy-zxI">
+														<connections>
+															<action selector="showGuessPanel:" target="Ady-hI-5gd" id="vFj-Ks-hy3" />
+														</connections>
+													</menuItem>
+													<menuItem title="Check Document Now" keyEquivalent=";" id="hz2-CU-CR7">
+														<connections>
+															<action selector="checkSpelling:" target="Ady-hI-5gd" id="fz7-VC-reM" />
+														</connections>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="bNw-od-mp5" />
+													<menuItem title="Check Spelling While Typing" id="rbD-Rh-wIN">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleContinuousSpellChecking:" target="Ady-hI-5gd" id="7w6-Qz-0kB" />
+														</connections>
+													</menuItem>
+													<menuItem title="Check Grammar With Spelling" id="mK6-2p-4JG">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleGrammarChecking:" target="Ady-hI-5gd" id="muD-Qn-j4w" />
+														</connections>
+													</menuItem>
+													<menuItem title="Correct Spelling Automatically" id="78Y-hA-62v">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticSpellingCorrection:" target="Ady-hI-5gd" id="2lM-Qi-WAP" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem title="Substitutions" id="9ic-FL-obx">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Substitutions" id="FeM-D8-WVr">
+												<items>
+													<menuItem title="Show Substitutions" id="z6F-FW-3nz">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="orderFrontSubstitutionsPanel:" target="Ady-hI-5gd" id="oku-mr-iSq" />
+														</connections>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="gPx-C9-uUO" />
+													<menuItem title="Smart Copy/Paste" id="9yt-4B-nSM">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleSmartInsertDelete:" target="Ady-hI-5gd" id="3IJ-Se-DZD" />
+														</connections>
+													</menuItem>
+													<menuItem title="Smart Quotes" id="hQb-2v-fYv">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticQuoteSubstitution:" target="Ady-hI-5gd" id="ptq-xd-QOA" />
+														</connections>
+													</menuItem>
+													<menuItem title="Smart Dashes" id="rgM-f4-ycn">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticDashSubstitution:" target="Ady-hI-5gd" id="oCt-pO-9gS" />
+														</connections>
+													</menuItem>
+													<menuItem title="Smart Links" id="cwL-P1-jid">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticLinkDetection:" target="Ady-hI-5gd" id="Gip-E3-Fov" />
+														</connections>
+													</menuItem>
+													<menuItem title="Data Detectors" id="tRr-pd-1PS">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticDataDetection:" target="Ady-hI-5gd" id="R1I-Nq-Kbl" />
+														</connections>
+													</menuItem>
+													<menuItem title="Text Replacement" id="HFQ-gK-NFA">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleAutomaticTextReplacement:" target="Ady-hI-5gd" id="DvP-Fe-Py6" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem title="Transformations" id="2oI-Rn-ZJC">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Transformations" id="c8a-y6-VQd">
+												<items>
+													<menuItem title="Make Upper Case" id="vmV-6d-7jI">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="uppercaseWord:" target="Ady-hI-5gd" id="sPh-Tk-edu" />
+														</connections>
+													</menuItem>
+													<menuItem title="Make Lower Case" id="d9M-CD-aMd">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="lowercaseWord:" target="Ady-hI-5gd" id="iUZ-b5-hil" />
+														</connections>
+													</menuItem>
+													<menuItem title="Capitalize" id="UEZ-Bs-lqG">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="capitalizeWord:" target="Ady-hI-5gd" id="26H-TL-nsh" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem title="Speech" id="xrE-MZ-jX0">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Speech" id="3rS-ZA-NoH">
+												<items>
+													<menuItem title="Start Speaking" id="Ynk-f8-cLZ">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="startSpeaking:" target="Ady-hI-5gd" id="654-Ng-kyl" />
+														</connections>
+													</menuItem>
+													<menuItem title="Stop Speaking" id="Oyz-dy-DGm">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="stopSpeaking:" target="Ady-hI-5gd" id="dX8-6p-jy9" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="Format" id="jxT-CU-nIS">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="Format" id="GEO-Iw-cKr">
+									<items>
+										<menuItem title="Font" id="Gi5-1S-RQB">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Font" systemMenu="font" id="aXa-aM-Jaq">
+												<items>
+													<menuItem title="Show Fonts" keyEquivalent="t" id="Q5e-8K-NDq" />
+													<menuItem title="Bold" tag="2" keyEquivalent="b" id="GB9-OM-e27" />
+													<menuItem title="Italic" tag="1" keyEquivalent="i" id="Vjx-xi-njq" />
+													<menuItem title="Underline" keyEquivalent="u" id="WRG-CD-K1S">
+														<connections>
+															<action selector="underline:" target="Ady-hI-5gd" id="FYS-2b-JAY" />
+														</connections>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="5gT-KC-WSO" />
+													<menuItem title="Bigger" tag="3" keyEquivalent="+" id="Ptp-SP-VEL" />
+													<menuItem title="Smaller" tag="4" keyEquivalent="-" id="i1d-Er-qST" />
+													<menuItem isSeparatorItem="YES" id="kx3-Dk-x3B" />
+													<menuItem title="Kern" id="jBQ-r6-VK2">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<menu key="submenu" title="Kern" id="tlD-Oa-oAM">
+															<items>
+																<menuItem title="Use Default" id="GUa-eO-cwY">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="useStandardKerning:" target="Ady-hI-5gd" id="6dk-9l-Ckg" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Use None" id="cDB-IK-hbR">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="turnOffKerning:" target="Ady-hI-5gd" id="U8a-gz-Maa" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Tighten" id="46P-cB-AYj">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="tightenKerning:" target="Ady-hI-5gd" id="hr7-Nz-8ro" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Loosen" id="ogc-rX-tC1">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="loosenKerning:" target="Ady-hI-5gd" id="8i4-f9-FKE" />
+																	</connections>
+																</menuItem>
+															</items>
+														</menu>
+													</menuItem>
+													<menuItem title="Ligatures" id="o6e-r0-MWq">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<menu key="submenu" title="Ligatures" id="w0m-vy-SC9">
+															<items>
+																<menuItem title="Use Default" id="agt-UL-0e3">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="useStandardLigatures:" target="Ady-hI-5gd" id="7uR-wd-Dx6" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Use None" id="J7y-lM-qPV">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="turnOffLigatures:" target="Ady-hI-5gd" id="iX2-gA-Ilz" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Use All" id="xQD-1f-W4t">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="useAllLigatures:" target="Ady-hI-5gd" id="KcB-kA-TuK" />
+																	</connections>
+																</menuItem>
+															</items>
+														</menu>
+													</menuItem>
+													<menuItem title="Baseline" id="OaQ-X3-Vso">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<menu key="submenu" title="Baseline" id="ijk-EB-dga">
+															<items>
+																<menuItem title="Use Default" id="3Om-Ey-2VK">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="unscript:" target="Ady-hI-5gd" id="0vZ-95-Ywn" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Superscript" id="Rqc-34-cIF">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="superscript:" target="Ady-hI-5gd" id="3qV-fo-wpU" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Subscript" id="I0S-gh-46l">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="subscript:" target="Ady-hI-5gd" id="Q6W-4W-IGz" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Raise" id="2h7-ER-AoG">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="raiseBaseline:" target="Ady-hI-5gd" id="4sk-31-7Q9" />
+																	</connections>
+																</menuItem>
+																<menuItem title="Lower" id="1tx-W0-xDw">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="lowerBaseline:" target="Ady-hI-5gd" id="OF1-bc-KW4" />
+																	</connections>
+																</menuItem>
+															</items>
+														</menu>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="Ndw-q3-faq" />
+													<menuItem title="Show Colors" keyEquivalent="C" id="bgn-CT-cEk">
+														<connections>
+															<action selector="orderFrontColorPanel:" target="Ady-hI-5gd" id="mSX-Xz-DV3" />
+														</connections>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="iMs-zA-UFJ" />
+													<menuItem title="Copy Style" keyEquivalent="c" id="5Vv-lz-BsD">
+														<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+														<connections>
+															<action selector="copyFont:" target="Ady-hI-5gd" id="GJO-xA-L4q" />
+														</connections>
+													</menuItem>
+													<menuItem title="Paste Style" keyEquivalent="v" id="vKC-jM-MkH">
+														<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+														<connections>
+															<action selector="pasteFont:" target="Ady-hI-5gd" id="JfD-CL-leO" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+										<menuItem title="Text" id="Fal-I4-PZk">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<menu key="submenu" title="Text" id="d9c-me-L2H">
+												<items>
+													<menuItem title="Align Left" keyEquivalent="{" id="ZM1-6Q-yy1">
+														<connections>
+															<action selector="alignLeft:" target="Ady-hI-5gd" id="zUv-R1-uAa" />
+														</connections>
+													</menuItem>
+													<menuItem title="Center" keyEquivalent="|" id="VIY-Ag-zcb">
+														<connections>
+															<action selector="alignCenter:" target="Ady-hI-5gd" id="spX-mk-kcS" />
+														</connections>
+													</menuItem>
+													<menuItem title="Justify" id="J5U-5w-g23">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="alignJustified:" target="Ady-hI-5gd" id="ljL-7U-jND" />
+														</connections>
+													</menuItem>
+													<menuItem title="Align Right" keyEquivalent="}" id="wb2-vD-lq4">
+														<connections>
+															<action selector="alignRight:" target="Ady-hI-5gd" id="r48-bG-YeY" />
+														</connections>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="4s2-GY-VfK" />
+													<menuItem title="Writing Direction" id="H1b-Si-o9J">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<menu key="submenu" title="Writing Direction" id="8mr-sm-Yjd">
+															<items>
+																<menuItem title="Paragraph" enabled="NO" id="ZvO-Gk-QUH">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																</menuItem>
+																<menuItem id="YGs-j5-SAR">
+																	<string key="title">	Default</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeBaseWritingDirectionNatural:" target="Ady-hI-5gd" id="qtV-5e-UBP" />
+																	</connections>
+																</menuItem>
+																<menuItem id="Lbh-J2-qVU">
+																	<string key="title">	Left to Right</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeBaseWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="S0X-9S-QSf" />
+																	</connections>
+																</menuItem>
+																<menuItem id="jFq-tB-4Kx">
+																	<string key="title">	Right to Left</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeBaseWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="5fk-qB-AqJ" />
+																	</connections>
+																</menuItem>
+																<menuItem isSeparatorItem="YES" id="swp-gr-a21" />
+																<menuItem title="Selection" enabled="NO" id="cqv-fj-IhA">
+																	<modifierMask key="keyEquivalentModifierMask" />
+																</menuItem>
+																<menuItem id="Nop-cj-93Q">
+																	<string key="title">	Default</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeTextWritingDirectionNatural:" target="Ady-hI-5gd" id="lPI-Se-ZHp" />
+																	</connections>
+																</menuItem>
+																<menuItem id="BgM-ve-c93">
+																	<string key="title">	Left to Right</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeTextWritingDirectionLeftToRight:" target="Ady-hI-5gd" id="caW-Bv-w94" />
+																	</connections>
+																</menuItem>
+																<menuItem id="RB4-Sm-HuC">
+																	<string key="title">	Right to Left</string>
+																	<modifierMask key="keyEquivalentModifierMask" />
+																	<connections>
+																		<action selector="makeTextWritingDirectionRightToLeft:" target="Ady-hI-5gd" id="EXD-6r-ZUu" />
+																	</connections>
+																</menuItem>
+															</items>
+														</menu>
+													</menuItem>
+													<menuItem isSeparatorItem="YES" id="fKy-g9-1gm" />
+													<menuItem title="Show Ruler" id="vLm-3I-IUL">
+														<modifierMask key="keyEquivalentModifierMask" />
+														<connections>
+															<action selector="toggleRuler:" target="Ady-hI-5gd" id="FOx-HJ-KwY" />
+														</connections>
+													</menuItem>
+													<menuItem title="Copy Ruler" keyEquivalent="c" id="MkV-Pr-PK5">
+														<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES" />
+														<connections>
+															<action selector="copyRuler:" target="Ady-hI-5gd" id="71i-fW-3W2" />
+														</connections>
+													</menuItem>
+													<menuItem title="Paste Ruler" keyEquivalent="v" id="LVM-kO-fVI">
+														<modifierMask key="keyEquivalentModifierMask" control="YES" command="YES" />
+														<connections>
+															<action selector="pasteRuler:" target="Ady-hI-5gd" id="cSh-wd-qM2" />
+														</connections>
+													</menuItem>
+												</items>
+											</menu>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="View" id="H8h-7b-M4v">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="View" id="HyV-fh-RgO">
+									<items>
+										<menuItem title="Show Toolbar" keyEquivalent="t" id="snW-S8-Cw5">
+											<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES" />
+											<connections>
+												<action selector="toggleToolbarShown:" target="Ady-hI-5gd" id="BXY-wc-z0C" />
+											</connections>
+										</menuItem>
+										<menuItem title="Customize Toolbar…" id="1UK-8n-QPP">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="runToolbarCustomizationPalette:" target="Ady-hI-5gd" id="pQI-g3-MTW" />
+											</connections>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="Window" id="aUF-d1-5bR">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
+									<items>
+										<menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
+											<connections>
+												<action selector="performMiniaturize:" target="Ady-hI-5gd" id="VwT-WD-YPe" />
+											</connections>
+										</menuItem>
+										<menuItem title="Zoom" id="R4o-n2-Eq4">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="performZoom:" target="Ady-hI-5gd" id="DIl-cC-cCs" />
+											</connections>
+										</menuItem>
+										<menuItem isSeparatorItem="YES" id="eu3-7i-yIM" />
+										<menuItem title="Bring All to Front" id="LE2-aR-0XJ">
+											<modifierMask key="keyEquivalentModifierMask" />
+											<connections>
+												<action selector="arrangeInFront:" target="Ady-hI-5gd" id="DRN-fu-gQh" />
+											</connections>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+							<menuItem title="Help" id="wpr-3q-Mcd">
+								<modifierMask key="keyEquivalentModifierMask" />
+								<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
+									<items>
+										<menuItem title="Facebook.Yoga.Mac.Sample Help" keyEquivalent="?" id="FKE-Sm-Kum">
+											<connections>
+												<action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no" />
+											</connections>
+										</menuItem>
+									</items>
+								</menu>
+							</menuItem>
+						</items>
+					</menu>
+					<connections>
+						<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m" />
+					</connections>
+				</application>
+				<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider="" />
+				<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder" />
+			</objects>
+			<point key="canvasLocation" x="75" y="0.0" />
+		</scene>
+		<!--Window Controller - Window-->
+		<scene sceneID="R2V-B0-nI4">
+			<objects>
+				<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
+					<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
+						<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" />
+						<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES" />
+						<rect key="contentRect" x="196" y="240" width="480" height="270" />
+						<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027" />
+					</window>
+					<connections>
+						<segue destination="XfG-lQ-9wD" kind="relationship" relationship="window.shadowedContentViewController" id="cq2-FE-JQM" />
+					</connections>
+				</windowController>
+				<customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder" />
+			</objects>
+			<point key="canvasLocation" x="75" y="250" />
+		</scene>
+		<!--View Controller-->
+		<scene sceneID="hIz-AP-VOD">
+			<objects>
+				<viewController id="XfG-lQ-9wD" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
+					<view key="view" id="m2S-Jp-Qdl">
+						<rect key="frame" x="0.0" y="0.0" width="480" height="270" />
+						<autoresizingMask key="autoresizingMask" />
+					</view>
+				</viewController>
+				<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder" />
+			</objects>
+			<point key="canvasLocation" x="75" y="655" />
+		</scene>
+	</scenes>
+</document>

csharp/Mac/Facebook.Yoga.Mac.Sample/ViewController.cs

@@ -0,0 +1,137 @@
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the license found in the
+ * LICENSE-examples file in the root directory of this source tree.
+ */
+
+//#define DEBUG_LAYOUT
+using System;
+
+using AppKit;
+using Foundation;
+using CoreGraphics;
+
+namespace Facebook.Yoga.Mac.Sample
+{
+    public static class NSViewYogaExtensions
+    {
+        public static void ApplyYogaLayout (this NSView view, YogaNode n, bool root = true)
+        {
+#if DEBUG_LAYOUT
+            Console.WriteLine ($"ApplyYogaLayout {view.ToolTip}, {n.LayoutX}, {n.LayoutY}, {n.LayoutWidth}, {n.LayoutHeight}");
+#endif
+
+            // A bit of gross special casing
+            // This really should mostly go away if/when the UIView+Yoga.m magic gets ported to AppKit
+            if (root)
+                view.Frame = new CGRect (n.LayoutX, n.LayoutY, n.LayoutWidth, n.LayoutHeight);
+#if DEBUG_LAYOUT
+            Console.WriteLine ($"Setting {view.ToolTip} frame to {view.Frame}");
+#endif
+
+            // This assumes your YogaNode and NSView children were inserted in same order
+            for (int i = 0; i < n.Count; ++i) {
+                YogaNode childNode = n[i];
+                // Cocoa coord space is from bottom left not top left
+                view.Subviews[i].Frame = new CGRect (childNode.LayoutX, n.LayoutHeight - childNode.LayoutY - childNode.LayoutHeight, childNode.LayoutWidth, childNode.LayoutHeight);
+#if DEBUG_LAYOUT
+                Console.WriteLine ($"Setting {view.Subviews[i].ToolTip} frame to {view.Subviews[i].Frame}");
+#endif
+                if (childNode.Count > 0){
+#if DEBUG_LAYOUT
+                    Console.WriteLine ($"Calling ApplyYogaLayout recursively on {view.Subviews[i].ToolTip}");
+#endif
+                    ApplyYogaLayout (view.Subviews[i], childNode, false);
+                }
+            }
+        }
+    }
+    
+    public partial class ViewController : NSViewController
+    {
+        public ViewController(IntPtr handle) : base(handle)
+        {
+        }
+
+        public override void ViewDidLoad()
+        {
+            base.ViewDidLoad ();
+
+            NSImage image = NSImage.ImageNamed (NSImageName.TrashFull);
+
+            NSView root = CreateViewHierarchy (image);
+            var rootNode = CalculateLayout (View.Frame, image.Size);
+
+            root.ApplyYogaLayout (rootNode);
+
+            View.AddSubview (root);
+        }
+
+        static NSView CreateViewHierarchy (NSImage image)
+        {
+            var root = new NSView () {
+                WantsLayer = true,
+                ToolTip = "Root"
+            };
+            root.Layer.BackgroundColor = NSColor.Red.CGColor;
+
+            NSView child1 = new NSView () {
+                WantsLayer = true,
+                ToolTip = "Child 1"
+            };
+            child1.Layer.BackgroundColor = NSColor.Blue.CGColor;
+
+            NSView child2 = new NSView () {
+                WantsLayer = true,
+                ToolTip = "Child 2"
+            };
+            child2.Layer.BackgroundColor = NSColor.Green.CGColor;
+
+            NSView child3 = new NSView () {
+                WantsLayer = true,
+                ToolTip = "Child 3"
+            };
+            child3.Layer.BackgroundColor = NSColor.Yellow.CGColor;
+
+            root.AddSubview (child1);
+            root.AddSubview (child2);
+            child2.AddSubview (child3);
+
+            return root;
+        }
+
+        static YogaNode CalculateLayout (CGRect rootFrame, CGSize imageSize)
+        {
+            var rootNode = new YogaNode () {
+                Width = (float)rootFrame.Width,
+                Height = (float)rootFrame.Height,
+                AlignItems = YogaAlign.Center,
+                JustifyContent = YogaJustify.Center
+            };
+
+            var child1Node = new YogaNode () {
+                Width = 100,
+                Height = 100
+            };
+
+            var child2Node = new YogaNode () {
+                Width = 200,
+                Height = 100
+            };
+
+            var child3Node = new YogaNode () {
+                Width = 100,
+                Height = 100
+            };
+
+            rootNode.Insert (0, child1Node);
+            rootNode.Insert (1, child2Node);
+            child2Node.Insert (0, child3Node);
+            rootNode.CalculateLayout ();
+
+            return rootNode;
+        }
+    }
+}

csharp/Mac/Facebook.Yoga.Mac.Sample/ViewController.designer.cs

@@ -0,0 +1,18 @@
+// WARNING
+//
+// This file has been generated automatically by Xamarin Studio to store outlets and
+// actions made in the UI designer. If it is removed, they will be lost.
+// Manual changes to this file may not be handled correctly.
+//
+using Foundation;
+
+namespace Facebook.Yoga.Mac.Sample
+{
+	[Register("ViewController")]
+	partial class ViewController
+	{
+		void ReleaseDesignerOutlets()
+		{
+		}
+	}
+}

csharp/Mac/Facebook.Yoga.Mac.Tests/Entitlements.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

csharp/Mac/Facebook.Yoga.Mac.Tests/Facebook.Yoga.Mac.Tests.csproj

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}</ProjectGuid>
+    <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>Facebook.Yoga.Mac.Tests</RootNamespace>
+    <AssemblyName>Facebook.Yoga.Mac.Tests</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
+    <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <EnableCodeSigning>false</EnableCodeSigning>
+    <CodeSigningKey>Mac Developer</CodeSigningKey>
+    <CreatePackage>false</CreatePackage>
+    <EnablePackageSigning>false</EnablePackageSigning>
+    <IncludeMonoRuntime>false</IncludeMonoRuntime>
+    <UseSGen>true</UseSGen>
+    <UseRefCounting>true</UseRefCounting>
+    <Profiling>true</Profiling>
+    <HttpClientHandler>HttpClientHandler</HttpClientHandler>
+    <TlsProvider>Default</TlsProvider>
+    <LinkMode>None</LinkMode>
+    <XamMacArch>x86_64</XamMacArch>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <DefineConstants></DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <EnableCodeSigning>false</EnableCodeSigning>
+    <CreatePackage>true</CreatePackage>
+    <EnablePackageSigning>false</EnablePackageSigning>
+    <IncludeMonoRuntime>true</IncludeMonoRuntime>
+    <UseSGen>true</UseSGen>
+    <UseRefCounting>true</UseRefCounting>
+    <LinkMode>SdkOnly</LinkMode>
+    <HttpClientHandler>HttpClientHandler</HttpClientHandler>
+    <TlsProvider>Default</TlsProvider>
+    <XamMacArch></XamMacArch>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Info.plist" />
+    <None Include="Entitlements.plist" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Main.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Facebook.Yoga.Mac.csproj">
+      <Project>{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}</Project>
+      <Name>Facebook.Yoga.Mac</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems" Label="Shared" Condition="Exists('..\..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems')" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
+</Project>

csharp/Mac/Facebook.Yoga.Mac.Tests/Info.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleName</key>
+	<string>Facebook.Yoga.Mac.Tests</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.facebook.facebook-yoga-mac-tests</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>10.11</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>${AuthorCopyright}</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSMainStoryboardFile</key>
+	<string>Main</string>
+</dict>
+</plist>

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

@@ -0,0 +1,20 @@
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the license found in the
+ * LICENSE-examples file in the root directory of this source tree.
+ */
+
+using System;
+using System.Reflection;
+
+namespace Facebook.Yoga.Mac.Tests
+{
+    static class MainClass
+    {
+        static void Main(string[] args)
+        {
+        }
+    }
+}

csharp/Mac/Facebook.Yoga.Mac.Tests/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="xamarinmac20" />
+</packages>

csharp/Mac/Facebook.Yoga.Mac.csproj

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}</ProjectGuid>
+    <ProjectTypeGuids>{810C163F-4746-4721-8B8E-88A3673A62EA};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <RootNamespace>Facebook.Yoga.Mac</RootNamespace>
+    <AssemblyName>Facebook.Yoga.Mac</AssemblyName>
+    <MacResourcePrefix>Resources</MacResourcePrefix>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>__UNIFIED__;DEBUG;MONOMAC</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <DefineConstants>__UNIFIED__;MONOMAC</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Xamarin.Mac" />
+  </ItemGroup>
+  <ItemGroup>
+    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="CustomBuildAction.targets" />
+  </ItemGroup>
+  <ItemGroup>
+    <NativeReference Include="libyoga.dylib">
+      <Kind>Dynamic</Kind>
+      <SmartLink>False</SmartLink>
+    </NativeReference>
+  </ItemGroup>
+  <Import Project="..\Facebook.Yoga\Facebook.Yoga.Shared.projitems" Label="Shared" Condition="Exists('..\Facebook.Yoga\Facebook.Yoga.Shared.projitems')" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.ObjcBinding.CSharp.targets" />
+  <Import Project="CustomBuildAction.targets" />  
+</Project>

csharp/Mac/Facebook.Yoga.Mac.sln

@@ -0,0 +1,39 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac", "Facebook.Yoga.Mac.csproj", "{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac.Sample", "Facebook.Yoga.Mac.Sample\Facebook.Yoga.Mac.Sample.csproj", "{64E0AB97-A904-4607-A535-EEA5A966C09E}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{4EDC82D9-A201-4831-8FE0-98F468F8E4AE}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{9352A9B6-F93B-45DD-8BCE-4696A62B3789}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Mac.Tests", "Facebook.Yoga.Mac.Tests\Facebook.Yoga.Mac.Tests.csproj", "{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19A1C7D7-C9CC-476A-B604-DF6A3DE1BA71}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{64E0AB97-A904-4607-A535-EEA5A966C09E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FCB6149-DFA8-4EAA-B4DB-2E91A5D8FF77}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{91C42D32-291D-4B72-90B4-551663D60B8B} = {9352A9B6-F93B-45DD-8BCE-4696A62B3789}
+		{4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {9352A9B6-F93B-45DD-8BCE-4696A62B3789}
+	EndGlobalSection
+EndGlobal

csharp/Mac/buck-build.sh

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