diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index 83427c715c..97b20c3f2b 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -217,14 +217,16 @@ 509E68651B3AEDC5009B9150 /* CGRect+ASConvenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 205F0E1F1B376416007741D0 /* CGRect+ASConvenience.h */; }; 509E68661B3AEDD7009B9150 /* CGRect+ASConvenience.m in Sources */ = {isa = PBXBuildFile; fileRef = 205F0E201B376416007741D0 /* CGRect+ASConvenience.m */; }; 6BDC61F61979037800E50D21 /* AsyncDisplayKit.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9C204A641B86349B00313849 /* ASStackTextPositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A621B86349B00313849 /* ASStackTextPositionedLayout.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9C204A651B86349B00313849 /* ASStackTextPositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A621B86349B00313849 /* ASStackTextPositionedLayout.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9C204A661B86349B00313849 /* ASStackTextPositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C204A631B86349B00313849 /* ASStackTextPositionedLayout.mm */; }; - 9C204A671B86349B00313849 /* ASStackTextPositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C204A631B86349B00313849 /* ASStackTextPositionedLayout.mm */; }; - 9C3061061B857EC400D0530B /* ASStackTextLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C3061041B857EC400D0530B /* ASStackTextLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9C3061071B857EC400D0530B /* ASStackTextLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C3061041B857EC400D0530B /* ASStackTextLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 9C3061081B857EC400D0530B /* ASStackTextLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C3061051B857EC400D0530B /* ASStackTextLayoutSpec.mm */; }; - 9C3061091B857EC400D0530B /* ASStackTextLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C3061051B857EC400D0530B /* ASStackTextLayoutSpec.mm */; }; + 9C204A641B86349B00313849 /* ASBaselineStackPositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A621B86349B00313849 /* ASBaselineStackPositionedLayout.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9C204A651B86349B00313849 /* ASBaselineStackPositionedLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A621B86349B00313849 /* ASBaselineStackPositionedLayout.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9C204A661B86349B00313849 /* ASBaselineStackPositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C204A631B86349B00313849 /* ASBaselineStackPositionedLayout.mm */; }; + 9C204A671B86349B00313849 /* ASBaselineStackPositionedLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C204A631B86349B00313849 /* ASBaselineStackPositionedLayout.mm */; }; + 9C204A6A1B87803A00313849 /* ASBaselineStackLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A681B87803A00313849 /* ASBaselineStackLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9C204A6B1B87803A00313849 /* ASBaselineStackLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C204A681B87803A00313849 /* ASBaselineStackLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9C3061061B857EC400D0530B /* ASBaselineStackLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C3061041B857EC400D0530B /* ASBaselineStackLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9C3061071B857EC400D0530B /* ASBaselineStackLayoutSpec.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C3061041B857EC400D0530B /* ASBaselineStackLayoutSpec.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9C3061081B857EC400D0530B /* ASBaselineStackLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C3061051B857EC400D0530B /* ASBaselineStackLayoutSpec.mm */; }; + 9C3061091B857EC400D0530B /* ASBaselineStackLayoutSpec.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9C3061051B857EC400D0530B /* ASBaselineStackLayoutSpec.mm */; }; 9C49C36F1B853957000B0DD5 /* ASStackLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9C49C3701B853961000B0DD5 /* ASStackLayoutable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */; settings = {ATTRIBUTES = (Public, ); }; }; 9F06E5CD1B4CAF4200F015D8 /* ASCollectionViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F06E5CC1B4CAF4200F015D8 /* ASCollectionViewTests.m */; }; @@ -566,10 +568,11 @@ 4640521E1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASMultidimensionalArrayUtils.h; sourceTree = ""; }; 4640521F1A3F83C40061C0BA /* ASMultidimensionalArrayUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASMultidimensionalArrayUtils.mm; sourceTree = ""; }; 6BDC61F51978FEA400E50D21 /* AsyncDisplayKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AsyncDisplayKit.h; sourceTree = ""; }; - 9C204A621B86349B00313849 /* ASStackTextPositionedLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASStackTextPositionedLayout.h; sourceTree = ""; }; - 9C204A631B86349B00313849 /* ASStackTextPositionedLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASStackTextPositionedLayout.mm; sourceTree = ""; }; - 9C3061041B857EC400D0530B /* ASStackTextLayoutSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStackTextLayoutSpec.h; path = AsyncDisplayKit/Layout/ASStackTextLayoutSpec.h; sourceTree = ""; }; - 9C3061051B857EC400D0530B /* ASStackTextLayoutSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ASStackTextLayoutSpec.mm; path = AsyncDisplayKit/Layout/ASStackTextLayoutSpec.mm; sourceTree = ""; }; + 9C204A621B86349B00313849 /* ASBaselineStackPositionedLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASBaselineStackPositionedLayout.h; sourceTree = ""; }; + 9C204A631B86349B00313849 /* ASBaselineStackPositionedLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ASBaselineStackPositionedLayout.mm; sourceTree = ""; }; + 9C204A681B87803A00313849 /* ASBaselineStackLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASBaselineStackLayoutable.h; path = AsyncDisplayKit/Layout/ASBaselineStackLayoutable.h; sourceTree = ""; }; + 9C3061041B857EC400D0530B /* ASBaselineStackLayoutSpec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASBaselineStackLayoutSpec.h; path = AsyncDisplayKit/Layout/ASBaselineStackLayoutSpec.h; sourceTree = ""; }; + 9C3061051B857EC400D0530B /* ASBaselineStackLayoutSpec.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ASBaselineStackLayoutSpec.mm; path = AsyncDisplayKit/Layout/ASBaselineStackLayoutSpec.mm; sourceTree = ""; }; 9C49C36E1B853957000B0DD5 /* ASStackLayoutable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStackLayoutable.h; path = AsyncDisplayKit/Layout/ASStackLayoutable.h; sourceTree = ""; }; 9F06E5CC1B4CAF4200F015D8 /* ASCollectionViewTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASCollectionViewTests.m; sourceTree = ""; }; AC21EC0F1B3D0BF600C8B19A /* ASStackLayoutDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASStackLayoutDefines.h; path = AsyncDisplayKit/Layout/ASStackLayoutDefines.h; sourceTree = ""; }; @@ -936,8 +939,8 @@ ACF6ED481B17847A00DA7C62 /* ASStackPositionedLayout.mm */, ACF6ED491B17847A00DA7C62 /* ASStackUnpositionedLayout.h */, ACF6ED4A1B17847A00DA7C62 /* ASStackUnpositionedLayout.mm */, - 9C204A621B86349B00313849 /* ASStackTextPositionedLayout.h */, - 9C204A631B86349B00313849 /* ASStackTextPositionedLayout.mm */, + 9C204A621B86349B00313849 /* ASBaselineStackPositionedLayout.h */, + 9C204A631B86349B00313849 /* ASBaselineStackPositionedLayout.mm */, ); path = Private; sourceTree = ""; @@ -960,6 +963,7 @@ children = ( ACF6ED011B17843500DA7C62 /* ASBackgroundLayoutSpec.h */, ACF6ED021B17843500DA7C62 /* ASBackgroundLayoutSpec.mm */, + 9C204A681B87803A00313849 /* ASBaselineStackLayoutable.h */, ACF6ED031B17843500DA7C62 /* ASCenterLayoutSpec.h */, ACF6ED041B17843500DA7C62 /* ASCenterLayoutSpec.mm */, ACF6ED071B17843500DA7C62 /* ASDimension.h */, @@ -983,8 +987,8 @@ ACF6ED171B17843500DA7C62 /* ASStackLayoutSpec.mm */, ACF6ED181B17843500DA7C62 /* ASStaticLayoutSpec.h */, ACF6ED191B17843500DA7C62 /* ASStaticLayoutSpec.mm */, - 9C3061041B857EC400D0530B /* ASStackTextLayoutSpec.h */, - 9C3061051B857EC400D0530B /* ASStackTextLayoutSpec.mm */, + 9C3061041B857EC400D0530B /* ASBaselineStackLayoutSpec.h */, + 9C3061051B857EC400D0530B /* ASBaselineStackLayoutSpec.mm */, ); name = Layout; path = ..; @@ -1045,6 +1049,7 @@ 464052201A3F83C40061C0BA /* ASDataController.h in Headers */, 05A6D05A19D0EB64002DD95E /* ASDealloc2MainObject.h in Headers */, 0516FA401A1563D200B4EBED /* ASMultiplexImageNode.h in Headers */, + 9C204A6A1B87803A00313849 /* ASBaselineStackLayoutable.h in Headers */, 058D0A47195D05CB00B7D73C /* ASControlNode.h in Headers */, 058D0A48195D05CB00B7D73C /* ASControlNode.m in Headers */, 058D0A49195D05CB00B7D73C /* ASControlNode+Subclasses.h in Headers */, @@ -1066,7 +1071,7 @@ 0574D5E219C110940097DC25 /* ASTableViewProtocols.h in Headers */, 055F1A3C19ABD43F004DAFF1 /* ASCellNode.h in Headers */, 058D0A53195D05DC00B7D73C /* _ASDisplayLayer.h in Headers */, - 9C204A641B86349B00313849 /* ASStackTextPositionedLayout.h in Headers */, + 9C204A641B86349B00313849 /* ASBaselineStackPositionedLayout.h in Headers */, 058D0A54195D05DC00B7D73C /* _ASDisplayLayer.mm in Headers */, 058D0A55195D05DC00B7D73C /* _ASDisplayView.h in Headers */, 058D0A56195D05DC00B7D73C /* _ASDisplayView.mm in Headers */, @@ -1093,7 +1098,7 @@ 058D0A67195D05DC00B7D73C /* NSMutableAttributedString+TextKitAdditions.m in Headers */, 058D0A68195D05EC00B7D73C /* _ASAsyncTransaction.h in Headers */, 205F0E0F1B371875007741D0 /* UICollectionViewLayout+ASConvenience.h in Headers */, - 9C3061061B857EC400D0530B /* ASStackTextLayoutSpec.h in Headers */, + 9C3061061B857EC400D0530B /* ASBaselineStackLayoutSpec.h in Headers */, 058D0A69195D05EC00B7D73C /* _ASAsyncTransaction.m in Headers */, 058D0A6A195D05EC00B7D73C /* _ASAsyncTransactionContainer+Private.h in Headers */, 058D0A6B195D05EC00B7D73C /* _ASAsyncTransactionContainer.h in Headers */, @@ -1159,7 +1164,7 @@ B35061FA1B010EFD0018CF92 /* ASControlNode+Subclasses.h in Headers */, B35062371B010EFD0018CF92 /* ASTextNodeWordKerner.h in Headers */, B35062261B010EFD0018CF92 /* ASRangeController.h in Headers */, - 9C204A651B86349B00313849 /* ASStackTextPositionedLayout.h in Headers */, + 9C204A651B86349B00313849 /* ASBaselineStackPositionedLayout.h in Headers */, B35062111B010EFD0018CF92 /* _ASDisplayView.h in Headers */, B35061F81B010EFD0018CF92 /* ASControlNode.h in Headers */, 430E7C901B4C23F100697A4C /* ASIndexPath.h in Headers */, @@ -1169,7 +1174,7 @@ B35061F31B010EFD0018CF92 /* ASCellNode.h in Headers */, 34EFC76C1B701CED00AD841F /* ASOverlayLayoutSpec.h in Headers */, B35062201B010EFD0018CF92 /* ASLayoutController.h in Headers */, - 9C3061071B857EC400D0530B /* ASStackTextLayoutSpec.h in Headers */, + 9C3061071B857EC400D0530B /* ASBaselineStackLayoutSpec.h in Headers */, B35062571B010F070018CF92 /* ASAssert.h in Headers */, B35062411B010EFD0018CF92 /* _ASAsyncTransactionGroup.h in Headers */, B350623C1B010EFD0018CF92 /* _ASAsyncTransaction.h in Headers */, @@ -1213,6 +1218,7 @@ 34EFC7631B701CBF00AD841F /* ASCenterLayoutSpec.h in Headers */, B350624D1B010EFD0018CF92 /* _ASScopeTimer.h in Headers */, 34EFC7701B701CFA00AD841F /* ASStackLayoutDefines.h in Headers */, + 9C204A6B1B87803A00313849 /* ASBaselineStackLayoutable.h in Headers */, 509E68651B3AEDC5009B9150 /* CGRect+ASConvenience.h in Headers */, B350624F1B010EFD0018CF92 /* ASDisplayNode+DebugTiming.h in Headers */, B35062211B010EFD0018CF92 /* ASLayoutRangeType.h in Headers */, @@ -1435,7 +1441,7 @@ 058D0A26195D050800B7D73C /* _ASCoreAnimationExtras.mm in Sources */, 058D0A23195D050800B7D73C /* _ASAsyncTransactionContainer.m in Sources */, 058D0A1E195D050800B7D73C /* ASTextNodeShadower.m in Sources */, - 9C204A661B86349B00313849 /* ASStackTextPositionedLayout.mm in Sources */, + 9C204A661B86349B00313849 /* ASBaselineStackPositionedLayout.mm in Sources */, ACF6ED2E1B17843500DA7C62 /* ASRatioLayoutSpec.mm in Sources */, 058D0A18195D050800B7D73C /* _ASDisplayLayer.mm in Sources */, ACF6ED321B17843500DA7C62 /* ASStaticLayoutSpec.mm in Sources */, @@ -1474,7 +1480,7 @@ 0549634A1A1EA066000F8E56 /* ASBasicImageDownloader.mm in Sources */, 058D0A14195D050800B7D73C /* ASDisplayNode.mm in Sources */, 058D0A1B195D050800B7D73C /* ASMutableAttributedStringBuilder.m in Sources */, - 9C3061081B857EC400D0530B /* ASStackTextLayoutSpec.mm in Sources */, + 9C3061081B857EC400D0530B /* ASBaselineStackLayoutSpec.mm in Sources */, 058D0A2B195D050800B7D73C /* ASImageNode+CGExtras.m in Sources */, 058D0A24195D050800B7D73C /* _ASAsyncTransactionGroup.m in Sources */, 058D0A1C195D050800B7D73C /* ASTextNodeCoreTextAdditions.m in Sources */, @@ -1536,10 +1542,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9C3061091B857EC400D0530B /* ASStackTextLayoutSpec.mm in Sources */, + 9C3061091B857EC400D0530B /* ASBaselineStackLayoutSpec.mm in Sources */, 34EFC7641B701CC600AD841F /* ASCenterLayoutSpec.mm in Sources */, B350623B1B010EFD0018CF92 /* NSMutableAttributedString+TextKitAdditions.m in Sources */, - 9C204A671B86349B00313849 /* ASStackTextPositionedLayout.mm in Sources */, + 9C204A671B86349B00313849 /* ASBaselineStackPositionedLayout.mm in Sources */, B35062401B010EFD0018CF92 /* _ASAsyncTransactionContainer.m in Sources */, B35062311B010EFD0018CF92 /* ASTextNodeRenderer.mm in Sources */, B35062051B010EFD0018CF92 /* ASMultiplexImageNode.mm in Sources */, diff --git a/AsyncDisplayKit/ASTextNode.h b/AsyncDisplayKit/ASTextNode.h index 681c2cb71e..d47925ed78 100644 --- a/AsyncDisplayKit/ASTextNode.h +++ b/AsyncDisplayKit/ASTextNode.h @@ -7,6 +7,7 @@ */ #import +#import @protocol ASTextNodeDelegate; @@ -30,7 +31,7 @@ typedef NS_ENUM(NSUInteger, ASTextNodeHighlightStyle) { @abstract Draws interactive rich text. @discussion Backed by TextKit. */ -@interface ASTextNode : ASControlNode +@interface ASTextNode : ASControlNode /** @abstract The attributed string to show. diff --git a/AsyncDisplayKit/Layout/ASStackTextLayoutSpec.h b/AsyncDisplayKit/Layout/ASBaselineStackLayoutSpec.h similarity index 70% rename from AsyncDisplayKit/Layout/ASStackTextLayoutSpec.h rename to AsyncDisplayKit/Layout/ASBaselineStackLayoutSpec.h index a7b94da03b..df613f42fc 100644 --- a/AsyncDisplayKit/Layout/ASStackTextLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASBaselineStackLayoutSpec.h @@ -9,15 +9,16 @@ */ #import +#import -typedef NS_ENUM(NSUInteger, ASStackTextLayoutBaselineAlignment) { +typedef NS_ENUM(NSUInteger, ASBaselineStackLayoutBaselineAlignment) { /** No baseline alignment. This is only valid for a vertical stack */ - ASStackTextLayoutBaselineAlignmentNone, + ASBaselineStackLayoutBaselineAlignmentNone, /** Align all children to the first baseline. This is only valid for a horizontal stack */ - ASStackTextLayoutBaselineAlignmentFirst, + ASBaselineStackLayoutBaselineAlignmentFirst, /** Align all children to the last baseline. This is useful when a text node wraps and you want to align to the bottom baseline. This is only valid for a horizontal stack */ - ASStackTextLayoutBaselineAlignmentLast, + ASBaselineStackLayoutBaselineAlignmentLast, }; @@ -26,24 +27,24 @@ typedef struct { ASStackLayoutSpecStyle stackLayoutStyle; /** The type of baseline alignment */ - ASStackTextLayoutBaselineAlignment baselineAlignment; -} ASStackTextLayoutSpecStyle; + ASBaselineStackLayoutBaselineAlignment baselineAlignment; +} ASBaselineStackLayoutSpecStyle; /** A specialized version of a stack layout that aligns its children on a baseline. This spec only works with - ASStackTextLayoutable children. + ASBaselineStackLayoutable children. If the spec is created with a horizontal direction, the children will be laid on a common baseline. If the spec is created with a vertical direction, a child's vertical spacing will be measured from its baseline instead of from the child's bounding box. */ -@interface ASStackTextLayoutSpec : ASLayoutSpec +@interface ASBaselineStackLayoutSpec : ASLayoutSpec /** @param style Specifies how children are laid out. @param children ASTextLayoutable children to be positioned. */ -+ (instancetype)newWithStyle:(ASStackTextLayoutSpecStyle)style children:(NSArray *)children; ++ (instancetype)newWithStyle:(ASBaselineStackLayoutSpecStyle)style children:(NSArray *)children; @end diff --git a/AsyncDisplayKit/Layout/ASStackTextLayoutSpec.mm b/AsyncDisplayKit/Layout/ASBaselineStackLayoutSpec.mm similarity index 71% rename from AsyncDisplayKit/Layout/ASStackTextLayoutSpec.mm rename to AsyncDisplayKit/Layout/ASBaselineStackLayoutSpec.mm index 67c6942696..52d6be3870 100644 --- a/AsyncDisplayKit/Layout/ASStackTextLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASBaselineStackLayoutSpec.mm @@ -8,7 +8,7 @@ * */ -#import "ASStackTextLayoutSpec.h" +#import "ASBaselineStackLayoutSpec.h" #import "ASStackLayoutable.h" #import @@ -21,13 +21,13 @@ #import "ASStackLayoutSpecUtilities.h" #import "ASStackPositionedLayout.h" #import "ASStackUnpositionedLayout.h" -#import "ASStackTextPositionedLayout.h" +#import "ASBaselineStackPositionedLayout.h" #import "ASThread.h" -@implementation ASStackTextLayoutSpec +@implementation ASBaselineStackLayoutSpec { - ASStackTextLayoutSpecStyle _textStyle; + ASBaselineStackLayoutSpecStyle _textStyle; std::vector> _stackChildren; ASDN::RecursiveMutex _propertyLock; } @@ -35,16 +35,16 @@ @synthesize ascender = _ascender; @synthesize descender = _descender; -+ (instancetype)newWithStyle:(ASStackTextLayoutSpecStyle)style children:(NSArray *)children ++ (instancetype)newWithStyle:(ASBaselineStackLayoutSpecStyle)style children:(NSArray *)children { - ASDisplayNodeAssert((style.stackLayoutStyle.direction == ASStackLayoutDirectionHorizontal && style.baselineAlignment != ASStackTextLayoutBaselineAlignmentNone) || style.stackLayoutStyle.direction == ASStackLayoutDirectionVertical, @"baselineAlignment is set to none. If you don't need baseline alignment please use ASStackLayoutSpec"); + ASDisplayNodeAssert((style.stackLayoutStyle.direction == ASStackLayoutDirectionHorizontal && style.baselineAlignment != ASBaselineStackLayoutBaselineAlignmentNone) || style.stackLayoutStyle.direction == ASStackLayoutDirectionVertical, @"baselineAlignment is set to none. If you don't need baseline alignment please use ASStackLayoutSpec"); - ASStackTextLayoutSpec *spec = [super new]; + ASBaselineStackLayoutSpec *spec = [super new]; if (spec) { spec->_textStyle = style; spec->_stackChildren = std::vector>(); - for (id child in children) { - ASDisplayNodeAssert([child conformsToProtocol:@protocol(ASStackTextLayoutable)], @"child must conform to ASStackLayoutable"); + for (id child in children) { + ASDisplayNodeAssert([child conformsToProtocol:@protocol(ASBaselineStackLayoutable)], @"child must conform to ASStackLayoutable"); spec->_stackChildren.push_back(child); } @@ -63,7 +63,7 @@ const auto unpositionedLayout = ASStackUnpositionedLayout::compute(_stackChildren, stackStyle, constrainedSize); const auto positionedLayout = ASStackPositionedLayout::compute(unpositionedLayout, stackStyle, constrainedSize); - const auto baselinePositionedLayout = ASStackTextPositionedLayout::compute(positionedLayout, _textStyle, constrainedSize); + const auto baselinePositionedLayout = ASBaselineStackPositionedLayout::compute(positionedLayout, _textStyle, constrainedSize); const CGSize finalSize = directionSize(stackStyle.direction, unpositionedLayout.stackDimensionSum, baselinePositionedLayout.crossSize); diff --git a/AsyncDisplayKit/Layout/ASBaselineStackLayoutable.h b/AsyncDisplayKit/Layout/ASBaselineStackLayoutable.h new file mode 100644 index 0000000000..e061641c79 --- /dev/null +++ b/AsyncDisplayKit/Layout/ASBaselineStackLayoutable.h @@ -0,0 +1,23 @@ +// +// ASBaselineStackLayoutable.h +// AsyncDisplayKit +// +// Created by Ricky Cancro on 8/21/15. +// Copyright (c) 2015 Facebook. All rights reserved. +// + +#import "ASStackLayoutable.h" + +@protocol ASBaselineStackLayoutable + +/** + * @abstract The distance from the top of the layoutable object to its baseline + */ +@property (nonatomic, readwrite) CGFloat ascender; + +/** + * @abstract The distance from the bottom of the layoutable object to its baseline + */ +@property (nonatomic, readwrite) CGFloat descender; + +@end diff --git a/AsyncDisplayKit/Layout/ASStackLayoutable.h b/AsyncDisplayKit/Layout/ASStackLayoutable.h index 057ca8b0fd..b23b4fbbdb 100644 --- a/AsyncDisplayKit/Layout/ASStackLayoutable.h +++ b/AsyncDisplayKit/Layout/ASStackLayoutable.h @@ -50,10 +50,3 @@ @property (nonatomic, readwrite) ASStackLayoutAlignSelf alignSelf; @end - -@protocol ASStackTextLayoutable - -@property (nonatomic, readwrite) CGFloat ascender; -@property (nonatomic, readwrite) CGFloat descender; - -@end diff --git a/AsyncDisplayKit/Private/ASStackTextPositionedLayout.h b/AsyncDisplayKit/Private/ASBaselineStackPositionedLayout.h similarity index 72% rename from AsyncDisplayKit/Private/ASStackTextPositionedLayout.h rename to AsyncDisplayKit/Private/ASBaselineStackPositionedLayout.h index 9794e9b807..877da2062f 100644 --- a/AsyncDisplayKit/Private/ASStackTextPositionedLayout.h +++ b/AsyncDisplayKit/Private/ASBaselineStackPositionedLayout.h @@ -10,17 +10,17 @@ #import "ASLayout.h" #import "ASDimension.h" -#import "ASStackTextLayoutSpec.h" +#import "ASBaselineStackLayoutSpec.h" #import "ASStackPositionedLayout.h" -struct ASStackTextPositionedLayout { +struct ASBaselineStackPositionedLayout { const std::vector sublayouts; const CGFloat crossSize; const CGFloat ascender; const CGFloat descender; /** Given a positioned layout, computes each child position using baseline alignment. */ - static ASStackTextPositionedLayout compute(const ASStackPositionedLayout &positionedLayout, - const ASStackTextLayoutSpecStyle &textStyle, + static ASBaselineStackPositionedLayout compute(const ASStackPositionedLayout &positionedLayout, + const ASBaselineStackLayoutSpecStyle &textStyle, const ASSizeRange &constrainedSize); }; diff --git a/AsyncDisplayKit/Private/ASStackTextPositionedLayout.mm b/AsyncDisplayKit/Private/ASBaselineStackPositionedLayout.mm similarity index 76% rename from AsyncDisplayKit/Private/ASStackTextPositionedLayout.mm rename to AsyncDisplayKit/Private/ASBaselineStackPositionedLayout.mm index f9429ee177..42ab80d339 100644 --- a/AsyncDisplayKit/Private/ASStackTextPositionedLayout.mm +++ b/AsyncDisplayKit/Private/ASBaselineStackPositionedLayout.mm @@ -8,39 +8,39 @@ * */ -#import "ASStackTextPositionedLayout.h" +#import "ASBaselineStackPositionedLayout.h" #import "ASLayoutSpecUtilities.h" #import "ASStackLayoutSpecUtilities.h" -static CGFloat baselineForItem(const ASStackTextLayoutSpecStyle &style, +static CGFloat baselineForItem(const ASBaselineStackLayoutSpecStyle &style, const ASLayout *layout) { - __weak id textChild = (id) layout.layoutableObject; + __weak id textChild = (id) layout.layoutableObject; switch (style.baselineAlignment) { - case ASStackTextLayoutBaselineAlignmentNone: + case ASBaselineStackLayoutBaselineAlignmentNone: return 0; - case ASStackTextLayoutBaselineAlignmentFirst: + case ASBaselineStackLayoutBaselineAlignmentFirst: return textChild.ascender; - case ASStackTextLayoutBaselineAlignmentLast: + case ASBaselineStackLayoutBaselineAlignmentLast: return layout.size.height + textChild.descender; } } -static CGFloat baselineOffset(const ASStackTextLayoutSpecStyle &style, +static CGFloat baselineOffset(const ASBaselineStackLayoutSpecStyle &style, const ASLayout *l, const CGFloat maxAscender, const CGFloat maxBaseline) { if (style.stackLayoutStyle.direction == ASStackLayoutDirectionHorizontal) { - __weak id textChild = (id)l.layoutableObject; + __weak id textChild = (id)l.layoutableObject; switch (style.baselineAlignment) { - case ASStackTextLayoutBaselineAlignmentFirst: + case ASBaselineStackLayoutBaselineAlignmentFirst: return maxAscender - textChild.ascender; - case ASStackTextLayoutBaselineAlignmentLast: + case ASBaselineStackLayoutBaselineAlignmentLast: return maxBaseline - baselineForItem(style, l); - case ASStackTextLayoutBaselineAlignmentNone: + case ASBaselineStackLayoutBaselineAlignmentNone: return 0; } } @@ -55,8 +55,8 @@ static CGFloat maxDimensionForLayout(const ASLayout *l, return maxDimension; } -ASStackTextPositionedLayout ASStackTextPositionedLayout::compute(const ASStackPositionedLayout &positionedLayout, - const ASStackTextLayoutSpecStyle &textStyle, +ASBaselineStackPositionedLayout ASBaselineStackPositionedLayout::compute(const ASStackPositionedLayout &positionedLayout, + const ASBaselineStackLayoutSpecStyle &textStyle, const ASSizeRange &constrainedSize) { ASStackLayoutSpecStyle stackStyle = textStyle.stackLayoutStyle; @@ -68,16 +68,16 @@ ASStackTextPositionedLayout ASStackTextPositionedLayout::compute(const ASStackPo }); const CGFloat maxBaseline = baselineIt == positionedLayout.sublayouts.end() ? 0 : baselineForItem(textStyle, *baselineIt); - // find the largest ascender for all children. This value will be used in offset computation as well as sent back to the ASStackTextLayoutSpec as its ascender. + // find the largest ascender for all children. This value will be used in offset computation as well as sent back to the ASBaselineStackLayoutSpec as its ascender. const auto ascenderIt = std::max_element(positionedLayout.sublayouts.begin(), positionedLayout.sublayouts.end(), [&](const ASLayout *a, const ASLayout *b){ - return ((id)a.layoutableObject).ascender < ((id)b.layoutableObject).ascender; + return ((id)a.layoutableObject).ascender < ((id)b.layoutableObject).ascender; }); - const CGFloat maxAscender = baselineIt == positionedLayout.sublayouts.end() ? 0 : ((id)(*ascenderIt).layoutableObject).ascender; + const CGFloat maxAscender = baselineIt == positionedLayout.sublayouts.end() ? 0 : ((id)(*ascenderIt).layoutableObject).ascender; CGPoint p = CGPointZero; BOOL first = YES; auto stackedChildren = AS::map(positionedLayout.sublayouts, [&](ASLayout *l) -> ASLayout *{ - __weak id textChild = (id) l.layoutableObject; + __weak id textChild = (id) l.layoutableObject; p = p + directionPoint(stackStyle.direction, textChild.spacingBefore, 0); if (first) { // if this is the first item use the previously computed start point @@ -108,11 +108,11 @@ ASStackTextPositionedLayout ASStackTextPositionedLayout::compute(const ASStackPo const auto maxCrossSize = crossDimension(stackStyle.direction, constrainedSize.max); const CGFloat crossSize = MIN(MAX(minCrossSize, largestChildCrossSize), maxCrossSize); - // find the child with the largest height. Use that child's descender as the descender to pass back to the ASStackTextLayoutSpec. + // find the child with the largest height. Use that child's descender as the descender to pass back to the ASBaselineStackLayoutSpec. const auto descenderIt = std::max_element(stackedChildren.begin(), stackedChildren.end(), [&](const ASLayout *a, const ASLayout *b){ return a.position.y + a.size.height < b.position.y + b.size.height; }); - const CGFloat minDescender = descenderIt == stackedChildren.end() ? 0 : ((id)(*descenderIt).layoutableObject).descender; + const CGFloat minDescender = descenderIt == stackedChildren.end() ? 0 : ((id)(*descenderIt).layoutableObject).descender; return {stackedChildren, crossSize, maxAscender, minDescender}; }