From df730d6771d07b663ea4a2ef63f0a5a8088fb2d3 Mon Sep 17 00:00:00 2001 From: Sal Date: Thu, 13 Aug 2015 13:53:08 -0400 Subject: [PATCH] Return CGSizeZero if ASTextNode's text length or attributed string is nil --- AsyncDisplayKit/Details/ASTextNodeRenderer.mm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/AsyncDisplayKit/Details/ASTextNodeRenderer.mm b/AsyncDisplayKit/Details/ASTextNodeRenderer.mm index b17ae283..af28bf17 100644 --- a/AsyncDisplayKit/Details/ASTextNodeRenderer.mm +++ b/AsyncDisplayKit/Details/ASTextNodeRenderer.mm @@ -173,9 +173,13 @@ static const CGFloat ASTextNodeRendererTextCapHeightPadding = 1.3; { ASDN::MutexLocker l(_textKitLock); + if (_attributedString.string.length == 0) { + _calculatedSize = CGSizeZero; + return; + } + [self _initializeTextKitComponentsIfNeeded]; - // Force glyph generation and layout, which may not have happened yet (and // isn't triggered by -usedRectForTextContainer:). [_layoutManager ensureLayoutForTextContainer:_textContainer];