Back out "Use uint32_t as internal Color representation" (#53622)

Nick Lefever · facebook-github-bot · commit 02e3a999ed1c · 2025-09-05T20:37:58.000-07:00
Summary: Pull Request resolved: #53622 Reverting to avoid lossy conversion on hosts expecting signed int values for color conversion. Changelog: [Internal] Reviewed By: rozele, javache Differential Revision: D81785268 fbshipit-source-id: 4a8d099e378fa55e76a58c2ab0356d88e344de2c
diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp
@@ -310,7 +310,7 @@ static void updateBorderColorPropValue(
     const std::optional<SharedColor>& newColor,
     const std::optional<SharedColor>& oldColor) {
   if (newColor != oldColor) {
-    result[propName] = *newColor.value_or(SharedColor());
+    result[propName] = newColor.has_value() ? *newColor.value() : NULL;
   }
 }
 
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/HostPlatformColor.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/HostPlatformColor.h
@@ -12,7 +12,7 @@
 
 namespace facebook::react {
 
-using Color = uint32_t;
+using Color = int32_t;
 
 namespace HostPlatformColor {
 constexpr facebook::react::Color UndefinedColor = 0;
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h
@@ -42,7 +42,7 @@ inline SharedColor parsePlatformColor(
     auto color =
         getColorFromJava(fabricUIManager, surfaceId, *javaResourcePaths);
 
-    auto argb = (uint32_t)color;
+    auto argb = (int64_t)color;
     auto ratio = 255.f;
     colorComponents.alpha = ((argb >> 24) & 0xFF) / ratio;
     colorComponents.red = ((argb >> 16) & 0xFF) / ratio;
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/HostPlatformColor.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/HostPlatformColor.h
@@ -13,7 +13,7 @@
 
 namespace facebook::react {
 
-using Color = uint32_t;
+using Color = int32_t;
 
 namespace HostPlatformColor {
 constexpr facebook::react::Color UndefinedColor = 0;
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.h
@@ -14,18 +14,18 @@
 namespace facebook::react {
 
 struct DynamicColor {
-  uint32_t lightColor = 0;
-  uint32_t darkColor = 0;
-  uint32_t highContrastLightColor = 0;
-  uint32_t highContrastDarkColor = 0;
+  int32_t lightColor = 0;
+  int32_t darkColor = 0;
+  int32_t highContrastLightColor = 0;
+  int32_t highContrastDarkColor = 0;
 };
 
 struct Color {
-  Color(uint32_t color);
+  Color(int32_t color);
   Color(const DynamicColor& dynamicColor);
   Color(const ColorComponents& components);
   Color() : uiColor_(nullptr){};
-  uint32_t getColor() const;
+  int32_t getColor() const;
   std::size_t getUIColorHash() const;
 
   static Color createSemanticColor(std::vector<std::string>& semanticItems);
@@ -38,7 +38,7 @@ struct Color {
 
   ColorComponents getColorComponents() const {
     float ratio = 255;
-    uint32_t primitiveColor = getColor();
+    int32_t primitiveColor = getColor();
     return ColorComponents{
         .red = (float)((primitiveColor >> 16) & 0xff) / ratio,
         .green = (float)((primitiveColor >> 8) & 0xff) / ratio,
@@ -47,7 +47,7 @@ struct Color {
   }
   bool operator==(const Color& other) const;
   bool operator!=(const Color& other) const;
-  operator uint32_t() const {
+  operator int32_t() const {
     return getColor();
   }
 
diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/HostPlatformColor.mm
@@ -36,7 +36,7 @@ bool UIColorIsP3ColorSpace(const std::shared_ptr<void> &uiColor)
   return false;
 }
 
-UIColor *_Nullable UIColorFromInt32(uint32_t intColor)
+UIColor *_Nullable UIColorFromInt32(int32_t intColor)
 {
   CGFloat a = CGFloat((intColor >> 24) & 0xFF) / 255.0;
   CGFloat r = CGFloat((intColor >> 16) & 0xFF) / 255.0;
@@ -49,10 +49,10 @@ bool UIColorIsP3ColorSpace(const std::shared_ptr<void> &uiColor)
 
 UIColor *_Nullable UIColorFromDynamicColor(const facebook::react::DynamicColor &dynamicColor)
 {
-  uint32_t light = dynamicColor.lightColor;
-  uint32_t dark = dynamicColor.darkColor;
-  uint32_t highContrastLight = dynamicColor.highContrastLightColor;
-  uint32_t highContrastDark = dynamicColor.highContrastDarkColor;
+  int32_t light = dynamicColor.lightColor;
+  int32_t dark = dynamicColor.darkColor;
+  int32_t highContrastLight = dynamicColor.highContrastLightColor;
+  int32_t highContrastDark = dynamicColor.highContrastDarkColor;
 
   UIColor *lightColor = UIColorFromInt32(light);
   UIColor *darkColor = UIColorFromInt32(dark);
@@ -83,7 +83,7 @@ bool UIColorIsP3ColorSpace(const std::shared_ptr<void> &uiColor)
   return nil;
 }
 
-uint32_t ColorFromColorComponents(const facebook::react::ColorComponents &components)
+int32_t ColorFromColorComponents(const facebook::react::ColorComponents &components)
 {
   float ratio = 255;
   auto color = ((int32_t)round((float)components.alpha * ratio) & 0xff) << 24 |
@@ -92,15 +92,15 @@ uint32_t ColorFromColorComponents(const facebook::react::ColorComponents &compon
   return color;
 }
 
-uint32_t ColorFromUIColor(UIColor *color)
+int32_t ColorFromUIColor(UIColor *color)
 {
   CGFloat rgba[4];
   [color getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];
   return ColorFromColorComponents(
       {.red = (float)rgba[0], .green = (float)rgba[1], .blue = (float)rgba[2], .alpha = (float)rgba[3]});
 }
 
-uint32_t ColorFromUIColorForSpecificTraitCollection(
+int32_t ColorFromUIColorForSpecificTraitCollection(
     const std::shared_ptr<void> &uiColor,
     UITraitCollection *traitCollection)
 {
@@ -113,7 +113,7 @@ uint32_t ColorFromUIColorForSpecificTraitCollection(
   return 0;
 }
 
-uint32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)
+int32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)
 {
   return ColorFromUIColorForSpecificTraitCollection(uiColor, [UITraitCollection currentTraitCollection]);
 }
@@ -172,7 +172,7 @@ uint32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)
 
 } // anonymous namespace
 
-Color::Color(uint32_t color)
+Color::Color(int32_t color)
 {
   uiColor_ = wrapManagedObject(UIColorFromInt32(color));
   uiColorHashValue_ = facebook::react::hash_combine(color, 0);
@@ -217,7 +217,7 @@ uint32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)
   return !(*this == other);
 }
 
-uint32_t Color::getColor() const
+int32_t Color::getColor() const
 {
   return ColorFromUIColor(uiColor_);
 }
diff --git a/packages/react-native/ReactCxxPlatform/react/devsupport/DevLoadingViewModule.cpp b/packages/react-native/ReactCxxPlatform/react/devsupport/DevLoadingViewModule.cpp
@@ -9,8 +9,8 @@
 
 namespace facebook::react {
 
-const uint32_t DEFAULT_TEXT_COLOR = 0xFFFFFFFF;
-const uint32_t DEFAULT_BACKGROUND_COLOR = 0xFF2584E8;
+const int32_t DEFAULT_TEXT_COLOR = 0xFFFFFFFF;
+const int32_t DEFAULT_BACKGROUND_COLOR = 0xFF2584E8;
 
 DevLoadingViewModule::DevLoadingViewModule(
     std::shared_ptr<CallInvoker> jsInvoker,
@@ -27,8 +27,8 @@ DevLoadingViewModule::~DevLoadingViewModule() {
 void DevLoadingViewModule::showMessage(
     jsi::Runtime& /*rt*/,
     const std::string& message,
-    std::optional<uint32_t> textColor,
-    std::optional<uint32_t> backgroundColor) {
+    std::optional<int32_t> textColor,
+    std::optional<int32_t> backgroundColor) {
   if (auto devUIDelegate = devUIDelegate_.lock()) {
     devUIDelegate->showLoadingView(
         message,
diff --git a/packages/react-native/ReactCxxPlatform/react/devsupport/DevLoadingViewModule.h b/packages/react-native/ReactCxxPlatform/react/devsupport/DevLoadingViewModule.h
@@ -27,8 +27,8 @@ class DevLoadingViewModule
   void showMessage(
       jsi::Runtime& rt,
       const std::string& message,
-      std::optional<uint32_t> textColor,
-      std::optional<uint32_t> backgroundColor);
+      std::optional<int32_t> textColor,
+      std::optional<int32_t> backgroundColor);
 
   void hide(jsi::Runtime& rt);
 

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ static void updateBorderColorPropValue(`
`310`	`310`	`const std::optional<SharedColor>& newColor,`
`311`	`311`	`const std::optional<SharedColor>& oldColor) {`
`312`	`312`	`if (newColor != oldColor) {`
`313`		`- result[propName] = *newColor.value_or(SharedColor());`
	`313`	`+ result[propName] = newColor.has_value() ? *newColor.value() : NULL;`
`314`	`314`	`}`
`315`	`315`	`}`
`316`	`316`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ bool UIColorIsP3ColorSpace(const std::shared_ptr<void> &uiColor)`
`36`	`36`	`return false;`
`37`	`37`	`}`
`38`	`38`
`39`		`-UIColor *_Nullable UIColorFromInt32(uint32_t intColor)`
	`39`	`+UIColor *_Nullable UIColorFromInt32(int32_t intColor)`
`40`	`40`	`{`
`41`	`41`	`CGFloat a = CGFloat((intColor >> 24) & 0xFF) / 255.0;`
`42`	`42`	`CGFloat r = CGFloat((intColor >> 16) & 0xFF) / 255.0;`
`@@ -49,10 +49,10 @@ bool UIColorIsP3ColorSpace(const std::shared_ptr<void> &uiColor)`
`49`	`49`
`50`	`50`	`UIColor *_Nullable UIColorFromDynamicColor(const facebook::react::DynamicColor &dynamicColor)`
`51`	`51`	`{`
`52`		`- uint32_t light = dynamicColor.lightColor;`
`53`		`- uint32_t dark = dynamicColor.darkColor;`
`54`		`- uint32_t highContrastLight = dynamicColor.highContrastLightColor;`
`55`		`- uint32_t highContrastDark = dynamicColor.highContrastDarkColor;`
	`52`	`+ int32_t light = dynamicColor.lightColor;`
	`53`	`+ int32_t dark = dynamicColor.darkColor;`
	`54`	`+ int32_t highContrastLight = dynamicColor.highContrastLightColor;`
	`55`	`+ int32_t highContrastDark = dynamicColor.highContrastDarkColor;`
`56`	`56`
`57`	`57`	`UIColor *lightColor = UIColorFromInt32(light);`
`58`	`58`	`UIColor *darkColor = UIColorFromInt32(dark);`
`@@ -83,7 +83,7 @@ bool UIColorIsP3ColorSpace(const std::shared_ptr<void> &uiColor)`
`83`	`83`	`return nil;`
`84`	`84`	`}`
`85`	`85`
`86`		`-uint32_t ColorFromColorComponents(const facebook::react::ColorComponents &components)`
	`86`	`+int32_t ColorFromColorComponents(const facebook::react::ColorComponents &components)`
`87`	`87`	`{`
`88`	`88`	`float ratio = 255;`
`89`	`89`	`auto color = ((int32_t)round((float)components.alpha * ratio) & 0xff) << 24 \|`
`@@ -92,15 +92,15 @@ uint32_t ColorFromColorComponents(const facebook::react::ColorComponents &compon`
`92`	`92`	`return color;`
`93`	`93`	`}`
`94`	`94`
`95`		`-uint32_t ColorFromUIColor(UIColor *color)`
	`95`	`+int32_t ColorFromUIColor(UIColor *color)`
`96`	`96`	`{`
`97`	`97`	`CGFloat rgba[4];`
`98`	`98`	`[color getRed:&rgba[0] green:&rgba[1] blue:&rgba[2] alpha:&rgba[3]];`
`99`	`99`	`return ColorFromColorComponents(`
`100`	`100`	`{.red = (float)rgba[0], .green = (float)rgba[1], .blue = (float)rgba[2], .alpha = (float)rgba[3]});`
`101`	`101`	`}`
`102`	`102`
`103`		`-uint32_t ColorFromUIColorForSpecificTraitCollection(`
	`103`	`+int32_t ColorFromUIColorForSpecificTraitCollection(`
`104`	`104`	`const std::shared_ptr<void> &uiColor,`
`105`	`105`	`UITraitCollection *traitCollection)`
`106`	`106`	`{`
`@@ -113,7 +113,7 @@ uint32_t ColorFromUIColorForSpecificTraitCollection(`
`113`	`113`	`return 0;`
`114`	`114`	`}`
`115`	`115`
`116`		`-uint32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)`
	`116`	`+int32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)`
`117`	`117`	`{`
`118`	`118`	`return ColorFromUIColorForSpecificTraitCollection(uiColor, [UITraitCollection currentTraitCollection]);`
`119`	`119`	`}`
`@@ -172,7 +172,7 @@ uint32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)`
`172`	`172`
`173`	`173`	`} // anonymous namespace`
`174`	`174`
`175`		`-Color::Color(uint32_t color)`
	`175`	`+Color::Color(int32_t color)`
`176`	`176`	`{`
`177`	`177`	`uiColor_ = wrapManagedObject(UIColorFromInt32(color));`
`178`	`178`	`uiColorHashValue_ = facebook::react::hash_combine(color, 0);`
`@@ -217,7 +217,7 @@ uint32_t ColorFromUIColor(const std::shared_ptr<void> &uiColor)`
`217`	`217`	`return !(*this == other);`
`218`	`218`	`}`
`219`	`219`
`220`		`-uint32_t Color::getColor() const`
	`220`	`+int32_t Color::getColor() const`
`221`	`221`	`{`
`222`	`222`	`return ColorFromUIColor(uiColor_);`
`223`	`223`	`}`