Kittens sample working

AsyncDisplayKit.xcodeproj/project.pbxproj

@@ -237,10 +237,10 @@
 		9C5FA35E1B90C9A500A62714 /* ASLayoutOptionsPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C5FA35B1B90C9A500A62714 /* ASLayoutOptionsPrivate.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9C5FA35F1B90C9A500A62714 /* ASLayoutOptionsPrivate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C5FA35C1B90C9A500A62714 /* ASLayoutOptionsPrivate.mm */; };
 		9C5FA3601B90C9A500A62714 /* ASLayoutOptionsPrivate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C5FA35C1B90C9A500A62714 /* ASLayoutOptionsPrivate.mm */; };
-		9C5FA3631B91007100A62714 /* ASLayoutablePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C5FA3611B91007100A62714 /* ASLayoutablePrivate.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9C5FA3641B91007100A62714 /* ASLayoutablePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C5FA3611B91007100A62714 /* ASLayoutablePrivate.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9C6BB3B21B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASStaticLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9C6BB3B31B8CC9C200F13F52 /* ASStaticLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C6BB3B01B8CC9C200F13F52 /* ASStaticLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9CDC18CC1B910E12004965E2 /* ASLayoutablePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CDC18CB1B910E12004965E2 /* ASLayoutablePrivate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9CDC18CD1B910E12004965E2 /* ASLayoutablePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9CDC18CB1B910E12004965E2 /* ASLayoutablePrivate.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9F06E5CD1B4CAF4200F015D8 /* ASCollectionViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F06E5CC1B4CAF4200F015D8 /* ASCollectionViewTests.m */; };
 		AC21EC101B3D0BF600C8B19A /* ASStackLayoutDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = AC21EC0F1B3D0BF600C8B19A /* ASStackLayoutDefines.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AC3C4A511A1139C100143C57 /* ASCollectionView.h in Headers */ = {isa = PBXBuildFile; fileRef = AC3C4A4F1A1139C100143C57 /* ASCollectionView.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -590,8 +590,8 @@
 		9C5FA3501B8F6ADF00A62714 /* ASLayoutOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASLayoutOptions.m; path = AsyncDisplayKit/Layout/ASLayoutOptions.m; sourceTree = "<group>"; };
 		9C5FA35B1B90C9A500A62714 /* ASLayoutOptionsPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASLayoutOptionsPrivate.h; path = AsyncDisplayKit/Layout/ASLayoutOptionsPrivate.h; sourceTree = "<group>"; };
 		9C5FA35C1B90C9A500A62714 /* ASLayoutOptionsPrivate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ASLayoutOptionsPrivate.mm; path = AsyncDisplayKit/Layout/ASLayoutOptionsPrivate.mm; sourceTree = "<group>"; };
-		9C5FA3611B91007100A62714 /* ASLayoutablePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASLayoutablePrivate.h; path = AsyncDisplayKit/Private/ASLayoutablePrivate.h; sourceTree = "<group>"; };
 		9C6BB3B01B8CC9C200F13F52 /* ASStaticLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStaticLayoutable.h; path = AsyncDisplayKit/Layout/ASStaticLayoutable.h; sourceTree = "<group>"; };
+		9CDC18CB1B910E12004965E2 /* ASLayoutablePrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASLayoutablePrivate.h; path = AsyncDisplayKit/Layout/ASLayoutablePrivate.h; sourceTree = "<group>"; };
 		9F06E5CC1B4CAF4200F015D8 /* ASCollectionViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASCollectionViewTests.m; sourceTree = "<group>"; };
 		AC21EC0F1B3D0BF600C8B19A /* ASStackLayoutDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStackLayoutDefines.h; path = AsyncDisplayKit/Layout/ASStackLayoutDefines.h; sourceTree = "<group>"; };
 		AC3C4A4F1A1139C100143C57 /* ASCollectionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASCollectionView.h; sourceTree = "<group>"; };
@@ -993,7 +993,7 @@
 				ACF6ED0B1B17843500DA7C62 /* ASLayout.h */,
 				ACF6ED0C1B17843500DA7C62 /* ASLayout.mm */,
 				ACF6ED111B17843500DA7C62 /* ASLayoutable.h */,
-				9C5FA3611B91007100A62714 /* ASLayoutablePrivate.h */,
+				9CDC18CB1B910E12004965E2 /* ASLayoutablePrivate.h */,
 				ACF6ED0D1B17843500DA7C62 /* ASLayoutSpec.h */,
 				ACF6ED0E1B17843500DA7C62 /* ASLayoutSpec.mm */,
 				ACF6ED121B17843500DA7C62 /* ASOverlayLayoutSpec.h */,
@@ -1131,7 +1131,7 @@
 				058D0A6B195D05EC00B7D73C /* _ASAsyncTransactionContainer.h in Headers */,
 				058D0A6C195D05EC00B7D73C /* _ASAsyncTransactionContainer.m in Headers */,
 				6BDC61F61979037800E50D21 /* AsyncDisplayKit.h in Headers */,
-				9C5FA3631B91007100A62714 /* ASLayoutablePrivate.h in Headers */,
+				9CDC18CC1B910E12004965E2 /* ASLayoutablePrivate.h in Headers */,
 				058D0A6D195D05EC00B7D73C /* _ASAsyncTransactionGroup.h in Headers */,
 				058D0A6E195D05EC00B7D73C /* _ASAsyncTransactionGroup.m in Headers */,
 				205F0E1D1B373A2C007741D0 /* ASCollectionViewLayoutController.h in Headers */,
@@ -1272,7 +1272,7 @@
 				B35062591B010F070018CF92 /* ASBaseDefines.h in Headers */,
 				B35062191B010EFD0018CF92 /* ASDealloc2MainObject.h in Headers */,
 				B350620F1B010EFD0018CF92 /* _ASDisplayLayer.h in Headers */,
-				9C5FA3641B91007100A62714 /* ASLayoutablePrivate.h in Headers */,
+				9CDC18CD1B910E12004965E2 /* ASLayoutablePrivate.h in Headers */,
 				B35062531B010EFD0018CF92 /* ASImageNode+CGExtras.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

AsyncDisplayKit/Layout/ASLayoutOptions.h

@@ -1,10 +1,12 @@
-//
+/*
-//  ASLayoutOptions.h
+ *  Copyright (c) 2014-present, Facebook, Inc.
-//  AsyncDisplayKit
+ *  All rights reserved.
-//
+ *
-//  Created by Ricky Cancro on 8/27/15.
+ *  This source code is licensed under the BSD-style license found in the
-//  Copyright (c) 2015 Facebook. All rights reserved.
+ *  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>
 

AsyncDisplayKit/Layout/ASLayoutOptions.m

@@ -1,10 +1,12 @@
-//
+/*
-//  ASLayoutOptions.m
+ *  Copyright (c) 2014-present, Facebook, Inc.
-//  AsyncDisplayKit
+ *  All rights reserved.
-//
+ *
-//  Created by Ricky Cancro on 8/27/15.
+ *  This source code is licensed under the BSD-style license found in the
-//  Copyright (c) 2015 Facebook. All rights reserved.
+ *  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 "ASLayoutOptions.h"
 
@@ -23,6 +25,11 @@ static Class gDefaultLayoutOptionsClass = nil;
 
 + (Class)defaultLayoutOptionsClass
 {
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    // If someone is asking for this and it hasn't been customized yet, use the default.
+    gDefaultLayoutOptionsClass = [ASLayoutOptions class];
+  });
   return gDefaultLayoutOptionsClass;
 }
 

AsyncDisplayKit/Layout/ASLayoutOptionsPrivate.h

@@ -1,10 +1,12 @@
-//
+/*
-//  ASDisplayNode+Layoutable.h
+ *  Copyright (c) 2014-present, Facebook, Inc.
-//  AsyncDisplayKit
+ *  All rights reserved.
-//
+ *
-//  Created by Ricky Cancro on 8/28/15.
+ *  This source code is licensed under the BSD-style license found in the
-//  Copyright (c) 2015 Facebook. All rights reserved.
+ *  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 <AsyncDisplayKit/ASDisplayNode.h>
 #import <AsyncDisplayKit/ASLayoutSpec.h>
@@ -13,6 +15,7 @@
 @interface ASDisplayNode()
 {
   ASLayoutOptions *_layoutOptions;
+  dispatch_once_t _layoutOptionsInitializeToken;
 }
 @end
 
@@ -22,6 +25,7 @@
 @interface ASLayoutSpec()
 {
   ASLayoutOptions *_layoutOptions;
+  dispatch_once_t _layoutOptionsInitializeToken;
 }
 @end
 

AsyncDisplayKit/Layout/ASLayoutOptionsPrivate.mm

@@ -1,10 +1,12 @@
-//
+/*
-//  ASDisplayNode+Layoutable.m
+ *  Copyright (c) 2014-present, Facebook, Inc.
-//  AsyncDisplayKit
+ *  All rights reserved.
-//
+ *
-//  Created by Ricky Cancro on 8/28/15.
+ *  This source code is licensed under the BSD-style license found in the
-//  Copyright (c) 2015 Facebook. All rights reserved.
+ *  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 "ASLayoutOptionsPrivate.h"
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
@@ -13,9 +15,9 @@
 #define ASLayoutOptionsForwarding \
 - (ASLayoutOptions *)layoutOptions\
 {\
-if (_layoutOptions == nil) {\
+dispatch_once(&_layoutOptionsInitializeToken, ^{\
 _layoutOptions = [[[ASLayoutOptions defaultLayoutOptionsClass] alloc] init];\
-}\
+});\
 return _layoutOptions;\
 }\
 \

AsyncDisplayKit/Layout/ASLayoutSpec.h

@@ -30,8 +30,4 @@
 - (id<ASLayoutable>)childForIdentifier:(NSString *)identifier;
 - (NSArray *)children;
 
-//+ (ASLayoutOptions *)layoutOptionsForChild:(id<ASLayoutable>)child;
-//+ (void)associateLayoutOptions:(ASLayoutOptions *)layoutOptions withChild:(id<ASLayoutable>)child;
-//+ (void)setLayoutOptionsClass:(Class)layoutOptionsClass;
-
 @end

AsyncDisplayKit/Layout/ASLayoutSpec.mm

@@ -74,20 +74,17 @@ static NSString * const kDefaultChildrenKey = @"kDefaultChildrenKey";
   NSMutableArray *finalChildren = [NSMutableArray arrayWithCapacity:children.count];
   for (id<ASLayoutable> child in children) {
     ASLayoutOptions *layoutOptions = [ASLayoutSpec layoutOptionsForChild:child];
-    if ([child respondsToSelector:@selector(finalLayoutable)]) {
+    id<ASLayoutable> finalLayoutable = [child finalLayoutable];
-      id<ASLayoutable> finalLayoutable = [child performSelector:@selector(finalLayoutable)];
+    layoutOptions.isMutable = NO;
-      layoutOptions.isMutable = NO;
+    
-      
+    if (finalLayoutable != child) {
-      if (finalLayoutable != child) {
+      ASLayoutOptions *finalLayoutOptions = [layoutOptions copy];
-        ASLayoutOptions *finalLayoutOptions = [layoutOptions copy];
+      finalLayoutOptions.isMutable = NO;
-        finalLayoutOptions.isMutable = NO;
+      [ASLayoutSpec associateLayoutOptions:finalLayoutOptions withChild:finalLayoutable];
-        [ASLayoutSpec associateLayoutOptions:finalLayoutOptions withChild:finalLayoutable];
+      [finalChildren addObject:finalLayoutable];
-        [finalChildren addObject:finalLayoutable];
-      }
     } else {
       [finalChildren addObject:child];
     }
-    
   }
   
   self.layoutChildren[kDefaultChildrenKey] = [NSArray arrayWithArray:finalChildren];

AsyncDisplayKit/Layout/ASLayoutable.h

@@ -11,6 +11,9 @@
 #import <AsyncDisplayKit/ASDimension.h>
 #import <AsyncDisplayKit/ASRelativeSize.h>
 #import <AsyncDisplayKit/ASStackLayoutDefines.h>
+#import <AsyncDisplayKit/ASStackLayoutable.h>
+#import <AsyncDisplayKit/ASBaselineLayoutable.h>
+#import <AsyncDisplayKit/ASStaticLayoutable.h>
 
 #import <AsyncDisplayKit/ASLayoutablePrivate.h>
 
@@ -22,7 +25,7 @@
  * so that instances of that class can be used to build layout trees. The protocol also provides information 
  * about how an object should be laid out within an ASStackLayoutSpec.
  */
-@protocol ASLayoutable <ASLayoutablePrivate>
+@protocol ASLayoutable <ASLayoutablePrivate, ASStackLayoutable, ASBaselineLayoutable, ASStaticLayoutable>
 
 /**
  * @abstract Calculate a layout based on given size range.
@@ -33,17 +36,4 @@
  */
 - (ASLayout *)measureWithSizeRange:(ASSizeRange)constrainedSize;
 
-@property (nonatomic, readwrite) CGFloat spacingBefore;
-@property (nonatomic, readwrite) CGFloat spacingAfter;
-@property (nonatomic, readwrite) BOOL flexGrow;
-@property (nonatomic, readwrite) BOOL flexShrink;
-@property (nonatomic, readwrite) ASRelativeDimension flexBasis;
-@property (nonatomic, readwrite) ASStackLayoutAlignSelf alignSelf;
-
-@property (nonatomic, readwrite) CGFloat ascender;
-@property (nonatomic, readwrite) CGFloat descender;
-
-@property (nonatomic, readwrite) ASRelativeSizeRange sizeRange;
-@property (nonatomic, readwrite) CGPoint layoutPosition;
-
 @end

AsyncDisplayKit/Layout/ASLayoutablePrivate.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 <Foundation/Foundation.h>
+
+@class ASLayoutSpec;
+@class ASLayoutOptions;
+
+@protocol ASLayoutablePrivate <NSObject>
+- (ASLayoutSpec *)finalLayoutable;
+@property (nonatomic, strong, readonly) ASLayoutOptions *layoutOptions;
+@end

AsyncDisplayKit/Private/ASLayoutablePrivate.h

@@ -1,16 +0,0 @@
-//
-//  ASLayoutablePrivate.h
-//  AsyncDisplayKit
-//
-//  Created by Ricky Cancro on 8/28/15.
-//  Copyright (c) 2015 Facebook. All rights reserved.
-//
-#import <Foundation/Foundation.h>
-
-@class ASLayoutSpec;
-@class ASLayoutOptions;
-
-@protocol ASLayoutablePrivate <NSObject>
-- (ASLayoutSpec *)finalLayoutable;
-@property (nonatomic, strong, readonly) ASLayoutOptions *layoutOptions;
-@end