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
189 lines
6.3 KiB
Objective-C
189 lines
6.3 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/RCTLinkingManager.h>
|
|
|
|
#import <React/RCTBridge.h>
|
|
#import <React/RCTEventDispatcher.h>
|
|
#import <React/RCTUtils.h>
|
|
|
|
static NSString *const kOpenURLNotification = @"RCTOpenURLNotification";
|
|
|
|
static void postNotificationWithURL(NSURL *URL, id sender)
|
|
{
|
|
NSDictionary<NSString *, id> *payload = @{@"url": URL.absoluteString};
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:kOpenURLNotification
|
|
object:sender
|
|
userInfo:payload];
|
|
}
|
|
|
|
@implementation RCTLinkingManager
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
- (dispatch_queue_t)methodQueue
|
|
{
|
|
return dispatch_get_main_queue();
|
|
}
|
|
|
|
- (void)startObserving
|
|
{
|
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
|
selector:@selector(handleOpenURLNotification:)
|
|
name:kOpenURLNotification
|
|
object:nil];
|
|
}
|
|
|
|
- (void)stopObserving
|
|
{
|
|
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
|
}
|
|
|
|
- (NSArray<NSString *> *)supportedEvents
|
|
{
|
|
return @[@"url"];
|
|
}
|
|
|
|
+ (BOOL)application:(UIApplication *)app
|
|
openURL:(NSURL *)URL
|
|
options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options
|
|
{
|
|
postNotificationWithURL(URL, self);
|
|
return YES;
|
|
}
|
|
|
|
// Corresponding api deprecated in iOS 9
|
|
+ (BOOL)application:(UIApplication *)application
|
|
openURL:(NSURL *)URL
|
|
sourceApplication:(NSString *)sourceApplication
|
|
annotation:(id)annotation
|
|
{
|
|
postNotificationWithURL(URL, self);
|
|
return YES;
|
|
}
|
|
|
|
+ (BOOL)application:(UIApplication *)application
|
|
continueUserActivity:(NSUserActivity *)userActivity
|
|
restorationHandler:
|
|
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && (__IPHONE_OS_VERSION_MAX_ALLOWED >= 12000) /* __IPHONE_12_0 */
|
|
(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> *_Nullable))restorationHandler {
|
|
#else
|
|
(nonnull void (^)(NSArray *_Nullable))restorationHandler {
|
|
#endif
|
|
if ([userActivity.activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) {
|
|
NSDictionary *payload = @{@"url": userActivity.webpageURL.absoluteString};
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:kOpenURLNotification
|
|
object:self
|
|
userInfo:payload];
|
|
}
|
|
return YES;
|
|
}
|
|
|
|
- (void)handleOpenURLNotification:(NSNotification *)notification
|
|
{
|
|
[self sendEventWithName:@"url" body:notification.userInfo];
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(openURL:(NSURL *)URL
|
|
resolve:(RCTPromiseResolveBlock)resolve
|
|
reject:(RCTPromiseRejectBlock)reject)
|
|
{
|
|
if (@available(iOS 10.0, *)) {
|
|
[RCTSharedApplication() openURL:URL options:@{} completionHandler:^(BOOL success) {
|
|
if (success) {
|
|
resolve(@YES);
|
|
} else {
|
|
reject(RCTErrorUnspecified, [NSString stringWithFormat:@"Unable to open URL: %@", URL], nil);
|
|
}
|
|
}];
|
|
} else {
|
|
#if !TARGET_OS_UIKITFORMAC
|
|
// Note: this branch will never be taken on UIKitForMac
|
|
BOOL opened = [RCTSharedApplication() openURL:URL];
|
|
if (opened) {
|
|
resolve(@YES);
|
|
} else {
|
|
reject(RCTErrorUnspecified, [NSString stringWithFormat:@"Unable to open URL: %@", URL], nil);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(canOpenURL:(NSURL *)URL
|
|
resolve:(RCTPromiseResolveBlock)resolve
|
|
reject:(__unused RCTPromiseRejectBlock)reject)
|
|
{
|
|
if (RCTRunningInAppExtension()) {
|
|
// Technically Today widgets can open urls, but supporting that would require
|
|
// a reference to the NSExtensionContext
|
|
resolve(@NO);
|
|
return;
|
|
}
|
|
|
|
// This can be expensive, so we deliberately don't call on main thread
|
|
BOOL canOpen = [RCTSharedApplication() canOpenURL:URL];
|
|
NSString *scheme = [URL scheme];
|
|
if (canOpen) {
|
|
resolve(@YES);
|
|
} else if (![[scheme lowercaseString] hasPrefix:@"http"] && ![[scheme lowercaseString] hasPrefix:@"https"]) {
|
|
// On iOS 9 and above canOpenURL returns NO without a helpful error.
|
|
// Check if a custom scheme is being used, and if it exists in LSApplicationQueriesSchemes
|
|
NSArray *querySchemes = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"LSApplicationQueriesSchemes"];
|
|
if (querySchemes != nil && ([querySchemes containsObject:scheme] || [querySchemes containsObject:[scheme lowercaseString]])) {
|
|
resolve(@NO);
|
|
} else {
|
|
reject(RCTErrorUnspecified, [NSString stringWithFormat:@"Unable to open URL: %@. Add %@ to LSApplicationQueriesSchemes in your Info.plist.", URL, scheme], nil);
|
|
}
|
|
} else {
|
|
resolve(@NO);
|
|
}
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(getInitialURL:(RCTPromiseResolveBlock)resolve
|
|
reject:(__unused RCTPromiseRejectBlock)reject)
|
|
{
|
|
NSURL *initialURL = nil;
|
|
if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) {
|
|
initialURL = self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey];
|
|
} else {
|
|
NSDictionary *userActivityDictionary =
|
|
self.bridge.launchOptions[UIApplicationLaunchOptionsUserActivityDictionaryKey];
|
|
if ([userActivityDictionary[UIApplicationLaunchOptionsUserActivityTypeKey] isEqual:NSUserActivityTypeBrowsingWeb]) {
|
|
initialURL = ((NSUserActivity *)userActivityDictionary[@"UIApplicationLaunchOptionsUserActivityKey"]).webpageURL;
|
|
}
|
|
}
|
|
resolve(RCTNullIfNil(initialURL.absoluteString));
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(openSettings:(RCTPromiseResolveBlock)resolve
|
|
reject:(__unused RCTPromiseRejectBlock)reject)
|
|
{
|
|
NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
|
|
if (@available(iOS 10.0, *)) {
|
|
[RCTSharedApplication() openURL:url options:@{} completionHandler:^(BOOL success) {
|
|
if (success) {
|
|
resolve(nil);
|
|
} else {
|
|
reject(RCTErrorUnspecified, @"Unable to open app settings", nil);
|
|
}
|
|
}];
|
|
} else {
|
|
#if !TARGET_OS_UIKITFORMAC
|
|
// Note: This branch will never be taken on UIKitForMac
|
|
BOOL opened = [RCTSharedApplication() openURL:url];
|
|
if (opened) {
|
|
resolve(nil);
|
|
} else {
|
|
reject(RCTErrorUnspecified, @"Unable to open app settings", nil);
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
|
|
@end
|