Revert color casting

axinvd · axinvd · commit 97743ce79a5e · 2023-10-06T12:55:05.000+03:00
diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/packages/react-native/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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollViewManager.java b/packages/react-native/ReactAndroid/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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/packages/react-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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewManager.java b/packages/react-native/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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java b/packages/react-native/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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/packages/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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/packages/react-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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/packages/react-native/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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundDrawable.java b/packages/react-native/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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewBackgroundManager.java b/packages/react-native/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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/packages/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/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/packages/react-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)

Original file line number	Diff line number	Diff line change
`@@ -1276,8 +1276,8 @@ public void setBorderWidth(int position, float width) {`
`1276`	`1276`	`mReactBackgroundManager.setBorderWidth(position, width);`
`1277`	`1277`	`}`
`1278`	`1278`
`1279`		`- public void setBorderColor(int position, Integer color) {`
`1280`		`- mReactBackgroundManager.setBorderColor(position, color);`
	`1279`	`+ public void setBorderColor(int position, float color, float alpha) {`
	`1280`	`+ mReactBackgroundManager.setBorderColor(position, color, alpha);`
`1281`	`1281`	`}`
`1282`	`1282`
`1283`	`1283`	`public void setBorderRadius(float borderRadius) {`
Original file line number	Diff line number	Diff line change
`@@ -1155,8 +1155,8 @@ public void setBorderWidth(int position, float width) {`
`1155`	`1155`	`mReactBackgroundManager.setBorderWidth(position, width);`
`1156`	`1156`	`}`
`1157`	`1157`
`1158`		`- public void setBorderColor(int position, Integer color) {`
`1159`		`- mReactBackgroundManager.setBorderColor(position, color);`
	`1158`	`+ public void setBorderColor(int position, float color, float alpha) {`
	`1159`	`+ mReactBackgroundManager.setBorderColor(position, color, alpha);`
`1160`	`1160`	`}`
`1161`	`1161`
`1162`	`1162`	`public void setBorderRadius(float borderRadius) {`
Original file line number	Diff line number	Diff line change
`@@ -629,8 +629,8 @@ public void setBorderWidth(int position, float width) {`
`629`	`629`	`mReactBackgroundManager.setBorderWidth(position, width);`
`630`	`630`	`}`
`631`	`631`
`632`		`- public void setBorderColor(int position, Integer color) {`
`633`		`- mReactBackgroundManager.setBorderColor(position, color);`
	`632`	`+ public void setBorderColor(int position, float color, float alpha) {`
	`633`	`+ mReactBackgroundManager.setBorderColor(position, color, alpha);`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`public void setBorderRadius(float borderRadius) {`
Original file line number	Diff line number	Diff line change
`@@ -1066,8 +1066,8 @@ public void setBorderWidth(int position, float width) {`
`1066`	`1066`	`mReactBackgroundManager.setBorderWidth(position, width);`
`1067`	`1067`	`}`
`1068`	`1068`
`1069`		`- public void setBorderColor(int position, Integer color) {`
`1070`		`- mReactBackgroundManager.setBorderColor(position, color);`
	`1069`	`+ public void setBorderColor(int position, float color, float alpha) {`
	`1070`	`+ mReactBackgroundManager.setBorderColor(position, color, alpha);`
`1071`	`1071`	`}`
`1072`	`1072`
`1073`	`1073`	`public int getBorderColor(int position) {`
Original file line number	Diff line number	Diff line change
`@@ -224,12 +224,9 @@ public void setBorderWidth(int position, float width) {`
`224`	`224`	`}`
`225`	`225`	`}`
`226`	`226`
`227`		`- public void setBorderColor(int position, Integer color) {`
`228`		`- float rgbComponent =`
`229`		`- color == null ? YogaConstants.UNDEFINED : (float) ((int) color & 0x00FFFFFF);`
`230`		`- float alphaComponent = color == null ? YogaConstants.UNDEFINED : (float) ((int) color >>> 24);`
`231`		`- this.setBorderRGB(position, rgbComponent);`
`232`		`- this.setBorderAlpha(position, alphaComponent);`
	`227`	`+ public void setBorderColor(int position, float rgb, float alpha) {`
	`228`	`+ this.setBorderRGB(position, rgb);`
	`229`	`+ this.setBorderAlpha(position, alpha);`
`233`	`230`	`mNeedUpdatePathForBorderRadius = true;`
`234`	`231`	`}`
`235`	`232`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,8 @@ public void setBorderWidth(int position, float width) {`
`65`	`65`	`getOrCreateReactViewBackground().setBorderWidth(position, width);`
`66`	`66`	`}`
`67`	`67`
`68`		`- public void setBorderColor(int position, Integer color) {`
`69`		`- getOrCreateReactViewBackground().setBorderColor(position, color);`
	`68`	`+ public void setBorderColor(int position, float color, float alpha) {`
	`69`	`+ getOrCreateReactViewBackground().setBorderColor(position, color, alpha);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public int getBorderColor(int position) {`