Skip to content

Commit e8848ea

Browse files
j-piaseckifacebook-github-bot
j-piasecki
authored and
facebook-github-bot
committed
Set per-header visibility for imagemanager Apple headers (#58878)
Summary: Makes `RCTImageManager.h`, `RCTSyncImageManager.h` and `RCTImageManagerProtocol.h` private and `RCTImagePrimitivesConversions.h` "for frameworks". `RCTImagePrimitivesConversions.h` and `RCTImageResponseObserverProxy.h` now include the public `<React/ImageManager.h>` umbrella so they don't trip its guard under `RN_STRICT_API`. The guards are inert without that flag. Changelog: [Internal] Reviewed By: christophpurrer Differential Revision: D123594275
1 parent 8d658f4 commit e8848ea

9 files changed

Lines changed: 10 additions & 58 deletions

File tree

‎packages/react-native/React/Fabric/RCTImageResponseObserverProxy.h‎

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

1010
#import "RCTImageResponseDelegate.h"
1111

12-
#include <react/renderer/imagemanager/ImageResponseObserver.h>
12+
#include <React/ImageManager.h>
1313

1414
NS_ASSUME_NONNULL_BEGIN
1515

‎packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManager.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
#include <react/cxxstableapi/PrivateGuard.h>
9+
810
#import <UIKit/UIKit.h>
911

1012
#import "RCTImageManagerProtocol.h"

‎packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManagerProtocol.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
#include <react/cxxstableapi/PrivateGuard.h>
9+
810
#import <Foundation/Foundation.h>
911
#import <React/RendererCore.h>
1012
#import <react/renderer/imagemanager/ImageRequest.h>

‎packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImagePrimitivesConversions.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
#include <react/cxxstableapi/FrameworksGuard.h>
9+
810
#import <UIKit/UIKit.h>
911

12+
#import <React/ImageManager.h>
1013
#import <React/RCTConvert.h>
1114
#import <React/RCTImageLoader.h>
12-
#import <react/renderer/imagemanager/primitives.h>
1315

1416
inline static UIViewContentMode RCTContentModeFromImageResizeMode(facebook::react::ImageResizeMode imageResizeMode)
1517
{

‎packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTSyncImageManager.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
#include <react/cxxstableapi/PrivateGuard.h>
9+
810
#import <UIKit/UIKit.h>
911

1012
#import "RCTImageManagerProtocol.h"

‎scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,11 +1173,6 @@ interface RCTImageLoader : public NSObject <RCTBridgeModule, RCTImageLoaderProto
11731173
public virtual instancetype initWithRedirectDelegate:loadersProvider:decodersProvider:(id<RCTImageRedirectProtocol> redirectDelegate, NSArray<id<RCTImageURLLoader>>*(^)(RCTModuleRegistry*) getLoaders, NSArray<id<RCTImageDataDecoder>>*(^)(RCTModuleRegistry*) getDecoders);
11741174
}
11751175

1176-
interface RCTImageManager : public NSObject <RCTImageManagerProtocol> {
1177-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
1178-
public virtual instancetype initWithImageLoader:(id<RCTImageLoaderWithAttributionProtocol> imageLoader);
1179-
}
1180-
11811176
interface RCTImageSource : public NSObject {
11821177
public @property (assign, readonly) CGFloat scale;
11831178
public @property (assign, readonly) CGSize size;
@@ -1897,11 +1892,6 @@ interface RCTSwiftUIContainerViewWrapper : public NSObject {
18971892
interface RCTSwitchComponentView : public RCTViewComponentView {
18981893
}
18991894

1900-
interface RCTSyncImageManager : public NSObject <RCTImageManagerProtocol> {
1901-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
1902-
public virtual instancetype initWithImageLoader:(id<RCTImageLoaderWithAttributionProtocol> imageLoader);
1903-
}
1904-
19051895
interface RCTTextInputComponentView : public RCTViewComponentView {
19061896
}
19071897

@@ -2767,10 +2757,6 @@ protocol RCTImageLoaderWithAttributionProtocol : public RCTImageLoaderProtocol,
27672757
public virtual void trackURLImageVisibilityForRequest:imageView:(RCTImageURLLoaderRequest* loaderRequest, UIView* imageView);
27682758
}
27692759

2770-
protocol RCTImageManagerProtocol : public NSObject {
2771-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
2772-
}
2773-
27742760
protocol RCTImageRedirectProtocol {
27752761
public virtual NSURL* redirectAssetsURL:(NSURL* URL);
27762762
}

‎scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,11 +1196,6 @@ interface RCTImageLoader : public NSObject <RCTBridgeModule, RCTImageLoaderProto
11961196
public virtual instancetype initWithRedirectDelegate:loadersProvider:decodersProvider:(id<RCTImageRedirectProtocol> redirectDelegate, NSArray<id<RCTImageURLLoader>>*(^)(RCTModuleRegistry*) getLoaders, NSArray<id<RCTImageDataDecoder>>*(^)(RCTModuleRegistry*) getDecoders);
11971197
}
11981198

1199-
interface RCTImageManager : public NSObject <RCTImageManagerProtocol> {
1200-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
1201-
public virtual instancetype initWithImageLoader:(id<RCTImageLoaderWithAttributionProtocol> imageLoader);
1202-
}
1203-
12041199
interface RCTImageSource : public NSObject {
12051200
public @property (assign, readonly) CGFloat scale;
12061201
public @property (assign, readonly) CGSize size;
@@ -1940,11 +1935,6 @@ interface RCTSwiftUIContainerViewWrapper : public NSObject {
19401935
interface RCTSwitchComponentView : public RCTViewComponentView {
19411936
}
19421937

1943-
interface RCTSyncImageManager : public NSObject <RCTImageManagerProtocol> {
1944-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
1945-
public virtual instancetype initWithImageLoader:(id<RCTImageLoaderWithAttributionProtocol> imageLoader);
1946-
}
1947-
19481938
interface RCTTextInputComponentView : public RCTViewComponentView {
19491939
}
19501940

@@ -2835,10 +2825,6 @@ protocol RCTImageLoaderWithAttributionProtocol : public RCTImageLoaderProtocol,
28352825
public virtual void trackURLImageVisibilityForRequest:imageView:(RCTImageURLLoaderRequest* loaderRequest, UIView* imageView);
28362826
}
28372827

2838-
protocol RCTImageManagerProtocol : public NSObject {
2839-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
2840-
}
2841-
28422828
protocol RCTImageRedirectProtocol {
28432829
public virtual NSURL* redirectAssetsURL:(NSURL* URL);
28442830
}

‎scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,11 +1173,6 @@ interface RCTImageLoader : public NSObject <RCTBridgeModule, RCTImageLoaderProto
11731173
public virtual instancetype initWithRedirectDelegate:loadersProvider:decodersProvider:(id<RCTImageRedirectProtocol> redirectDelegate, NSArray<id<RCTImageURLLoader>>*(^)(RCTModuleRegistry*) getLoaders, NSArray<id<RCTImageDataDecoder>>*(^)(RCTModuleRegistry*) getDecoders);
11741174
}
11751175

1176-
interface RCTImageManager : public NSObject <RCTImageManagerProtocol> {
1177-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
1178-
public virtual instancetype initWithImageLoader:(id<RCTImageLoaderWithAttributionProtocol> imageLoader);
1179-
}
1180-
11811176
interface RCTImageSource : public NSObject {
11821177
public @property (assign, readonly) CGFloat scale;
11831178
public @property (assign, readonly) CGSize size;
@@ -1890,11 +1885,6 @@ interface RCTSwiftUIContainerViewWrapper : public NSObject {
18901885
interface RCTSwitchComponentView : public RCTViewComponentView {
18911886
}
18921887

1893-
interface RCTSyncImageManager : public NSObject <RCTImageManagerProtocol> {
1894-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
1895-
public virtual instancetype initWithImageLoader:(id<RCTImageLoaderWithAttributionProtocol> imageLoader);
1896-
}
1897-
18981888
interface RCTTextInputComponentView : public RCTViewComponentView {
18991889
}
19001890

@@ -2759,10 +2749,6 @@ protocol RCTImageLoaderWithAttributionProtocol : public RCTImageLoaderProtocol,
27592749
public virtual void trackURLImageVisibilityForRequest:imageView:(RCTImageURLLoaderRequest* loaderRequest, UIView* imageView);
27602750
}
27612751

2762-
protocol RCTImageManagerProtocol : public NSObject {
2763-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
2764-
}
2765-
27662752
protocol RCTImageRedirectProtocol {
27672753
public virtual NSURL* redirectAssetsURL:(NSURL* URL);
27682754
}

‎scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,11 +1173,6 @@ interface RCTImageLoader : public NSObject <RCTBridgeModule, RCTImageLoaderProto
11731173
public virtual instancetype initWithRedirectDelegate:loadersProvider:decodersProvider:(id<RCTImageRedirectProtocol> redirectDelegate, NSArray<id<RCTImageURLLoader>>*(^)(RCTModuleRegistry*) getLoaders, NSArray<id<RCTImageDataDecoder>>*(^)(RCTModuleRegistry*) getDecoders);
11741174
}
11751175

1176-
interface RCTImageManager : public NSObject <RCTImageManagerProtocol> {
1177-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
1178-
public virtual instancetype initWithImageLoader:(id<RCTImageLoaderWithAttributionProtocol> imageLoader);
1179-
}
1180-
11811176
interface RCTImageSource : public NSObject {
11821177
public @property (assign, readonly) CGFloat scale;
11831178
public @property (assign, readonly) CGSize size;
@@ -1897,11 +1892,6 @@ interface RCTSwiftUIContainerViewWrapper : public NSObject {
18971892
interface RCTSwitchComponentView : public RCTViewComponentView {
18981893
}
18991894

1900-
interface RCTSyncImageManager : public NSObject <RCTImageManagerProtocol> {
1901-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
1902-
public virtual instancetype initWithImageLoader:(id<RCTImageLoaderWithAttributionProtocol> imageLoader);
1903-
}
1904-
19051895
interface RCTTextInputComponentView : public RCTViewComponentView {
19061896
}
19071897

@@ -2767,10 +2757,6 @@ protocol RCTImageLoaderWithAttributionProtocol : public RCTImageLoaderProtocol,
27672757
public virtual void trackURLImageVisibilityForRequest:imageView:(RCTImageURLLoaderRequest* loaderRequest, UIView* imageView);
27682758
}
27692759

2770-
protocol RCTImageManagerProtocol : public NSObject {
2771-
public virtual facebook::react::ImageRequest requestImage:surfaceId:(facebook::react::ImageSource imageSource, facebook::react::SurfaceId surfaceId);
2772-
}
2773-
27742760
protocol RCTImageRedirectProtocol {
27752761
public virtual NSURL* redirectAssetsURL:(NSURL* URL);
27762762
}

0 commit comments

Comments
 (0)