From 8d546c3b800bf68d6b94de29f93aa22d9e14e811 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Fri, 25 Sep 2026 04:01:57 -0700 Subject: [PATCH 1/3] Add a RawValue umbrella to the renderer core module Summary: Changelog: [Internal] Add a `React/RawValue.h` umbrella for the `rawValue` target, the slice of `react/renderer/core` that exists so core and `react/renderer/graphics` do not form a dependency cycle. `React/RendererCore.h` re-exports it instead of listing the two headers directly. Differential Revision: D121388426 --- .../react/renderer/core/React/RawValue.h | 44 +++++++++++++++++++ .../react/renderer/core/React/RendererCore.h | 12 ++--- 2 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 packages/react-native/ReactCommon/react/renderer/core/React/RawValue.h diff --git a/packages/react-native/ReactCommon/react/renderer/core/React/RawValue.h b/packages/react-native/ReactCommon/react/renderer/core/React/RawValue.h new file mode 100644 index 00000000000..0505b9d0eb0 --- /dev/null +++ b/packages/react-native/ReactCommon/react/renderer/core/React/RawValue.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#pragma once + +// ============================================================================= +// Umbrella header for the `rawValue` module - public entry point. +// +// #include +// +// `rawValue` is the slice of `react/renderer/core` that `react/renderer/graphics` +// depends on. It is built as its own target so the two modules do not form a +// dependency cycle; re-exports it, so consumers that want +// the whole renderer core still only need that one umbrella. +// +// Re-exports the module's public interface headers. React Native's own code +// should keep using the fine-grained `` includes, +// except in headers it exports to consumers: those are preprocessed in the +// consumer's translation unit, where the fine-grained include hits this +// module's . `RN_ALLOW_FRAMEWORKS` does not +// suppress that guard, so a "for frameworks" header must reach this module +// through the umbrella. +// ============================================================================= + +// Marks that the following headers are pulled in through the umbrella, so their +// shared guard () accepts them. The marker +// is saved and restored rather than defined and undefined: the scope ends at +// this block, so a later *direct* include of a guarded header the umbrella did +// not already pull in is still caught, and it nests inside an enclosing +// umbrella rather than disarming it. The headers below are `#pragma once`, so +// re-including one of them directly is a silent no-op, not a guard hit. +#pragma push_macro("RN_UMBRELLA_CONTEXT") +#undef RN_UMBRELLA_CONTEXT +#define RN_UMBRELLA_CONTEXT 1 + +#include +#include + +#undef RN_UMBRELLA_CONTEXT +#pragma pop_macro("RN_UMBRELLA_CONTEXT") diff --git a/packages/react-native/ReactCommon/react/renderer/core/React/RendererCore.h b/packages/react-native/ReactCommon/react/renderer/core/React/RendererCore.h index 6856ae14296..b34a5608ba2 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/React/RendererCore.h +++ b/packages/react-native/ReactCommon/react/renderer/core/React/RendererCore.h @@ -12,7 +12,8 @@ // // #include // -// Re-exports the module's public interface headers. React Native's own code +// Re-exports the module's public interface headers, including those of the +// `rawValue` target via . React Native's own code // should keep using the fine-grained `` includes, // except in headers it exports to consumers: those are preprocessed in the // consumer's translation unit, where the fine-grained include hits this @@ -24,12 +25,15 @@ // Marks that the following headers are pulled in through the umbrella, so their // shared guard () accepts them. The marker // is saved and restored rather than defined and undefined: the scope ends at -// this block, so later *direct* includes in the same TU are still caught, and -// it nests inside an enclosing umbrella rather than disarming it. +// this block, so a later *direct* include of a guarded header the umbrella did +// not already pull in is still caught, and it nests inside an enclosing +// umbrella rather than disarming it. The headers below are `#pragma once`, so +// re-including one of them directly is a silent no-op, not a guard hit. #pragma push_macro("RN_UMBRELLA_CONTEXT") #undef RN_UMBRELLA_CONTEXT #define RN_UMBRELLA_CONTEXT 1 +#include #include #include #include @@ -61,8 +65,6 @@ #include #include #include -#include -#include #include #include #include From 6eea6bc32f8413ee64ef9bb4a4b28ddebc92b5ad Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Fri, 25 Sep 2026 04:01:57 -0700 Subject: [PATCH 2/3] Use umbrellas instead of direct includes in renderer core module Summary: Changelog: [Internal] Update `react/renderer/core` to use the `React/Debug.h`, `React/FeatureFlags.h`, `React/Graphics.h`, `React/MapBuffer.h`, `React/RendererDebug.h`, `React/Timing.h` and `React/Utils.h` umbrellas instead of direct includes. `debugStringConvertibleUtils.h` is an implementation helper, not public API, and is no longer re-exported from `React/RendererDebug.h`. Public API surface is unchanged. Differential Revision: D121395742 --- .../react-native/ReactCommon/React-Fabric.podspec | 1 + .../ReactCommon/react/renderer/core/CMakeLists.txt | 1 + .../renderer/core/ConcreteComponentDescriptor.h | 6 +++--- .../react/renderer/core/ConcreteShadowNode.h | 2 +- .../ReactCommon/react/renderer/core/ConcreteState.h | 5 ++--- .../ReactCommon/react/renderer/core/EventEmitter.h | 2 +- .../ReactCommon/react/renderer/core/EventLogger.h | 2 +- .../ReactCommon/react/renderer/core/EventPipe.h | 2 +- .../react/renderer/core/LayoutConstraints.h | 4 ++-- .../ReactCommon/react/renderer/core/LayoutMetrics.h | 8 +++----- .../react/renderer/core/LayoutableShadowNode.h | 6 +++--- .../ReactCommon/react/renderer/core/Props.h | 4 ++-- .../ReactCommon/react/renderer/core/PropsMacros.h | 2 +- .../react/renderer/core/PropsParserContext.h | 2 +- .../ReactCommon/react/renderer/core/RawEvent.h | 2 +- .../ReactCommon/react/renderer/core/RawValue.h | 2 +- .../ReactCommon/react/renderer/core/Sealable.h | 2 +- .../ReactCommon/react/renderer/core/ShadowNode.h | 2 +- .../ReactCommon/react/renderer/core/State.h | 2 +- .../react/renderer/core/graphicsConversions.h | 13 +++---------- .../react/renderer/debug/React/RendererDebug.h | 1 - .../renderer/debug/debugStringConvertibleUtils.h | 2 +- .../react/renderer/graphics/React/Graphics.h | 9 --------- .../react/renderer/graphics/RCTPlatformColorUtils.h | 2 +- .../ReactCommon/react/renderer/graphics/rounding.h | 2 +- 25 files changed, 34 insertions(+), 52 deletions(-) diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec index 7a13eb84ef3..04dcdf8b2de 100644 --- a/packages/react-native/ReactCommon/React-Fabric.podspec +++ b/packages/react-native/ReactCommon/React-Fabric.podspec @@ -44,6 +44,7 @@ Pod::Spec.new do |s| s.dependency "React-debug" s.dependency "React-cxxstableapi" s.dependency "React-featureflags" + s.dependency "React-timing" s.dependency "React-runtimescheduler" s.dependency "React-cxxreact" s.dependency "React-bridging" diff --git a/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt b/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt index 80f0d536449..d5ea3badd3d 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt +++ b/packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt @@ -25,6 +25,7 @@ target_link_libraries(react_renderer_core react_renderer_graphics react_renderer_mapbuffer react_renderer_runtimescheduler + react_timing react_utils runtimeexecutor yoga) diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h index bf552e0e67e..4f98387c77a 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h @@ -12,8 +12,9 @@ #include #include -#include -#include +#include +#include +#include #include #include #include @@ -21,7 +22,6 @@ #include #include #include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h index d7d47377c76..d758d39a472 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h @@ -9,7 +9,7 @@ #include -#include +#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h index f74a8c9f241..f115b358b70 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h @@ -12,13 +12,12 @@ #include #include -#include +#include #include #ifdef RN_SERIALIZABLE_STATE +#include #include -#include -#include #endif namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h index f1313960d7d..619f1bc52cf 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.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/core/EventLogger.h b/packages/react-native/ReactCommon/react/renderer/core/EventLogger.h index f9d797f02a8..2b637eb6edb 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventLogger.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventLogger.h @@ -9,8 +9,8 @@ #include +#include #include -#include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h b/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h index 43e7d7161d8..0178f1c0752 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h @@ -12,12 +12,12 @@ #include #include +#include #include #include #include #include #include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h index 865ad7ccb7f..87f3d246f04 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h @@ -11,9 +11,9 @@ #include +#include +#include #include -#include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h index ff9c41ee44f..1287da4feec 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h @@ -9,12 +9,10 @@ #include +#include +#include +#include #include -#include -#include -#include -#include -#include #include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h index a7a4ea33f07..8655de5f396 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h @@ -14,12 +14,12 @@ #include #include -#include +#include +#include +#include #include #include #include -#include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/Props.h b/packages/react-native/ReactCommon/react/renderer/core/Props.h index e5c0cba8dae..c717e3182a0 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/Props.h +++ b/packages/react-native/ReactCommon/react/renderer/core/Props.h @@ -9,16 +9,16 @@ #include +#include #include #include #include #include #include -#include #ifdef ANDROID +#include #include -#include #endif namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/PropsMacros.h b/packages/react-native/ReactCommon/react/renderer/core/PropsMacros.h index 42f386ad618..cb1ad5bb93e 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/PropsMacros.h +++ b/packages/react-native/ReactCommon/react/renderer/core/PropsMacros.h @@ -9,8 +9,8 @@ #include +#include #include -#include #include // We need to use clang pragmas inside of a macro below, diff --git a/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h b/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h index dab268aab28..7ff760a0219 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h +++ b/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h @@ -11,8 +11,8 @@ #include +#include #include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawEvent.h b/packages/react-native/ReactCommon/react/renderer/core/RawEvent.h index e6b798053fd..2b082a5c473 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawEvent.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawEvent.h @@ -12,10 +12,10 @@ #include #include +#include #include #include #include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawValue.h b/packages/react-native/ReactCommon/react/renderer/core/RawValue.h index 176ca8ce00b..e96d25328aa 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawValue.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawValue.h @@ -18,7 +18,7 @@ #include -#include +#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/Sealable.h b/packages/react-native/ReactCommon/react/renderer/core/Sealable.h index a18904ba98b..74e13041c68 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/Sealable.h +++ b/packages/react-native/ReactCommon/react/renderer/core/Sealable.h @@ -11,7 +11,7 @@ #include -#include +#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h index 3c016db8334..2426c9065fc 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h @@ -15,6 +15,7 @@ #include #include +#include #include #include #include @@ -22,7 +23,6 @@ #include #include #include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/core/State.h b/packages/react-native/ReactCommon/react/renderer/core/State.h index 437409a119e..7a07bc26806 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/State.h +++ b/packages/react-native/ReactCommon/react/renderer/core/State.h @@ -10,9 +10,9 @@ #include #ifdef RN_SERIALIZABLE_STATE +#include #include #include -#include #endif #include diff --git a/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h b/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h index 725ad9ec674..6b77ed7a209 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h @@ -12,19 +12,12 @@ #include #include +#include +#include +#include #include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #ifdef RN_SERIALIZABLE_STATE #include diff --git a/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h b/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h index 7780c7af94b..549ea9b7538 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h +++ b/packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h @@ -32,7 +32,6 @@ #include #include -#include #include #undef RN_UMBRELLA_CONTEXT diff --git a/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h b/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h index acc9a23fd84..0b411ed5cfa 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h +++ b/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h b/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h index 1301e24a9d4..fc097b2fe9b 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h @@ -53,15 +53,6 @@ #include #include #include -#include - -#ifdef ANDROID -#include -#endif - -#if defined(__APPLE__) && defined(__OBJC__) -#include -#endif #undef RN_UMBRELLA_CONTEXT #pragma pop_macro("RN_UMBRELLA_CONTEXT") diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h index bfd96f12281..5b666747f51 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #import #import diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h b/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h index b5f93f2891f..eea8010b503 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/rounding.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include From 2017d64734e619689a6faf96db65aecda236a590 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Fri, 25 Sep 2026 06:20:12 -0700 Subject: [PATCH 3/3] Use umbrella includes in textlayoutmanager headers (#58665) Summary: Pull Request resolved: https://github.com/react/react-native/pull/58665 Switch the public headers of `react/renderer/textlayoutmanager` from fine-grained cross-module includes to the stable umbrella headers (``, ``, ``). Implementation files keep using the fine-grained headers. Adds the `react/renderer/graphics` umbrella search path to `React-FabricComponents` for framework builds, since textlayoutmanager headers now reach it through the umbrella. No new module dependencies are needed. Changelog: [Internal] Differential Revision: D121582300 --- .../react-native/ReactCommon/React-FabricComponents.podspec | 1 + .../react/renderer/textlayoutmanager/TextLayoutContext.h | 4 ++-- .../renderer/textlayoutmanager/TextLayoutManagerExtended.h | 2 +- .../react/renderer/textlayoutmanager/TextMeasureCache.h | 6 ++---- .../renderer/textlayoutmanager/TextMeasurementRounding.h | 2 +- .../react/renderer/textlayoutmanager/TextLayoutManager.h | 4 ++-- .../react/renderer/textlayoutmanager/TextLayoutManager.h | 4 ++-- .../react/renderer/textlayoutmanager/RCTTextLayoutManager.h | 2 +- .../textlayoutmanager/RCTTextPrimitivesConversions.h | 2 +- .../react/renderer/textlayoutmanager/TextLayoutManager.h | 4 ++-- 10 files changed, 15 insertions(+), 16 deletions(-) diff --git a/packages/react-native/ReactCommon/React-FabricComponents.podspec b/packages/react-native/ReactCommon/React-FabricComponents.podspec index ae7adc6ace1..93e329c6ee2 100644 --- a/packages/react-native/ReactCommon/React-FabricComponents.podspec +++ b/packages/react-native/ReactCommon/React-FabricComponents.podspec @@ -41,6 +41,7 @@ if ENV['USE_FRAMEWORKS'] "\"$(PODS_TARGET_SRCROOT)/react/renderer/components/view\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/core\"", "\"$(PODS_TARGET_SRCROOT)/react/renderer/debug\"", + "\"$(PODS_TARGET_SRCROOT)/react/renderer/graphics\"", "\"$(PODS_TARGET_SRCROOT)/react/utils\"", ] end diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h index b80911286e6..4bac2ed2436 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h @@ -9,8 +9,8 @@ #include -#include -#include +#include +#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutManagerExtended.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutManagerExtended.h index acb7a068e2d..a0aaf283b59 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutManagerExtended.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutManagerExtended.h @@ -12,9 +12,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h index 9840fa85073..3ce94eef03a 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h @@ -9,12 +9,10 @@ #include +#include +#include #include #include -#include -#include -#include -#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasurementRounding.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasurementRounding.h index 56d30c39f44..d42c96893f8 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasurementRounding.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasurementRounding.h @@ -11,7 +11,7 @@ #include -#include +#include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h index 51936a111e1..97b878dcec9 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h @@ -9,14 +9,14 @@ #include +#include +#include #include #include #include -#include #include #include #include -#include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.h index 2fc306d3bd6..9cf9543b628 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/react/renderer/textlayoutmanager/TextLayoutManager.h @@ -9,12 +9,12 @@ #include +#include +#include #include #include -#include #include #include -#include #include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h index e0f30b8499a..d30a3e3a470 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.h @@ -9,9 +9,9 @@ #import +#import #import #import -#import #import #import diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h index 8e873550637..b5d29cf44a6 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextPrimitivesConversions.h @@ -9,7 +9,7 @@ #import -#include +#include #include #include diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h index 71100221f09..c97994b6068 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h @@ -9,12 +9,12 @@ #include +#include +#include #include #include -#include #include #include -#include #include namespace facebook::react {