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
158 lines
4.9 KiB
Objective-C
158 lines
4.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/RCTBaseTextShadowView.h>
|
|
|
|
#import <React/RCTShadowView+Layout.h>
|
|
|
|
#import <React/RCTRawTextShadowView.h>
|
|
#import <React/RCTVirtualTextShadowView.h>
|
|
|
|
NSString *const RCTBaseTextShadowViewEmbeddedShadowViewAttributeName = @"RCTBaseTextShadowViewEmbeddedShadowViewAttributeName";
|
|
|
|
static void RCTInlineViewYogaNodeDirtied(YGNodeRef node)
|
|
{
|
|
// An inline view (a view nested inside of a text node) does not have a parent
|
|
// in the Yoga tree. Consequently, we have to manually propagate the inline
|
|
// view's dirty signal up through the text nodes. At some point, it'll reach
|
|
// the outermost text node which has a Yoga node and then Yoga will take over
|
|
// the dirty signal propagation.
|
|
RCTShadowView *inlineView = (__bridge RCTShadowView *)YGNodeGetContext(node);
|
|
RCTBaseTextShadowView *baseTextShadowView =
|
|
(RCTBaseTextShadowView *)inlineView.reactSuperview;
|
|
|
|
[baseTextShadowView dirtyLayout];
|
|
}
|
|
|
|
@implementation RCTBaseTextShadowView
|
|
|
|
- (instancetype)init
|
|
{
|
|
if (self = [super init]) {
|
|
_textAttributes = [RCTTextAttributes new];
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (void)setReactTag:(NSNumber *)reactTag
|
|
{
|
|
[super setReactTag:reactTag];
|
|
_textAttributes.tag = reactTag;
|
|
}
|
|
|
|
#pragma mark - Life Cycle
|
|
|
|
- (void)insertReactSubview:(RCTShadowView *)subview atIndex:(NSInteger)index
|
|
{
|
|
[super insertReactSubview:subview atIndex:index];
|
|
|
|
[self dirtyLayout];
|
|
|
|
if (![subview isKindOfClass:[RCTVirtualTextShadowView class]]) {
|
|
YGNodeSetDirtiedFunc(subview.yogaNode, RCTInlineViewYogaNodeDirtied);
|
|
}
|
|
}
|
|
|
|
- (void)removeReactSubview:(RCTShadowView *)subview
|
|
{
|
|
if (![subview isKindOfClass:[RCTVirtualTextShadowView class]]) {
|
|
YGNodeSetDirtiedFunc(subview.yogaNode, NULL);
|
|
}
|
|
|
|
[self dirtyLayout];
|
|
|
|
[super removeReactSubview:subview];
|
|
}
|
|
|
|
#pragma mark - attributedString
|
|
|
|
- (NSAttributedString *)attributedTextWithBaseTextAttributes:(nullable RCTTextAttributes *)baseTextAttributes
|
|
{
|
|
RCTTextAttributes *textAttributes;
|
|
|
|
if (baseTextAttributes) {
|
|
textAttributes = [baseTextAttributes copy];
|
|
[textAttributes applyTextAttributes:self.textAttributes];
|
|
} else {
|
|
textAttributes = [self.textAttributes copy];
|
|
}
|
|
|
|
if (cachedAttributedText && [cachedTextAttributes isEqual:textAttributes]) {
|
|
return cachedAttributedText;
|
|
}
|
|
|
|
NSMutableAttributedString *attributedText = [NSMutableAttributedString new];
|
|
|
|
[attributedText beginEditing];
|
|
|
|
for (RCTShadowView *shadowView in self.reactSubviews) {
|
|
// Special Case: RCTRawTextShadowView
|
|
if ([shadowView isKindOfClass:[RCTRawTextShadowView class]]) {
|
|
RCTRawTextShadowView *rawTextShadowView = (RCTRawTextShadowView *)shadowView;
|
|
NSString *text = rawTextShadowView.text;
|
|
if (text) {
|
|
NSAttributedString *rawTextAttributedString =
|
|
[[NSAttributedString alloc] initWithString:[textAttributes applyTextAttributesToText:text]
|
|
attributes:textAttributes.effectiveTextAttributes];
|
|
[attributedText appendAttributedString:rawTextAttributedString];
|
|
}
|
|
continue;
|
|
}
|
|
|
|
// Special Case: RCTBaseTextShadowView
|
|
if ([shadowView isKindOfClass:[RCTBaseTextShadowView class]]) {
|
|
RCTBaseTextShadowView *baseTextShadowView = (RCTBaseTextShadowView *)shadowView;
|
|
NSAttributedString *baseTextAttributedString =
|
|
[baseTextShadowView attributedTextWithBaseTextAttributes:textAttributes];
|
|
[attributedText appendAttributedString:baseTextAttributedString];
|
|
continue;
|
|
}
|
|
|
|
// Generic Case: Any RCTShadowView
|
|
NSTextAttachment *attachment = [NSTextAttachment new];
|
|
NSMutableAttributedString *embeddedShadowViewAttributedString = [NSMutableAttributedString new];
|
|
[embeddedShadowViewAttributedString beginEditing];
|
|
[embeddedShadowViewAttributedString appendAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]];
|
|
[embeddedShadowViewAttributedString addAttribute:RCTBaseTextShadowViewEmbeddedShadowViewAttributeName
|
|
value:shadowView
|
|
range:(NSRange){0, embeddedShadowViewAttributedString.length}];
|
|
[embeddedShadowViewAttributedString endEditing];
|
|
[attributedText appendAttributedString:embeddedShadowViewAttributedString];
|
|
}
|
|
|
|
[attributedText endEditing];
|
|
|
|
[self clearLayout];
|
|
|
|
cachedAttributedText = [attributedText copy];
|
|
cachedTextAttributes = textAttributes;
|
|
|
|
return cachedAttributedText;
|
|
}
|
|
|
|
- (void)dirtyLayout
|
|
{
|
|
[super dirtyLayout];
|
|
cachedAttributedText = nil;
|
|
cachedTextAttributes = nil;
|
|
}
|
|
|
|
- (void)didUpdateReactSubviews
|
|
{
|
|
[super didUpdateReactSubviews];
|
|
[self dirtyLayout];
|
|
}
|
|
|
|
- (void)didSetProps:(NSArray<NSString *> *)changedProps
|
|
{
|
|
[super didSetProps:changedProps];
|
|
[self dirtyLayout];
|
|
}
|
|
|
|
@end
|