Skip to content

Commit 6422424

Browse files
coadometa-codesync[bot]
authored andcommitted
Use public umbrellas in UIManager headers
Summary: Migrate React-Fabric mounting headers to consume the RendererCore, Graphics, and Utils stable umbrellas instead of guarded leaf headers. Add the coreUmbrella dependency to the mounting subspec so dynamic-framework consumers receive the owning header. Avoid RendererDebug.h because its eager utility-template exports change downstream overload lookup; RendererCore already provides the debug flags and declaration types used by mounting. Drop the `#ifdef ANDROID` include of `configurePlatformColorCacheInvalidationHook.h` from the Graphics umbrella. The Android `PlatformColorParser.h` already includes it, and the explicit include broke Android builds that use the cxx graphics platform headers, where that header does not exist. Changelog: [Internal] Differential Revision: D121790104
1 parent 1472190 commit 6422424

12 files changed

Lines changed: 14 additions & 27 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ Pod::Spec.new do |s|
208208
end
209209

210210
s.subspec "mounting" do |ss|
211+
ss.dependency "React-Fabric/coreUmbrella"
211212
ss.dependency "React-jsinspectortracing"
212213
ss.source_files = podspec_sources("react/renderer/mounting/**/*.{m,mm,cpp,h}", "react/renderer/mounting/**/*.h")
213214
ss.exclude_files = "react/renderer/mounting/tests"

‎packages/react-native/ReactCommon/react/renderer/graphics/React/Graphics.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,6 @@
5555
#include <react/renderer/graphics/fromRawValueShared.h>
5656
#include <react/renderer/graphics/rounding.h>
5757

58-
#ifdef ANDROID
59-
#include <react/renderer/graphics/configurePlatformColorCacheInvalidationHook.h>
60-
#endif
61-
6258
#if defined(__APPLE__) && defined(__OBJC__)
6359
#include <react/renderer/graphics/RCTPlatformColorUtils.h>
6460
#endif

‎packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h‎

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

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

12-
#include <react/renderer/core/ShadowNode.h>
12+
#include <React/RendererCore.h>
1313
#include <react/renderer/mounting/ShadowViewMutation.h>
1414

1515
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h‎

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

16-
#include <react/renderer/debug/flags.h>
16+
#include <React/RendererCore.h>
1717
#include <react/renderer/mounting/Differentiator.h>
1818
#include <react/renderer/mounting/MountingOverrideDelegate.h>
1919
#include <react/renderer/mounting/MountingTransaction.h>

‎packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,12 @@
1313
#include <mutex>
1414
#include <shared_mutex>
1515

16+
#include <React/RendererCore.h>
17+
#include <React/Utils.h>
1618
#include <react/renderer/components/root/RootShadowNode.h>
17-
#include <react/renderer/core/LayoutConstraints.h>
18-
#include <react/renderer/core/ReactPrimitives.h>
19-
#include <react/renderer/core/ShadowNode.h>
2019
#include <react/renderer/mounting/MountingCoordinator.h>
2120
#include <react/renderer/mounting/ShadowTreeDelegate.h>
2221
#include <react/renderer/mounting/ShadowTreeRevision.h>
23-
#include <react/utils/ContextContainer.h>
2422
#include "MountingOverrideDelegate.h"
2523

2624
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h‎

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

15-
#include <react/renderer/core/ReactPrimitives.h>
15+
#include <React/RendererCore.h>
1616
#include <react/renderer/mounting/ShadowTree.h>
1717

1818
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h‎

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

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

12-
#include <react/renderer/core/EventEmitter.h>
13-
#include <react/renderer/core/LayoutMetrics.h>
14-
#include <react/renderer/core/Props.h>
15-
#include <react/renderer/core/ReactPrimitives.h>
16-
#include <react/renderer/core/ShadowNode.h>
17-
#include <react/renderer/debug/flags.h>
18-
#include <react/utils/hash_combine.h>
12+
#include <React/RendererCore.h>
13+
#include <React/Utils.h>
1914

2015
namespace facebook::react {
2116

‎packages/react-native/ReactCommon/react/renderer/mounting/internal/CullingContext.h‎

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

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

12-
#include <react/renderer/graphics/Rect.h>
13-
#include <react/renderer/graphics/Transform.h>
12+
#include <React/Graphics.h>
1413

1514
namespace facebook::react {
1615

‎packages/react-native/ReactCommon/react/renderer/mounting/internal/ShadowViewNodePair.h‎

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

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

12-
#include <react/renderer/core/ShadowNode.h>
13-
#include <react/renderer/graphics/Point.h>
12+
#include <React/Graphics.h>
13+
#include <React/RendererCore.h>
1414
#include <react/renderer/mounting/ShadowView.h>
1515

1616
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/mounting/stubs/StubView.h‎

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

15-
#include <react/renderer/core/LayoutMetrics.h>
16-
#include <react/renderer/core/State.h>
17-
#include <react/renderer/debug/debugStringConvertibleUtils.h>
15+
#include <React/RendererCore.h>
1816
#include <react/renderer/mounting/ShadowView.h>
1917

2018
namespace facebook::react {

0 commit comments

Comments
 (0)