update foreground and background color spans

ryanlntn · Feb 1, 2024 · 6344460 · 6344460
1 parent 366001c
commit 6344460
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/...ve/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBackgroundColorSpan.java b/...ve/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBackgroundColorSpan.java
@@ -7,6 +7,7 @@
 
 package com.facebook.react.views.text;
 
+import android.graphics.Color;
 import android.text.style.BackgroundColorSpan;
 
 /*
@@ -16,4 +17,8 @@ public class ReactBackgroundColorSpan extends BackgroundColorSpan implements Rea
   public ReactBackgroundColorSpan(int color) {
     super(color);
   }
+
+  public ReactBackgroundColorSpan(long color) {
+    super(Color.toArgb(color));
+  }
 }
diff --git a/...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java b/...ive/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactBaseTextShadowNode.java
@@ -303,7 +303,7 @@ protected Spannable spannedFromShadowNode(
   protected boolean mIsColorSet = false;
   protected long mColor;
   protected boolean mIsBackgroundColorSet = false;
-  protected int mBackgroundColor;
+  protected long mBackgroundColor;
 
   protected @Nullable AccessibilityRole mAccessibilityRole = null;
   protected @Nullable Role mRole = null;
@@ -471,7 +471,7 @@ public void setBackgroundColor(@Nullable Long color) {
     if (isVirtual()) {
       mIsBackgroundColorSet = (color != null);
       if (mIsBackgroundColorSet) {
-        mBackgroundColor = Color.toArgb(color);
+        mBackgroundColor = color;
       }
       markUpdated();
     }

diff --git a/...ve/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactForegroundColorSpan.java b/...ve/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactForegroundColorSpan.java
@@ -7,12 +7,10 @@
 
 package com.facebook.react.views.text;
 
-import androidx.annotation.NonNull;
 import android.graphics.Color;
-import android.os.Parcel;
 import android.text.style.ForegroundColorSpan;
 import android.text.TextPaint;
-import com.facebook.common.logging.FLog;
+import androidx.annotation.NonNull;
 
 /*
  * Wraps {@link ForegroundColorSpan} as a {@link ReactSpan}.

diff --git a/...t-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java b/...t-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java
@@ -83,7 +83,7 @@ public class TextAttributeProps {
   protected boolean mAllowFontScaling = true;
   protected long mColor;
   protected boolean mIsBackgroundColorSet = false;
-  protected int mBackgroundColor;
+  protected long mBackgroundColor;
 
   protected int mNumberOfLines = UNSET;
   protected int mFontSize = UNSET;
@@ -428,7 +428,7 @@ private void setBackgroundColor(Long color) {
     // if (!isVirtualAnchor()) {
     mIsBackgroundColorSet = (color != null);
     if (mIsBackgroundColorSet) {
-      mBackgroundColor = Color.valueOf(color).toArgb();
+      mBackgroundColor = color;
     }
     // }
   }