-
Notifications
You must be signed in to change notification settings - Fork 25k
Replace RCTLocalAssetImageLoader to RCTBundleAssetImageLoader #37232
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.
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
hellohublot
wants to merge
1
commit into
facebook:main
from
hellohublot:Fix_iOS_Sandbox_Image_Async_Load
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
packages/react-native/Libraries/Image/RCTBundleAssetImageLoader.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| #import <React/RCTImageURLLoader.h> | ||
|
|
||
| @interface RCTBundleAssetImageLoader : NSObject <RCTImageURLLoader> | ||
|
|
||
| @end |
78 changes: 78 additions & 0 deletions
78
packages/react-native/Libraries/Image/RCTBundleAssetImageLoader.mm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| #import <React/RCTBundleAssetImageLoader.h> | ||
|
|
||
| #import <atomic> | ||
| #import <memory> | ||
|
|
||
| #import <React/RCTUtils.h> | ||
| #import <ReactCommon/RCTTurboModule.h> | ||
|
|
||
| #import "RCTImagePlugins.h" | ||
|
|
||
| @interface RCTBundleAssetImageLoader () <RCTTurboModule> | ||
| @end | ||
|
|
||
| @implementation RCTBundleAssetImageLoader | ||
|
|
||
| RCT_EXPORT_MODULE() | ||
|
|
||
| - (BOOL)canLoadImageURL:(NSURL *)requestURL | ||
| { | ||
| return RCTIsBundleAssetURL(requestURL); | ||
| } | ||
|
|
||
| - (BOOL)requiresScheduling | ||
| { | ||
| // Don't schedule this loader on the URL queue so we can load the | ||
| // local assets synchronously to avoid flickers. | ||
| return NO; | ||
| } | ||
|
|
||
| - (BOOL)shouldCacheLoadedImages | ||
| { | ||
| // UIImage imageNamed handles the caching automatically so we don't want | ||
| // to add it to the image cache. | ||
| return NO; | ||
| } | ||
|
|
||
| - (nullable RCTImageLoaderCancellationBlock)loadImageForURL:(NSURL *)imageURL | ||
| size:(CGSize)size | ||
| scale:(CGFloat)scale | ||
| resizeMode:(RCTResizeMode)resizeMode | ||
| progressHandler:(RCTImageLoaderProgressBlock)progressHandler | ||
| partialLoadHandler:(RCTImageLoaderPartialLoadBlock)partialLoadHandler | ||
| completionHandler:(RCTImageLoaderCompletionBlock)completionHandler | ||
| { | ||
| UIImage *image = RCTImageFromLocalAssetURL(imageURL); | ||
| if (image) { | ||
| if (progressHandler) { | ||
| progressHandler(1, 1); | ||
| } | ||
| completionHandler(nil, image); | ||
| } else { | ||
| NSString *message = [NSString stringWithFormat:@"Could not find image %@", imageURL]; | ||
| RCTLogWarn(@"%@", message); | ||
| completionHandler(RCTErrorWithMessage(message), nil); | ||
| } | ||
|
|
||
| return nil; | ||
| } | ||
|
|
||
| - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule: | ||
| (const facebook::react::ObjCTurboModule::InitParams &)params | ||
| { | ||
| return nullptr; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| Class RCTBundleAssetImageLoaderCls(void) | ||
| { | ||
| return RCTBundleAssetImageLoader.class; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a huge breaking change and something that will break the internal system badly as it is.
My suggestion here is to:
RCTLocalAssetImageLoaderand rename itRCTBundleAssetImageLoaderRCTLocalAssetImageLoaderfor one version, at least, so that other libraries that may use this class won't break in the next release and will have some time to migrate away from itRCTAppSetupUtilsas you already did.In this way, we can bring in the change more easily as it is more conservative. The change will require two passes but it will be much less disruptive.