Skip to content

Fix oss formatting #58586

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
javache wants to merge 1 commit into from
+11 −15
Closed

Fix oss formatting #58586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/react-native/Libraries/Image/RCTImageLoader.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,8 +689,8 @@ - (RCTImageURLLoaderRequest *)_loadImageOrDataWithURLRequest:(NSURLRequest *)req
} else {
UIImage *image;
if (cacheResult) {
image = RCTCachedImageForURL(
[strongSelf imageCache], request.URL.absoluteString, size, scale, clipped, resizeMode);
image =
RCTCachedImageForURL([strongSelf imageCache], request.URL.absoluteString, size, scale, clipped, resizeMode);
}

if (image) {
Expand Down
22 changes: 9 additions & 13 deletions packages/rn-tester/RNTesterUnitTests/RCTImageLoaderTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
RCTDefineImageURLLoader(RCTImageLoaderTestsURLLoader1) RCTDefineImageURLLoader(RCTImageLoaderTestsURLLoader2)
RCTDefineImageDecoder(RCTImageLoaderTestsDecoder1) RCTDefineImageDecoder(RCTImageLoaderTestsDecoder2)

@interface RCTImageLoaderTestsImageCache : NSObject <RCTImageCache>
@interface RCTImageLoaderTestsImageCache : NSObject<RCTImageCache>

@property (nonatomic, strong) UIImage *image;
@property (nonatomic, copy) NSString *URLString;
Expand All @@ -31,10 +31,7 @@

@implementation RCTImageLoaderTestsImageCache

- (UIImage *)imageForUrl:(NSString *)url
size:(CGSize)size
scale:(CGFloat)scale
resizeMode:(RCTResizeMode)resizeMode
- (UIImage *)imageForUrl:(NSString *)url size:(CGSize)size scale:(CGFloat)scale resizeMode:(RCTResizeMode)resizeMode
{
if (![url isEqualToString:self.URLString] || scale != 1 || resizeMode != RCTResizeModeStretch) {
return nil;
Expand Down Expand Up @@ -79,14 +76,13 @@ - (void)testCachedImagePreservesNaturalSizeWhenNotClipped
imageCache.URLString = @"https://reactnative.dev/img/opengraph.png";
imageCache.requestedSize = CGSizeMake(100, 100);

NS_VALID_UNTIL_END_OF_SCOPE RCTImageLoader *imageLoader = [[RCTImageLoader alloc]
initWithRedirectDelegate:nil
loadersProvider:^NSArray<id<RCTImageURLLoader>> *(__unused RCTModuleRegistry *moduleRegistry) {
return @[];
}
decodersProvider:^NSArray<id<RCTImageDataDecoder>> *(__unused RCTModuleRegistry *moduleRegistry) {
return @[];
}];
NS_VALID_UNTIL_END_OF_SCOPE RCTImageLoader *imageLoader = [[RCTImageLoader alloc] initWithRedirectDelegate:nil
loadersProvider:^NSArray<id<RCTImageURLLoader>> *(__unused RCTModuleRegistry *moduleRegistry) {
return @[];
}
decodersProvider:^NSArray<id<RCTImageDataDecoder>> *(__unused RCTModuleRegistry *moduleRegistry) {
return @[];
}];
[imageLoader setImageCache:imageCache];

XCTestExpectation *expectation = [self expectationWithDescription:@"Image loaded from cache"];
Expand Down
Loading