Skip to content

feat(iOS): add all supported ReturnKeyTypes #43362

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

Closed
wants to merge 5 commits into from
Closed

feat(iOS): add all supported ReturnKeyTypes #43362

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d73a23
feat(ios): add all supported ReturnKeyTypes
Mar 7, 2024
6f0e026
Merge branch 'main' of https://github.com/facebook/react-native into …
elencho May 3, 2024
17ea3e1
feat(ios): add fabric support
elencho May 8, 2024
edf5c8b
feat(ios): removed default value
elencho May 8, 2024
5f111ab
feat(ios): revert default value
elencho May 24, 2024
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
58 changes: 52 additions & 6 deletions packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,17 +658,60 @@ - (void)setCustomInputAccessoryViewWithNativeID:(NSString *)nativeID
}];
}

- (NSString *)returnKeyTypeToString:(UIReturnKeyType)returnKeyType {
switch (returnKeyType) {
case UIReturnKeyDefault:
return @"Default";
case UIReturnKeyGo:
return @"Go";
case UIReturnKeyNext:
return @"Next";
case UIReturnKeySearch:
return @"Search";
case UIReturnKeySend:
return @"Send";
case UIReturnKeyYahoo:
return @"Yahoo";
case UIReturnKeyGoogle:
return @"Google";
case UIReturnKeyRoute:
return @"Route";
case UIReturnKeyJoin:
return @"Join";
case UIReturnKeyEmergencyCall:
return @"Emergency Call";
default:
return @"Done";
}
}

- (void)setDefaultInputAccessoryView
{
UIView<RCTBackedTextInputViewProtocol> *textInputView = self.backedTextInputView;
UIKeyboardType keyboardType = textInputView.keyboardType;

// These keyboard types (all are number pads) don't have a "Done" button by default,
// These keyboard types (all are number pads) don't have a Return Key button by default,
// so we create an `inputAccessoryView` with this button for them.

NSArray<NSNumber *> *returnKeyTypes = @[
@(UIReturnKeyDone),
@(UIReturnKeyGo),
@(UIReturnKeyDefault),
@(UIReturnKeyNext),
@(UIReturnKeySearch),
@(UIReturnKeySend),
@(UIReturnKeyYahoo),
@(UIReturnKeyGoogle),
@(UIReturnKeyRoute),
@(UIReturnKeyJoin),
@(UIReturnKeyRoute),
@(UIReturnKeyEmergencyCall)
];
Copy link
Contributor

@cipolleschi cipolleschi Apr 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A couple of suggestions here:

  1. Can we create a NSSet<NSNumber *> instead of an NSArray? This will be more efficient when looking up as we won't have to iterate over the array
  2. Can we move this to a static variable out of the implementation?
    (before the @implementation keyword on top)?

The reason for 2 is that this Collection will be created and destroyed every time the method setDefaultInputAccessoryView is invoked, so it is not very efficient.

BOOL containsKeyType = [returnKeyTypes containsObject:@(textInputView.returnKeyType)];
BOOL shouldHaveInputAccessoryView =
(keyboardType == UIKeyboardTypeNumberPad || keyboardType == UIKeyboardTypePhonePad ||
keyboardType == UIKeyboardTypeDecimalPad || keyboardType == UIKeyboardTypeASCIICapableNumberPad) &&
textInputView.returnKeyType == UIReturnKeyDone;
containsKeyType;

if (_hasInputAccessoryView == shouldHaveInputAccessoryView) {
return;
Expand All @@ -677,14 +720,17 @@ - (void)setDefaultInputAccessoryView
_hasInputAccessoryView = shouldHaveInputAccessoryView;

if (shouldHaveInputAccessoryView) {
NSString *buttonLabel = [self returnKeyTypeToString:textInputView.returnKeyType];

UIToolbar *toolbarView = [UIToolbar new];
[toolbarView sizeToFit];
UIBarButtonItem *flexibleSpace =
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
UIBarButtonItem *doneButton =
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone
target:self
action:@selector(handleInputAccessoryDoneButton)];
UIBarButtonItem *doneButton =
[[UIBarButtonItem alloc] initWithTitle:buttonLabel
style:UIBarButtonItemStylePlain
target:self
action:@selector(handleInputAccessoryDoneButton)];
toolbarView.items = @[ flexibleSpace, doneButton ];
textInputView.inputAccessoryView = toolbarView;
} else {
Expand Down