Skip to content

Commit be69c8b

Browse files
NickGerlemanfacebook-github-bot
authored andcommitted
Mitigation for Samsung TextInput Hangs (#35967)
Summary: Pull Request resolved: #35967 In #35936 we observed that the presence of AbsoluteSizeSpan may lead to hangs when using the Grammarly keyboard on Samsung. This mitigation makes it so that we do not emit this span in any case where it is sufficient to rely on already set EditText textSize. In simple cases, tested on two devices, it causes typing into the TextInput to no longer hang. This does not fully resolve the issue for TextInputs which meaningfully use layout-effecting spans (or at least font size), such as non-uniform text size within the input. We instead just try to reduce to minimum AbsoluteSizeSpan possible. Testing the first commit was able to resolve hangs in some simpler inputs tested, by me and cortinico. Changelog: [Android][Fixed] - Mitigation for Samsung TextInput Hangs Reviewed By: cortinico Differential Revision: D42721684 fbshipit-source-id: e0388dfb4617f0217bc1d0b71752c733e10261dd
1 parent a8166bd commit be69c8b

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

+25
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,10 @@ public void maybeSetText(ReactTextUpdate reactTextUpdate) {
585585
new SpannableStringBuilder(reactTextUpdate.getText());
586586

587587
manageSpans(spannableStringBuilder, reactTextUpdate.mContainsMultipleFragments);
588+
589+
// Mitigation for https://github.com/facebook/react-native/issues/35936 (S318090)
590+
stripAbsoluteSizeSpans(spannableStringBuilder);
591+
588592
mContainsImages = reactTextUpdate.containsImages();
589593

590594
// When we update text, we trigger onChangeText code that will
@@ -658,6 +662,27 @@ private void manageSpans(
658662
}
659663
}
660664

665+
private void stripAbsoluteSizeSpans(SpannableStringBuilder sb) {
666+
// We have already set a font size on the EditText itself. We can safely remove sizing spans
667+
// which are the same as the set font size, and not otherwise overlapped.
668+
final int effectiveFontSize = mTextAttributes.getEffectiveFontSize();
669+
ReactAbsoluteSizeSpan[] spans = sb.getSpans(0, sb.length(), ReactAbsoluteSizeSpan.class);
670+
671+
outerLoop:
672+
for (ReactAbsoluteSizeSpan span : spans) {
673+
ReactAbsoluteSizeSpan[] overlappingSpans =
674+
sb.getSpans(sb.getSpanStart(span), sb.getSpanEnd(span), ReactAbsoluteSizeSpan.class);
675+
676+
for (ReactAbsoluteSizeSpan overlappingSpan : overlappingSpans) {
677+
if (span.getSize() != effectiveFontSize) {
678+
continue outerLoop;
679+
}
680+
}
681+
682+
sb.removeSpan(span);
683+
}
684+
}
685+
661686
private static boolean sameTextForSpan(
662687
final Editable oldText,
663688
final SpannableStringBuilder newText,

0 commit comments

Comments
 (0)