Skip to content

Commit 84298a0

Browse files
coadometa-codesync[bot]
authored andcommitted
Include utils umbrella from renderer CSS headers (#58789)
Summary: Pull Request resolved: #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 `<React/Utils.h>` hit a hard error even after acknowledging framework-tier usage with `RN_ALLOW_FRAMEWORKS`. Include `<React/Utils.h>` 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
1 parent 21b90e7 commit 84298a0

11 files changed

Lines changed: 11 additions & 17 deletions

File tree

‎packages/react-native/ReactCommon/react/renderer/css/CSSAngleUnit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <optional>
1515
#include <string_view>
1616

17-
#include <react/utils/fnv1a.h>
17+
#include <React/Utils.h>
1818

1919
namespace facebook::react {
2020

‎packages/react-native/ReactCommon/react/renderer/css/CSSBackgroundImage.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <optional>
1313
#include <variant>
1414

15+
#include <React/Utils.h>
1516
#include <react/renderer/css/CSSAngle.h>
1617
#include <react/renderer/css/CSSColor.h>
1718
#include <react/renderer/css/CSSCompoundDataType.h>
@@ -21,9 +22,6 @@
2122
#include <react/renderer/css/CSSList.h>
2223
#include <react/renderer/css/CSSPercentage.h>
2324
#include <react/renderer/css/CSSValueParser.h>
24-
#include <react/utils/TemplateStringLiteral.h>
25-
#include <react/utils/fnv1a.h>
26-
#include <react/utils/iequals.h>
2725

2826
namespace facebook::react {
2927

‎packages/react-native/ReactCommon/react/renderer/css/CSSColorFunction.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
#include <string_view>
1717
#include <tuple>
1818

19+
#include <React/Utils.h>
1920
#include <react/renderer/css/CSSAngle.h>
2021
#include <react/renderer/css/CSSNumber.h>
2122
#include <react/renderer/css/CSSPercentage.h>
2223
#include <react/renderer/css/CSSValueParser.h>
23-
#include <react/utils/PackTraits.h>
24-
#include <react/utils/fnv1a.h>
2524

2625
namespace facebook::react {
2726

‎packages/react-native/ReactCommon/react/renderer/css/CSSFilter.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <optional>
1414
#include <variant>
1515

16+
#include <React/Utils.h>
1617
#include <react/renderer/css/CSSColor.h>
1718
#include <react/renderer/css/CSSCompoundDataType.h>
1819
#include <react/renderer/css/CSSDataType.h>
@@ -21,8 +22,6 @@
2122
#include <react/renderer/css/CSSNumber.h>
2223
#include <react/renderer/css/CSSPercentage.h>
2324
#include <react/renderer/css/CSSZero.h>
24-
#include <react/utils/TemplateStringLiteral.h>
25-
#include <react/utils/iequals.h>
2625

2726
namespace facebook::react {
2827

‎packages/react-native/ReactCommon/react/renderer/css/CSSFontVariant.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

1010
#include <react/cxxstableapi/FrameworksGuard.h>
1111

12+
#include <React/Utils.h>
1213
#include <react/renderer/css/CSSDataType.h>
1314
#include <react/renderer/css/CSSKeyword.h>
1415
#include <react/renderer/css/CSSList.h>
15-
#include <react/utils/to_underlying.h>
1616

1717
namespace facebook::react {
1818

‎packages/react-native/ReactCommon/react/renderer/css/CSSHexColor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <optional>
1313
#include <string_view>
1414

15-
#include <react/utils/toLower.h>
15+
#include <React/Utils.h>
1616

1717
namespace facebook::react {
1818

‎packages/react-native/ReactCommon/react/renderer/css/CSSKeyword.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
#include <optional>
1414
#include <string_view>
1515

16+
#include <React/Utils.h>
1617
#include <react/renderer/css/CSSDataType.h>
17-
#include <react/utils/fnv1a.h>
18-
#include <react/utils/to_underlying.h>
1918

2019
namespace facebook::react {
2120

‎packages/react-native/ReactCommon/react/renderer/css/CSSLengthUnit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <optional>
1414
#include <string_view>
1515

16-
#include <react/utils/fnv1a.h>
16+
#include <React/Utils.h>
1717

1818
namespace facebook::react {
1919

‎packages/react-native/ReactCommon/react/renderer/css/CSSNamedColor.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <optional>
1313
#include <string_view>
1414

15-
#include <react/utils/fnv1a.h>
15+
#include <React/Utils.h>
1616

1717
namespace facebook::react {
1818

‎packages/react-native/ReactCommon/react/renderer/css/CSSShadow.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
#include <optional>
1313
#include <tuple>
1414

15+
#include <React/Utils.h>
1516
#include <react/renderer/css/CSSColor.h>
1617
#include <react/renderer/css/CSSDataType.h>
1718
#include <react/renderer/css/CSSKeyword.h>
1819
#include <react/renderer/css/CSSLength.h>
1920
#include <react/renderer/css/CSSList.h>
2021
#include <react/renderer/css/CSSValueParser.h>
21-
#include <react/utils/to_underlying.h>
2222

2323
namespace facebook::react {
2424

0 commit comments

Comments
 (0)