Skip to content

Add umbrella for public components in react/renderer/components/* subtree. (#57312)#57312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
coado wants to merge 4 commits into from
Closed

Add umbrella for public components in react/renderer/components/* subtree. (#57312) #57312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4af531a
Add guards for react/renderer/components/view
Aug 17, 2026
0308f03
Add stable API guards to text and textinput components
Aug 17, 2026
2ef9fa3
Add stable API guards for the Image component
Aug 17, 2026
9696b81
Add umbrella for public components in `react/renderer/components/*` s…
coado Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/react-native/React/React-RCTFBReactNativeSpec.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,6 +68,7 @@ Pod::Spec.new do |s|
add_dependency(ss, "React-debug")
add_dependency(ss, "React-rendererdebug")
add_dependency(ss, "React-utils")
add_dependency(ss, "React-cxxstableapi")
add_dependency(ss, "React-graphics", :additional_framework_paths => ["react/renderer/graphics/platform/ios"])
add_dependency(ss, "React-Fabric", :additional_framework_paths => [
"react/renderer/components/view/platform/cxx",
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/React/React-RCTFabric.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ Pod::Spec.new do |s|
add_dependency(s, "React-networking", :framework_name => 'React_networking')
add_dependency(s, "React-renderercss")
add_dependency(s, "React-RCTFBReactNativeSpec")
add_dependency(s, "React-cxxstableapi")

depend_on_js_engine(s)
add_rn_third_party_dependencies(s)
Expand Down
17 changes: 17 additions & 0 deletions packages/react-native/ReactAndroid/build.gradle.kts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -167,17 +167,29 @@ val preparePrefab by
"../ReactCommon/react/renderer/components/image/",
"react/renderer/components/image/",
),
Pair(
"../ReactCommon/react/renderer/components/image/React/",
"React/",
),
// rrc_view
Pair(
"../ReactCommon/react/renderer/components/view/",
"react/renderer/components/view/",
),
Pair(
"../ReactCommon/react/renderer/components/view/React/",
"React/",
),
Pair("../ReactCommon/react/renderer/components/view/platform/android/", ""),
// rrc_root
Pair(
"../ReactCommon/react/renderer/components/root/",
"react/renderer/components/root/",
),
Pair(
"../ReactCommon/react/renderer/components/root/React/",
"React/",
),
// runtimeexecutor
Pair("../ReactCommon/runtimeexecutor/", ""),
// react_renderer_textlayoutmanager
Expand All@@ -191,6 +203,11 @@ val preparePrefab by
"../ReactCommon/react/renderer/components/text/",
"react/renderer/components/text/",
),
Pair(
"../ReactCommon/react/renderer/components/text/React/",
"React/",
),
Pair("../ReactCommon/react/renderer/components/text/platform/android/", ""),
Pair(
"../ReactCommon/react/renderer/attributedstring",
"react/renderer/attributedstring",
Expand Down
23 changes: 21 additions & 2 deletions packages/react-native/ReactCommon/React-Fabric.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ Pod::Spec.new do |s|
s.dependency "React-logger"
s.dependency "React-Core"
s.dependency "React-debug"
s.dependency "React-cxxstableapi"
s.dependency "React-featureflags"
s.dependency "React-runtimescheduler"
s.dependency "React-cxxreact"
Expand DownExpand Up@@ -127,21 +128,39 @@ Pod::Spec.new do |s|
s.subspec "components" do |ss|
ss.subspec "root" do |sss|
sss.source_files = podspec_sources("react/renderer/components/root/**/*.{m,mm,cpp,h}", "react/renderer/components/root/**/*.{h}")
sss.exclude_files = "react/renderer/components/root/tests"
sss.exclude_files = ["react/renderer/components/root/tests", "react/renderer/components/root/React"]
sss.header_dir = "react/renderer/components/root"
end

ss.subspec "rootUmbrella" do |sss|
sss.source_files = "react/renderer/components/root/React/*.h"
sss.header_dir = "React"
sss.header_mappings_dir = "react/renderer/components/root/React"
end

ss.subspec "view" do |sss|
sss.dependency "React-renderercss"
sss.dependency "Yoga"
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}"])
sss.header_dir = "react/renderer/components/view"
end

ss.subspec "viewUmbrella" do |sss|
sss.source_files = "react/renderer/components/view/React/*.h"
sss.header_dir = "React"
sss.header_mappings_dir = "react/renderer/components/view/React"
end

ss.subspec "scrollview" do |sss|
sss.source_files = podspec_sources("react/renderer/components/scrollview/**/*.{m,mm,cpp,h}", "react/renderer/components/scrollview/**/*.{h}")
sss.header_dir = "react/renderer/components/scrollview"
sss.exclude_files = "react/renderer/components/scrollview/tests", "react/renderer/components/scrollview/platform/android"
sss.exclude_files = "react/renderer/components/scrollview/tests", "react/renderer/components/scrollview/platform/android", "react/renderer/components/scrollview/React"
end

ss.subspec "scrollviewUmbrella" do |sss|
sss.source_files = "react/renderer/components/scrollview/React/*.h"
sss.header_dir = "React"
sss.header_mappings_dir = "react/renderer/components/scrollview/React"
end

ss.subspec "legacyviewmanagerinterop" do |sss|
Expand Down
13 changes: 13 additions & 0 deletions packages/react-native/ReactCommon/React-FabricComponents.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,7 @@ Pod::Spec.new do |s|
s.dependency "React-logger"
s.dependency "React-Core"
s.dependency "React-debug"
s.dependency "React-cxxstableapi"
s.dependency "React-featureflags"
s.dependency "React-utils"
s.dependency "React-runtimescheduler"
Expand DownExpand Up@@ -94,6 +95,12 @@ Pod::Spec.new do |s|
sss.header_dir = "react/renderer/components/modal"
end

ss.subspec "modalUmbrella" do |sss|
sss.source_files = "react/renderer/components/modal/React/*.h"
sss.header_dir = "React"
sss.header_mappings_dir = "react/renderer/components/modal/React"
end

ss.subspec "safeareaview" do |sss|
sss.source_files = podspec_sources("react/renderer/components/safeareaview/**/*.{m,mm,cpp,h}", "react/renderer/components/safeareaview/**/*.h")
# Exclude tests to avoid conflicts with the react-native-safe-area-context package
Expand All@@ -109,6 +116,12 @@ Pod::Spec.new do |s|
sss.header_dir = "react/renderer/components/text"
end

ss.subspec "textUmbrella" do |sss|
sss.source_files = "react/renderer/components/text/React/*.h"
sss.header_dir = "React"
sss.header_mappings_dir = "react/renderer/components/text/React"
end

ss.subspec "iostextinput" do |sss|
sss.source_files = podspec_sources(["react/renderer/components/textinput/*.{m,mm,cpp,h}",
"react/renderer/components/textinput/platform/ios/**/*.{m,mm,cpp,h}"],
Expand Down
9 changes: 8 additions & 1 deletion packages/react-native/ReactCommon/React-FabricImage.podspec
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,13 +43,19 @@ Pod::Spec.new do |s|
s.platforms = min_supported_versions
s.source = source
s.source_files = podspec_sources("react/renderer/components/image/**/*.{m,mm,cpp,h}", "react/renderer/components/image/**/*.h")
s.exclude_files = "react/renderer/components/image/tests"
s.exclude_files = ["react/renderer/components/image/tests", "react/renderer/components/image/React"]
s.header_dir = "react/renderer/components/image"
s.pod_target_xcconfig = { "USE_HEADERMAP" => "YES",
"CLANG_CXX_LANGUAGE_STANDARD" => rct_cxx_language_standard(),
"HEADER_SEARCH_PATHS" => header_search_path.join(" ")
}

s.subspec "ImageUmbrella" do |ss|
ss.source_files = "react/renderer/components/image/React/*.h"
ss.header_dir = "React"
ss.header_mappings_dir = "react/renderer/components/image/React"
end

resolve_use_frameworks(s, header_mappings_dir: './', module_name: "React_FabricImage")

s.dependency "React-jsiexecutor", version
Expand All@@ -60,6 +66,7 @@ Pod::Spec.new do |s|
s.dependency "React-featureflags"
s.dependency "React-utils"
s.dependency "Yoga"
s.dependency "React-cxxstableapi"

add_dependency(s, "React-ImageManager", :additional_framework_paths => [
"react/renderer/components/view/platform/cxx",
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/components/image/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@ target_link_libraries(rrc_image
folly_runtime
glog_init
jsi
react_cxxstableapi
react_debug
react_utils
react_renderer_core
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/image/ImageShadowNode.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>

Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/view/ViewEventEmitter.h>
#include <react/renderer/imagemanager/primitives.h>

Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/view/ViewProps.h>
#include <react/renderer/core/PropsParserContext.h>
#include <react/renderer/graphics/Color.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/image/ImageEventEmitter.h>
#include <react/renderer/components/image/ImageProps.h>
#include <react/renderer/components/image/ImageState.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/imagemanager/ImageRequest.h>
#include <react/renderer/imagemanager/ImageRequestParams.h>
#include <react/renderer/imagemanager/primitives.h>
Expand Down
31 changes: 31 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/image/React/Image.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// =============================================================================
// Umbrella header for the `react/renderer/components/image` module - public entry point.
//
// #include <React/Image.h>
//
// Re-exports the module's public interface headers. React Native's own code
// should keep using the fine-grained `<react/renderer/components/image/...>` includes; only outside
// consumers use this umbrella.
// =============================================================================

// Marks that the following headers are pulled in through the umbrella, so their
// shared guard (<react/cxxstableapi/UmbrellaGuard.h>) accepts them.
#define RN_UMBRELLA_CONTEXT

#include <react/renderer/components/image/ImageComponentDescriptor.h>
#include <react/renderer/components/image/ImageEventEmitter.h>
#include <react/renderer/components/image/ImageProps.h>
#include <react/renderer/components/image/ImageShadowNode.h>
#include <react/renderer/components/image/ImageState.h>
#include <react/renderer/components/image/conversions.h>

#undef RN_UMBRELLA_CONTEXT
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/image/conversions.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <unordered_map>

#include <glog/logging.h>
Expand Down
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/components/modal/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ target_link_libraries(rrc_modal
folly_runtime
glog_init
react_codegen_rncore
react_cxxstableapi
react_renderer_componentregistry
react_renderer_core
react_renderer_debug
Expand Down
2 changes: 2 additions & 0 deletions ...act-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <glog/logging.h>
#include <react/renderer/components/modal/ModalHostViewShadowNode.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/FBReactNativeSpec/EventEmitters.h>
#include <react/renderer/components/FBReactNativeSpec/Props.h>
#include <react/renderer/components/modal/ModalHostViewState.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/core/graphicsConversions.h>
#include <react/renderer/graphics/Float.h>
#include "ModalHostViewUtils.h"
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewUtils.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/graphics/Size.h>

namespace facebook::react {
Expand Down
30 changes: 30 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/modal/React/Modal.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// =============================================================================
// Umbrella header for the `react/renderer/components/modal` module - public
// entry point.
//
// #include <React/Modal.h>
//
// Re-exports the module's public interface headers. React Native's own code
// should keep using the fine-grained `<react/renderer/components/modal/...>`
// includes; only outside consumers use this umbrella.
// =============================================================================

// Marks that the following headers are pulled in through the umbrella, so their
// shared guard (<react/cxxstableapi/UmbrellaGuard.h>) accepts them.
#define RN_UMBRELLA_CONTEXT

#include <react/renderer/components/modal/ModalHostViewComponentDescriptor.h>
#include <react/renderer/components/modal/ModalHostViewShadowNode.h>
#include <react/renderer/components/modal/ModalHostViewState.h>
#include <react/renderer/components/modal/ModalHostViewUtils.h>

#undef RN_UMBRELLA_CONTEXT
1 change: 1 addition & 0 deletions packages/react-native/ReactCommon/react/renderer/components/root/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,6 +17,7 @@ target_link_libraries(rrc_root
folly_runtime
glog
glog_init
react_cxxstableapi
react_debug
react_renderer_core
react_renderer_debug
Expand Down
29 changes: 29 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/root/React/Root.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// =============================================================================
// Umbrella header for the `react/renderer/components/root` module - public
// entry point.
//
// #include <React/Root.h>
//
// Re-exports the module's public interface headers. React Native's own code
// should keep using the fine-grained `<react/renderer/components/root/...>`
// includes; only outside consumers use this umbrella.
// =============================================================================

// Marks that the following headers are pulled in through the umbrella, so their
// shared guard (<react/cxxstableapi/UmbrellaGuard.h>) accepts them.
#define RN_UMBRELLA_CONTEXT

#include <react/renderer/components/root/RootComponentDescriptor.h>
#include <react/renderer/components/root/RootProps.h>
#include <react/renderer/components/root/RootShadowNode.h>

#undef RN_UMBRELLA_CONTEXT
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/root/RootComponentDescriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/root/RootShadowNode.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>

Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <memory>

#include <react/renderer/components/view/ViewProps.h>
Expand Down
Loading
Loading