Skip to content

Use umbrella includes in textlayoutmanager headers (#58665) #58665

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

Open
j-piasecki wants to merge 3 commits into
base: main
Choose a base branch
from
+50 −68
Open

Use umbrella includes in textlayoutmanager headers (#58665) #58665

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
d720f74
Make select graphics and debug implementation headers private
j-piasecki Sep 28, 2026
25fdf5e
Use umbrellas instead of direct includes in renderer core module
Sep 28, 2026
e4b7e52
Use umbrella includes in textlayoutmanager headers (#58665)
j-piasecki Sep 28, 2026
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
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/React-Fabric.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/React-FabricComponents.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
#include <memory>
#include <vector>

#include <react/debug/react_native_assert.h>
#include <react/featureflags/ReactNativeFeatureFlags.h>
#include <React/Debug.h>
#include <React/FeatureFlags.h>
#include <React/Graphics.h>
#include <react/renderer/core/ComponentDescriptor.h>
#include <react/renderer/core/EventDispatcher.h>
#include <react/renderer/core/Props.h>
#include <react/renderer/core/PropsParserContext.h>
#include <react/renderer/core/ShadowNode.h>
#include <react/renderer/core/ShadowNodeFragment.h>
#include <react/renderer/core/State.h>
#include <react/renderer/graphics/Float.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/debug/react_native_assert.h>
#include <React/Debug.h>
#include <react/renderer/core/ConcreteState.h>
#include <react/renderer/core/Props.h>
#include <react/renderer/core/PropsParserContext.h>
Expand Down
5 changes: 2 additions & 3 deletions packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@
#include <functional>
#include <memory>

#include <react/debug/react_native_assert.h>
#include <React/Debug.h>
#include <react/renderer/core/State.h>

#ifdef RN_SERIALIZABLE_STATE
#include <React/MapBuffer.h>
#include <fbjni/fbjni.h>
#include <react/renderer/mapbuffer/MapBuffer.h>
#include <react/renderer/mapbuffer/MapBufferBuilder.h>
#endif

namespace facebook::react {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
#include <memory>
#include <mutex>

#include <React/Timing.h>
#include <folly/dynamic.h>
#include <react/renderer/core/EventDispatcher.h>
#include <react/renderer/core/EventPayload.h>
#include <react/renderer/core/EventTarget.h>
#include <react/renderer/core/ReactPrimitives.h>
#include <react/renderer/core/ValueFactoryEventPayload.h>
#include <react/timing/primitives.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/EventLogger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <React/Timing.h>
#include <react/renderer/core/EventTarget.h>
#include <react/timing/primitives.h>

#include <optional>
#include <string_view>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/EventPipe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
#include <functional>
#include <string>

#include <React/Timing.h>
#include <jsi/jsi.h>
#include <react/renderer/core/EventPayload.h>
#include <react/renderer/core/EventTarget.h>
#include <react/renderer/core/ReactEventPriority.h>
#include <react/renderer/core/ValueFactory.h>
#include <react/timing/primitives.h>

namespace facebook::react {

Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

#include <limits>

#include <React/Graphics.h>
#include <React/Utils.h>
#include <react/renderer/core/LayoutPrimitives.h>
#include <react/renderer/graphics/Size.h>
#include <react/utils/hash_combine.h>

namespace facebook::react {

Expand Down
8 changes: 3 additions & 5 deletions packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <React/Graphics.h>
#include <React/RendererDebug.h>
#include <React/Utils.h>
#include <react/renderer/core/LayoutPrimitives.h>
#include <react/renderer/debug/DebugStringConvertible.h>
#include <react/renderer/debug/flags.h>
#include <react/renderer/graphics/Rect.h>
#include <react/renderer/graphics/RectangleEdges.h>
#include <react/utils/hash_combine.h>
#include <algorithm>

namespace facebook::react {
Expand Down
6 changes: 3 additions & 3 deletions packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
#include <memory>
#include <vector>

#include <react/debug/react_native_assert.h>
#include <React/Debug.h>
#include <React/Graphics.h>
#include <React/RendererDebug.h>
#include <react/renderer/core/LayoutMetrics.h>
#include <react/renderer/core/ShadowNode.h>
#include <react/renderer/core/ShadowNodeFragment.h>
#include <react/renderer/debug/DebugStringConvertible.h>
#include <react/renderer/graphics/Transform.h>

namespace facebook::react {

Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/core/Props.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <React/RendererDebug.h>
#include <react/renderer/core/PropsMacros.h>
#include <react/renderer/core/PropsParserContext.h>
#include <react/renderer/core/RawProps.h>
#include <react/renderer/core/ReactPrimitives.h>
#include <react/renderer/core/Sealable.h>
#include <react/renderer/debug/DebugStringConvertible.h>

#ifdef ANDROID
#include <React/MapBuffer.h>
#include <folly/dynamic.h>
#include <react/renderer/mapbuffer/MapBufferBuilder.h>
#endif

namespace facebook::react {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/PropsMacros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <React/Utils.h>
#include <react/renderer/core/RawPropsPrimitives.h>
#include <react/utils/fnv1a.h>
#include <functional>

// We need to use clang pragmas inside of a macro below,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#include <optional>

#include <React/Utils.h>
#include <react/renderer/core/ReactPrimitives.h>
#include <react/utils/ContextContainer.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/RawEvent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include <memory>
#include <string>

#include <React/Timing.h>
#include <react/renderer/core/EventLogger.h>
#include <react/renderer/core/EventPayload.h>
#include <react/renderer/core/EventTarget.h>
#include <react/timing/primitives.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/RawValue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <react/renderer/core/RawPropsPrimitives.h>

#include <react/debug/react_native_assert.h>
#include <React/Debug.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/Sealable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <atomic>

#include <react/debug/flags.h>
#include <React/Debug.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
#include <type_traits>
#include <vector>

#include <React/RendererDebug.h>
#include <react/renderer/core/EventEmitter.h>
#include <react/renderer/core/Props.h>
#include <react/renderer/core/ReactPrimitives.h>
#include <react/renderer/core/Sealable.h>
#include <react/renderer/core/ShadowNodeFamily.h>
#include <react/renderer/core/ShadowNodeTraits.h>
#include <react/renderer/core/State.h>
#include <react/renderer/debug/DebugStringConvertible.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/core/State.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
#include <react/cxxstableapi/UmbrellaGuard.h>

#ifdef RN_SERIALIZABLE_STATE
#include <React/MapBuffer.h>
#include <fbjni/fbjni.h>
#include <folly/dynamic.h>
#include <react/renderer/mapbuffer/MapBuffer.h>
#endif

#include <react/renderer/core/ShadowNodeFamily.h>
Expand Down
13 changes: 3 additions & 10 deletions packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,12 @@
#include <array>
#include <unordered_map>

#include <React/Debug.h>
#include <React/Graphics.h>
#include <React/RendererDebug.h>
#include <glog/logging.h>
#include <react/debug/react_native_expect.h>
#include <react/renderer/core/PropsParserContext.h>
#include <react/renderer/core/RawProps.h>
#include <react/renderer/debug/DebugStringConvertible.h>
#include <react/renderer/graphics/Color.h>
#include <react/renderer/graphics/Float.h>
#include <react/renderer/graphics/PlatformColorParser.h>
#include <react/renderer/graphics/Point.h>
#include <react/renderer/graphics/Rect.h>
#include <react/renderer/graphics/RectangleCorners.h>
#include <react/renderer/graphics/RectangleEdges.h>
#include <react/renderer/graphics/Size.h>

#ifdef RN_SERIALIZABLE_STATE
#include <yoga/Yoga.h>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/css/CSSColorFunction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ constexpr uint8_t clamp255Component(float f)
// be rounded towards +∞.
// https://www.w3.org/TR/css-color-4/#rgb-functions
auto i = static_cast<int32_t>(f);
auto ceiled = f > i ? i + 1 : i;
auto ceiled = f > static_cast<float>(i) ? i + 1 : i;
return static_cast<uint8_t>(std::clamp(ceiled, 0, 255));
}

Expand Down
1 change: 0 additions & 1 deletion packages/react-native/ReactCommon/react/renderer/debug/React/RendererDebug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

#include <react/renderer/debug/DebugStringConvertible.h>
#include <react/renderer/debug/DebugStringConvertibleItem.h>
#include <react/renderer/debug/debugStringConvertibleUtils.h>
#include <react/renderer/debug/flags.h>

#undef RN_UMBRELLA_CONTEXT
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/PrivateGuard.h>

#include <memory>
#include <optional>
Expand Down
9 changes: 0 additions & 9 deletions packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,6 @@
#include <react/renderer/graphics/ValueUnit.h>
#include <react/renderer/graphics/Vector.h>
#include <react/renderer/graphics/fromRawValueShared.h>
#include <react/renderer/graphics/rounding.h>

#ifdef ANDROID
#include <react/renderer/graphics/configurePlatformColorCacheInvalidationHook.h>
#endif

#if defined(__APPLE__) && defined(__OBJC__)
#include <react/renderer/graphics/RCTPlatformColorUtils.h>
#endif

#undef RN_UMBRELLA_CONTEXT
#pragma pop_macro("RN_UMBRELLA_CONTEXT")
2 changes: 1 addition & 1 deletion ...mmon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/FrameworksGuard.h>

#import <UIKit/UIKit.h>
#import <vector>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/graphics/rounding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>
#include <react/cxxstableapi/PrivateGuard.h>

#include <react/renderer/graphics/Float.h>

Expand Down
4 changes: 2 additions & 2 deletions packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include <react/cxxstableapi/FrameworksGuard.h>

#include <react/renderer/core/ReactPrimitives.h>
#include <react/renderer/graphics/Float.h>
#include <React/Graphics.h>
#include <React/RendererCore.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion ...ges/react-native/ReactCommon/react/renderer/textlayoutmanager/TextLayoutManagerExtended.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#include <glog/logging.h>
#include <cstddef>

#include <React/Graphics.h>
#include <react/renderer/attributedstring/AttributedStringBox.h>
#include <react/renderer/attributedstring/ParagraphAttributes.h>
#include <react/renderer/graphics/Size.h>
#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
#include <react/renderer/textlayoutmanager/TextMeasureCache.h>

Expand Down
6 changes: 2 additions & 4 deletions packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@

#include <react/cxxstableapi/FrameworksGuard.h>

#include <React/RendererCore.h>
#include <React/Utils.h>
#include <react/renderer/attributedstring/AttributedString.h>
#include <react/renderer/attributedstring/ParagraphAttributes.h>
#include <react/renderer/core/LayoutConstraints.h>
#include <react/utils/FloatComparison.h>
#include <react/utils/SimpleThreadSafeCache.h>
#include <react/utils/hash_combine.h>

namespace facebook::react {

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasurementRounding.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#include <cmath>

#include <react/renderer/graphics/Size.h>
#include <React/Graphics.h>

namespace facebook::react {

Expand Down
4 changes: 2 additions & 2 deletions ...r/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

#include <react/cxxstableapi/FrameworksGuard.h>

#include <React/RendererCore.h>
#include <React/Utils.h>
#include <react/jni/SafeReleaseJniRef.h>
#include <react/renderer/attributedstring/AttributedStringBox.h>
#include <react/renderer/attributedstring/ParagraphAttributes.h>
#include <react/renderer/core/LayoutConstraints.h>
#include <react/renderer/textlayoutmanager/JPreparedLayout.h>
#include <react/renderer/textlayoutmanager/TextLayoutContext.h>
#include <react/renderer/textlayoutmanager/TextMeasureCache.h>
#include <react/utils/ContextContainer.h>

#include <fbjni/fbjni.h>
#include <memory>
Expand Down
Loading
Loading