[AsyncDisplayKit 2] Final changes to ease migration of clients to 2.0 APIs. (#2460)

This commit is contained in:
appleguy
2016-10-21 13:12:13 -07:00
committed by GitHub
parent e87ac54138
commit 2c6f8b0506
17 changed files with 470 additions and 72 deletions

View File

@@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
* access to the options via convenience properties. If you are creating custom layout spec, then you can
* extend the backing layout options class to accommodate any new layout options.
*/
@protocol ASLayoutElement <ASEnvironment, ASLayoutElementPrivate, ASLayoutElementExtensibility, ASLayoutElementStylability, NSFastEnumeration>
@protocol ASLayoutElement <ASEnvironment, ASLayoutElementPrivate, ASLayoutElementExtensibility, ASLayoutElementStylability, NSFastEnumeration, ASStackLayoutElement, ASAbsoluteLayoutElement>
#pragma mark - Getter
@@ -74,7 +74,6 @@ NS_ASSUME_NONNULL_BEGIN
*/
@property (nullable, nonatomic, copy) NSString *debugName;
#pragma mark - Calculate layout
/**
@@ -320,3 +319,4 @@ extern NSString * const ASLayoutElementStyleLayoutPositionProperty;
@end
NS_ASSUME_NONNULL_END
#define ASLayoutable ASLayoutElement