Skip to content

Add support for TextInput clearTextOnFocus and selectTextOnFocus #1517

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Dec 28, 2022
Merged

Add support for TextInput clearTextOnFocus and selectTextOnFocus #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
75d33c1
Enable `selectTextOnFocus` and `clearTextOnFocus` for TextInput
Nov 15, 2022
c11a21e
Fix select all for multiline textview
Nov 18, 2022
ae49a63
Only reset selected range for macOS
Nov 23, 2022
71443c4
Don't run else branch for iOS
Nov 23, 2022
90cfab5
Merge remote-tracking branch 'microsoft/main' into textview-select-an…
Dec 16, 2022
0c4eca2
Merge remote-tracking branch 'microsoft/main' into textview-select-an…
Dec 21, 2022
f4e3959
Merge branch 'main' into textview-select-and-clear-all
chiuam Dec 28, 2022
28ff002
Fix tags
Saadnajmi Dec 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions Libraries/Text/TextInput/Multiline/RCTUITextView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,12 @@ - (BOOL)becomeFirstResponder

- (BOOL)resignFirstResponder
{
BOOL success = [super resignFirstResponder];
if (self.selectable) {
self.selectedRange = NSMakeRange(NSNotFound, 0);
}

BOOL success = [super resignFirstResponder];

if (success) {
// Break undo coalescing when losing focus.
[self breakUndoCoalescing];
Expand Down Expand Up @@ -436,13 +440,13 @@ - (void)selectAll:(id)sender
{
[super selectAll:sender];

#if !TARGET_OS_OSX // TODO(macOS GH#774) For `selectTextOnFocus` prop, which isn't supported on macOS atm.
#if !TARGET_OS_OSX // TODO(macOS GH#774)
// `selectAll:` does not work for UITextView when it's being called inside UITextView's delegate methods.
dispatch_async(dispatch_get_main_queue(), ^{
UITextRange *selectionRange = [self textRangeFromPosition:self.beginningOfDocument toPosition:self.endOfDocument];
[self setSelectedTextRange:selectionRange notifyDelegate:NO];
});
#endif
#endif // TODO(macOS GH#774)
}

#pragma mark - Layout
Expand Down
8 changes: 7 additions & 1 deletion Libraries/Text/TextInput/RCTBaseTextInputView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,13 @@ - (void)textInputDidBeginEditing
}

if (_selectTextOnFocus) {
[self.backedTextInputView selectAll:nil];
if ([self.backedTextInputView respondsToSelector:@selector(selectAll:)]) {
[self.backedTextInputView selectAll:nil];
}
#if TARGET_OS_OSX // [TODO(macOS GH#774)
} else {
[self.backedTextInputView setSelectedTextRange:NSMakeRange(NSNotFound, 0) notifyDelegate:NO];
#endif // ]TODO(macOS GH#774)
}

[_eventDispatcher sendTextEventWithType:RCTTextEventTypeFocus
Expand Down
4 changes: 2 additions & 2 deletions Libraries/Text/TextInput/RCTBaseTextInputViewManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ @implementation RCTBaseTextInputViewManager
RCT_REMAP_NOT_OSX_VIEW_PROPERTY(secureTextEntry, backedTextInputView.secureTextEntry, BOOL) // TODO(macOS GH#774)
RCT_EXPORT_VIEW_PROPERTY(autoFocus, BOOL)
RCT_EXPORT_VIEW_PROPERTY(blurOnSubmit, BOOL)
RCT_EXPORT_NOT_OSX_VIEW_PROPERTY(clearTextOnFocus, BOOL) // TODO(macOS GH#774)
RCT_EXPORT_VIEW_PROPERTY(clearTextOnFocus, BOOL)
RCT_REMAP_NOT_OSX_VIEW_PROPERTY(keyboardType, backedTextInputView.keyboardType, UIKeyboardType) // TODO(macOS GH#774)
RCT_EXPORT_NOT_OSX_VIEW_PROPERTY(showSoftInputOnFocus, BOOL) // TODO(macOS GH#774)
RCT_EXPORT_VIEW_PROPERTY(maxLength, NSNumber)
RCT_EXPORT_NOT_OSX_VIEW_PROPERTY(selectTextOnFocus, BOOL) // TODO(macOS GH#774)
RCT_EXPORT_VIEW_PROPERTY(selectTextOnFocus, BOOL)
RCT_EXPORT_VIEW_PROPERTY(selection, RCTTextSelection)
RCT_EXPORT_VIEW_PROPERTY(inputAccessoryViewID, NSString)
RCT_EXPORT_VIEW_PROPERTY(textContentType, NSString)
Expand Down