Synchronizing Internal and GitHub ComponentKit version

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "Carthage/Checkouts/ios-snapshot-test-case"]
 	path = Carthage/Checkouts/ios-snapshot-test-case
 	url = https://github.com/facebook/ios-snapshot-test-case.git
+[submodule "Carthage/Checkouts/yoga"]
+	path = Carthage/Checkouts/yoga
+	url = https://github.com/facebook/yoga.git

Cartfile.private

@@ -1,3 +1,4 @@
 github "erikdoe/ocmock" ~> 3.3
 github "facebook/ios-snapshot-test-case" ~> 2.1
 github "jspahrsummers/xcconfigs" ~> 0.9
+github "facebook/yoga" ~> 1.6.0

Cartfile.resolved

@@ -1,3 +1,4 @@
+github "erikdoe/ocmock" "v3.4"
 github "facebook/ios-snapshot-test-case" "2.1.4"
-github "erikdoe/ocmock" "v3.3.1"
+github "facebook/yoga" "1.6.0"
 github "jspahrsummers/xcconfigs" "0.9"

ComponentKit/ComponentKit.h

@@ -44,10 +44,10 @@
 //Layout components
 #import <ComponentKit/CKBackgroundLayoutComponent.h>
 #import <ComponentKit/CKCenterLayoutComponent.h>
+#import <ComponentKit/CKFlexboxComponent.h>
 #import <ComponentKit/CKInsetComponent.h>
 #import <ComponentKit/CKOverlayLayoutComponent.h>
 #import <ComponentKit/CKRatioLayoutComponent.h>
-#import <ComponentKit/CKStackLayoutComponent.h>
 #import <ComponentKit/CKStaticLayoutComponent.h>
 //Utilities
 #import <ComponentKit/CKComponentAction.h>

ComponentKit/Core/CKComponentMemoizer.h

@@ -30,7 +30,7 @@ struct CKMemoizationKey;
    return CKMemoize(CKMakeTupleMemoizationKey(model, other), ^{
      return [self
             newWithComponent:
-            [CKStackLayoutComponent
+            [CKFlexboxComponent
               newWith...
    });
  }

ComponentKit/Core/CKCompositeComponent.h

@@ -12,12 +12,12 @@
 
 /**
  CKCompositeComponent allows you to hide your implementation details and avoid subclassing layout components like
- CKStackLayoutComponent. In almost all cases, you should subclass CKCompositeComponent instead of subclassing any other
+ CKFlexboxComponent. In almost all cases, you should subclass CKCompositeComponent instead of subclassing any other
  class directly.
 
  For example, suppose you create a component that should lay out some children in a vertical stack.
- Incorrect: subclass CKStackLayoutComponent and call `self newWithChildren:`.
- Correct: subclass CKCompositeComponent and call `super newWithComponent:[CKStackLayoutComponent newWithChildren...`
+ Incorrect: subclass CKFlexboxComponent and call `self newWithChildren:`.
+ Correct: subclass CKCompositeComponent and call `super newWithComponent:[CKFlexboxComponent newWithChildren...`
 
  This hides your layout implementation details from the outside world.
 

ComponentKit/Core/CKDimension.h

@@ -50,6 +50,11 @@ namespace std {
 
 class CKRelativeDimension {
 public:
+  enum class Type {
+    AUTO,
+    POINTS,
+    PERCENT,
+  };
   /** Default constructor is equivalent to "Auto". */
   constexpr CKRelativeDimension() noexcept : _type(Type::AUTO), _value(0) {}
   CKRelativeDimension(CGFloat points) noexcept : CKRelativeDimension(Type::POINTS, points) {}
@@ -64,13 +69,10 @@ class CKRelativeDimension {
   bool operator==(const CKRelativeDimension &) const noexcept;
   NSString *description() const noexcept;
   CGFloat resolve(CGFloat autoSize, CGFloat parent) const noexcept;
+  Type type() const noexcept;
+  CGFloat value() const noexcept;
 
 private:
-  enum class Type {
-    AUTO,
-    POINTS,
-    PERCENT,
-  };
   CKRelativeDimension(Type type, CGFloat value)
     : _type(type), _value(value)
   {

ComponentKit/Core/CKDimension.mm

@@ -58,6 +58,16 @@
   }
 }
 
+CKRelativeDimension::Type CKRelativeDimension::type(void) const noexcept
+{
+  return _type;
+}
+
+CGFloat CKRelativeDimension::value(void) const noexcept
+{
+  return _value;
+}
+
 size_t std::hash<CKRelativeDimension>::operator ()(const CKRelativeDimension &size) noexcept {
   NSUInteger subhashes[] = {
     (size_t)(size._type),

ComponentKit/Debug/CKComponentHierarchyDebugHelper.h

@@ -13,8 +13,11 @@
 #import <ComponentKit/CKComponentViewConfiguration.h>
 
 @class CKComponent;
+@class CKComponentRootView;
 @class UIView;
 
+struct CKComponentLayout;
+
 /**
  CKComponentHierarchyDebugHelper allows
  */
@@ -26,4 +29,6 @@
  */
 + (NSString *)componentHierarchyDescription NS_EXTENSION_UNAVAILABLE("Recursively describes components using -[UIApplication keyWindow]");
 
++ (const CKComponentLayout *) rootLayoutFromRootView: (CKComponentRootView*) view;
+
 @end

ComponentKit/Debug/CKComponentHierarchyDebugHelper.mm

@@ -59,6 +59,10 @@ + (NSString *)componentHierarchyDescriptionForView:(UIView *)view searchUpwards:
   }
 }
 
++ (const CKComponentLayout *) rootLayoutFromRootView: (CKComponentRootView *)view {
+  return rootLayoutFromRootView(view);
+}
+
 static NSString *ancestorComponentHierarchyDescriptionForView(UIView *view, BOOL showViews)
 {
   NSString *ancestorDescription;

ComponentKit/LayoutComponents/CKComponentLayoutBaseline.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 <Foundation/Foundation.h>
+
+/**
+ Set a key value pair using this in CKComponentLayout.extra for a custom baseline.
+ e.g. @{kCKComponentLayoutExtraBaselineKey : 20}
+ */
+extern NSString *const kCKComponentLayoutExtraBaselineKey;

ComponentKit/LayoutComponents/CKComponentLayoutBaseline.m

@@ -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.
+ *
+ */
+
+#import "CKComponentLayoutBaseline.h"
+
+NSString *const kCKComponentLayoutExtraBaselineKey = @"kCKComponentLayoutExtraBaselineKey";