Skip to content

Commit 56e918b

Browse files
coadofacebook-github-bot
authored andcommitted
Use public umbrellas in root headers (#58575)
Summary: Route public C++ dependencies through their supported umbrella entry points so framework consumers can use the root module with strict API enforcement enabled. Stage the iOS ImageRequestParams header under its canonical imagemanager include path in the prebuilt header inventory. The public ImageManager umbrella exposes this platform-specific type transitively, so framework builds need it alongside the root imagemanager headers. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D120532145
1 parent fbcfdac commit 56e918b

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ Pod::Spec.new do |s|
142142

143143
s.subspec "components" do |ss|
144144
ss.subspec "root" do |sss|
145+
sss.dependency "React-Fabric/coreUmbrella"
146+
sss.dependency "React-Fabric/components/viewUmbrella"
145147
sss.source_files = podspec_sources("react/renderer/components/root/**/*.{m,mm,cpp,h}", "react/renderer/components/root/**/*.{h}")
146148
sss.exclude_files = "react/renderer/components/root/tests"
147149
sss.header_dir = "react/renderer/components/root"

‎packages/react-native/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h‎

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

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

12+
#include <React/RendererCore.h>
1213
#include <react/renderer/components/root/RootShadowNode.h>
13-
#include <react/renderer/core/ConcreteComponentDescriptor.h>
1414

1515
namespace facebook::react {
1616

‎packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h‎

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

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

12-
#include <memory>
13-
14-
#include <react/renderer/components/view/ViewProps.h>
15-
#include <react/renderer/core/LayoutConstraints.h>
16-
#include <react/renderer/core/LayoutContext.h>
17-
#include <react/renderer/core/PropsParserContext.h>
12+
#include <React/RendererCore.h>
13+
#include <React/View.h>
1814

1915
namespace facebook::react {
2016

‎packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h‎

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

1212
#include <memory>
1313

14+
#include <React/RendererCore.h>
15+
#include <React/View.h>
1416
#include <react/renderer/components/root/RootProps.h>
15-
#include <react/renderer/components/view/ConcreteViewShadowNode.h>
16-
#include <react/renderer/core/LayoutContext.h>
17-
#include <react/renderer/core/PropsParserContext.h>
1817

1918
namespace facebook::react {
2019

‎packages/react-native/scripts/ios-prebuild/headers-config.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,10 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
185185

186186
{
187187
name: 'imagemanager',
188-
headerPatterns: ['react/renderer/imagemanager/*.h'],
188+
headerPatterns: [
189+
'react/renderer/imagemanager/*.h',
190+
'react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequestParams.h',
191+
],
189192
headerDir: 'react/renderer/imagemanager',
190193
},
191194

0 commit comments

Comments
 (0)