Skip to content

Commit 8b472cb

Browse files
coadometa-codesync[bot]
coado
authored and
meta-codesync[bot]
committed
Add umbrella for react/renderer/components/* subtree. (#57312)
Summary: Pull Request resolved: #57312 This change rolls the umbrella-header + include-guard mechanism across the `react/renderer/components/*` modules, classifying each target as public, for-frameworks, or private. Changelog: [Internal] Differential Revision: D109316840
1 parent 79b6659 commit 8b472cb

110 files changed

Lines changed: 484 additions & 3 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/react-native/ReactAndroid/build.gradle.kts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,17 +167,29 @@ val preparePrefab by
167167
"../ReactCommon/react/renderer/components/image/",
168168
"react/renderer/components/image/",
169169
),
170+
Pair(
171+
"../ReactCommon/react/renderer/components/image/React/",
172+
"React/",
173+
),
170174
// rrc_view
171175
Pair(
172176
"../ReactCommon/react/renderer/components/view/",
173177
"react/renderer/components/view/",
174178
),
179+
Pair(
180+
"../ReactCommon/react/renderer/components/view/React/",
181+
"React/",
182+
),
175183
Pair("../ReactCommon/react/renderer/components/view/platform/android/", ""),
176184
// rrc_root
177185
Pair(
178186
"../ReactCommon/react/renderer/components/root/",
179187
"react/renderer/components/root/",
180188
),
189+
Pair(
190+
"../ReactCommon/react/renderer/components/root/React/",
191+
"React/",
192+
),
181193
// runtimeexecutor
182194
Pair("../ReactCommon/runtimeexecutor/", ""),
183195
// react_renderer_textlayoutmanager
@@ -191,6 +203,10 @@ val preparePrefab by
191203
"../ReactCommon/react/renderer/components/text/",
192204
"react/renderer/components/text/",
193205
),
206+
Pair(
207+
"../ReactCommon/react/renderer/components/text/React/",
208+
"React/",
209+
),
194210
Pair(
195211
"../ReactCommon/react/renderer/attributedstring",
196212
"react/renderer/attributedstring",

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ Pod::Spec.new do |s|
4242
s.dependency "React-logger"
4343
s.dependency "React-Core"
4444
s.dependency "React-debug"
45+
s.dependency "React-cxxstableapi"
4546
s.dependency "React-featureflags"
4647
s.dependency "React-runtimescheduler"
4748
s.dependency "React-cxxreact"
@@ -126,21 +127,33 @@ Pod::Spec.new do |s|
126127
s.subspec "components" do |ss|
127128
ss.subspec "root" do |sss|
128129
sss.source_files = podspec_sources("react/renderer/components/root/**/*.{m,mm,cpp,h}", "react/renderer/components/root/**/*.{h}")
129-
sss.exclude_files = "react/renderer/components/root/tests"
130+
sss.exclude_files = ["react/renderer/components/root/tests", "react/renderer/components/root/React"]
130131
sss.header_dir = "react/renderer/components/root"
131132
end
132133

134+
ss.subspec "rootUmbrella" do |sss|
135+
sss.source_files = "react/renderer/components/root/React/*.h"
136+
sss.header_dir = "React"
137+
sss.header_mappings_dir = "react/renderer/components/root/React"
138+
end
139+
133140
ss.subspec "view" do |sss|
134141
sss.dependency "React-renderercss"
135142
sss.dependency "Yoga"
136143
sss.source_files = podspec_sources(["react/renderer/components/view/*.{m,mm,cpp,h}", "react/renderer/components/view/platform/cxx/**/*.{m,mm,cpp,h}"], ["react/renderer/components/view/*.{h}", "react/renderer/components/view/platform/cxx/**/*.{h}"])
137144
sss.header_dir = "react/renderer/components/view"
138145
end
139146

147+
ss.subspec "viewUmbrella" do |sss|
148+
sss.source_files = "react/renderer/components/view/React/*.h"
149+
sss.header_dir = "React"
150+
sss.header_mappings_dir = "react/renderer/components/view/React"
151+
end
152+
140153
ss.subspec "scrollview" do |sss|
141154
sss.source_files = podspec_sources("react/renderer/components/scrollview/**/*.{m,mm,cpp,h}", "react/renderer/components/scrollview/**/*.{h}")
142155
sss.header_dir = "react/renderer/components/scrollview"
143-
sss.exclude_files = "react/renderer/components/scrollview/tests", "react/renderer/components/scrollview/platform/android"
156+
sss.exclude_files = "react/renderer/components/scrollview/tests", "react/renderer/components/scrollview/platform/android", "react/renderer/components/scrollview/React"
144157
end
145158

146159
ss.subspec "legacyviewmanagerinterop" do |sss|

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ Pod::Spec.new do |s|
6060
s.dependency "React-logger"
6161
s.dependency "React-Core"
6262
s.dependency "React-debug"
63+
s.dependency "React-cxxstableapi"
6364
s.dependency "React-featureflags"
6465
s.dependency "React-utils"
6566
s.dependency "React-runtimescheduler"
@@ -94,6 +95,12 @@ Pod::Spec.new do |s|
9495
sss.header_dir = "react/renderer/components/modal"
9596
end
9697

98+
ss.subspec "modalUmbrella" do |sss|
99+
sss.source_files = "react/renderer/components/modal/React/*.h"
100+
sss.header_dir = "React"
101+
sss.header_mappings_dir = "react/renderer/components/modal/React"
102+
end
103+
97104
ss.subspec "safeareaview" do |sss|
98105
sss.source_files = podspec_sources("react/renderer/components/safeareaview/**/*.{m,mm,cpp,h}", "react/renderer/components/safeareaview/**/*.h")
99106
# Exclude tests to avoid conflicts with the react-native-safe-area-context package
@@ -112,6 +119,12 @@ Pod::Spec.new do |s|
112119
sss.header_dir = "react/renderer/components/scrollview"
113120
end
114121

122+
ss.subspec "scrollviewUmbrella" do |sss|
123+
sss.source_files = "react/renderer/components/scrollview/React/*.h"
124+
sss.header_dir = "React"
125+
sss.header_mappings_dir = "react/renderer/components/scrollview/React"
126+
end
127+
115128
ss.subspec "text" do |sss|
116129
sss.source_files = podspec_sources(["react/renderer/components/text/*.{m,mm,cpp,h}",
117130
"react/renderer/components/text/platform/cxx/**/*.{m,mm,cpp,h}"],
@@ -120,6 +133,12 @@ Pod::Spec.new do |s|
120133
sss.header_dir = "react/renderer/components/text"
121134
end
122135

136+
ss.subspec "textUmbrella" do |sss|
137+
sss.source_files = "react/renderer/components/text/React/*.h"
138+
sss.header_dir = "React"
139+
sss.header_mappings_dir = "react/renderer/components/text/React"
140+
end
141+
123142
ss.subspec "iostextinput" do |sss|
124143
sss.source_files = podspec_sources(["react/renderer/components/textinput/*.{m,mm,cpp,h}",
125144
"react/renderer/components/textinput/platform/ios/**/*.{m,mm,cpp,h}"],

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,19 @@ Pod::Spec.new do |s|
4343
s.platforms = min_supported_versions
4444
s.source = source
4545
s.source_files = podspec_sources("react/renderer/components/image/**/*.{m,mm,cpp,h}", "react/renderer/components/image/**/*.h")
46-
s.exclude_files = "react/renderer/components/image/tests"
46+
s.exclude_files = ["react/renderer/components/image/tests", "react/renderer/components/image/React"]
4747
s.header_dir = "react/renderer/components/image"
4848
s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
4949
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
5050
"HEADER_SEARCH_PATHS" => header_search_path.join(" ")
5151
}
5252

53+
s.subspec "Umbrella" do |ss|
54+
ss.source_files = "react/renderer/components/image/React/*.h"
55+
ss.header_dir = "React"
56+
ss.header_mappings_dir = "react/renderer/components/image/React"
57+
end
58+
5359
resolve_use_frameworks(s, header_mappings_dir: './', module_name: "React_FabricImage")
5460

5561
s.dependency "React-jsiexecutor", version
@@ -60,6 +66,7 @@ Pod::Spec.new do |s|
6066
s.dependency "React-featureflags"
6167
s.dependency "React-utils"
6268
s.dependency "Yoga"
69+
s.dependency "React-cxxstableapi"
6370

6471
add_dependency(s, "React-ImageManager", :additional_framework_paths => [
6572
"react/renderer/components/view/platform/cxx",

‎packages/react-native/ReactCommon/react/renderer/components/image/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ target_link_libraries(rrc_image
3030
)
3131
target_compile_reactnative_options(rrc_image PRIVATE)
3232
target_compile_options(rrc_image PRIVATE -Wpedantic)
33+

‎packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h‎

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

88
#pragma once
99

10+
#include <react/cxxstableapi/UmbrellaGuard.h>
11+
1012
#include <react/renderer/components/image/ImageShadowNode.h>
1113
#include <react/renderer/core/ConcreteComponentDescriptor.h>
1214

‎packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.h‎

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

88
#pragma once
99

10+
#include <react/cxxstableapi/UmbrellaGuard.h>
11+
1012
#include <react/renderer/components/view/ViewEventEmitter.h>
1113
#include <react/renderer/imagemanager/primitives.h>
1214

‎packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h‎

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

88
#pragma once
99

10+
#include <react/cxxstableapi/UmbrellaGuard.h>
11+
1012
#include <react/renderer/components/view/ViewProps.h>
1113
#include <react/renderer/core/PropsParserContext.h>
1214
#include <react/renderer/graphics/Color.h>

‎packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h‎

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

88
#pragma once
99

10+
#include <react/cxxstableapi/UmbrellaGuard.h>
11+
1012
#include <react/renderer/components/image/ImageEventEmitter.h>
1113
#include <react/renderer/components/image/ImageProps.h>
1214
#include <react/renderer/components/image/ImageState.h>

‎packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h‎

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

88
#pragma once
99

10+
#include <react/cxxstableapi/UmbrellaGuard.h>
11+
1012
#include <react/renderer/imagemanager/ImageRequest.h>
1113
#include <react/renderer/imagemanager/ImageRequestParams.h>
1214
#include <react/renderer/imagemanager/primitives.h>

0 commit comments

Comments
 (0)