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
234 lines
6.1 KiB
Objective-C
234 lines
6.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/RCTUITextField.h>
|
|
|
|
#import <React/RCTUtils.h>
|
|
#import <React/UIView+React.h>
|
|
|
|
#import <React/RCTBackedTextInputDelegateAdapter.h>
|
|
#import <React/RCTTextAttributes.h>
|
|
|
|
@implementation RCTUITextField {
|
|
RCTBackedTextFieldDelegateAdapter *_textInputDelegateAdapter;
|
|
}
|
|
|
|
@synthesize reactTextAttributes = _reactTextAttributes;
|
|
|
|
- (instancetype)initWithFrame:(CGRect)frame
|
|
{
|
|
if (self = [super initWithFrame:frame]) {
|
|
[[NSNotificationCenter defaultCenter] addObserver:self
|
|
selector:@selector(_textDidChange)
|
|
name:UITextFieldTextDidChangeNotification
|
|
object:self];
|
|
|
|
_textInputDelegateAdapter = [[RCTBackedTextFieldDelegateAdapter alloc] initWithTextField:self];
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (void)dealloc
|
|
{
|
|
[[NSNotificationCenter defaultCenter] removeObserver:self];
|
|
}
|
|
|
|
- (void)_textDidChange
|
|
{
|
|
_textWasPasted = NO;
|
|
}
|
|
|
|
#pragma mark - Accessibility
|
|
|
|
- (void)setIsAccessibilityElement:(BOOL)isAccessibilityElement
|
|
{
|
|
// UITextField 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.
|
|
}
|
|
|
|
#pragma mark - Properties
|
|
|
|
- (void)setTextContainerInset:(UIEdgeInsets)textContainerInset
|
|
{
|
|
_textContainerInset = textContainerInset;
|
|
[self setNeedsLayout];
|
|
}
|
|
|
|
- (void)setPlaceholder:(NSString *)placeholder
|
|
{
|
|
[super setPlaceholder:placeholder];
|
|
[self _updatePlaceholder];
|
|
}
|
|
|
|
- (void)setPlaceholderColor:(UIColor *)placeholderColor
|
|
{
|
|
_placeholderColor = placeholderColor;
|
|
[self _updatePlaceholder];
|
|
}
|
|
|
|
- (void)setReactTextAttributes:(RCTTextAttributes *)reactTextAttributes
|
|
{
|
|
if ([reactTextAttributes isEqual:_reactTextAttributes]) {
|
|
return;
|
|
}
|
|
self.defaultTextAttributes = reactTextAttributes.effectiveTextAttributes;
|
|
_reactTextAttributes = reactTextAttributes;
|
|
[self _updatePlaceholder];
|
|
}
|
|
|
|
- (RCTTextAttributes *)reactTextAttributes
|
|
{
|
|
return _reactTextAttributes;
|
|
}
|
|
|
|
- (void)_updatePlaceholder
|
|
{
|
|
if (self.placeholder == nil) {
|
|
return;
|
|
}
|
|
|
|
self.attributedPlaceholder = [[NSAttributedString alloc] initWithString:self.placeholder
|
|
attributes:[self placeholderEffectiveTextAttributes]];
|
|
}
|
|
|
|
- (BOOL)isEditable
|
|
{
|
|
return self.isEnabled;
|
|
}
|
|
|
|
- (void)setEditable:(BOOL)editable
|
|
{
|
|
self.enabled = editable;
|
|
}
|
|
|
|
- (void)setScrollEnabled:(BOOL)enabled
|
|
{
|
|
// Do noting, compatible with multiline textinput
|
|
}
|
|
|
|
- (BOOL)scrollEnabled
|
|
{
|
|
return NO;
|
|
}
|
|
|
|
#pragma mark - Placeholder
|
|
|
|
- (NSDictionary<NSAttributedStringKey, id> *)placeholderEffectiveTextAttributes
|
|
{
|
|
NSMutableDictionary<NSAttributedStringKey, id> *effectiveTextAttributes = [NSMutableDictionary dictionary];
|
|
|
|
if (_placeholderColor) {
|
|
effectiveTextAttributes[NSForegroundColorAttributeName] = _placeholderColor;
|
|
}
|
|
// Kerning
|
|
if (!isnan(_reactTextAttributes.letterSpacing)) {
|
|
effectiveTextAttributes[NSKernAttributeName] = @(_reactTextAttributes.letterSpacing);
|
|
}
|
|
|
|
NSParagraphStyle *paragraphStyle = [_reactTextAttributes effectiveParagraphStyle];
|
|
if (paragraphStyle) {
|
|
effectiveTextAttributes[NSParagraphStyleAttributeName] = paragraphStyle;
|
|
}
|
|
|
|
return [effectiveTextAttributes copy];
|
|
}
|
|
|
|
#pragma mark - Context Menu
|
|
|
|
- (BOOL)canPerformAction:(SEL)action withSender:(id)sender
|
|
{
|
|
if (_contextMenuHidden) {
|
|
return NO;
|
|
}
|
|
|
|
return [super canPerformAction:action withSender:sender];
|
|
}
|
|
|
|
#pragma mark - Caret Manipulation
|
|
|
|
- (CGRect)caretRectForPosition:(UITextPosition *)position
|
|
{
|
|
if (_caretHidden) {
|
|
return CGRectZero;
|
|
}
|
|
|
|
return [super caretRectForPosition:position];
|
|
}
|
|
|
|
|
|
#pragma mark - Positioning Overrides
|
|
|
|
- (CGRect)textRectForBounds:(CGRect)bounds
|
|
{
|
|
return UIEdgeInsetsInsetRect([super textRectForBounds:bounds], _textContainerInset);
|
|
}
|
|
|
|
- (CGRect)editingRectForBounds:(CGRect)bounds
|
|
{
|
|
return [self textRectForBounds:bounds];
|
|
}
|
|
|
|
#pragma mark - Overrides
|
|
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wdeprecated-implementations"
|
|
// Overrides selectedTextRange setter to get notify when selectedTextRange changed.
|
|
- (void)setSelectedTextRange:(UITextRange *)selectedTextRange
|
|
{
|
|
[super setSelectedTextRange:selectedTextRange];
|
|
[_textInputDelegateAdapter selectedTextRangeWasSet];
|
|
}
|
|
#pragma clang diagnostic pop
|
|
|
|
- (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;
|
|
}
|
|
|
|
#pragma mark - Layout
|
|
|
|
- (CGSize)contentSize
|
|
{
|
|
// Returning size DOES contain `textContainerInset` (aka `padding`).
|
|
return self.intrinsicContentSize;
|
|
}
|
|
|
|
- (CGSize)intrinsicContentSize
|
|
{
|
|
// Note: `placeholder` defines intrinsic size for `<TextInput>`.
|
|
NSString *text = self.placeholder ?: @"";
|
|
CGSize size = [text sizeWithAttributes:[self placeholderEffectiveTextAttributes]];
|
|
size = CGSizeMake(RCTCeilPixelValue(size.width), RCTCeilPixelValue(size.height));
|
|
size.width += _textContainerInset.left + _textContainerInset.right;
|
|
size.height += _textContainerInset.top + _textContainerInset.bottom;
|
|
// Returning size DOES contain `textContainerInset` (aka `padding`).
|
|
return size;
|
|
}
|
|
|
|
- (CGSize)sizeThatFits:(CGSize)size
|
|
{
|
|
// All size values here contain `textContainerInset` (aka `padding`).
|
|
CGSize intrinsicSize = self.intrinsicContentSize;
|
|
return CGSizeMake(MIN(size.width, intrinsicSize.width), MIN(size.height, intrinsicSize.height));
|
|
}
|
|
|
|
@end
|