diff --git a/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.mm b/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.mm index e060aab0c8..00201a79b9 100644 --- a/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASBackgroundLayoutSpec.mm @@ -14,7 +14,8 @@ #import "ASBaseDefines.h" #import "ASLayout.h" -static NSString * const kBackgroundChildKey = @"kBackgroundChildKey"; +static NSUInteger const kForegroundChildIndex = 0; +static NSUInteger const kBackgroundChildIndex = 1; @interface ASBackgroundLayoutSpec () @end @@ -28,7 +29,7 @@ static NSString * const kBackgroundChildKey = @"kBackgroundChildKey"; } ASDisplayNodeAssertNotNil(child, @"Child cannot be nil"); - [self setChild:child]; + [self setChild:child forIndex:kForegroundChildIndex]; self.background = background; return self; } @@ -63,12 +64,12 @@ static NSString * const kBackgroundChildKey = @"kBackgroundChildKey"; - (void)setBackground:(id)background { - [super setChild:background forIdentifier:kBackgroundChildKey]; + [super setChild:background forIndex:kBackgroundChildIndex]; } - (id)background { - return [super childForIdentifier:kBackgroundChildKey]; + return [super childForIndex:kBackgroundChildIndex]; } @end diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.h b/AsyncDisplayKit/Layout/ASLayoutSpec.h index 32e2d43779..7d7e4bc5d4 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec.h +++ b/AsyncDisplayKit/Layout/ASLayoutSpec.h @@ -52,19 +52,19 @@ NS_ASSUME_NONNULL_BEGIN * * @param child A child to be added. * - * @param identifier An identifier associated with the child. + * @param index An index associated with the child. * * @discussion Every ASLayoutSpec must act on at least one child. The ASLayoutSpec base class takes the * responsibility of holding on to the spec children. Some layout specs, like ASInsetLayoutSpec, * only require a single child. * * For layout specs that require a known number of children (ASBackgroundLayoutSpec, for example) - * a subclass should use the setChild method to set the "primary" child. It can then use this method + * a subclass can use the setChild method to set the "primary" child. It should then use this method * to set any other required children. Ideally a subclass would hide this from the user, and use the - * setChild:forIdentifier: internally. For example, ASBackgroundLayoutSpec exposes a backgroundChild - * property that behind the scenes is calling setChild:forIdentifier:. + * setChild:forIndex: internally. For example, ASBackgroundLayoutSpec exposes a backgroundChild + * property that behind the scenes is calling setChild:forIndex:. */ -- (void)setChild:(id)child forIdentifier:(NSString *)identifier; +- (void)setChild:(id)child forIndex:(NSUInteger)index; /** * Adds childen to this layout spec. @@ -94,11 +94,11 @@ NS_ASSUME_NONNULL_BEGIN - (nullable id)child; /** - * Returns the child added to this layout spec using the given identifier. + * Returns the child added to this layout spec using the given index. * - * @param identifier An identifier associated withe the child. + * @param index An identifier associated withe the child. */ -- (nullable id)childForIdentifier:(NSString *)identifier; +- (nullable id)childForIndex:(NSUInteger)index; /** * Returns all children added to this layout spec. diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.mm b/AsyncDisplayKit/Layout/ASLayoutSpec.mm index e7eb57bae0..db522daa4f 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASLayoutSpec.mm @@ -25,9 +25,7 @@ @interface ASLayoutSpec() { ASEnvironmentState _environmentState; ASDN::RecursiveMutex _propertyLock; - - NSArray *_children; - NSMutableDictionary *_childrenWithIdentifier; + std::vector> _children; } @end @@ -45,7 +43,6 @@ } _isMutable = YES; _environmentState = ASEnvironmentStateMakeDefault(); - _children = [NSArray array]; return self; } @@ -102,14 +99,6 @@ return child; } -- (NSMutableDictionary *)childrenWithIdentifier -{ - if (!_childrenWithIdentifier) { - _childrenWithIdentifier = [NSMutableDictionary dictionary]; - } - return _childrenWithIdentifier; -} - - (void)setParent:(id)parent { // FIXME: Locking should be evaluated here. _parent is not widely used yet, though. @@ -126,34 +115,29 @@ if (child) { id finalLayoutable = [self layoutableToAddFromLayoutable:child]; if (finalLayoutable) { - _children = @[finalLayoutable]; + _children.insert(_children.begin(), finalLayoutable); [self propagateUpLayoutable:finalLayoutable]; } - } else { - // remove the only child - _children = [NSArray array]; + } else if (_children.size() > 0) { + _children.erase(_children.begin()); } } -- (void)setChild:(id)child forIdentifier:(NSString *)identifier +- (void)setChild:(id)child forIndex:(NSUInteger)index { ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable"); if (child) { id finalLayoutable = [self layoutableToAddFromLayoutable:child]; - self.childrenWithIdentifier[identifier] = finalLayoutable; - if (finalLayoutable) { - _children = [_children arrayByAddingObject:finalLayoutable]; + if (index > _children.size()) { + _children.insert(_children.end(), finalLayoutable); + } else { + _children.insert(_children.begin() + index, finalLayoutable); } } else { - id oldChild = self.childrenWithIdentifier[identifier]; - if (oldChild) { - self.childrenWithIdentifier[identifier] = nil; - NSMutableArray *mutableChildren = [_children mutableCopy]; - [mutableChildren removeObject:oldChild]; - _children = [mutableChildren copy]; + if (_children.begin() + index < _children.end()) { + _children.erase(_children.begin() + index); } } - // TODO: Should we propagate up the layoutable at it could happen that multiple children will propagated up their // layout options and one child will overwrite values from another child // [self propagateUpLayoutable:finalLayoutable]; @@ -163,32 +147,31 @@ { ASDisplayNodeAssert(self.isMutable, @"Cannot set properties when layout spec is not mutable"); - std::vector> finalChildren; + _children.clear(); for (id child in children) { - finalChildren.push_back([self layoutableToAddFromLayoutable:child]); - } - - _children = nil; - if (finalChildren.size() > 0) { - _children = [NSArray arrayWithObjects:&finalChildren[0] count:finalChildren.size()]; - } else { - _children = [NSArray array]; + _children.push_back([self layoutableToAddFromLayoutable:child]); } } -- (id)childForIdentifier:(NSString *)identifier +- (id)childForIndex:(NSUInteger)index { - return self.childrenWithIdentifier[identifier]; + if (index < _children.size()) { + return _children[index]; + } + return nil; } - (id)child { - return [_children firstObject]; + if (_children.size() > 0) { + return _children[0]; + } + return nil; } - (NSArray *)children { - return _children; + return [NSArray arrayWithObjects:&_children[0] count:_children.size()]; } #pragma mark - ASEnvironment diff --git a/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm b/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm index 35a686db3b..669a5ad9eb 100644 --- a/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm @@ -14,7 +14,8 @@ #import "ASBaseDefines.h" #import "ASLayout.h" -static NSString * const kOverlayChildKey = @"kOverlayChildKey"; +static NSUInteger const kUnderlayChildIndex = 0; +static NSUInteger const kOverlayChildIndex = 1; @implementation ASOverlayLayoutSpec @@ -25,7 +26,7 @@ static NSString * const kOverlayChildKey = @"kOverlayChildKey"; } ASDisplayNodeAssertNotNil(child, @"Child that will be overlayed on shouldn't be nil"); self.overlay = overlay; - [self setChild:child]; + [self setChild:child forIndex:kUnderlayChildIndex]; return self; } @@ -36,12 +37,12 @@ static NSString * const kOverlayChildKey = @"kOverlayChildKey"; - (void)setOverlay:(id)overlay { - [super setChild:overlay forIdentifier:kOverlayChildKey]; + [super setChild:overlay forIndex:kOverlayChildIndex]; } - (id)overlay { - return [super childForIdentifier:kOverlayChildKey]; + return [super childForIndex:kOverlayChildIndex]; } /**