From 36212c248bed79c72a3e6013d6894ff7acde7633 Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Wed, 25 Feb 2026 12:39:16 -0800 Subject: [PATCH] Unify CSSCompoundDataType with its variant (#55738) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/55738 Previously, CSS compound data types used two separate types: `CSSCompoundDataType` as an empty marker struct for template parameter deduction, and `CSSVariantWithTypes>` which resolved to `std::variant` for actual storage. This resulted in redundant type aliases like `CSSTransformFunctionVariant`. This change makes `CSSCompoundDataType` a `using` alias for `std::variant` directly, so one type serves both roles: template parameter deduction for parsing AND storage. - Change `CSSCompoundDataType` from a marker struct to a `using` alias for `std::variant` - Replace `CSSValidCompoundDataType` concept with `is_variant_of_data_types` trait that pattern-matches `std::variant` where all types satisfy `CSSDataType` - Update `merge_data_types` and `merge_variant` specializations to use `std::variant` directly - Store `AllowedTypesT` directly in `CSSList` compound type specialization (since it IS now the variant) - Remove redundant `CSSTransformFunctionVariant`, `CSSFilterFunctionVariant`, and `CSSBackgroundImageVariant` aliases - Update all downstream references in conversions Changelog: [Internal] Reviewed By: jorge-cab Differential Revision: D94347088 fbshipit-source-id: 99cfe13400325c36682297263aa87d00ac13de13 --- .../view/BackgroundImagePropsConversions.cpp | 2 +- .../components/view/FilterPropsConversions.h | 4 +- .../renderer/components/view/conversions.h | 2 +- .../react/renderer/css/CSSBackgroundImage.h | 5 --- .../react/renderer/css/CSSCompoundDataType.h | 40 +++++++++++-------- .../react/renderer/css/CSSFilter.h | 5 --- .../ReactCommon/react/renderer/css/CSSList.h | 2 +- .../react/renderer/css/CSSTransform.h | 5 --- .../react/renderer/css/CSSValueParser.h | 2 +- 9 files changed, 29 insertions(+), 38 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/BackgroundImagePropsConversions.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/BackgroundImagePropsConversions.cpp index 6861ab759ba..0875fd04e96 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/BackgroundImagePropsConversions.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/BackgroundImagePropsConversions.cpp @@ -477,7 +477,7 @@ void fromCSSColorStop( } std::optional fromCSSBackgroundImage( - const CSSBackgroundImageVariant& cssBackgroundImage) { + const CSSBackgroundImage& cssBackgroundImage) { if (std::holds_alternative(cssBackgroundImage)) { const auto& gradient = std::get(cssBackgroundImage); diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/FilterPropsConversions.h b/packages/react-native/ReactCommon/react/renderer/components/view/FilterPropsConversions.h index 264ea7d0c45..c2485110453 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/FilterPropsConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/FilterPropsConversions.h @@ -108,7 +108,7 @@ parseProcessedFilter(const PropsParserContext &context, const RawValue &value, s result = filter; } -inline FilterType filterTypeFromVariant(const CSSFilterFunctionVariant &filter) +inline FilterType filterTypeFromVariant(const CSSFilterFunction &filter) { return std::visit( [](auto &&filter) -> FilterType { @@ -148,7 +148,7 @@ inline FilterType filterTypeFromVariant(const CSSFilterFunctionVariant &filter) filter); } -inline std::optional fromCSSFilter(const CSSFilterFunctionVariant &cssFilter) +inline std::optional fromCSSFilter(const CSSFilterFunction &cssFilter) { return std::visit( [&](auto &&filter) -> std::optional { diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h index 69b92b00b92..929fe68cd58 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h @@ -550,7 +550,7 @@ inline ValueUnit cssLengthPercentageToValueUnit(const std::variant fromCSSTransformFunction(const CSSTransformFunctionVariant &cssTransform) +inline std::optional fromCSSTransformFunction(const CSSTransformFunction &cssTransform) { constexpr auto Zero = ValueUnit(0, UnitType::Point); constexpr auto One = ValueUnit(1, UnitType::Point); diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSBackgroundImage.h b/packages/react-native/ReactCommon/react/renderer/css/CSSBackgroundImage.h index 6df7eee43df..3376d1759c8 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSBackgroundImage.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSBackgroundImage.h @@ -845,11 +845,6 @@ static_assert(CSSDataType); */ using CSSBackgroundImage = CSSCompoundDataType; -/** - * Variant of possible CSS background image types - */ -using CSSBackgroundImageVariant = CSSVariantWithTypes; - /** * Representation of */ diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSCompoundDataType.h b/packages/react-native/ReactCommon/react/renderer/css/CSSCompoundDataType.h index a97296e02a0..72fa717ca1e 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSCompoundDataType.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSCompoundDataType.h @@ -11,18 +11,24 @@ namespace facebook::react { -namespace detail { -struct CSSCompoundDataTypeMarker {}; -} // namespace detail - /** * Allows grouping together multiple possible CSSDataType to parse. + * CSSCompoundDataType is a std::variant of the allowed types, serving both + * as storage and for template parameter deduction during parsing. */ template -struct CSSCompoundDataType : public detail::CSSCompoundDataTypeMarker {}; +using CSSCompoundDataType = std::variant; + +namespace detail { +template +struct is_variant_of_data_types : std::false_type {}; + +template +struct is_variant_of_data_types> : std::true_type {}; +} // namespace detail template -concept CSSValidCompoundDataType = std::is_base_of_v; +concept CSSValidCompoundDataType = detail::is_variant_of_data_types::value; /** * A concrete data type, or a compound data type which represents multiple other @@ -38,40 +44,40 @@ template struct merge_data_types; template -struct merge_data_types, CSSCompoundDataType, RestT...> { - using type = typename merge_data_types, RestT...>::type; +struct merge_data_types, std::variant, RestT...> { + using type = typename merge_data_types, RestT...>::type; }; template -struct merge_data_types, RestT...> { - using type = typename merge_data_types, RestT...>::type; +struct merge_data_types, RestT...> { + using type = typename merge_data_types, RestT...>::type; }; template -struct merge_data_types, AlllowedType2T, RestT...> { - using type = typename merge_data_types, RestT...>::type; +struct merge_data_types, AlllowedType2T, RestT...> { + using type = typename merge_data_types, RestT...>::type; }; template struct merge_data_types { - using type = typename merge_data_types, RestT...>::type; + using type = typename merge_data_types, RestT...>::type; }; template -struct merge_data_types> { - using type = CSSCompoundDataType; +struct merge_data_types> { + using type = std::variant; }; template struct merge_data_types { - using type = CSSCompoundDataType; + using type = std::variant; }; template struct merge_variant; template -struct merge_variant, RestT...> { +struct merge_variant, RestT...> { using type = std::variant; }; } // namespace detail diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSFilter.h b/packages/react-native/ReactCommon/react/renderer/css/CSSFilter.h index f1ff35eda5d..697537d0d55 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSFilter.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSFilter.h @@ -307,11 +307,6 @@ using CSSFilterFunction = CSSCompoundDataType< CSSSaturateFilter, CSSSepiaFilter>; -/** - * Variant of possible CSS filter function types - */ -using CSSFilterFunctionVariant = CSSVariantWithTypes; - /** * Representation of * https://www.w3.org/TR/filter-effects-1/#typedef-filter-value-list diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSList.h b/packages/react-native/ReactCommon/react/renderer/css/CSSList.h index 1bccd52d7aa..3fe63a799f3 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSList.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSList.h @@ -24,7 +24,7 @@ template struct CSSList : public std::vector {}; template -struct CSSList : public std::vector> {}; +struct CSSList : public std::vector {}; template struct CSSDataTypeParser> { diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSTransform.h b/packages/react-native/ReactCommon/react/renderer/css/CSSTransform.h index 367080c9beb..2f66f891410 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSTransform.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSTransform.h @@ -452,11 +452,6 @@ using CSSTransformFunction = CSSCompoundDataType< CSSSkewY, CSSPerspective>; -/** - * Variant of possible CSS transform function types - */ -using CSSTransformFunctionVariant = CSSVariantWithTypes; - /** * Represents the type. * https://drafts.csswg.org/css-transforms-1/#typedef-transform-list diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSValueParser.h b/packages/react-native/ReactCommon/react/renderer/css/CSSValueParser.h index 144c04821d7..e88850cd92e 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSValueParser.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSValueParser.h @@ -33,7 +33,7 @@ class CSSValueParser { template constexpr std::variant consumeValue( CSSDelimiter delimeter, - CSSCompoundDataType /*unused*/) + std::variant /*unused*/) { using ReturnT = std::variant;