Update port of component text kit

AsyncDisplayKit/TextKit/ASTextKitRenderer+Positioning.mm

@@ -27,9 +27,8 @@ - (NSArray *)rectsForTextRange:(NSRange)textRange
 {
   __block NSArray *textRects = @[];
   [self.context performBlockWithLockedTextKitComponents:^(NSLayoutManager *layoutManager, NSTextStorage *textStorage, NSTextContainer *textContainer) {
-    BOOL textRangeIsValid = (NSMaxRange(textRange) <= [textStorage length]);
-    ASDisplayNodeCAssertTrue(textRangeIsValid);
-    if (!textRangeIsValid) {
+    NSRange clampedRange = NSIntersectionRange(textRange, NSMakeRange(0, [textStorage length]));
+    if (clampedRange.location == NSNotFound || clampedRange.length == 0) {
       return;
     }
 
@@ -41,7 +40,7 @@ - (NSArray *)rectsForTextRange:(NSRange)textRange
 
     NSString *string = textStorage.string;
 
-    NSRange totalGlyphRange = [layoutManager glyphRangeForCharacterRange:textRange actualCharacterRange:NULL];
+    NSRange totalGlyphRange = [layoutManager glyphRangeForCharacterRange:clampedRange actualCharacterRange:NULL];
 
     [layoutManager enumerateLineFragmentsForGlyphRange:totalGlyphRange usingBlock:^(CGRect rect,
                                                                                     CGRect usedRect,

AsyncDisplayKit/TextKit/ASTextKitRenderer+TextChecking.mm

@@ -72,11 +72,12 @@ - (NSTextCheckingResult *)textCheckingResultAtPoint:(CGPoint)point
 
   if (truncationTokenRange.location == NSNotFound) {
     // The truncation string didn't specify a substring which should be highlighted, so we just highlight it all
-    truncationTokenRange = { 0, self.attributes.truncationAttributedString.length };
+    truncationTokenRange = { 0, truncationAttributedString.length };
   }
 
   truncationTokenRange.location += NSMaxRange(visibleRange);
-
+
+  __block CGFloat minDistance = CGFLOAT_MAX;
   [self enumerateTextIndexesAtPosition:point usingBlock:^(NSUInteger index, CGRect glyphBoundingRect, BOOL *stop){
     if (index >= truncationTokenRange.location) {
       result = [[ASTextKitTextCheckingResult alloc] initWithType:ASTextKitTextCheckingTypeTruncation
@@ -86,15 +87,14 @@ - (NSTextCheckingResult *)textCheckingResultAtPoint:(CGPoint)point
       NSRange range;
       NSDictionary *attributes = [attributedString attributesAtIndex:index effectiveRange:&range];
       ASTextKitEntityAttribute *entityAttribute = attributes[ASTextKitEntityAttributeName];
-      if (entityAttribute) {
+      CGFloat distance = hypot(CGRectGetMidX(glyphBoundingRect) - point.x, CGRectGetMidY(glyphBoundingRect) - point.y);
+      if (entityAttribute && distance < minDistance) {
         result = [[ASTextKitTextCheckingResult alloc] initWithType:ASTextKitTextCheckingTypeEntity
                                                    entityAttribute:entityAttribute
                                                              range:range];
+        minDistance = distance;
       }
     }
-    if (result != nil) {
-      *stop = YES;
-    }
   }];
   return result;
 }

AsyncDisplayKitTests/ASTextKitTests.mm

@@ -11,8 +11,10 @@
 
 #import <FBSnapshotTestCase/FBSnapshotTestController.h>
 
+#import "ASTextKitEntityAttribute.h"
 #import "ASTextKitAttributes.h"
 #import "ASTextKitRenderer.h"
+#import "ASTextKitRenderer+Positioning.h"
 
 @interface ASTextKitTests : XCTestCase
 
@@ -133,4 +135,20 @@ - (void)testStringsWithVariableAttributes
   XCTAssert(checkAttributes(attributes, { 100, 100 }));
 }
 
+- (void)testRectsForRangeBeyondTruncationSizeReturnsNonZeroNumberOfRects
+{
+  NSAttributedString *attributedString =
+  [[NSAttributedString alloc]
+   initWithString:@"90's cray photo booth tote bag bespoke Carles. Plaid wayfarers Odd Future master cleanse tattooed four dollar toast small batch kale chips leggings meh photo booth occupy irony.  " attributes:@{ASTextKitEntityAttributeName : [[ASTextKitEntityAttribute alloc] initWithEntity:@"entity"]}];
+  ASTextKitRenderer *renderer =
+  [[ASTextKitRenderer alloc]
+   initWithTextKitAttributes:{
+     .attributedString = attributedString,
+     .maximumNumberOfLines = 1,
+     .truncationAttributedString = [[NSAttributedString alloc] initWithString:@"... Continue Reading"]
+   }
+   constrainedSize:{ 100, 100 }];
+  XCTAssert([renderer rectsForTextRange:NSMakeRange(0, attributedString.length) measureOption:ASTextKitRendererMeasureOptionBlock].count > 0);
+}
+
 @end