Revert color casting

facebook · Oct 6, 2023 · 97743ce · 97743ce
1 parent c8db188
commit 97743ce
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 23 deletions.
diff --git a/...ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/...ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
@@ -1276,8 +1276,8 @@ public void setBorderWidth(int position, float width) {
     mReactBackgroundManager.setBorderWidth(position, width);
   }
 
-  public void setBorderColor(int position, Integer color) {
-    mReactBackgroundManager.setBorderColor(position, color);
+  public void setBorderColor(int position, float color, float alpha) {
+    mReactBackgroundManager.setBorderColor(position, color, alpha);
   }
 
   public void setBorderRadius(float borderRadius) {

diff --git a/...droid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/...droid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java
@@ -292,7 +292,10 @@ public void setBorderWidth(ReactHorizontalScrollView view, int index, float widt
       },
       customType = "Color")
   public void setBorderColor(ReactHorizontalScrollView view, int index, Integer color) {
-    view.setBorderColor(SPACING_TYPES[index], color);
+    float rgbComponent =
+        color == null ? YogaConstants.UNDEFINED : (float) ((int) color & 0x00FFFFFF);
+    float alphaComponent = color == null ? YogaConstants.UNDEFINED : (float) ((int) color >>> 24);
+    view.setBorderColor(SPACING_TYPES[index], rgbComponent, alphaComponent);
   }
 
   @ReactProp(name = "overflow")

diff --git a/...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
@@ -1155,8 +1155,8 @@ public void setBorderWidth(int position, float width) {
     mReactBackgroundManager.setBorderWidth(position, width);
   }
 
-  public void setBorderColor(int position, Integer color) {
-    mReactBackgroundManager.setBorderColor(position, color);
+  public void setBorderColor(int position, float color, float alpha) {
+    mReactBackgroundManager.setBorderColor(position, color, alpha);
   }
 
   public void setBorderRadius(float borderRadius) {

diff --git a/...ve/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/...ve/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java
@@ -273,7 +273,9 @@ public void setBorderWidth(ReactScrollView view, int index, float width) {
       },
       customType = "Color")
   public void setBorderColor(ReactScrollView view, int index, Integer color) {
-    view.setBorderColor(SPACING_TYPES[index], color);
+    float rgbComponent = color == null ? YogaConstants.UNDEFINED : (float) (color & 0x00FFFFFF);
+    float alphaComponent = color == null ? YogaConstants.UNDEFINED : (float) (color >>> 24);
+    view.setBorderColor(SPACING_TYPES[index], rgbComponent, alphaComponent);
   }
 
   @ReactProp(name = "overflow")

diff --git a/.../ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java b/.../ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java
@@ -181,7 +181,10 @@ public void setBorderWidth(ReactTextView view, int index, float width) {
       },
       customType = "Color")
   public void setBorderColor(ReactTextView view, int index, Integer color) {
-    view.setBorderColor(SPACING_TYPES[index], color);
+    float rgbComponent =
+        color == null ? YogaConstants.UNDEFINED : (float) ((int) color & 0x00FFFFFF);
+    float alphaComponent = color == null ? YogaConstants.UNDEFINED : (float) ((int) color >>> 24);
+    view.setBorderColor(SPACING_TYPES[index], rgbComponent, alphaComponent);
   }
 
   @ReactProp(name = ViewProps.INCLUDE_FONT_PADDING, defaultBoolean = true)

diff --git a/.../react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/.../react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
@@ -629,8 +629,8 @@ public void setBorderWidth(int position, float width) {
     mReactBackgroundManager.setBorderWidth(position, width);
   }
 
-  public void setBorderColor(int position, Integer color) {
-    mReactBackgroundManager.setBorderColor(position, color);
+  public void setBorderColor(int position, float color, float alpha) {
+    mReactBackgroundManager.setBorderColor(position, color, alpha);
   }
 
   public void setBorderRadius(float borderRadius) {

diff --git a/...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/...t-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -1066,8 +1066,8 @@ public void setBorderWidth(int position, float width) {
     mReactBackgroundManager.setBorderWidth(position, width);
   }
 
-  public void setBorderColor(int position, Integer color) {
-    mReactBackgroundManager.setBorderColor(position, color);
+  public void setBorderColor(int position, float color, float alpha) {
+    mReactBackgroundManager.setBorderColor(position, color, alpha);
   }
 
   public int getBorderColor(int position) {

diff --git a/.../ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/.../ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -979,7 +979,10 @@ public void setBorderWidth(ReactEditText view, int index, float width) {
       },
       customType = "Color")
   public void setBorderColor(ReactEditText view, int index, Integer color) {
-    view.setBorderColor(SPACING_TYPES[index], color);
+    float rgbComponent =
+        color == null ? YogaConstants.UNDEFINED : (float) ((int) color & 0x00FFFFFF);
+    float alphaComponent = color == null ? YogaConstants.UNDEFINED : (float) ((int) color >>> 24);
+    view.setBorderColor(SPACING_TYPES[index], rgbComponent, alphaComponent);
   }
 
   @Override

diff --git a/...ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java b/...ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java
@@ -224,12 +224,9 @@ public void setBorderWidth(int position, float width) {
     }
   }
 
-  public void setBorderColor(int position, Integer color) {
-    float rgbComponent =
-        color == null ? YogaConstants.UNDEFINED : (float) ((int) color & 0x00FFFFFF);
-    float alphaComponent = color == null ? YogaConstants.UNDEFINED : (float) ((int) color >>> 24);
-    this.setBorderRGB(position, rgbComponent);
-    this.setBorderAlpha(position, alphaComponent);
+  public void setBorderColor(int position, float rgb, float alpha) {
+    this.setBorderRGB(position, rgb);
+    this.setBorderAlpha(position, alpha);
     mNeedUpdatePathForBorderRadius = true;
   }
 

diff --git a/.../ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java b/.../ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java
@@ -65,8 +65,8 @@ public void setBorderWidth(int position, float width) {
     getOrCreateReactViewBackground().setBorderWidth(position, width);
   }
 
-  public void setBorderColor(int position, Integer color) {
-    getOrCreateReactViewBackground().setBorderColor(position, color);
+  public void setBorderColor(int position, float color, float alpha) {
+    getOrCreateReactViewBackground().setBorderColor(position, color, alpha);
   }
 
   public int getBorderColor(int position) {

diff --git a/...react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/...react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
@@ -310,8 +310,8 @@ public void setBorderWidth(int position, float width) {
     getOrCreateReactViewBackground().setBorderWidth(position, width);
   }
 
-  public void setBorderColor(int position, Integer color) {
-    getOrCreateReactViewBackground().setBorderColor(position, color);
+  public void setBorderColor(int position, float rgb, float alpha) {
+    getOrCreateReactViewBackground().setBorderColor(position, rgb, alpha);
   }
 
   public void setBorderRadius(float borderRadius) {

diff --git a/...act-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/...act-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
@@ -253,7 +253,10 @@ public void setBorderWidth(ReactViewGroup view, int index, float width) {
       },
       customType = "Color")
   public void setBorderColor(ReactViewGroup view, int index, Integer color) {
-    view.setBorderColor(SPACING_TYPES[index], color);
+    float rgbComponent =
+        color == null ? YogaConstants.UNDEFINED : (float) ((int) color & 0x00FFFFFF);
+    float alphaComponent = color == null ? YogaConstants.UNDEFINED : (float) ((int) color >>> 24);
+    view.setBorderColor(SPACING_TYPES[index], rgbComponent, alphaComponent);
   }
 
   @ReactProp(name = ViewProps.COLLAPSABLE)