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
146 lines
5.3 KiB
Objective-C
146 lines
5.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 <UIKit/UIKit.h>
|
|
#import <XCTest/XCTest.h>
|
|
|
|
#import <RCTTest/RCTTestRunner.h>
|
|
#import <React/RCTEventDispatcher.h>
|
|
#import <React/RCTRootView.h>
|
|
#import <React/RCTRootViewDelegate.h>
|
|
|
|
#define RCT_TEST_DATA_CONFIGURATION_BLOCK(appName, testType, input, block) \
|
|
- (void)DISABLED_test##appName##_##testType##_##input \
|
|
{ \
|
|
[_runner runTest:_cmd \
|
|
module:@#appName \
|
|
initialProps:@{@#input:@YES} \
|
|
configurationBlock:block]; \
|
|
}
|
|
|
|
#define RCT_TEST_CONFIGURATION_BLOCK(appName, block) \
|
|
- (void)DISABLED_test##appName \
|
|
{ \
|
|
[_runner runTest:_cmd \
|
|
module:@#appName \
|
|
initialProps:nil \
|
|
configurationBlock:block]; \
|
|
}
|
|
|
|
#define RCTNone RCTRootViewSizeFlexibilityNone
|
|
#define RCTHeight RCTRootViewSizeFlexibilityHeight
|
|
#define RCTWidth RCTRootViewSizeFlexibilityWidth
|
|
#define RCTBoth RCTRootViewSizeFlexibilityWidthAndHeight
|
|
|
|
typedef void (^ControlBlock)(RCTRootView*);
|
|
|
|
@interface SizeFlexibilityTestDelegate : NSObject<RCTRootViewDelegate>
|
|
@end
|
|
|
|
@implementation SizeFlexibilityTestDelegate
|
|
|
|
- (void)rootViewDidChangeIntrinsicSize:(RCTRootView *)rootView
|
|
{
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
|
|
|
[rootView.bridge.eventDispatcher sendAppEventWithName:@"rootViewDidChangeIntrinsicSize"
|
|
body:@{@"width": @(rootView.intrinsicSize.width),
|
|
@"height": @(rootView.intrinsicSize.height)}];
|
|
#pragma clang diagnostic pop
|
|
}
|
|
|
|
@end
|
|
|
|
static SizeFlexibilityTestDelegate *sizeFlexibilityDelegate()
|
|
{
|
|
static SizeFlexibilityTestDelegate *delegate;
|
|
if (delegate == nil) {
|
|
delegate = [SizeFlexibilityTestDelegate new];
|
|
}
|
|
|
|
return delegate;
|
|
}
|
|
|
|
static ControlBlock simpleSizeFlexibilityBlock(RCTRootViewSizeFlexibility sizeFlexibility)
|
|
{
|
|
return ^(RCTRootView *rootView){
|
|
rootView.delegate = sizeFlexibilityDelegate();
|
|
rootView.sizeFlexibility = sizeFlexibility;
|
|
};
|
|
}
|
|
|
|
static ControlBlock multipleSizeFlexibilityUpdatesBlock(RCTRootViewSizeFlexibility finalSizeFlexibility)
|
|
{
|
|
return ^(RCTRootView *rootView){
|
|
|
|
NSInteger arr[4] = {RCTNone,
|
|
RCTHeight,
|
|
RCTWidth,
|
|
RCTBoth};
|
|
|
|
rootView.delegate = sizeFlexibilityDelegate();
|
|
|
|
for (int i = 0; i < 4; ++i) {
|
|
if (arr[i] != finalSizeFlexibility) {
|
|
rootView.sizeFlexibility = arr[i];
|
|
}
|
|
}
|
|
|
|
rootView.sizeFlexibility = finalSizeFlexibility;
|
|
};
|
|
}
|
|
|
|
static ControlBlock reactContentSizeUpdateBlock(RCTRootViewSizeFlexibility sizeFlexibility)
|
|
{
|
|
return ^(RCTRootView *rootView){
|
|
rootView.delegate = sizeFlexibilityDelegate();
|
|
rootView.sizeFlexibility = sizeFlexibility;
|
|
};
|
|
}
|
|
|
|
@interface RCTRootViewIntegrationTests : XCTestCase
|
|
|
|
@end
|
|
|
|
@implementation RCTRootViewIntegrationTests
|
|
{
|
|
RCTTestRunner *_runner;
|
|
}
|
|
|
|
- (void)setUp
|
|
{
|
|
_runner = RCTInitRunnerForApp(@"IntegrationTests/RCTRootViewIntegrationTestApp", nil, nil);
|
|
}
|
|
|
|
#pragma mark Logic Tests
|
|
|
|
// This list should be kept in sync with RCTRootViewIntegrationTestsApp.js
|
|
|
|
// Simple size flexibility tests - test if the content is measured properly
|
|
RCT_TEST_DATA_CONFIGURATION_BLOCK(SizeFlexibilityUpdateTest, SingleUpdate, none, simpleSizeFlexibilityBlock(RCTNone));
|
|
RCT_TEST_DATA_CONFIGURATION_BLOCK(SizeFlexibilityUpdateTest, SingleUpdate, height, simpleSizeFlexibilityBlock(RCTHeight));
|
|
RCT_TEST_DATA_CONFIGURATION_BLOCK(SizeFlexibilityUpdateTest, SingleUpdate, width, simpleSizeFlexibilityBlock(RCTWidth));
|
|
RCT_TEST_DATA_CONFIGURATION_BLOCK(SizeFlexibilityUpdateTest, SingleUpdate, both, simpleSizeFlexibilityBlock(RCTBoth));
|
|
|
|
// Consider multiple size flexibility updates in a row. Test if the view's flexibility mode eventually is set to the expected value
|
|
RCT_TEST_DATA_CONFIGURATION_BLOCK(SizeFlexibilityUpdateTest, MultipleUpdates, none, multipleSizeFlexibilityUpdatesBlock(RCTNone));
|
|
RCT_TEST_DATA_CONFIGURATION_BLOCK(SizeFlexibilityUpdateTest, MultipleUpdates, height, multipleSizeFlexibilityUpdatesBlock(RCTHeight));
|
|
RCT_TEST_DATA_CONFIGURATION_BLOCK(SizeFlexibilityUpdateTest, MultipleUpdates, width, multipleSizeFlexibilityUpdatesBlock(RCTWidth));
|
|
RCT_TEST_DATA_CONFIGURATION_BLOCK(SizeFlexibilityUpdateTest, MultipleUpdates, both, multipleSizeFlexibilityUpdatesBlock(RCTBoth));
|
|
|
|
// Test if the 'rootViewDidChangeIntrinsicSize' delegate method is called after the RN app decides internally to resize
|
|
RCT_TEST_CONFIGURATION_BLOCK(ReactContentSizeUpdateTest, reactContentSizeUpdateBlock(RCTBoth))
|
|
|
|
// Test if setting 'appProperties' property updates the RN app
|
|
RCT_TEST_CONFIGURATION_BLOCK(PropertiesUpdateTest, ^(RCTRootView *rootView) {
|
|
rootView.appProperties = @{@"markTestPassed":@YES};
|
|
})
|
|
|
|
@end
|