Skip to content

Commit d3b7893

Browse files
j-piaseckimeta-codesync[bot]
authored andcommitted
Upgrade Image visibility to "for frameworks" (#58283)
Summary: Pull Request resolved: #58283 Reclassifies `react/renderer/components/image:image` from public to "for frameworks" under the C++ stable API three-tier visibility model. Consumers that opt into `RN_STRICT_API` now get a suppressible warning where they previously got an error pointing at the umbrella, and can acknowledge it with `RN_ALLOW_FRAMEWORKS`; without that flag the guards are inert, so no existing build changes behaviour. Changelog: [Internal] Reviewed By: christophpurrer, javache Differential Revision: D118440296 fbshipit-source-id: 45faf64ef36d3c3c596b1b8c06408fc43d3b59f8
1 parent 0c0e9f0 commit d3b7893

10 files changed

Lines changed: 7 additions & 70 deletions

File tree

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,6 @@ val preparePrefab by
169169
"../ReactCommon/react/renderer/components/image/",
170170
"react/renderer/components/image/",
171171
),
172-
Pair(
173-
"../ReactCommon/react/renderer/components/image/React/",
174-
"React/",
175-
),
176172
// rrc_view
177173
Pair(
178174
"../ReactCommon/react/renderer/components/view/",

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,13 @@ 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", "react/renderer/components/image/React"]
46+
s.exclude_files = "react/renderer/components/image/tests"
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 "imageUmbrella" do |ss|
54-
ss.source_files = "react/renderer/components/image/React/*.h"
55-
ss.header_dir = ""
56-
ss.header_mappings_dir = "react/renderer/components/image"
57-
end
58-
5953
resolve_use_frameworks(s, header_mappings_dir: './', module_name: "React_FabricImage")
6054

6155
s.dependency "React-jsiexecutor", version

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

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

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

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

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

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

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

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

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

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

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <react/renderer/components/view/ViewProps.h>
1313
#include <react/renderer/core/PropsParserContext.h>

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

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

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <react/renderer/components/image/ImageEventEmitter.h>
1313
#include <react/renderer/components/image/ImageProps.h>

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

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

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <react/renderer/imagemanager/ImageRequest.h>
1313
#include <react/renderer/imagemanager/ImageRequestParams.h>

packages/react-native/ReactCommon/react/renderer/components/image/React/Image.h

Lines changed: 0 additions & 37 deletions
This file was deleted.

packages/react-native/ReactCommon/react/renderer/components/image/conversions.h

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

88
#pragma once
99

10-
#include <react/cxxstableapi/UmbrellaGuard.h>
10+
#include <react/cxxstableapi/FrameworksGuard.h>
1111

1212
#include <unordered_map>
1313

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -491,22 +491,6 @@ const PodspecExceptions /*: {[key: string]: PodSpecConfiguration} */ = {
491491
},
492492
],
493493
},
494-
'ReactCommon/React-FabricImage.podspec': {
495-
name: 'React-FabricImage',
496-
headerPatterns: ['react/renderer/components/image/**/*.h'],
497-
excludePatterns: [
498-
'react/renderer/components/image/tests',
499-
'react/renderer/components/image/React',
500-
],
501-
headerDir: 'react/renderer/components/image',
502-
subSpecs: [
503-
{
504-
name: 'imageUmbrella',
505-
headerPatterns: ['react/renderer/components/image/React/*.h'],
506-
headerDir: 'React',
507-
},
508-
],
509-
},
510494
'ReactCommon/callinvoker/React-callinvoker.podspec': {
511495
name: 'React-callinvoker',
512496
headerPatterns: ['**/*.h'],

0 commit comments

Comments
 (0)