Skip to content

Commit 317c398

Browse files
j-piaseckifacebook-github-bot
authored andcommitted
Use umbrellas instead of direct includes in renderer core module
Summary: Changelog: [Internal] Update the `react/renderer/core` module to use the `React/Debug.h`, `React/FeatureFlags.h`, `React/Timing.h`, `React/Utils.h` and `React/MapBuffer.h` umbrella includes instead of direct ones. `react/renderer/graphics` and `react/renderer/debug` keep direct includes. Their umbrellas re-export `rounding.h` and `debugStringConvertibleUtils.h`, which are unsafe to pull into every translation unit that sees a core header: the former makes unqualified `round()` ambiguous in ObjC++, the latter resolves `toString(T)` before later overloads are declared. Differential Revision: D121395742
1 parent 27383ff commit 317c398

19 files changed

Lines changed: 21 additions & 20 deletions

‎packages/react-native/ReactCommon/React-Fabric.podspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Pod::Spec.new do |s|
4444
s.dependency "React-debug"
4545
s.dependency "React-cxxstableapi"
4646
s.dependency "React-featureflags"
47+
s.dependency "React-timing"
4748
s.dependency "React-runtimescheduler"
4849
s.dependency "React-cxxreact"
4950
s.dependency "React-bridging"

‎packages/react-native/ReactCommon/react/renderer/core/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ target_link_libraries(react_renderer_core
2525
react_renderer_graphics
2626
react_renderer_mapbuffer
2727
react_renderer_runtimescheduler
28+
react_timing
2829
react_utils
2930
runtimeexecutor
3031
yoga)

‎packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include <memory>
1313
#include <vector>
1414

15-
#include <react/debug/react_native_assert.h>
16-
#include <react/featureflags/ReactNativeFeatureFlags.h>
15+
#include <React/Debug.h>
16+
#include <React/FeatureFlags.h>
1717
#include <react/renderer/core/ComponentDescriptor.h>
1818
#include <react/renderer/core/EventDispatcher.h>
1919
#include <react/renderer/core/Props.h>

‎packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h‎

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

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

12-
#include <react/debug/react_native_assert.h>
12+
#include <React/Debug.h>
1313
#include <react/renderer/core/ConcreteState.h>
1414
#include <react/renderer/core/Props.h>
1515
#include <react/renderer/core/PropsParserContext.h>

‎packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
#include <functional>
1313
#include <memory>
1414

15-
#include <react/debug/react_native_assert.h>
15+
#include <React/Debug.h>
1616
#include <react/renderer/core/State.h>
1717

1818
#ifdef RN_SERIALIZABLE_STATE
19+
#include <React/MapBuffer.h>
1920
#include <fbjni/fbjni.h>
20-
#include <react/renderer/mapbuffer/MapBuffer.h>
21-
#include <react/renderer/mapbuffer/MapBufferBuilder.h>
2221
#endif
2322

2423
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h‎

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

15+
#include <React/Timing.h>
1516
#include <folly/dynamic.h>
1617
#include <react/renderer/core/EventDispatcher.h>
1718
#include <react/renderer/core/EventPayload.h>
1819
#include <react/renderer/core/EventTarget.h>
1920
#include <react/renderer/core/ReactPrimitives.h>
2021
#include <react/renderer/core/ValueFactoryEventPayload.h>
21-
#include <react/timing/primitives.h>
2222

2323
namespace facebook::react {
2424

‎packages/react-native/ReactCommon/react/renderer/core/EventLogger.h‎

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

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

12+
#include <React/Timing.h>
1213
#include <react/renderer/core/EventTarget.h>
13-
#include <react/timing/primitives.h>
1414

1515
#include <optional>
1616
#include <string_view>

‎packages/react-native/ReactCommon/react/renderer/core/EventPipe.h‎

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

15+
#include <React/Timing.h>
1516
#include <jsi/jsi.h>
1617
#include <react/renderer/core/EventPayload.h>
1718
#include <react/renderer/core/EventTarget.h>
1819
#include <react/renderer/core/ReactEventPriority.h>
1920
#include <react/renderer/core/ValueFactory.h>
20-
#include <react/timing/primitives.h>
2121

2222
namespace facebook::react {
2323

‎packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h‎

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

1212
#include <limits>
1313

14+
#include <React/Utils.h>
1415
#include <react/renderer/core/LayoutPrimitives.h>
1516
#include <react/renderer/graphics/Size.h>
16-
#include <react/utils/hash_combine.h>
1717

1818
namespace facebook::react {
1919

‎packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h‎

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

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

12+
#include <React/Utils.h>
1213
#include <react/renderer/core/LayoutPrimitives.h>
1314
#include <react/renderer/debug/DebugStringConvertible.h>
1415
#include <react/renderer/debug/flags.h>
1516
#include <react/renderer/graphics/Rect.h>
1617
#include <react/renderer/graphics/RectangleEdges.h>
17-
#include <react/utils/hash_combine.h>
1818
#include <algorithm>
1919

2020
namespace facebook::react {

0 commit comments

Comments
 (0)