Skip to content

Commit d63e658

Browse files
coadometa-codesync[bot]
authored andcommitted
Use public umbrellas in UIManager headers
Summary: Route public React Native dependencies in exported UIManager framework headers through supported umbrella entry points. Preserve same-target, framework-tier, graphics, and third-party includes while declaring standard-library and build dependencies directly. Changelog: [Internal] Differential Revision: D121402288
1 parent 575346c commit d63e658

15 files changed

Lines changed: 71 additions & 33 deletions

‎packages/react-native/ReactCommon/react/renderer/uimanager/AppRegistryBinding.h‎

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

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

12+
#include <React/RendererCore.h>
13+
1214
#include <folly/dynamic.h>
1315
#include <jsi/jsi.h>
14-
#include <react/renderer/core/ReactPrimitives.h>
16+
17+
#include <string>
1518

1619
namespace facebook::react {
1720

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ add_library(react_renderer_uimanager OBJECT ${react_renderer_uimanager_SRC})
1414
target_include_directories(react_renderer_uimanager PUBLIC ${REACT_COMMON_DIR})
1515

1616
target_link_libraries(react_renderer_uimanager
17+
callinvoker
1718
glog
1819
folly_runtime
1920
jsi
@@ -32,6 +33,8 @@ target_link_libraries(react_renderer_uimanager
3233
react_renderer_leakchecker
3334
react_renderer_runtimescheduler
3435
react_renderer_mounting
36+
react_timing
37+
react_utils
3538
rrc_root
3639
rrc_view
3740
runtimeexecutor

‎packages/react-native/ReactCommon/react/renderer/uimanager/LayoutEventEmitter.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
#include <react/renderer/uimanager/UIManagerCommitHook.h>
1313

14+
#include <vector>
15+
1416
namespace facebook::react {
1517

1618
/*

‎packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99

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

12+
#include <cstdint>
1213
#include <functional>
14+
#include <memory>
15+
#include <string>
16+
#include <unordered_map>
1317

1418
#include <jsi/jsi.h>
1519
#include <react/renderer/uimanager/PointerHoverTracker.h>

‎packages/react-native/ReactCommon/react/renderer/uimanager/PointerHoverTracker.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@
99

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

12+
#include <React/RendererCore.h>
13+
#include <React/View.h>
14+
1215
#include <functional>
1316
#include <initializer_list>
1417
#include <memory>
18+
#include <tuple>
19+
#include <vector>
1520

16-
#include <react/renderer/components/view/primitives.h>
17-
#include <react/renderer/core/ReactPrimitives.h>
18-
#include <react/renderer/core/ShadowNode.h>
1921
#include <react/renderer/uimanager/UIManager.h>
2022

2123
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,14 @@
99

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

12+
#include <React/ComponentRegistry.h>
13+
#include <React/RendererCore.h>
14+
#include <React/RuntimeExecutor.h>
15+
#include <React/Utils.h>
16+
1217
#include <folly/dynamic.h>
1318
#include <jsi/jsi.h>
1419

15-
#include <ReactCommon/RuntimeExecutor.h>
16-
#include <shared_mutex>
17-
18-
#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
19-
#include <react/renderer/core/InstanceHandle.h>
20-
#include <react/renderer/core/RawValue.h>
21-
#include <react/renderer/core/ShadowNode.h>
22-
#include <react/renderer/core/StateData.h>
2320
#include <react/renderer/mounting/ShadowTree.h>
2421
#include <react/renderer/mounting/ShadowTreeDelegate.h>
2522
#include <react/renderer/mounting/ShadowTreeRegistry.h>
@@ -29,7 +26,12 @@
2926
#include <react/renderer/uimanager/UIManagerNativeAnimatedDelegate.h>
3027
#include <react/renderer/uimanager/UIManagerViewTransitionDelegate.h>
3128
#include <react/renderer/uimanager/primitives.h>
32-
#include <react/utils/ContextContainer.h>
29+
#include <functional>
30+
#include <memory>
31+
#include <shared_mutex>
32+
#include <string>
33+
#include <unordered_map>
34+
#include <vector>
3335

3436
namespace facebook::react {
3537

‎packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationBackend.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99

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

12-
#include <ReactCommon/CallInvoker.h>
13-
#include <react/renderer/core/ReactPrimitives.h>
12+
#include <React/CallInvoker.h>
13+
#include <React/RendererCore.h>
14+
1415
#include <chrono>
16+
#include <cstdint>
1517
#include <functional>
1618
#include <memory>
1719

‎packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99

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

12-
#include <jsi/jsi.h>
12+
#include <React/ComponentRegistry.h>
13+
#include <React/RendererCore.h>
1314

14-
#include <react/renderer/componentregistry/ComponentDescriptorFactory.h>
15-
#include <react/renderer/core/RawValue.h>
15+
#include <jsi/jsi.h>
1616

1717
namespace facebook::react {
1818

‎packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@
99

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

12+
#include <React/Timing.h>
13+
1214
#include <jsi/jsi.h>
13-
#include <react/renderer/core/RawValue.h>
15+
16+
#include <memory>
17+
#include <string>
18+
1419
#include <react/renderer/uimanager/PointerEventsProcessor.h>
1520
#include <react/renderer/uimanager/UIManager.h>
16-
#include <react/renderer/uimanager/primitives.h>
17-
#include <react/timing/primitives.h>
1821

1922
namespace facebook::react {
2023

‎packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

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

12+
#include <vector>
13+
1214
#include <react/renderer/components/root/RootShadowNode.h>
1315

1416
namespace facebook::react {

0 commit comments

Comments
 (0)