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
245 lines
7.3 KiB
Objective-C
245 lines
7.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 <React/RCTBackedTextInputDelegateAdapter.h>
|
|
|
|
#pragma mark - RCTBackedTextFieldDelegateAdapter (for UITextField)
|
|
|
|
static void *TextFieldSelectionObservingContext = &TextFieldSelectionObservingContext;
|
|
|
|
@interface RCTBackedTextFieldDelegateAdapter () <UITextFieldDelegate>
|
|
@end
|
|
|
|
@implementation RCTBackedTextFieldDelegateAdapter {
|
|
__weak UITextField<RCTBackedTextInputViewProtocol> *_backedTextInputView;
|
|
BOOL _textDidChangeIsComing;
|
|
UITextRange *_previousSelectedTextRange;
|
|
}
|
|
|
|
- (instancetype)initWithTextField:(UITextField<RCTBackedTextInputViewProtocol> *)backedTextInputView
|
|
{
|
|
if (self = [super init]) {
|
|
_backedTextInputView = backedTextInputView;
|
|
backedTextInputView.delegate = self;
|
|
|
|
[_backedTextInputView addTarget:self action:@selector(textFieldDidChange) forControlEvents:UIControlEventEditingChanged];
|
|
[_backedTextInputView addTarget:self action:@selector(textFieldDidEndEditingOnExit) forControlEvents:UIControlEventEditingDidEndOnExit];
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (void)dealloc
|
|
{
|
|
[_backedTextInputView removeTarget:self action:nil forControlEvents:UIControlEventEditingChanged];
|
|
[_backedTextInputView removeTarget:self action:nil forControlEvents:UIControlEventEditingDidEndOnExit];
|
|
}
|
|
|
|
#pragma mark - UITextFieldDelegate
|
|
|
|
- (BOOL)textFieldShouldBeginEditing:(__unused UITextField *)textField
|
|
{
|
|
return [_backedTextInputView.textInputDelegate textInputShouldBeginEditing];
|
|
}
|
|
|
|
- (void)textFieldDidBeginEditing:(__unused UITextField *)textField
|
|
{
|
|
[_backedTextInputView.textInputDelegate textInputDidBeginEditing];
|
|
}
|
|
|
|
- (BOOL)textFieldShouldEndEditing:(__unused UITextField *)textField
|
|
{
|
|
return [_backedTextInputView.textInputDelegate textInputShouldEndEditing];
|
|
}
|
|
|
|
- (void)textFieldDidEndEditing:(__unused UITextField *)textField
|
|
{
|
|
if (_textDidChangeIsComing) {
|
|
// iOS does't call `textViewDidChange:` delegate method if the change was happened because of autocorrection
|
|
// which was triggered by losing focus. So, we call it manually.
|
|
_textDidChangeIsComing = NO;
|
|
[_backedTextInputView.textInputDelegate textInputDidChange];
|
|
}
|
|
|
|
[_backedTextInputView.textInputDelegate textInputDidEndEditing];
|
|
}
|
|
|
|
- (BOOL)textField:(__unused UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
|
|
{
|
|
BOOL result = [_backedTextInputView.textInputDelegate textInputShouldChangeTextInRange:range replacementText:string];
|
|
if (result) {
|
|
_textDidChangeIsComing = YES;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
- (BOOL)textFieldShouldReturn:(__unused UITextField *)textField
|
|
{
|
|
return [_backedTextInputView.textInputDelegate textInputShouldReturn];
|
|
}
|
|
|
|
#pragma mark - UIControlEventEditing* Family Events
|
|
|
|
- (void)textFieldDidChange
|
|
{
|
|
_textDidChangeIsComing = NO;
|
|
[_backedTextInputView.textInputDelegate textInputDidChange];
|
|
|
|
// `selectedTextRangeWasSet` isn't triggered during typing.
|
|
[self textFieldProbablyDidChangeSelection];
|
|
}
|
|
|
|
- (void)textFieldDidEndEditingOnExit
|
|
{
|
|
[_backedTextInputView.textInputDelegate textInputDidReturn];
|
|
}
|
|
|
|
#pragma mark - UIKeyboardInput (private UIKit protocol)
|
|
|
|
// This method allows us to detect a [Backspace] `keyPress`
|
|
// even when there is no more text in the `UITextField`.
|
|
- (BOOL)keyboardInputShouldDelete:(__unused UITextField *)textField
|
|
{
|
|
[_backedTextInputView.textInputDelegate textInputShouldChangeTextInRange:NSMakeRange(0, 0) replacementText:@""];
|
|
return YES;
|
|
}
|
|
|
|
#pragma mark - Public Interface
|
|
|
|
- (void)skipNextTextInputDidChangeSelectionEventWithTextRange:(UITextRange *)textRange
|
|
{
|
|
_previousSelectedTextRange = textRange;
|
|
}
|
|
|
|
- (void)selectedTextRangeWasSet
|
|
{
|
|
[self textFieldProbablyDidChangeSelection];
|
|
}
|
|
|
|
#pragma mark - Generalization
|
|
|
|
- (void)textFieldProbablyDidChangeSelection
|
|
{
|
|
if ([_backedTextInputView.selectedTextRange isEqual:_previousSelectedTextRange]) {
|
|
return;
|
|
}
|
|
|
|
_previousSelectedTextRange = _backedTextInputView.selectedTextRange;
|
|
[_backedTextInputView.textInputDelegate textInputDidChangeSelection];
|
|
}
|
|
|
|
@end
|
|
|
|
#pragma mark - RCTBackedTextViewDelegateAdapter (for UITextView)
|
|
|
|
@interface RCTBackedTextViewDelegateAdapter () <UITextViewDelegate>
|
|
@end
|
|
|
|
@implementation RCTBackedTextViewDelegateAdapter {
|
|
__weak UITextView<RCTBackedTextInputViewProtocol> *_backedTextInputView;
|
|
BOOL _textDidChangeIsComing;
|
|
UITextRange *_previousSelectedTextRange;
|
|
}
|
|
|
|
- (instancetype)initWithTextView:(UITextView<RCTBackedTextInputViewProtocol> *)backedTextInputView
|
|
{
|
|
if (self = [super init]) {
|
|
_backedTextInputView = backedTextInputView;
|
|
backedTextInputView.delegate = self;
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
#pragma mark - UITextViewDelegate
|
|
|
|
- (BOOL)textViewShouldBeginEditing:(__unused UITextView *)textView
|
|
{
|
|
return [_backedTextInputView.textInputDelegate textInputShouldBeginEditing];
|
|
}
|
|
|
|
- (void)textViewDidBeginEditing:(__unused UITextView *)textView
|
|
{
|
|
[_backedTextInputView.textInputDelegate textInputDidBeginEditing];
|
|
}
|
|
|
|
- (BOOL)textViewShouldEndEditing:(__unused UITextView *)textView
|
|
{
|
|
return [_backedTextInputView.textInputDelegate textInputShouldEndEditing];
|
|
}
|
|
|
|
- (void)textViewDidEndEditing:(__unused UITextView *)textView
|
|
{
|
|
if (_textDidChangeIsComing) {
|
|
// iOS does't call `textViewDidChange:` delegate method if the change was happened because of autocorrection
|
|
// which was triggered by losing focus. So, we call it manually.
|
|
_textDidChangeIsComing = NO;
|
|
[_backedTextInputView.textInputDelegate textInputDidChange];
|
|
}
|
|
|
|
[_backedTextInputView.textInputDelegate textInputDidEndEditing];
|
|
}
|
|
|
|
- (BOOL)textView:(__unused UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text
|
|
{
|
|
// Custom implementation of `textInputShouldReturn` and `textInputDidReturn` pair for `UITextView`.
|
|
if (!_backedTextInputView.textWasPasted && [text isEqualToString:@"\n"]) {
|
|
if ([_backedTextInputView.textInputDelegate textInputShouldReturn]) {
|
|
[_backedTextInputView.textInputDelegate textInputDidReturn];
|
|
[_backedTextInputView endEditing:NO];
|
|
return NO;
|
|
}
|
|
}
|
|
|
|
BOOL result = [_backedTextInputView.textInputDelegate textInputShouldChangeTextInRange:range replacementText:text];
|
|
if (result) {
|
|
_textDidChangeIsComing = YES;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
- (void)textViewDidChange:(__unused UITextView *)textView
|
|
{
|
|
_textDidChangeIsComing = NO;
|
|
[_backedTextInputView.textInputDelegate textInputDidChange];
|
|
}
|
|
|
|
- (void)textViewDidChangeSelection:(__unused UITextView *)textView
|
|
{
|
|
[self textViewProbablyDidChangeSelection];
|
|
}
|
|
|
|
#pragma mark - UIScrollViewDelegate
|
|
|
|
- (void)scrollViewDidScroll:(UIScrollView *)scrollView
|
|
{
|
|
if ([_backedTextInputView.textInputDelegate respondsToSelector:@selector(scrollViewDidScroll:)]) {
|
|
[_backedTextInputView.textInputDelegate scrollViewDidScroll:scrollView];
|
|
}
|
|
}
|
|
|
|
#pragma mark - Public Interface
|
|
|
|
- (void)skipNextTextInputDidChangeSelectionEventWithTextRange:(UITextRange *)textRange
|
|
{
|
|
_previousSelectedTextRange = textRange;
|
|
}
|
|
|
|
#pragma mark - Generalization
|
|
|
|
- (void)textViewProbablyDidChangeSelection
|
|
{
|
|
if ([_backedTextInputView.selectedTextRange isEqual:_previousSelectedTextRange]) {
|
|
return;
|
|
}
|
|
|
|
_previousSelectedTextRange = _backedTextInputView.selectedTextRange;
|
|
[_backedTextInputView.textInputDelegate textInputDidChangeSelection];
|
|
}
|
|
|
|
@end
|