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
294 lines
10 KiB
Objective-C
294 lines
10 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/RCTUITextView.h>
|
|
|
|
#import <React/RCTUtils.h>
|
|
#import <React/UIView+React.h>
|
|
|
|
#import <React/RCTBackedTextInputDelegateAdapter.h>
|
|
#import <React/RCTTextAttributes.h>
|
|
|
|
@implementation RCTUITextView
|
|
{
|
|
UILabel *_placeholderView;
|
|
UITextView *_detachedTextView;
|
|
RCTBackedTextViewDelegateAdapter *_textInputDelegateAdapter;
|
|
}
|
|
|
|
@synthesize reactTextAttributes = _reactTextAttributes;
|
|
|
|
static UIFont *defaultPlaceholderFont()
|
|
{
|
|
return [UIFont systemFontOfSize:17];
|
|
}
|
|
|
|
static UIColor *defaultPlaceholderColor()
|
|
{
|
|
// Default placeholder color from UITextField.
|
|
return [UIColor colorWithRed:0 green:0 blue:0.0980392 alpha:0.22];
|
|
}
|
|
|
|
- (instancetype)initWithFrame:(CGRect)frame
|
|
{
|
|
if (self = [super initWithFrame:frame]) {
|
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
|
selector:@selector(textDidChange)
|
|
name:UITextViewTextDidChangeNotification
|
|
object:self];
|
|
|
|
_placeholderView = [[UILabel alloc] initWithFrame:self.bounds];
|
|
_placeholderView.isAccessibilityElement = NO;
|
|
_placeholderView.numberOfLines = 0;
|
|
_placeholderView.textColor = defaultPlaceholderColor();
|
|
[self addSubview:_placeholderView];
|
|
|
|
_textInputDelegateAdapter = [[RCTBackedTextViewDelegateAdapter alloc] initWithTextView:self];
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (void)dealloc
|
|
{
|
|
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
|
}
|
|
|
|
#pragma mark - Accessibility
|
|
|
|
- (void)setIsAccessibilityElement:(BOOL)isAccessibilityElement
|
|
{
|
|
// UITextView is accessible by default (some nested views are) and disabling that is not supported.
|
|
// On iOS accessible elements cannot be nested, therefore enabling accessibility for some container view
|
|
// (even in a case where this view is a part of public API of TextInput on iOS) shadows some features implemented inside the component.
|
|
}
|
|
|
|
- (NSString *)accessibilityLabel
|
|
{
|
|
NSMutableString *accessibilityLabel = [NSMutableString new];
|
|
|
|
NSString *superAccessibilityLabel = [super accessibilityLabel];
|
|
if (superAccessibilityLabel.length > 0) {
|
|
[accessibilityLabel appendString:superAccessibilityLabel];
|
|
}
|
|
|
|
if (self.placeholder.length > 0 && self.attributedText.string.length == 0) {
|
|
if (accessibilityLabel.length > 0) {
|
|
[accessibilityLabel appendString:@" "];
|
|
}
|
|
[accessibilityLabel appendString:self.placeholder];
|
|
}
|
|
|
|
return accessibilityLabel;
|
|
}
|
|
|
|
#pragma mark - Properties
|
|
|
|
- (void)setPlaceholder:(NSString *)placeholder
|
|
{
|
|
_placeholder = placeholder;
|
|
_placeholderView.attributedText = [[NSAttributedString alloc] initWithString:_placeholder ?: @"" attributes:[self placeholderEffectiveTextAttributes]];
|
|
}
|
|
|
|
- (void)setPlaceholderColor:(UIColor *)placeholderColor
|
|
{
|
|
_placeholderColor = placeholderColor;
|
|
_placeholderView.textColor = _placeholderColor ?: defaultPlaceholderColor();
|
|
}
|
|
|
|
- (void)setReactTextAttributes:(RCTTextAttributes *)reactTextAttributes
|
|
{
|
|
if ([reactTextAttributes isEqual:_reactTextAttributes]) {
|
|
return;
|
|
}
|
|
self.typingAttributes = reactTextAttributes.effectiveTextAttributes;
|
|
_reactTextAttributes = reactTextAttributes;
|
|
// Update placeholder text attributes
|
|
[self setPlaceholder:_placeholder];
|
|
}
|
|
|
|
- (RCTTextAttributes *)reactTextAttributes
|
|
{
|
|
return _reactTextAttributes;
|
|
}
|
|
|
|
- (void)textDidChange
|
|
{
|
|
_textWasPasted = NO;
|
|
[self invalidatePlaceholderVisibility];
|
|
}
|
|
|
|
#pragma mark - Overrides
|
|
|
|
- (void)setFont:(UIFont *)font
|
|
{
|
|
[super setFont:font];
|
|
_placeholderView.font = font ?: defaultPlaceholderFont();
|
|
}
|
|
|
|
- (void)setTextAlignment:(NSTextAlignment)textAlignment
|
|
{
|
|
[super setTextAlignment:textAlignment];
|
|
_placeholderView.textAlignment = textAlignment;
|
|
}
|
|
|
|
- (void)setAttributedText:(NSAttributedString *)attributedText
|
|
{
|
|
// Using `setAttributedString:` while user is typing breaks some internal mechanics
|
|
// when entering complex input languages such as Chinese, Korean or Japanese.
|
|
// see: https://github.com/facebook/react-native/issues/19339
|
|
|
|
// We try to avoid calling this method as much as we can.
|
|
// If the text has changed, there is nothing we can do.
|
|
if (![super.attributedText.string isEqualToString:attributedText.string]) {
|
|
[super setAttributedText:attributedText];
|
|
} else {
|
|
// But if the text is preserved, we just copying the attributes from the source string.
|
|
if (![super.attributedText isEqualToAttributedString:attributedText]) {
|
|
[self copyTextAttributesFrom:attributedText];
|
|
}
|
|
}
|
|
|
|
[self textDidChange];
|
|
}
|
|
|
|
#pragma mark - Overrides
|
|
|
|
- (void)setSelectedTextRange:(UITextRange *)selectedTextRange notifyDelegate:(BOOL)notifyDelegate
|
|
{
|
|
if (!notifyDelegate) {
|
|
// We have to notify an adapter that following selection change was initiated programmatically,
|
|
// so the adapter must not generate a notification for it.
|
|
[_textInputDelegateAdapter skipNextTextInputDidChangeSelectionEventWithTextRange:selectedTextRange];
|
|
}
|
|
|
|
[super setSelectedTextRange:selectedTextRange];
|
|
}
|
|
|
|
- (void)paste:(id)sender
|
|
{
|
|
[super paste:sender];
|
|
_textWasPasted = YES;
|
|
}
|
|
|
|
- (void)setContentOffset:(CGPoint)contentOffset animated:(__unused BOOL)animated
|
|
{
|
|
// Turning off scroll animation.
|
|
// This fixes the problem also known as "flaky scrolling".
|
|
[super setContentOffset:contentOffset animated:NO];
|
|
}
|
|
|
|
#pragma mark - Layout
|
|
|
|
- (CGFloat)preferredMaxLayoutWidth
|
|
{
|
|
// Returning size DOES contain `textContainerInset` (aka `padding`).
|
|
return _preferredMaxLayoutWidth ?: self.placeholderSize.width;
|
|
}
|
|
|
|
- (CGSize)placeholderSize
|
|
{
|
|
UIEdgeInsets textContainerInset = self.textContainerInset;
|
|
NSString *placeholder = self.placeholder ?: @"";
|
|
CGSize maxPlaceholderSize = CGSizeMake(UIEdgeInsetsInsetRect(self.bounds, textContainerInset).size.width, CGFLOAT_MAX);
|
|
CGSize placeholderSize = [placeholder boundingRectWithSize:maxPlaceholderSize options:NSStringDrawingUsesLineFragmentOrigin attributes:[self placeholderEffectiveTextAttributes] context:nil].size;
|
|
placeholderSize = CGSizeMake(RCTCeilPixelValue(placeholderSize.width), RCTCeilPixelValue(placeholderSize.height));
|
|
placeholderSize.width += textContainerInset.left + textContainerInset.right;
|
|
placeholderSize.height += textContainerInset.top + textContainerInset.bottom;
|
|
// Returning size DOES contain `textContainerInset` (aka `padding`; as `sizeThatFits:` does).
|
|
return placeholderSize;
|
|
}
|
|
|
|
- (CGSize)contentSize
|
|
{
|
|
CGSize contentSize = super.contentSize;
|
|
CGSize placeholderSize = _placeholderView.isHidden ? CGSizeZero : self.placeholderSize;
|
|
// When a text input is empty, it actually displays a placehoder.
|
|
// So, we have to consider `placeholderSize` as a minimum `contentSize`.
|
|
// Returning size DOES contain `textContainerInset` (aka `padding`).
|
|
return CGSizeMake(
|
|
MAX(contentSize.width, placeholderSize.width),
|
|
MAX(contentSize.height, placeholderSize.height));
|
|
}
|
|
|
|
- (void)layoutSubviews
|
|
{
|
|
[super layoutSubviews];
|
|
|
|
CGRect textFrame = UIEdgeInsetsInsetRect(self.bounds, self.textContainerInset);
|
|
CGFloat placeholderHeight = [_placeholderView sizeThatFits:textFrame.size].height;
|
|
textFrame.size.height = MIN(placeholderHeight, textFrame.size.height);
|
|
_placeholderView.frame = textFrame;
|
|
}
|
|
|
|
- (CGSize)intrinsicContentSize
|
|
{
|
|
// Returning size DOES contain `textContainerInset` (aka `padding`).
|
|
return [self sizeThatFits:CGSizeMake(self.preferredMaxLayoutWidth, CGFLOAT_MAX)];
|
|
}
|
|
|
|
- (CGSize)sizeThatFits:(CGSize)size
|
|
{
|
|
// Returned fitting size depends on text size and placeholder size.
|
|
CGSize textSize = [super sizeThatFits:size];
|
|
CGSize placeholderSize = self.placeholderSize;
|
|
// Returning size DOES contain `textContainerInset` (aka `padding`).
|
|
return CGSizeMake(MAX(textSize.width, placeholderSize.width), MAX(textSize.height, placeholderSize.height));
|
|
}
|
|
|
|
#pragma mark - Context Menu
|
|
|
|
- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
|
|
{
|
|
if (_contextMenuHidden) {
|
|
return NO;
|
|
}
|
|
|
|
return [super canPerformAction:action withSender:sender];
|
|
}
|
|
|
|
#pragma mark - Placeholder
|
|
|
|
- (void)invalidatePlaceholderVisibility
|
|
{
|
|
BOOL isVisible = _placeholder.length != 0 && self.attributedText.length == 0;
|
|
_placeholderView.hidden = !isVisible;
|
|
}
|
|
|
|
- (NSDictionary<NSAttributedStringKey, id> *)placeholderEffectiveTextAttributes
|
|
{
|
|
NSMutableDictionary<NSAttributedStringKey, id> *effectiveTextAttributes = [NSMutableDictionary dictionaryWithDictionary:@{
|
|
NSFontAttributeName: _reactTextAttributes.effectiveFont ?: defaultPlaceholderFont(),
|
|
NSForegroundColorAttributeName: self.placeholderColor ?: defaultPlaceholderColor(),
|
|
NSKernAttributeName:isnan(_reactTextAttributes.letterSpacing) ? @0 : @(_reactTextAttributes.letterSpacing)
|
|
}];
|
|
NSParagraphStyle *paragraphStyle = [_reactTextAttributes effectiveParagraphStyle];
|
|
if (paragraphStyle) {
|
|
effectiveTextAttributes[NSParagraphStyleAttributeName] = paragraphStyle;
|
|
}
|
|
|
|
return [effectiveTextAttributes copy];
|
|
}
|
|
|
|
#pragma mark - Utility Methods
|
|
|
|
- (void)copyTextAttributesFrom:(NSAttributedString *)sourceString
|
|
{
|
|
[self.textStorage beginEditing];
|
|
|
|
NSTextStorage *textStorage = self.textStorage;
|
|
[sourceString enumerateAttributesInRange:NSMakeRange(0, sourceString.length)
|
|
options:NSAttributedStringEnumerationReverse
|
|
usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
|
|
[textStorage setAttributes:attrs range:range];
|
|
}];
|
|
|
|
[self.textStorage endEditing];
|
|
}
|
|
|
|
@end
|