Skip to content

Add stable API guards for the Image component (#57966) #57966

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

Open
coado wants to merge 3 commits into
base: main
Choose a base branch
from
+492 −11
Open

Add stable API guards for the Image component (#57966) #57966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2acf539
Add guards for react/renderer/components/view
Aug 17, 2026
38aa20f
Add stable API guards to text and textinput components
Aug 17, 2026
5965e6b
Add stable API guards for the Image component (#57966)
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 number Diff line number Diff 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 number Diff line number Diff 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
12 changes: 12 additions & 0 deletions packages/react-native/ReactAndroid/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,19 @@ 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(
Expand All @@ -191,6 +199,10 @@ val preparePrefab by
"../ReactCommon/react/renderer/components/text/",
"react/renderer/components/text/",
),
Pair(
"../ReactCommon/react/renderer/components/text/React/",
"React/",
),
Pair(
"../ReactCommon/react/renderer/attributedstring",
"react/renderer/attributedstring",
Expand Down
7 changes: 7 additions & 0 deletions packages/react-native/ReactCommon/React-Fabric.podspec
View file
Open in desktop
Original file line number Diff line number Diff 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 Down Expand Up @@ -138,6 +139,12 @@ Pod::Spec.new do |s|
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"
Expand Down
7 changes: 7 additions & 0 deletions packages/react-native/ReactCommon/React-FabricComponents.podspec
View file
Open in desktop
Original file line number Diff line number Diff 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 Down Expand Up @@ -109,6 +110,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 number Diff line number Diff 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 number Diff line number Diff 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 number Diff line number Diff 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 number Diff line number Diff 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 number Diff line number Diff 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 number Diff line number Diff 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 number Diff line number Diff 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 number Diff line number Diff 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 number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <unordered_map>

#include <glog/logging.h>
Expand Down
2 changes: 2 additions & 0 deletions ...eact-native/ReactCommon/react/renderer/components/text/BaseParagraphComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/core/ConcreteComponentDescriptor.h>
#include <react/renderer/textlayoutmanager/TextLayoutManager.h>
#include <react/utils/ContextContainer.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/text/BaseParagraphProps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <limits>
#include <memory>

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

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/attributedstring/TextAttributes.h>
#include <react/renderer/core/Props.h>
#include <react/renderer/core/PropsParserContext.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/attributedstring/AttributedString.h>
#include <react/renderer/attributedstring/TextAttributes.h>

Expand Down
2 changes: 2 additions & 0 deletions ...es/react-native/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/text/BaseParagraphComponentDescriptor.h>
#include <react/renderer/components/text/ParagraphShadowNode.h>

Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
View file
Open in desktop
Original file line number Diff line number Diff 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/textlayoutmanager/TextMeasureCache.h>

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

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/text/HostPlatformParagraphProps.h>

namespace facebook::react {
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/text/BaseTextShadowNode.h>
#include <react/renderer/components/text/ParagraphEventEmitter.h>
#include <react/renderer/components/text/ParagraphProps.h>
Expand Down
2 changes: 2 additions & 0 deletions ...ages/react-native/ReactCommon/react/renderer/components/text/RawTextComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/text/RawTextShadowNode.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>

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

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <memory>

#include <react/renderer/core/Props.h>
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/text/RawTextShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/text/RawTextProps.h>
#include <react/renderer/core/ConcreteShadowNode.h>

Expand Down
53 changes: 53 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/text/React/Text.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* 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/text` module - public
// entry point.
//
// #include <React/Text.h>
//
// Re-exports the module's public interface headers. React Native's own code
// should keep using the fine-grained `<react/renderer/components/text/...>`
// 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/text/BaseParagraphComponentDescriptor.h>
#include <react/renderer/components/text/BaseParagraphProps.h>
#include <react/renderer/components/text/BaseTextProps.h>
#include <react/renderer/components/text/BaseTextShadowNode.h>
#include <react/renderer/components/text/HostPlatformParagraphProps.h>
#include <react/renderer/components/text/ParagraphComponentDescriptor.h>
#include <react/renderer/components/text/ParagraphEventEmitter.h>
#include <react/renderer/components/text/ParagraphProps.h>
#include <react/renderer/components/text/ParagraphShadowNode.h>
#include <react/renderer/components/text/ParagraphState.h>
#include <react/renderer/components/text/RawTextComponentDescriptor.h>
#include <react/renderer/components/text/RawTextProps.h>
#include <react/renderer/components/text/RawTextShadowNode.h>
#include <react/renderer/components/text/SelectableParagraphComponentDescriptor.h>
#include <react/renderer/components/text/SelectableParagraphShadowNode.h>
#include <react/renderer/components/text/TextComponentDescriptor.h>
#include <react/renderer/components/text/TextEffectComponentDescriptor.h>
#include <react/renderer/components/text/TextEffectProps.h>
#include <react/renderer/components/text/TextEffectShadowNode.h>
#include <react/renderer/components/text/TextProps.h>
#include <react/renderer/components/text/TextShadowNode.h>
#include <react/renderer/components/text/stateConversions.h>

#ifdef ANDROID
#include <react/renderer/components/text/conversions.h>
#include <react/renderer/components/text/primitives.h>
#endif

#undef RN_UMBRELLA_CONTEXT
2 changes: 2 additions & 0 deletions ...ative/ReactCommon/react/renderer/components/text/SelectableParagraphComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/text/BaseParagraphComponentDescriptor.h>
#include <react/renderer/components/text/SelectableParagraphShadowNode.h>

Expand Down
2 changes: 2 additions & 0 deletions ...s/react-native/ReactCommon/react/renderer/components/text/SelectableParagraphShadowNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/text/ParagraphShadowNode.h>

namespace facebook::react {
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/text/TextComponentDescriptor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#pragma once

#include <react/cxxstableapi/UmbrellaGuard.h>

#include <react/renderer/components/text/TextShadowNode.h>
#include <react/renderer/core/ConcreteComponentDescriptor.h>

Expand Down
Loading
Loading