Skip to content
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

Jump to bottom

[iOS] Implement missing showSoftInputOnFocus prop on TextInput on the new arch #35878

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[iOS] Implement missing showSoftInputOnFocus prop on TextInput on the new arch #35878

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
763f19c
Add support for `showSoftInputOnFocus` prop on TextInput iOS
j-piasecki Jan 18, 2023
38f6b81
Copy implementation
j-piasecki Jan 18, 2023
b68a19e
Reapply prop when creating new view
j-piasecki Jan 18, 2023
05ad3dd
Use correct field
j-piasecki Jan 18, 2023
0ca1927
Merge branch 'main' into jpiasecki-patch-3
j-piasecki Mar 25, 2024
f0eadd5
Move `showSoftInputOnFocus` to base props
j-piasecki Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 24 additions & 0 deletions React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
[self _setMultiline:newTextInputProps.traits.multiline];
}

if (newTextInputProps.traits.showSoftInputOnFocus != oldTextInputProps.traits.showSoftInputOnFocus) {
[self _setShowSoftInputOnFocus:newTextInputProps.traits.showSoftInputOnFocus];
}

if (newTextInputProps.traits.autocapitalizationType != oldTextInputProps.traits.autocapitalizationType) {
_backedTextInputView.autocapitalizationType =
RCTUITextAutocapitalizationTypeFromAutocapitalizationType(newTextInputProps.traits.autocapitalizationType);
Expand Down Expand Up @@ -617,6 +621,26 @@ - (void)_setMultiline:(BOOL)multiline
RCTCopyBackedTextInput(_backedTextInputView, backedTextInputView);
_backedTextInputView = backedTextInputView;
[self addSubview:_backedTextInputView];

auto const &currentTextInputProps = *std::static_pointer_cast<TextInputProps const>(_props);
[self _setShowSoftInputOnFocus:currentTextInputProps.traits.showSoftInputOnFocus];
Copy link
Contributor

Choose a reason for hiding this comment

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

why do we couple this logic with multiline? regardless, the initial props should go through the updateProps:oldProps pipeline.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry for the late reply, I must've missed the notification 😅. It's there because setting multiline causes the creation of a new underlying component (either RCTUITextView or RCTUITextField) and we need to apply the showSoftInputOnFocus prop again to the newly created view. Otherwise, it will be reset every time the multiline is set.

}

- (void)_setShowSoftInputOnFocus:(BOOL)showSoftInputOnFocus
{
if (showSoftInputOnFocus) {
// Resets to default keyboard.
_backedTextInputView.inputView = nil;

// Without the call to reloadInputViews, the keyboard will not change until the textInput field (the first
// responder) loses and regains focus.
if (_backedTextInputView.isFirstResponder) {
[_backedTextInputView reloadInputViews];
}
} else {
// Hides keyboard, but keeps blinking cursor.
_backedTextInputView.inputView = [UIView new];
}
}

- (BOOL)_textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldText
Expand Down
6 changes: 6 additions & 0 deletions ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ TextInputProps::TextInputProps(
"maxLength",
sourceProps.maxLength,
{})),
showSoftInputOnFocus(convertRawProp(
context,
rawProps,
"showSoftInputOnFocus",
sourceProps.showSoftInputOnFocus,
{})),
cursorColor(convertRawProp(
context,
rawProps,
Expand Down
2 changes: 2 additions & 0 deletions ReactCommon/react/renderer/components/textinput/iostextinput/TextInputProps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ class TextInputProps final : public ViewProps, public BaseTextProps {

int maxLength{};

bool showSoftInputOnFocus{true};

/*
* Tint colors
*/
Expand Down