From 4e6bf240b80b54ad2d71b5159eb13d251b24408c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Ma=C5=82ecki?= Date: Mon, 5 Oct 2026 08:49:11 -0700 Subject: [PATCH] Include utils umbrella from renderer CSS headers (#58789) Summary: Pull Request resolved: https://github.com/react/react-native/pull/58789 The renderer CSS headers are framework-tier APIs, but several of them included fine-grained public `react/utils/*` headers directly. Those headers are guarded by the public umbrella guard, so a strict consumer that includes a CSS header without first including `` hit a hard error even after acknowledging framework-tier usage with `RN_ALLOW_FRAMEWORKS`. Include `` from the affected CSS headers instead of the fine-grained utils headers, matching how other exported headers reach public modules. Export the utils dependency from the CSS Buck target, since utils is now part of the CSS headers' public interface; CMake and CocoaPods already expose it. Changelog: [Internal] Reviewed By: cipolleschi Differential Revision: D122337018 fbshipit-source-id: 2ca13b7e730116676404f744770e7c1b68c99d32 --- .../ReactCommon/react/renderer/css/CSSAngleUnit.h | 2 +- .../ReactCommon/react/renderer/css/CSSBackgroundImage.h | 4 +--- .../ReactCommon/react/renderer/css/CSSColorFunction.h | 3 +-- .../react-native/ReactCommon/react/renderer/css/CSSFilter.h | 3 +-- .../ReactCommon/react/renderer/css/CSSFontVariant.h | 2 +- .../react-native/ReactCommon/react/renderer/css/CSSHexColor.h | 2 +- .../react-native/ReactCommon/react/renderer/css/CSSKeyword.h | 3 +-- .../ReactCommon/react/renderer/css/CSSLengthUnit.h | 2 +- .../ReactCommon/react/renderer/css/CSSNamedColor.h | 2 +- .../react-native/ReactCommon/react/renderer/css/CSSShadow.h | 2 +- .../ReactCommon/react/renderer/css/CSSTransform.h | 3 +-- 11 files changed, 11 insertions(+), 17 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSAngleUnit.h b/packages/react-native/ReactCommon/react/renderer/css/CSSAngleUnit.h index 112bf7ca22a..339f3360a29 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSAngleUnit.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSAngleUnit.h @@ -14,7 +14,7 @@ #include #include -#include +#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSBackgroundImage.h b/packages/react-native/ReactCommon/react/renderer/css/CSSBackgroundImage.h index 11c9daeea6b..a3a6cc9b727 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSBackgroundImage.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSBackgroundImage.h @@ -12,6 +12,7 @@ #include #include +#include #include #include #include @@ -21,9 +22,6 @@ #include #include #include -#include -#include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSColorFunction.h b/packages/react-native/ReactCommon/react/renderer/css/CSSColorFunction.h index fccefab6fa1..6a3d7b16602 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSColorFunction.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSColorFunction.h @@ -16,12 +16,11 @@ #include #include +#include #include #include #include #include -#include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSFilter.h b/packages/react-native/ReactCommon/react/renderer/css/CSSFilter.h index b413453ab59..acc1b1eee8b 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSFilter.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSFilter.h @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -21,8 +22,6 @@ #include #include #include -#include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSFontVariant.h b/packages/react-native/ReactCommon/react/renderer/css/CSSFontVariant.h index e9a61a801f6..472a11e0c6b 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSFontVariant.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSFontVariant.h @@ -9,10 +9,10 @@ #include +#include #include #include #include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSHexColor.h b/packages/react-native/ReactCommon/react/renderer/css/CSSHexColor.h index db4cfb1c804..a630c754256 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSHexColor.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSHexColor.h @@ -12,7 +12,7 @@ #include #include -#include +#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSKeyword.h b/packages/react-native/ReactCommon/react/renderer/css/CSSKeyword.h index a3ff512f0e4..57fdf87c537 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSKeyword.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSKeyword.h @@ -13,9 +13,8 @@ #include #include +#include #include -#include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSLengthUnit.h b/packages/react-native/ReactCommon/react/renderer/css/CSSLengthUnit.h index 64149e379b2..a17158c0b59 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSLengthUnit.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSLengthUnit.h @@ -13,7 +13,7 @@ #include #include -#include +#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSNamedColor.h b/packages/react-native/ReactCommon/react/renderer/css/CSSNamedColor.h index e9eb2b97872..413100c7ad3 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSNamedColor.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSNamedColor.h @@ -12,7 +12,7 @@ #include #include -#include +#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSShadow.h b/packages/react-native/ReactCommon/react/renderer/css/CSSShadow.h index ea5784c6898..87acc337eb3 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSShadow.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSShadow.h @@ -12,13 +12,13 @@ #include #include +#include #include #include #include #include #include #include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/css/CSSTransform.h b/packages/react-native/ReactCommon/react/renderer/css/CSSTransform.h index 7ef7fdf0a0a..6b7b45261c2 100644 --- a/packages/react-native/ReactCommon/react/renderer/css/CSSTransform.h +++ b/packages/react-native/ReactCommon/react/renderer/css/CSSTransform.h @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -22,8 +23,6 @@ #include #include #include -#include -#include namespace facebook::react {