mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
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
209 lines
6.9 KiB
Objective-C
209 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 <XCTest/XCTest.h>
|
|
|
|
#import <RCTTest/RCTTestRunner.h>
|
|
#import <React/RCTRootShadowView.h>
|
|
#import <React/RCTShadowView.h>
|
|
#import <React/RCTUIManager.h>
|
|
#import <React/RCTView.h>
|
|
#import <React/RCTViewManager.h>
|
|
|
|
@interface RCTUIManager ()
|
|
|
|
- (void)createView:(NSNumber *)reactTag
|
|
viewName:(NSString *)viewName
|
|
rootTag:(NSNumber *)rootTag
|
|
props:(NSDictionary *)props;
|
|
|
|
- (void)updateView:(nonnull NSNumber *)reactTag
|
|
viewName:(NSString *)viewName
|
|
props:(NSDictionary *)props;
|
|
|
|
@property (nonatomic, copy, readonly) NSMutableDictionary<NSNumber *, RCTShadowView *> *shadowViewRegistry;
|
|
|
|
@end
|
|
|
|
@interface RCTPropsTestView : UIView
|
|
|
|
@property (nonatomic, assign) NSInteger integerProp;
|
|
@property (nonatomic, strong) id objectProp;
|
|
@property (nonatomic, assign) CGPoint structProp;
|
|
@property (nonatomic, copy) NSString *customProp;
|
|
|
|
@end
|
|
|
|
@implementation RCTPropsTestView
|
|
@end
|
|
|
|
@interface RCTPropsTestViewManager : RCTViewManager
|
|
@end
|
|
|
|
@implementation RCTPropsTestViewManager
|
|
|
|
RCT_EXPORT_MODULE()
|
|
|
|
- (UIView *)view
|
|
{
|
|
RCTPropsTestView *view = [RCTPropsTestView new];
|
|
view.integerProp = 57;
|
|
view.objectProp = @9;
|
|
view.structProp = CGPointMake(5, 6);
|
|
view.customProp = @"Hello";
|
|
return view;
|
|
}
|
|
|
|
RCT_EXPORT_VIEW_PROPERTY(integerProp, NSInteger)
|
|
RCT_EXPORT_VIEW_PROPERTY(objectProp, NSNumber)
|
|
RCT_EXPORT_VIEW_PROPERTY(structProp, CGPoint)
|
|
RCT_CUSTOM_VIEW_PROPERTY(customProp, NSString, RCTPropsTestView)
|
|
{
|
|
view.customProp = json ? [RCTConvert NSString:json] : defaultView.customProp;
|
|
}
|
|
|
|
@end
|
|
|
|
@interface RCTComponentPropsTests : XCTestCase
|
|
|
|
@end
|
|
|
|
@implementation RCTComponentPropsTests
|
|
{
|
|
RCTBridge *_bridge;
|
|
NSNumber *_rootViewReactTag;
|
|
}
|
|
|
|
- (void)setUp
|
|
{
|
|
[super setUp];
|
|
|
|
NSBundle *bundle = [NSBundle bundleForClass:[self class]];
|
|
_bridge = [[RCTBridge alloc] initWithBundleURL:[bundle URLForResource:@"RNTesterUnitTestsBundle" withExtension:@"js"]
|
|
moduleProvider:nil
|
|
launchOptions:nil];
|
|
|
|
_rootViewReactTag = @1;
|
|
RCTUIManager *uiManager = _bridge.uiManager;
|
|
|
|
dispatch_async(uiManager.methodQueue, ^{
|
|
RCTRootShadowView *rootShadowView = [RCTRootShadowView new];
|
|
rootShadowView.reactTag = self->_rootViewReactTag;
|
|
uiManager.shadowViewRegistry[rootShadowView.reactTag] = rootShadowView;
|
|
});
|
|
|
|
RCT_RUN_RUNLOOP_WHILE(_bridge.isLoading);
|
|
}
|
|
|
|
- (void)testSetProps
|
|
{
|
|
__block RCTPropsTestView *view;
|
|
RCTUIManager *uiManager = _bridge.uiManager;
|
|
NSDictionary *props = @{@"integerProp": @58,
|
|
@"objectProp": @10,
|
|
@"structProp": @{@"x": @7, @"y": @8},
|
|
@"customProp": @"Goodbye"};
|
|
|
|
dispatch_async(uiManager.methodQueue, ^{
|
|
[uiManager createView:@2 viewName:@"RCTPropsTestView" rootTag:self->_rootViewReactTag props:props];
|
|
[uiManager addUIBlock:^(__unused RCTUIManager *_uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
|
|
view = (RCTPropsTestView *)viewRegistry[@2];
|
|
XCTAssertEqual(view.integerProp, 58);
|
|
XCTAssertEqualObjects(view.objectProp, @10);
|
|
XCTAssertTrue(CGPointEqualToPoint(view.structProp, CGPointMake(7, 8)));
|
|
XCTAssertEqualObjects(view.customProp, @"Goodbye");
|
|
}];
|
|
[uiManager setNeedsLayout];
|
|
});
|
|
|
|
RCT_RUN_RUNLOOP_WHILE(view == nil);
|
|
}
|
|
|
|
- (void)testNeedsOffscreenAlphaCompositing
|
|
{
|
|
__block RCTPropsTestView *view;
|
|
RCTUIManager *uiManager = _bridge.uiManager;
|
|
|
|
XCTestExpectation *initialExpectation = [self expectationWithDescription:@"initial expectation"];
|
|
XCTestExpectation *updateExpectation = [self expectationWithDescription:@"second expectation"];
|
|
|
|
dispatch_async(uiManager.methodQueue, ^{
|
|
[uiManager createView:@2 viewName:@"RCTPropsTestView" rootTag:self->_rootViewReactTag props:@{}];
|
|
[uiManager addUIBlock:^(__unused RCTUIManager *_uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
|
|
view = (RCTPropsTestView *)viewRegistry[@2];
|
|
XCTAssertEqual(view.layer.allowsGroupOpacity, TRUE);
|
|
[initialExpectation fulfill];
|
|
}];
|
|
[uiManager updateView:@2 viewName:@"RCTPropsTestView" props:@{@"needsOffscreenAlphaCompositing": @NO}];
|
|
[uiManager addUIBlock:^(__unused RCTUIManager *_uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
|
|
view = (RCTPropsTestView *)viewRegistry[@2];
|
|
XCTAssertEqual(view.layer.allowsGroupOpacity, FALSE);
|
|
[updateExpectation fulfill];
|
|
}];
|
|
[uiManager setNeedsLayout];
|
|
});
|
|
|
|
[self waitForExpectations:@[initialExpectation, updateExpectation] timeout:0.1];
|
|
}
|
|
|
|
- (void)testResetProps
|
|
{
|
|
__block RCTPropsTestView *view;
|
|
RCTUIManager *uiManager = _bridge.uiManager;
|
|
NSDictionary *props = @{@"integerProp": @58,
|
|
@"objectProp": @10,
|
|
@"structProp": @{@"x": @7, @"y": @8},
|
|
@"customProp": @"Goodbye"};
|
|
|
|
NSDictionary *resetProps = @{@"integerProp": [NSNull null],
|
|
@"objectProp": [NSNull null],
|
|
@"structProp": [NSNull null],
|
|
@"customProp": [NSNull null]};
|
|
|
|
dispatch_async(uiManager.methodQueue, ^{
|
|
[uiManager createView:@2 viewName:@"RCTPropsTestView" rootTag:self->_rootViewReactTag props:props];
|
|
[uiManager updateView:@2 viewName:@"RCTPropsTestView" props:resetProps];
|
|
[uiManager addUIBlock:^(__unused RCTUIManager *_uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
|
|
view = (RCTPropsTestView *)viewRegistry[@2];
|
|
XCTAssertEqual(view.integerProp, 57);
|
|
XCTAssertEqualObjects(view.objectProp, @9);
|
|
XCTAssertTrue(CGPointEqualToPoint(view.structProp, CGPointMake(5, 6)));
|
|
XCTAssertEqualObjects(view.customProp, @"Hello");
|
|
}];
|
|
[uiManager setNeedsLayout];
|
|
});
|
|
|
|
RCT_RUN_RUNLOOP_WHILE(view == nil);
|
|
}
|
|
|
|
- (void)testResetBackgroundColor
|
|
{
|
|
__block RCTView *view;
|
|
RCTUIManager *uiManager = _bridge.uiManager;
|
|
NSDictionary *props = @{@"backgroundColor": @0xffffffff};
|
|
NSDictionary *resetProps = @{@"backgroundColor": [NSNull null]};
|
|
|
|
dispatch_async(uiManager.methodQueue, ^{
|
|
[uiManager createView:@2 viewName:@"RCTView" rootTag:self->_rootViewReactTag props:props];
|
|
[uiManager addUIBlock:^(__unused RCTUIManager *_uiManager, NSDictionary<NSNumber *, UIView *> *viewRegistry) {
|
|
view = (RCTView *)viewRegistry[@2];
|
|
XCTAssertEqualObjects(view.backgroundColor, [RCTConvert UIColor:@0xffffffff]);
|
|
}];
|
|
[uiManager updateView:@2 viewName:@"RCTView" props:resetProps];
|
|
[uiManager addUIBlock:^(__unused RCTUIManager *_uiManager, __unused NSDictionary<NSNumber *,UIView *> *viewRegistry) {
|
|
view = (RCTView *)viewRegistry[@2];
|
|
XCTAssertNil(view.backgroundColor);
|
|
}];
|
|
[uiManager setNeedsLayout];
|
|
});
|
|
|
|
RCT_RUN_RUNLOOP_WHILE(view == nil);
|
|
}
|
|
|
|
@end
|