Support old and Fabric arch

zhongwuzw · Oct 17, 2023 · aadbf6f · aadbf6f
1 parent 4817a95
commit aadbf6f
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm b/packages/react-native/Libraries/Text/Text/RCTTextShadowView.mm
@@ -237,6 +237,23 @@ - (NSTextStorage *)textStorageAndLayoutManagerThatFitsSize:(CGSize)size exclusiv
                         maximumFontSize:self.textAttributes.effectiveFont.pointSize];
   }
 
+  [layoutManager ensureLayoutForTextContainer:textContainer];
+  NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
+  NSRange characterRange = [layoutManager characterRangeForGlyphRange:glyphRange actualGlyphRange:NULL];
+
+  [textStorage enumerateAttribute:NSBackgroundColorAttributeName
+                          inRange:characterRange
+                          options:0
+                       usingBlock:^(id _Nullable value, NSRange range, BOOL *_Nonnull stop) {
+                         NSRange truncatedRange =
+                             [layoutManager truncatedGlyphRangeInLineFragmentForGlyphAtIndex:range.location];
+
+                         // Remove background color if glyphs is truncated
+                         if (truncatedRange.location != NSNotFound && range.location >= truncatedRange.location) {
+                           [textStorage removeAttribute:NSBackgroundColorAttributeName range:range];
+                         }
+                       }];
+
   if (!exclusiveOwnership) {
     [_cachedTextStorages setObject:textStorage forKey:key];
   }

diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.cpp
@@ -32,12 +32,14 @@ TextMeasurement ParagraphLayoutManager::measure(
 
     return cachedTextMeasurement_;
   } else {
+    hostTextStorage_ = textLayoutManager_->getHostTextStorage(
+        attributedString, paragraphAttributes, layoutConstraints);
     return textLayoutManager_->measure(
         AttributedStringBox(attributedString),
         paragraphAttributes,
         layoutContext,
         layoutConstraints,
-        nullptr);
+        hostTextStorage_);
   }
 }
 

diff --git a/...r/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm b/...r/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm
@@ -320,6 +320,22 @@ - (TextMeasurement)_measureTextStorage:(NSTextStorage *)textStorage
                 attachments.push_back(TextMeasurement::Attachment{rect, false});
               }];
 
+  NSRange glyphRange = [layoutManager glyphRangeForTextContainer:textContainer];
+  NSRange characterRange = [layoutManager characterRangeForGlyphRange:glyphRange actualGlyphRange:NULL];
+
+  [textStorage enumerateAttribute:NSBackgroundColorAttributeName
+                          inRange:characterRange
+                          options:0
+                       usingBlock:^(id _Nullable value, NSRange range, BOOL *_Nonnull stop) {
+                         NSRange truncatedRange =
+                             [layoutManager truncatedGlyphRangeInLineFragmentForGlyphAtIndex:range.location];
+
+                         // Remove background color if glyphs is truncated
+                         if (truncatedRange.location != NSNotFound && range.location >= truncatedRange.location) {
+                           [textStorage removeAttribute:NSBackgroundColorAttributeName range:range];
+                         }
+                       }];
+
   return TextMeasurement{{size.width, size.height}, attachments};
 }