diff --git a/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.mm b/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.mm index c4506ad72d..8c4ff3d2b5 100644 --- a/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASAbsoluteLayoutSpec.mm @@ -100,19 +100,6 @@ @end - -#pragma mark - Debugging - -@implementation ASAbsoluteLayoutSpec (Debugging) - -- (NSString *)debugBoxString -{ - return [ASLayoutSpec asciiArtStringForChildren:self.children parentName:[self asciiArtName]]; -} - -@end - - #pragma mark - ASStaticLayoutSpec @implementation ASStaticLayoutSpec : ASAbsoluteLayoutSpec diff --git a/AsyncDisplayKit/Layout/ASLayoutSpec.mm b/AsyncDisplayKit/Layout/ASLayoutSpec.mm index 2b227bce28..a6be4feb2c 100644 --- a/AsyncDisplayKit/Layout/ASLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASLayoutSpec.mm @@ -345,7 +345,7 @@ ASEnvironmentLayoutExtensibilityForwarding - (NSString *)asciiArtString { - NSArray *children = self.child ? @[self.child] : self.children; + NSArray *children = self.children.count < 2 && self.child ? @[self.child] : self.children; return [ASLayoutSpec asciiArtStringForChildren:children parentName:[self asciiArtName]]; } diff --git a/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm b/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm index b38fe83a86..8084b22746 100644 --- a/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm +++ b/AsyncDisplayKit/Layout/ASOverlayLayoutSpec.mm @@ -74,14 +74,3 @@ static NSUInteger const kOverlayChildIndex = 1; } @end - -@implementation ASOverlayLayoutSpec (Debugging) - -#pragma mark - ASLayoutElementAsciiArtProtocol - -- (NSString *)debugBoxString -{ - return [ASLayoutSpec asciiArtStringForChildren:@[self.overlay, self.child] parentName:[self asciiArtName]]; -} - -@end diff --git a/AsyncDisplayKit/Private/ASLayoutTransition.h b/AsyncDisplayKit/Private/ASLayoutTransition.h index e6f37eab8a..db2e764790 100644 --- a/AsyncDisplayKit/Private/ASLayoutTransition.h +++ b/AsyncDisplayKit/Private/ASLayoutTransition.h @@ -50,12 +50,12 @@ NS_ASSUME_NONNULL_BEGIN previousLayout:(std::shared_ptr)previousLayout NS_DESIGNATED_INITIALIZER; /** - * Insert and remove subnodes that where added or removed between the previousLayout and the pendingLayout + * Insert and remove subnodes that were added or removed between the previousLayout and the pendingLayout */ - (void)commitTransition; /** - * Insert all new subnodes that where added between the previous layout and the pending layout + * Insert all new subnodes that were added between the previous layout and the pending layout */ - (void)applySubnodeInsertions;