Minimize EditText Spans 3/9: ReactBackgroundColorSpan (#36547)

Summary: Pull Request resolved: #36547 This is part of a series of changes to minimize the number of spans committed to EditText, as a mitigation for platform issues on Samsung devices. See this [GitHub thread]( #35936 (comment)) for greater context on the platform behavior. This adds `ReactBackgroundColorSpan` to the list of spans eligible to be stripped. Changelog: [Android][Fixed] - Minimize Spans 3/N: ReactBackgroundColorSpan Reviewed By: javache Differential Revision: D44240782 fbshipit-source-id: 2ded1a1687a41cf6d5f83e89ffadd2d932089969

Author: NickGerleman

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

@@ -11,6 +11,7 @@
 import static com.facebook.react.views.text.TextAttributeProps.UNSET;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
@@ -50,6 +51,7 @@
 import com.facebook.react.views.text.CustomLineHeightSpan;
 import com.facebook.react.views.text.CustomStyleSpan;
 import com.facebook.react.views.text.ReactAbsoluteSizeSpan;
+import com.facebook.react.views.text.ReactBackgroundColorSpan;
 import com.facebook.react.views.text.ReactSpan;
 import com.facebook.react.views.text.ReactTextUpdate;
 import com.facebook.react.views.text.ReactTypefaceUtils;
@@ -645,6 +647,16 @@ public boolean test(ReactAbsoluteSizeSpan span) {
  return span.getSize() == mTextAttributes.getEffectiveFontSize();
  }
  });
+
+ stripSpansOfKind(
+ sb,
+ ReactBackgroundColorSpan.class,
+ new SpanPredicate<ReactBackgroundColorSpan>() {
+ @Override
+ public boolean test(ReactBackgroundColorSpan span) {
+ return span.getBackgroundColor() == mReactBackgroundManager.getBackgroundColor();
+ }
+ });
  }
 
  private <T> void stripSpansOfKind(
@@ -669,11 +681,17 @@ private void restoreStyleEquivalentSpans(SpannableStringBuilder workingText) {
  // (least precedence). This ensures the span is behind any overlapping spans.
  spanFlags |= Spannable.SPAN_PRIORITY;
 
- workingText.setSpan(
- new ReactAbsoluteSizeSpan(mTextAttributes.getEffectiveFontSize()),
- 0,
- workingText.length(),
- spanFlags);
+ List<Object> spans = new ArrayList<>();
+ spans.add(new ReactAbsoluteSizeSpan(mTextAttributes.getEffectiveFontSize()));
+
+ int backgroundColor = mReactBackgroundManager.getBackgroundColor();
+ if (backgroundColor != Color.TRANSPARENT) {
+ spans.add(new ReactBackgroundColorSpan(backgroundColor));
+ }
+
+ for (Object span : spans) {
+ workingText.setSpan(span, 0, workingText.length(), spanFlags);
+ }
  }
 
  private static boolean sameTextForSpan(

ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java

@@ -19,6 +19,7 @@ public class ReactViewBackgroundManager {
 
  private @Nullable ReactViewBackgroundDrawable mReactBackgroundDrawable;
  private View mView;
+ private int mColor = Color.TRANSPARENT;
 
  public ReactViewBackgroundManager(View view) {
  this.mView = view;
@@ -50,6 +51,10 @@ public void setBackgroundColor(int color) {
  }
  }
 
+ public int getBackgroundColor() {
+ return mColor;
+ }
+
  public void setBorderWidth(int position, float width) {
  getOrCreateReactViewBackground().setBorderWidth(position, width);
  }