mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
8131b7bb7b
Summary: This is my proposal for fixing `use_frameworks!` compatibility without breaking all `<React/*>` imports I outlined in https://github.com/facebook/react-native/pull/25393#issuecomment-508457700. If accepted, it will fix https://github.com/facebook/react-native/issues/25349. It builds on the changes I made in https://github.com/facebook/react-native/pull/25496 by ensuring each podspec has a unique value for `header_dir` so that framework imports do not conflict. Every podspec which should be included in the `<React/*>` namespace now includes it's headers from `React-Core.podspec`. The following pods can still be imported with `<React/*>` and so should not have breaking changes: `React-ART`,`React-DevSupport`, `React-CoreModules`, `React-RCTActionSheet`, `React-RCTAnimation`, `React-RCTBlob`, `React-RCTImage`, `React-RCTLinking`, `React-RCTNetwork`, `React-RCTPushNotification`, `React-RCTSettings`, `React-RCTText`, `React-RCTSettings`, `React-RCTVibration`, `React-RCTWebSocket` . There are still a few breaking changes which I hope will be acceptable: - `React-Core.podspec` has been moved to the root of the project. Any `Podfile` that references it will need to update the path. - ~~`React-turbomodule-core`'s headers now live under `<turbomodule/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-turbomodulesamples`'s headers now live under `<turbomodulesamples/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - ~~`React-TypeSaferty`'s headers now live under `<TypeSafety/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511040967. - ~~`React-jscallinvoker`'s headers now live under `<jscallinvoker/*>`~~ Replaced by https://github.com/facebook/react-native/pull/25619#issuecomment-511091823. - Each podspec now uses `s.static_framework = true`. This means that a minimum of CocoaPods 1.5 ([released in April 2018](http://blog.cocoapods.org/CocoaPods-1.5.0/)) is now required. This is needed so that the ` __has_include` conditions can still work when frameworks are enabled. Still to do: - ~~Including `React-turbomodule-core` with `use_frameworks!` enabled causes the C++ import failures we saw in https://github.com/facebook/react-native/issues/25349. I'm sure it will be possible to fix this but I need to dig deeper (perhaps a custom modulemap would be needed).~~ Addressed by https://github.com/facebook/react-native/pull/25619/commits/33573511f02f3502a28bad48e085e9a4b8608302. - I haven't got Fabric working yet. I wonder if it would be acceptable to move Fabric out of the `<React/*>` namespace since it is new? � ## Changelog [iOS] [Fixed] - Fixed compatibility with CocoaPods frameworks. Pull Request resolved: https://github.com/facebook/react-native/pull/25619 Test Plan: ### FB ``` buck build catalyst ``` ### Sample Project Everything should work exactly as before, where `use_frameworks!` is not in `Podfile`s. I have a branch on my [sample project](https://github.com/jtreanor/react-native-cocoapods-frameworks) here which has `use_frameworks!` in its `Podfile` to demonstrate this is fixed. You can see that it works with these steps: 1. `git clone git@github.com:jtreanor/react-native-cocoapods-frameworks.git` 2. `git checkout fix-frameworks-subspecs` 3. `cd ios && pod install` 4. `cd .. && react-native run-ios` The sample app will build and run successfully. To see that it still works without frameworks, remove `use_frameworks!` from the `Podfile` and do steps 3 and 4 again. ### RNTesterPods `RNTesterPodsPods` can now work with or without `use_frameworks!`. 1. Go to the `RNTester` directory and run `pod install`. 2. Run the tests in `RNTesterPods.xcworkspace` to see that everything still works fine. 3. Uncomment the `use_frameworks!` line at the top of `RNTester/Podfile` and run `pod install` again. 4. Run the tests again and see that it still works with frameworks enabled. Reviewed By: PeteTheHeat Differential Revision: D16465247 Pulled By: PeteTheHeat fbshipit-source-id: cad837e9cced06d30cc5b372af1c65c7780b9e7a
241 lines
6.9 KiB
Objective-C
241 lines
6.9 KiB
Objective-C
/**
|
|
* Copyright (c) Facebook, Inc. and its 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/RCTImageStoreManager.h>
|
|
|
|
#import <stdatomic.h>
|
|
|
|
#import <ImageIO/ImageIO.h>
|
|
#import <MobileCoreServices/UTType.h>
|
|
|
|
#import <React/RCTAssert.h>
|
|
#import <React/RCTLog.h>
|
|
#import <React/RCTUtils.h>
|
|
|
|
#import <React/RCTImageUtils.h>
|
|
|
|
static NSString *const RCTImageStoreURLScheme = @"rct-image-store";
|
|
|
|
@implementation RCTImageStoreManager
|
|
{
|
|
NSMutableDictionary<NSString *, NSData *> *_store;
|
|
NSUInteger _id;
|
|
}
|
|
|
|
@synthesize methodQueue = _methodQueue;
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
- (float)handlerPriority
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
- (void)removeImageForTag:(NSString *)imageTag withBlock:(void (^)(void))block
|
|
{
|
|
dispatch_async(_methodQueue, ^{
|
|
[self removeImageForTag:imageTag];
|
|
if (block) {
|
|
block();
|
|
}
|
|
});
|
|
}
|
|
|
|
- (NSString *)_storeImageData:(NSData *)imageData
|
|
{
|
|
RCTAssertThread(_methodQueue, @"Must be called on RCTImageStoreManager thread");
|
|
|
|
if (!_store) {
|
|
_store = [NSMutableDictionary new];
|
|
_id = 0;
|
|
}
|
|
|
|
NSString *imageTag = [NSString stringWithFormat:@"%@://%tu", RCTImageStoreURLScheme, _id++];
|
|
_store[imageTag] = imageData;
|
|
return imageTag;
|
|
}
|
|
|
|
- (void)storeImageData:(NSData *)imageData withBlock:(void (^)(NSString *imageTag))block
|
|
{
|
|
RCTAssertParam(block);
|
|
dispatch_async(_methodQueue, ^{
|
|
block([self _storeImageData:imageData]);
|
|
});
|
|
}
|
|
|
|
- (void)getImageDataForTag:(NSString *)imageTag withBlock:(void (^)(NSData *imageData))block
|
|
{
|
|
RCTAssertParam(block);
|
|
dispatch_async(_methodQueue, ^{
|
|
block(self->_store[imageTag]);
|
|
});
|
|
}
|
|
|
|
- (void)storeImage:(UIImage *)image withBlock:(void (^)(NSString *imageTag))block
|
|
{
|
|
RCTAssertParam(block);
|
|
dispatch_async(_methodQueue, ^{
|
|
NSString *imageTag = [self _storeImageData:RCTGetImageData(image, 0.75)];
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
block(imageTag);
|
|
});
|
|
});
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(removeImageForTag:(NSString *)imageTag)
|
|
{
|
|
[_store removeObjectForKey:imageTag];
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(hasImageForTag:(NSString *)imageTag
|
|
callback:(RCTResponseSenderBlock)callback)
|
|
{
|
|
callback(@[@(_store[imageTag] != nil)]);
|
|
}
|
|
|
|
// TODO (#5906496): Name could be more explicit - something like getBase64EncodedDataForTag:?
|
|
RCT_EXPORT_METHOD(getBase64ForTag:(NSString *)imageTag
|
|
successCallback:(RCTResponseSenderBlock)successCallback
|
|
errorCallback:(RCTResponseErrorBlock)errorCallback)
|
|
{
|
|
NSData *imageData = _store[imageTag];
|
|
if (!imageData) {
|
|
errorCallback(RCTErrorWithMessage([NSString stringWithFormat:@"Invalid imageTag: %@", imageTag]));
|
|
return;
|
|
}
|
|
// Dispatching to a background thread to perform base64 encoding
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
successCallback(@[[imageData base64EncodedStringWithOptions:0]]);
|
|
});
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(addImageFromBase64:(NSString *)base64String
|
|
successCallback:(RCTResponseSenderBlock)successCallback
|
|
errorCallback:(RCTResponseErrorBlock)errorCallback)
|
|
|
|
{
|
|
// Dispatching to a background thread to perform base64 decoding
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
|
|
NSData *imageData = [[NSData alloc] initWithBase64EncodedString:base64String options:0];
|
|
if (imageData) {
|
|
dispatch_async(self->_methodQueue, ^{
|
|
successCallback(@[[self _storeImageData:imageData]]);
|
|
});
|
|
} else {
|
|
errorCallback(RCTErrorWithMessage(@"Failed to add image from base64String"));
|
|
}
|
|
});
|
|
}
|
|
|
|
#pragma mark - RCTURLRequestHandler
|
|
|
|
- (BOOL)canHandleRequest:(NSURLRequest *)request
|
|
{
|
|
return [request.URL.scheme caseInsensitiveCompare:RCTImageStoreURLScheme] == NSOrderedSame;
|
|
}
|
|
|
|
- (id)sendRequest:(NSURLRequest *)request withDelegate:(id<RCTURLRequestDelegate>)delegate
|
|
{
|
|
__block atomic_bool cancelled = ATOMIC_VAR_INIT(NO);
|
|
void (^cancellationBlock)(void) = ^{
|
|
atomic_store(&cancelled, YES);
|
|
};
|
|
|
|
// Dispatch async to give caller time to cancel the request
|
|
dispatch_async(_methodQueue, ^{
|
|
if (atomic_load(&cancelled)) {
|
|
return;
|
|
}
|
|
|
|
NSString *imageTag = request.URL.absoluteString;
|
|
NSData *imageData = self->_store[imageTag];
|
|
if (!imageData) {
|
|
NSError *error = RCTErrorWithMessage([NSString stringWithFormat:@"Invalid imageTag: %@", imageTag]);
|
|
[delegate URLRequest:cancellationBlock didCompleteWithError:error];
|
|
return;
|
|
}
|
|
|
|
CGImageSourceRef sourceRef = CGImageSourceCreateWithData((__bridge CFDataRef)imageData, NULL);
|
|
if (!sourceRef) {
|
|
NSError *error = RCTErrorWithMessage([NSString stringWithFormat:@"Unable to decode data for imageTag: %@", imageTag]);
|
|
[delegate URLRequest:cancellationBlock didCompleteWithError:error];
|
|
return;
|
|
}
|
|
CFStringRef UTI = CGImageSourceGetType(sourceRef);
|
|
CFRelease(sourceRef);
|
|
|
|
NSString *MIMEType = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass(UTI, kUTTagClassMIMEType);
|
|
NSURLResponse *response = [[NSURLResponse alloc] initWithURL:request.URL
|
|
MIMEType:MIMEType
|
|
expectedContentLength:imageData.length
|
|
textEncodingName:nil];
|
|
|
|
[delegate URLRequest:cancellationBlock didReceiveResponse:response];
|
|
[delegate URLRequest:cancellationBlock didReceiveData:imageData];
|
|
[delegate URLRequest:cancellationBlock didCompleteWithError:nil];
|
|
|
|
});
|
|
|
|
return cancellationBlock;
|
|
}
|
|
|
|
- (void)cancelRequest:(id)requestToken
|
|
{
|
|
if (requestToken) {
|
|
((void (^)(void))requestToken)();
|
|
}
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation RCTImageStoreManager (Deprecated)
|
|
|
|
- (NSString *)storeImage:(UIImage *)image
|
|
{
|
|
RCTAssertMainQueue();
|
|
RCTLogWarn(@"RCTImageStoreManager.storeImage() is deprecated and has poor performance. Use an alternative method instead.");
|
|
__block NSString *imageTag;
|
|
dispatch_sync(_methodQueue, ^{
|
|
imageTag = [self _storeImageData:RCTGetImageData(image, 0.75)];
|
|
});
|
|
return imageTag;
|
|
}
|
|
|
|
- (UIImage *)imageForTag:(NSString *)imageTag
|
|
{
|
|
RCTAssertMainQueue();
|
|
RCTLogWarn(@"RCTImageStoreManager.imageForTag() is deprecated and has poor performance. Use an alternative method instead.");
|
|
__block NSData *imageData;
|
|
dispatch_sync(_methodQueue, ^{
|
|
imageData = self->_store[imageTag];
|
|
});
|
|
return [UIImage imageWithData:imageData];
|
|
}
|
|
|
|
- (void)getImageForTag:(NSString *)imageTag withBlock:(void (^)(UIImage *image))block
|
|
{
|
|
RCTAssertParam(block);
|
|
dispatch_async(_methodQueue, ^{
|
|
NSData *imageData = self->_store[imageTag];
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
// imageWithData: is not thread-safe, so we can't do this on methodQueue
|
|
block([UIImage imageWithData:imageData]);
|
|
});
|
|
});
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation RCTBridge (RCTImageStoreManager)
|
|
|
|
- (RCTImageStoreManager *)imageStoreManager
|
|
{
|
|
return [self moduleForClass:[RCTImageStoreManager class]];
|
|
}
|
|
|
|
@end
|