forked from facebook/react-native
-
Notifications
You must be signed in to change notification settings - Fork 151
[DRAFT] fix(fabric, textinput): support some macOS only TextInput props #2675
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
5017481
[fabric] Selection range should use the correct backed input range
shwanton fffdb49
[fabric] Add wrapper class for TextView with scroll callback support
9b9db57
[fabric] Add responder property to backing text input view protocol
91df54a
[fabric] Update backed text input copy method to support view instances
94cc170
[fabric] Use wrapped text view for multiline TextInput
8917e55
[fabric] Implement escape/cancel key press callback for TextInput
ac9fcc2
[fabric] Submit scroll view metrics when scrolling multiline TextInput
42fc36f
[fabric] Fix random TextInput cursor position changes while typing
259d1b1
[fabric] Add submitKeyEvents property to TextInput
b85c8a2
[fabric] Implement TextInput key down event checking for submit
41f16ee
[fabric] Add support for clearing the TextInput on submit
7a77292
[fabric] Add support for the secure text entry to TextInput
07259eb
[fabric] Copy accessibility attributes when switching TextInput backi…
2a021c2
Merge branch 'shwanton/fabric-core-fixes' into fabric/more
Saadnajmi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
28 changes: 28 additions & 0 deletions
28
packages/react-native/Libraries/Text/TextInput/Multiline/RCTWrappedTextView.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * Copyright (c) Meta Platforms, Inc. and affiliates. | ||
| * | ||
| * This source code is licensed under the MIT license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| */ | ||
|
|
||
| #if TARGET_OS_OSX // [macOS | ||
|
|
||
| #import <React/RCTUIKit.h> | ||
|
|
||
| #import "RCTTextUIKit.h" | ||
|
|
||
| #import <React/RCTBackedTextInputDelegate.h> | ||
| #import <React/RCTBackedTextInputViewProtocol.h> | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| @interface RCTWrappedTextView : RCTPlatformView <RCTBackedTextInputViewProtocol> | ||
|
|
||
| @property (nonatomic, weak) id<RCTBackedTextInputDelegate> textInputDelegate; | ||
| @property (assign) BOOL hideVerticalScrollIndicator; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END | ||
|
|
||
| #endif // macOS] |
208 changes: 208 additions & 0 deletions
208
packages/react-native/Libraries/Text/TextInput/Multiline/RCTWrappedTextView.m
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,208 @@ | ||
| /* | ||
| * Copyright (c) Meta Platforms, Inc. and affiliates. | ||
| * | ||
| * This source code is licensed under the MIT license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| */ | ||
|
|
||
| #if TARGET_OS_OSX // [macOS | ||
|
|
||
| #import <React/RCTWrappedTextView.h> | ||
|
|
||
| #import <React/RCTUITextView.h> | ||
| #import <React/RCTTextAttributes.h> | ||
|
|
||
| @implementation RCTWrappedTextView { | ||
| RCTUITextView *_forwardingTextView; | ||
| RCTUIScrollView *_scrollView; | ||
| RCTClipView *_clipView; | ||
| } | ||
|
|
||
| - (instancetype)initWithFrame:(CGRect)frame | ||
| { | ||
| if (self = [super initWithFrame:frame]) { | ||
| self.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; | ||
|
|
||
| self.hideVerticalScrollIndicator = NO; | ||
|
|
||
| _scrollView = [[RCTUIScrollView alloc] initWithFrame:self.bounds]; | ||
| _scrollView.backgroundColor = [RCTUIColor clearColor]; | ||
| _scrollView.drawsBackground = NO; | ||
| _scrollView.borderType = NSNoBorder; | ||
| _scrollView.hasHorizontalRuler = NO; | ||
| _scrollView.hasVerticalRuler = NO; | ||
| _scrollView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; | ||
| [_scrollView setHasVerticalScroller:YES]; | ||
| [_scrollView setHasHorizontalScroller:NO]; | ||
|
|
||
| _clipView = [[RCTClipView alloc] initWithFrame:_scrollView.bounds]; | ||
| [_scrollView setContentView:_clipView]; | ||
|
|
||
| _forwardingTextView = [[RCTUITextView alloc] initWithFrame:_scrollView.bounds]; | ||
| _forwardingTextView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; | ||
| _forwardingTextView.delegate = self; | ||
|
|
||
| _forwardingTextView.verticallyResizable = YES; | ||
| _forwardingTextView.horizontallyResizable = YES; | ||
| _forwardingTextView.textContainer.containerSize = NSMakeSize(FLT_MAX, FLT_MAX); | ||
| _forwardingTextView.textContainer.widthTracksTextView = YES; | ||
| _forwardingTextView.textInputDelegate = self; | ||
|
|
||
| _scrollView.documentView = _forwardingTextView; | ||
| _scrollView.contentView.postsBoundsChangedNotifications = YES; | ||
|
|
||
| // Enable the focus ring by default | ||
| _scrollView.enableFocusRing = YES; | ||
| [self addSubview:_scrollView]; | ||
|
|
||
| // a register for those notifications on the content view. | ||
| #if !TARGET_OS_OSX // [macOS] | ||
| [[NSNotificationCenter defaultCenter] addObserver:self | ||
| selector:@selector(boundsDidChange:) | ||
| name:NSViewBoundsDidChangeNotification | ||
| object:_scrollView.contentView]; | ||
| #else // [macOS | ||
| [[NSNotificationCenter defaultCenter] addObserver:self | ||
| selector:@selector(scrollViewDidScroll:) | ||
| name:NSViewBoundsDidChangeNotification | ||
| object:_scrollView.contentView]; | ||
| #endif // macOS] | ||
| } | ||
|
|
||
| return self; | ||
| } | ||
|
|
||
| - (void)dealloc | ||
| { | ||
| [[NSNotificationCenter defaultCenter] removeObserver:self]; | ||
| } | ||
|
|
||
| - (BOOL)isFlipped | ||
| { | ||
| return YES; | ||
| } | ||
|
|
||
| #pragma mark - | ||
| #pragma mark Method forwarding to text view | ||
|
|
||
| - (void)forwardInvocation:(NSInvocation *)invocation | ||
| { | ||
| [invocation invokeWithTarget:_forwardingTextView]; | ||
| } | ||
|
|
||
| - (NSMethodSignature *)methodSignatureForSelector:(SEL)selector | ||
| { | ||
| if ([_forwardingTextView respondsToSelector:selector]) { | ||
| return [_forwardingTextView methodSignatureForSelector:selector]; | ||
| } | ||
|
|
||
| return [super methodSignatureForSelector:selector]; | ||
| } | ||
|
|
||
| - (void)boundsDidChange:(NSNotification *)notification | ||
| { | ||
| } | ||
|
|
||
| #pragma mark - | ||
| #pragma mark First Responder forwarding | ||
|
|
||
| - (NSResponder *)responder | ||
| { | ||
| return _forwardingTextView; | ||
| } | ||
|
|
||
| - (BOOL)acceptsFirstResponder | ||
| { | ||
| return _forwardingTextView.acceptsFirstResponder; | ||
| } | ||
|
|
||
| - (BOOL)becomeFirstResponder | ||
| { | ||
| return [_forwardingTextView becomeFirstResponder]; | ||
| } | ||
|
|
||
| - (BOOL)resignFirstResponder | ||
| { | ||
| return [_forwardingTextView resignFirstResponder]; | ||
| } | ||
|
|
||
| #pragma mark - | ||
| #pragma mark Text Input delegate forwarding | ||
|
|
||
| - (id<RCTBackedTextInputDelegate>)textInputDelegate | ||
| { | ||
| return _forwardingTextView.textInputDelegate; | ||
| } | ||
|
|
||
| - (void)setTextInputDelegate:(id<RCTBackedTextInputDelegate>)textInputDelegate | ||
| { | ||
| _forwardingTextView.textInputDelegate = textInputDelegate; | ||
| } | ||
|
|
||
| #pragma mark - | ||
| #pragma mark Scrolling control | ||
|
|
||
| #if TARGET_OS_OSX // [macOS | ||
| - (void)scrollViewDidScroll:(NSNotification *)notification | ||
| { | ||
| [self.textInputDelegate scrollViewDidScroll:_scrollView]; | ||
| } | ||
| #endif // macOS] | ||
|
|
||
| - (BOOL)scrollEnabled | ||
| { | ||
| return _scrollView.isScrollEnabled; | ||
| } | ||
|
|
||
| - (void)setScrollEnabled:(BOOL)scrollEnabled | ||
| { | ||
| if (scrollEnabled) { | ||
| _scrollView.scrollEnabled = YES; | ||
| [_clipView setConstrainScrolling:NO]; | ||
| } else { | ||
| _scrollView.scrollEnabled = NO; | ||
| [_clipView setConstrainScrolling:YES]; | ||
| } | ||
| } | ||
|
|
||
| - (BOOL)shouldShowVerticalScrollbar | ||
| { | ||
| // Hide vertical scrollbar if explicity set to NO | ||
| if (self.hideVerticalScrollIndicator) { | ||
| return NO; | ||
| } | ||
|
|
||
| // Hide vertical scrollbar if attributed text overflows view | ||
| CGSize textViewSize = [_forwardingTextView intrinsicContentSize]; | ||
| NSClipView *clipView = (NSClipView *)_scrollView.contentView; | ||
| if (textViewSize.height > clipView.bounds.size.height) { | ||
| return YES; | ||
| }; | ||
|
|
||
| return NO; | ||
| } | ||
|
|
||
| - (void)textInputDidChange | ||
| { | ||
| [_scrollView setHasVerticalScroller:[self shouldShowVerticalScrollbar]]; | ||
| } | ||
|
|
||
| - (void)setAttributedText:(NSAttributedString *)attributedText | ||
| { | ||
| [_forwardingTextView setAttributedText:attributedText]; | ||
| [_scrollView setHasVerticalScroller:[self shouldShowVerticalScrollbar]]; | ||
| } | ||
|
|
||
| #pragma mark - | ||
| #pragma mark Text Container Inset override for NSTextView | ||
|
|
||
| // This method is there to match the textContainerInset property on RCTUITextField | ||
| - (void)setTextContainerInset:(UIEdgeInsets)textContainerInsets | ||
| { | ||
| // RCTUITextView has logic in setTextContainerInset[s] to convert th UIEdgeInsets to a valid NSSize struct | ||
| _forwardingTextView.textContainerInsets = textContainerInsets; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| #endif // macOS] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,6 +38,7 @@ NS_ASSUME_NONNULL_BEGIN | |
| @property (nonatomic, assign, readonly) BOOL textWasPasted; | ||
| #else // [macOS | ||
| @property (nonatomic, assign) BOOL textWasPasted; | ||
| @property (nonatomic, readonly) NSResponder *responder; | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. macOS tag? |
||
| #endif // macOS] | ||
| @property (nonatomic, assign, readonly) BOOL dictationRecognizing; | ||
| @property (nonatomic, assign) UIEdgeInsets textContainerInset; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is there an iOS diff in a macOS only file?