Skip to content

Avoid copying text fragments and re-attributing runs when building NSAttributedString #59154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hryhoriiK97 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid copying text fragments and re-attributing runs when building NSAttributedString #59154

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions ...textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,8 @@ void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)

static NSMutableAttributedString *RCTNSAttributedStringFragmentFromFragment(
const AttributedString::Fragment &fragment,
UIImage *placeholderImage)
UIImage *placeholderImage,
NSData *_Nullable eventEmitterWrapper)
{
if (fragment.isAttachment()) {
auto layoutMetrics = fragment.parentShadowView.layoutMetrics;
Expand All @@ -427,21 +428,28 @@ void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
string = RCTNSStringFromStringApplyingTextTransform(string, textTransform);
}

return [[NSMutableAttributedString alloc]
initWithString:string
attributes:RCTNSTextAttributesFromTextAttributes(fragment.textAttributes)];
// Set with the initial attributes; adding it afterwards would re-split the runs.
NSMutableDictionary<NSAttributedStringKey, id> *attributes =
RCTNSTextAttributesFromTextAttributes(fragment.textAttributes);
if (eventEmitterWrapper != nil) {
attributes[RCTAttributedStringEventEmitterKey] = eventEmitterWrapper;
}

return [[NSMutableAttributedString alloc] initWithString:string attributes:attributes];
}
}

static NSMutableAttributedString *RCTNSAttributedStringFragmentWithAttributesFromFragment(
const AttributedString::Fragment &fragment,
UIImage *placeholderImage)
{
auto nsAttributedStringFragment = RCTNSAttributedStringFragmentFromFragment(fragment, placeholderImage);
NSData *eventEmitterWrapper =
fragment.parentShadowView.componentHandle ? RCTWrapEventEmitter(fragment.parentShadowView.eventEmitter) : nil;

if (fragment.parentShadowView.componentHandle) {
auto eventEmitterWrapper = RCTWrapEventEmitter(fragment.parentShadowView.eventEmitter);
auto nsAttributedStringFragment =
RCTNSAttributedStringFragmentFromFragment(fragment, placeholderImage, eventEmitterWrapper);

if (fragment.isAttachment() && eventEmitterWrapper != nil) {
NSDictionary<NSAttributedStringKey, id> *additionalTextAttributes =
@{RCTAttributedStringEventEmitterKey : eventEmitterWrapper};

Expand All @@ -464,7 +472,7 @@ void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)

[nsAttributedString beginEditing];

for (auto fragment : attributedString.getFragments()) {
for (const auto &fragment : attributedString.getFragments()) {
NSMutableAttributedString *nsAttributedStringFragment =
RCTNSAttributedStringFragmentWithAttributesFromFragment(fragment, placeholderImage);

Expand Down
Loading