[ASRelativeLayoutSpec] New core layout spec type: Relative Position, now powers Center as well.

This spec allows positioning a child at any 9-part box position (corners, edges, or center).

AsyncDisplayKitTests/ASCenterLayoutSpecSnapshotTests.mm

@@ -38,10 +38,14 @@ static const ASSizeRange kSize = {{100, 120}, {320, 160}};
 
 - (void)testWithSizingOptions
 {
-  [self testWithCenteringOptions:ASCenterLayoutSpecCenteringNone sizingOptions:ASCenterLayoutSpecSizingOptionDefault];
-  [self testWithCenteringOptions:ASCenterLayoutSpecCenteringNone sizingOptions:ASCenterLayoutSpecSizingOptionMinimumX];
-  [self testWithCenteringOptions:ASCenterLayoutSpecCenteringNone sizingOptions:ASCenterLayoutSpecSizingOptionMinimumY];
-  [self testWithCenteringOptions:ASCenterLayoutSpecCenteringNone sizingOptions:ASCenterLayoutSpecSizingOptionMinimumXY];
+  [self testWithCenteringOptions:ASCenterLayoutSpecCenteringNone
+                   sizingOptions:ASCenterLayoutSpecSizingOptionDefault];
+  [self testWithCenteringOptions:ASCenterLayoutSpecCenteringNone
+                   sizingOptions:ASCenterLayoutSpecSizingOptionMinimumX];
+  [self testWithCenteringOptions:ASCenterLayoutSpecCenteringNone
+                   sizingOptions:ASCenterLayoutSpecSizingOptionMinimumY];
+  [self testWithCenteringOptions:ASCenterLayoutSpecCenteringNone
+                   sizingOptions:ASCenterLayoutSpecSizingOptionMinimumXY];
 }
 
 - (void)testWithCenteringOptions:(ASCenterLayoutSpecCenteringOptions)options
@@ -51,14 +55,7 @@ static const ASSizeRange kSize = {{100, 120}, {320, 160}};
   ASStaticSizeDisplayNode *foregroundNode = ASDisplayNodeWithBackgroundColor([UIColor greenColor]);
   foregroundNode.staticSize = {70, 100};
 
-  ASLayoutSpec *layoutSpec =
-  [ASBackgroundLayoutSpec
-   backgroundLayoutSpecWithChild:
-   [ASCenterLayoutSpec
-    centerLayoutSpecWithCenteringOptions:options
-    sizingOptions:sizingOptions
-    child:foregroundNode]
-   background:backgroundNode];
+  ASLayoutSpec *layoutSpec = [ASBackgroundLayoutSpec backgroundLayoutSpecWithChild:[ASCenterLayoutSpec centerLayoutSpecWithCenteringOptions:options sizingOptions:sizingOptions child:foregroundNode]background:backgroundNode];
 
   [self testLayoutSpec:layoutSpec
              sizeRange:kSize
@@ -97,14 +94,7 @@ static NSString *suffixForCenteringOptions(ASCenterLayoutSpecCenteringOptions ce
   foregroundNode.staticSize = {10, 10};
   foregroundNode.flexGrow = YES;
   
-  ASCenterLayoutSpec *layoutSpec =
-  [ASCenterLayoutSpec
-   centerLayoutSpecWithCenteringOptions:ASCenterLayoutSpecCenteringNone
-   sizingOptions:{}
-   child:
-   [ASBackgroundLayoutSpec
-    backgroundLayoutSpecWithChild:[ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical spacing:0 justifyContent:ASStackLayoutJustifyContentStart alignItems:ASStackLayoutAlignItemsStart children:@[foregroundNode]]
-    background:backgroundNode]];
+  ASCenterLayoutSpec *layoutSpec = [ASCenterLayoutSpec centerLayoutSpecWithCenteringOptions:ASCenterLayoutSpecCenteringNone sizingOptions:{} child:[ASBackgroundLayoutSpec backgroundLayoutSpecWithChild:[ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical spacing:0 justifyContent:ASStackLayoutJustifyContentStart alignItems:ASStackLayoutAlignItemsStart children:@[foregroundNode]] background:backgroundNode]];
 
   [self testLayoutSpec:layoutSpec sizeRange:kSize subnodes:@[backgroundNode, foregroundNode] identifier:nil];
 }

AsyncDisplayKitTests/ASRelativeLayoutSpecSnapshotTests.mm

@@ -0,0 +1,130 @@
+/*
+ *  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 "ASLayoutSpecSnapshotTestsHelper.h"
+
+#import "ASBackgroundLayoutSpec.h"
+#import "ASRelativeLayoutSpec.h"
+#import "ASStackLayoutSpec.h"
+#import "ASLayoutOptions.h"
+
+static const ASSizeRange kSize = {{100, 120}, {320, 160}};
+
+@interface ASRelativeLayoutSpecSnapshotTests : ASLayoutSpecSnapshotTestCase
+@end
+
+@implementation ASRelativeLayoutSpecSnapshotTests
+
+- (void)setUp
+{
+  [super setUp];
+  self.recordMode = NO;
+}
+
+- (void)testWithOptions
+{
+
+  [self testAllVerticalPositionsForHorizontalPosition:ASRelativeLayoutSpecPositionStart];
+  [self testAllVerticalPositionsForHorizontalPosition:ASRelativeLayoutSpecPositionCenter];
+  [self testAllVerticalPositionsForHorizontalPosition:ASRelativeLayoutSpecPositionEnd];
+
+}
+
+- (void)testAllVerticalPositionsForHorizontalPosition:(ASRelativeLayoutSpecPosition)horizontalPosition {
+  [self testWithHorizontalPosition:horizontalPosition verticalPosition:ASRelativeLayoutSpecPositionStart sizingOptions:{}];
+  [self testWithHorizontalPosition:horizontalPosition verticalPosition:ASRelativeLayoutSpecPositionCenter sizingOptions:{}];
+  [self testWithHorizontalPosition:horizontalPosition verticalPosition:ASRelativeLayoutSpecPositionEnd sizingOptions:{}];
+}
+
+- (void)testWithSizingOptions
+{
+  [self testWithHorizontalPosition:ASRelativeLayoutSpecPositionStart
+                  verticalPosition:ASRelativeLayoutSpecPositionStart
+                     sizingOptions:ASRelativeLayoutSpecSizingOptionDefault];
+  [self testWithHorizontalPosition:ASRelativeLayoutSpecPositionStart
+                  verticalPosition:ASRelativeLayoutSpecPositionStart
+                     sizingOptions:ASRelativeLayoutSpecSizingOptionMinimumWidth];
+  [self testWithHorizontalPosition:ASRelativeLayoutSpecPositionStart
+                  verticalPosition:ASRelativeLayoutSpecPositionStart
+                     sizingOptions:ASRelativeLayoutSpecSizingOptionMinimumHeight];
+  [self testWithHorizontalPosition:ASRelativeLayoutSpecPositionStart
+                  verticalPosition:ASRelativeLayoutSpecPositionStart
+                     sizingOptions:ASRelativeLayoutSpecSizingOptionMinimumSize];
+}
+
+- (void)testWithHorizontalPosition:(ASRelativeLayoutSpecPosition)horizontalPosition
+                  verticalPosition:(ASRelativeLayoutSpecPosition)verticalPosition
+                   sizingOptions:(ASRelativeLayoutSpecSizingOption)sizingOptions
+{
+  ASDisplayNode *backgroundNode = ASDisplayNodeWithBackgroundColor([UIColor redColor]);
+  ASStaticSizeDisplayNode *foregroundNode = ASDisplayNodeWithBackgroundColor([UIColor greenColor]);
+  foregroundNode.staticSize = {70, 100};
+
+  ASLayoutSpec *layoutSpec =
+  [ASBackgroundLayoutSpec
+   backgroundLayoutSpecWithChild:
+   [ASRelativeLayoutSpec
+    relativePositionLayoutSpecWithHorizontalPosition:horizontalPosition verticalPosition:verticalPosition sizingOption:sizingOptions child:foregroundNode]
+   background:backgroundNode];
+
+  [self testLayoutSpec:layoutSpec
+             sizeRange:kSize
+              subnodes:@[backgroundNode, foregroundNode]
+            identifier:suffixForPositionOptions(horizontalPosition, verticalPosition, sizingOptions)];
+}
+
+static NSString *suffixForPositionOptions(ASRelativeLayoutSpecPosition horizontalPosition,
+                                          ASRelativeLayoutSpecPosition verticalPosition,
+                                           ASRelativeLayoutSpecSizingOption sizingOptions)
+{
+  NSMutableString *suffix = [NSMutableString string];
+
+  if ((horizontalPosition & ASRelativeLayoutSpecPositionCenter) != 0) {
+    [suffix appendString:@"CenterX"];
+  } else if ((horizontalPosition & ASRelativeLayoutSpecPositionEnd) != 0) {
+    [suffix appendString:@"EndX"];
+  }
+
+  if ((verticalPosition & ASRelativeLayoutSpecPositionCenter) != 0) {
+    [suffix appendString:@"CenterY"];
+  } else if ((verticalPosition & ASRelativeLayoutSpecPositionEnd) != 0) {
+    [suffix appendString:@"EndY"];
+  }
+
+  if ((sizingOptions & ASRelativeLayoutSpecSizingOptionMinimumWidth) != 0) {
+    [suffix appendString:@"SizingMinimumWidth"];
+  }
+
+  if ((sizingOptions & ASRelativeLayoutSpecSizingOptionMinimumHeight) != 0) {
+    [suffix appendString:@"SizingMinimumHeight"];
+  }
+
+  return suffix;
+}
+
+- (void)testMinimumSizeRangeIsGivenToChildWhenNotPositioning
+{
+  ASDisplayNode *backgroundNode = ASDisplayNodeWithBackgroundColor([UIColor redColor]);
+  ASStaticSizeDisplayNode *foregroundNode = ASDisplayNodeWithBackgroundColor([UIColor redColor]);
+  foregroundNode.staticSize = {10, 10};
+  foregroundNode.flexGrow = YES;
+  
+  ASLayoutSpec *childSpec = [ASBackgroundLayoutSpec
+                             backgroundLayoutSpecWithChild:[ASStackLayoutSpec stackLayoutSpecWithDirection:ASStackLayoutDirectionVertical spacing:0 justifyContent:ASStackLayoutJustifyContentStart alignItems:ASStackLayoutAlignItemsStart children:@[foregroundNode]]
+                             background:backgroundNode];
+  
+  ASRelativeLayoutSpec *layoutSpec =  [ASRelativeLayoutSpec
+                                       relativePositionLayoutSpecWithHorizontalPosition:ASRelativeLayoutSpecPositionStart verticalPosition:ASRelativeLayoutSpecPositionStart sizingOption:{} child:childSpec];
+
+
+  [self testLayoutSpec:layoutSpec sizeRange:kSize subnodes:@[backgroundNode, foregroundNode] identifier:nil];
+}
+
+@end