From eb3ff1a73979730a53a352715145ffed24290f01 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Thu, 22 Jun 2017 17:51:22 +0100 Subject: [PATCH 1/2] Gate orphaned node detector behind YOGA flag --- Source/ASDisplayNode+Layout.mm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Source/ASDisplayNode+Layout.mm b/Source/ASDisplayNode+Layout.mm index 9c3aac271..8006b13ff 100644 --- a/Source/ASDisplayNode+Layout.mm +++ b/Source/ASDisplayNode+Layout.mm @@ -864,7 +864,11 @@ - (void)_assertSubnodeState - (void)_pendingLayoutTransitionDidComplete { + // This assertion introduces a breaking behavior for nodes that has ASM enabled but also manually manage some subnodes. + // Let's gate it behind YOGA flag and remove it right after a branch cut. +#if YOGA [self _assertSubnodeState]; +#endif // Subclass hook [self calculatedLayoutDidChange]; From 2723c85426521622a333828d9107aeeaa72ffec5 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Thu, 22 Jun 2017 18:32:21 +0100 Subject: [PATCH 2/2] Tiny indentation change --- Source/ASDisplayNode+Layout.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/ASDisplayNode+Layout.mm b/Source/ASDisplayNode+Layout.mm index 8006b13ff..1506c7824 100644 --- a/Source/ASDisplayNode+Layout.mm +++ b/Source/ASDisplayNode+Layout.mm @@ -143,7 +143,7 @@ - (NSString *)asciiArtName { NSString *string = NSStringFromClass([self class]); if (_debugName) { - string = [string stringByAppendingString:[NSString stringWithFormat:@"\"%@\"",_debugName]]; + string = [string stringByAppendingString:[NSString stringWithFormat:@"\"%@\"", _debugName]]; } return string; }