Skip to content

Property updates switching between PlatformColors would no-op #14398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acoates-ms merged 3 commits into from
Mar 7, 2025
Merged

Property updates switching between PlatformColors would no-op #14398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dcf156
Property updates switching between PlatformColors would no-op
acoates-ms Mar 6, 2025
33e7b8c
Change files
acoates-ms Mar 6, 2025
61e4c07
format
acoates-ms Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions change/react-native-windows-ca0880f1-4d40-4ab6-9c95-d843aade3939.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Property updates switching between PlatformColors would no-op",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
18 changes: 8 additions & 10 deletions vnext/Microsoft.ReactNative/Fabric/AbiViewProps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,12 @@ winrt::Microsoft::ReactNative::Color Color::ReadValue(
switch (reader.ValueType()) {
case JSValueType::Int64: {
auto argb = reader.GetInt64();
return winrt::make<Color>(facebook::react::Color{
/*m_isDefined*/ true,
/*color*/
{static_cast<uint8_t>((argb >> 24) & 0xFF),
static_cast<uint8_t>((argb >> 16) & 0xFF),
static_cast<uint8_t>((argb >> 8) & 0xFF),
static_cast<uint8_t>(argb & 0xFF)},
{}});
return winrt::make<Color>(facebook::react::Color{/*color*/
{static_cast<uint8_t>((argb >> 24) & 0xFF),
static_cast<uint8_t>((argb >> 16) & 0xFF),
static_cast<uint8_t>((argb >> 8) & 0xFF),
static_cast<uint8_t>(argb & 0xFF)},
{}});
}
case JSValueType::Object: {
std::vector<std::string> platformColors;
Expand All @@ -96,10 +94,10 @@ winrt::Microsoft::ReactNative::Color Color::ReadValue(
SkipValue<JSValue>(reader); // Skip this property
}
}
return winrt::make<Color>(facebook::react::Color{/*m_isDefined*/ true, /*color*/ {}, std::move(platformColors)});
return winrt::make<Color>(facebook::react::Color{/*color*/ {}, std::move(platformColors)});
}
default:
return winrt::make<Color>(facebook::react::Color{/*m_isDefined*/ false, /*color*/ {0, 0, 0, 0}, {}});
return winrt::make<Color>(facebook::react::Color{/*color*/ {0, 0, 0, 0}, {}});
}
}

Expand Down
11 changes: 3 additions & 8 deletions vnext/Microsoft.ReactNative/Fabric/platform/react/renderer/graphics/HostPlatformColor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,10 @@ namespace facebook::react {

struct Color {
bool operator==(const Color &otherColor) const {
return m_isUndefined && otherColor.m_isUndefined ||
(m_isUndefined == otherColor.m_isUndefined && m_color == otherColor.m_color &&
m_platformColor == otherColor.m_platformColor);
return m_color == otherColor.m_color && m_platformColor == otherColor.m_platformColor;
}
bool operator!=(const Color &otherColor) const {
return m_isUndefined != otherColor.m_isUndefined || m_color != otherColor.m_color ||
m_platformColor != otherColor.m_platformColor;
return m_color != otherColor.m_color || m_platformColor != otherColor.m_platformColor;
}

winrt::Windows::UI::Color AsWindowsColor() const {
Expand All @@ -36,13 +33,12 @@ struct Color {
return RGB(m_color.R, m_color.G, m_color.B) | (m_color.A << 24);
}

bool m_isUndefined;
winrt::Windows::UI::Color m_color;
std::vector<std::string> m_platformColor;
};

namespace HostPlatformColor {
static const facebook::react::Color UndefinedColor{true};
static const facebook::react::Color UndefinedColor{{0, 0, 0, 0} /*Black*/, {} /*Empty PlatformColors*/};
} // namespace HostPlatformColor

inline Color hostPlatformColorFromComponents(ColorComponents components) {
Expand All @@ -53,7 +49,6 @@ inline Color hostPlatformColorFromComponents(ColorComponents components) {
static_cast<uint8_t>((int)round(components.green * ratio) & 0xff),
static_cast<uint8_t>((int)round(components.blue * ratio) & 0xff)};
return {
/* .m_isUndefined = */ false,
/* .m_color = */ color,
/* .m_platformColor = */ {}};
}
Expand Down
1 change: 0 additions & 1 deletion vnext/Microsoft.ReactNative/Fabric/platform/react/renderer/graphics/PlatformColorParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ parsePlatformColor(const ContextContainer &contextContainer, int32_t surfaceId,
auto map = (std::unordered_map<std::string, std::vector<std::string>>)value;
if (map.find("windowsbrush") != map.end()) {
facebook::react::Color color = {
/* .m_isDefined = */ true,
/* .m_color = */ {},
/* .m_platformColor = */ std::move(map["windowsbrush"]),
};
Expand Down
Loading