From b2843d29c4859fea3ce3e0b807e2f01e23d51b6c Mon Sep 17 00:00:00 2001 From: Levi McCallum Date: Thu, 28 Jan 2016 23:54:05 -0800 Subject: [PATCH] Allow any node to be identified in the flattened predicate search --- AsyncDisplayKit/ASDisplayNode.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index 5caf4f49b9..1983befffa 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -1606,7 +1606,8 @@ static BOOL ShouldUseNewRenderingRange = YES; layout = [ASLayout layoutWithLayoutableObject:self size:layout.size sublayouts:@[layout]]; } return [layout flattenedLayoutUsingPredicateBlock:^BOOL(ASLayout *evaluatedLayout) { - return [_subnodes containsObject:evaluatedLayout.layoutableObject]; + return ASObjectIsEqual(layout, evaluatedLayout) == NO && + [evaluatedLayout.layoutableObject isKindOfClass:[ASDisplayNode class]]; }]; } else { // If neither -layoutSpecThatFits: nor -calculateSizeThatFits: is overridden by subclassses, preferredFrameSize should be used,