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
179 lines
5.1 KiB
Objective-C
179 lines
5.1 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/RCTDevLoadingView.h>
|
|
|
|
#import <QuartzCore/QuartzCore.h>
|
|
|
|
#import <React/RCTBridge.h>
|
|
#import <React/RCTDefines.h>
|
|
#import <React/RCTModalHostViewController.h>
|
|
#import <React/RCTUtils.h>
|
|
|
|
#if RCT_DEV | RCT_ENABLE_LOADING_VIEW
|
|
|
|
static BOOL isEnabled = YES;
|
|
|
|
@implementation RCTDevLoadingView
|
|
{
|
|
UIWindow *_window;
|
|
UILabel *_label;
|
|
NSDate *_showDate;
|
|
}
|
|
|
|
@synthesize bridge = _bridge;
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
+ (void)setEnabled:(BOOL)enabled
|
|
{
|
|
isEnabled = enabled;
|
|
}
|
|
|
|
- (void)dealloc
|
|
{
|
|
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
|
}
|
|
|
|
+ (BOOL)requiresMainQueueSetup
|
|
{
|
|
return YES;
|
|
}
|
|
|
|
- (void)setBridge:(RCTBridge *)bridge
|
|
{
|
|
_bridge = bridge;
|
|
|
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
|
selector:@selector(hide)
|
|
name:RCTJavaScriptDidLoadNotification
|
|
object:nil];
|
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
|
selector:@selector(hide)
|
|
name:RCTJavaScriptDidFailToLoadNotification
|
|
object:nil];
|
|
|
|
if (bridge.loading) {
|
|
[self showWithURL:bridge.bundleURL];
|
|
}
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(showMessage:(NSString *)message color:(UIColor *)color backgroundColor:(UIColor *)backgroundColor)
|
|
{
|
|
if (!isEnabled) {
|
|
return;
|
|
}
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
self->_showDate = [NSDate date];
|
|
if (!self->_window && !RCTRunningInTestEnvironment()) {
|
|
CGSize screenSize = [UIScreen mainScreen].bounds.size;
|
|
|
|
if (@available(iOS 11.0, *)) {
|
|
UIWindow *window = UIApplication.sharedApplication.keyWindow;
|
|
self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, window.safeAreaInsets.top + 30)];
|
|
self->_label = [[UILabel alloc] initWithFrame:CGRectMake(0, window.safeAreaInsets.top, screenSize.width, 30)];
|
|
} else {
|
|
self->_window = [[UIWindow alloc] initWithFrame:CGRectMake(0, 0, screenSize.width, 22)];
|
|
self->_label = [[UILabel alloc] initWithFrame:self->_window.bounds];
|
|
}
|
|
[self->_window addSubview:self->_label];
|
|
#if TARGET_OS_TV
|
|
self->_window.windowLevel = UIWindowLevelNormal + 1;
|
|
#else
|
|
self->_window.windowLevel = UIWindowLevelStatusBar + 1;
|
|
#endif
|
|
// set a root VC so rotation is supported
|
|
self->_window.rootViewController = [UIViewController new];
|
|
|
|
self->_label.font = [UIFont monospacedDigitSystemFontOfSize:12.0
|
|
weight:UIFontWeightRegular];
|
|
self->_label.textAlignment = NSTextAlignmentCenter;
|
|
}
|
|
|
|
self->_label.text = message;
|
|
self->_label.textColor = color;
|
|
self->_window.backgroundColor = backgroundColor;
|
|
self->_window.hidden = NO;
|
|
});
|
|
}
|
|
|
|
RCT_EXPORT_METHOD(hide)
|
|
{
|
|
if (!isEnabled) {
|
|
return;
|
|
}
|
|
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
const NSTimeInterval MIN_PRESENTED_TIME = 0.6;
|
|
NSTimeInterval presentedTime = [[NSDate date] timeIntervalSinceDate:self->_showDate];
|
|
NSTimeInterval delay = MAX(0, MIN_PRESENTED_TIME - presentedTime);
|
|
CGRect windowFrame = self->_window.frame;
|
|
[UIView animateWithDuration:0.25
|
|
delay:delay
|
|
options:0
|
|
animations:^{
|
|
self->_window.frame = CGRectOffset(windowFrame, 0, -windowFrame.size.height);
|
|
} completion:^(__unused BOOL finished) {
|
|
self->_window.frame = windowFrame;
|
|
self->_window.hidden = YES;
|
|
self->_window = nil;
|
|
}];
|
|
});
|
|
}
|
|
|
|
- (void)showWithURL:(NSURL *)URL
|
|
{
|
|
UIColor *color;
|
|
UIColor *backgroundColor;
|
|
NSString *source;
|
|
if (URL.fileURL) {
|
|
// If dev mode is not enabled, we don't want to show this kind of notification
|
|
#if !RCT_DEV
|
|
return;
|
|
#endif
|
|
color = [UIColor grayColor];
|
|
backgroundColor = [UIColor blackColor];
|
|
source = @"pre-bundled file";
|
|
} else {
|
|
color = [UIColor whiteColor];
|
|
backgroundColor = [UIColor colorWithHue:1./3 saturation:1 brightness:.35 alpha:1];
|
|
source = [NSString stringWithFormat:@"%@:%@", URL.host, URL.port];
|
|
}
|
|
|
|
[self showMessage:[NSString stringWithFormat:@"Loading from %@...", source]
|
|
color:color
|
|
backgroundColor:backgroundColor];
|
|
}
|
|
|
|
- (void)updateProgress:(RCTLoadingProgress *)progress
|
|
{
|
|
if (!progress) {
|
|
return;
|
|
}
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
self->_label.text = [progress description];
|
|
});
|
|
}
|
|
|
|
@end
|
|
|
|
#else
|
|
|
|
@implementation RCTDevLoadingView
|
|
|
|
+ (NSString *)moduleName { return nil; }
|
|
+ (void)setEnabled:(BOOL)enabled { }
|
|
- (void)showMessage:(NSString *)message color:(UIColor *)color backgroundColor:(UIColor *)backgroundColor { }
|
|
- (void)showWithURL:(NSURL *)URL { }
|
|
- (void)updateProgress:(RCTLoadingProgress *)progress { }
|
|
- (void)hide { }
|
|
|
|
@end
|
|
|
|
#endif
|