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 all 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-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
[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 @@ -596,6 +600,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];
}

- (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
7 changes: 7 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/textinput/BaseTextInputProps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ BaseTextInputProps::BaseTextInputProps(
"maxLength",
sourceProps.maxLength,
{})),
showSoftInputOnFocus(convertRawProp(
context,
rawProps,
"showSoftInputOnFocus",
sourceProps.showSoftInputOnFocus,
{})),
text(convertRawProp(context, rawProps, "text", sourceProps.text, {})),
mostRecentEventCount(convertRawProp(
context,
Expand Down Expand Up @@ -173,6 +179,7 @@ void BaseTextInputProps::setProp(
RAW_SET_PROP_SWITCH_CASE_BASIC(cursorColor);
RAW_SET_PROP_SWITCH_CASE_BASIC(text);
RAW_SET_PROP_SWITCH_CASE_BASIC(mostRecentEventCount);
RAW_SET_PROP_SWITCH_CASE_BASIC(showSoftInputOnFocus);
}
}

Expand Down
2 changes: 2 additions & 0 deletions packages/react-native/ReactCommon/react/renderer/components/textinput/BaseTextInputProps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ class BaseTextInputProps : public ViewProps, public BaseTextProps {

int maxLength{};

bool showSoftInputOnFocus{false};

/*
* "Private" (only used by TextInput.js) props
*/
Expand Down
5 changes: 0 additions & 5 deletions ...put/platform/android/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ AndroidTextInputProps::AndroidTextInputProps(
"importantForAutofill",
sourceProps.importantForAutofill,
{})),
showSoftInputOnFocus(CoreFeatures::enablePropIteratorSetter? sourceProps.showSoftInputOnFocus : convertRawProp(context, rawProps,
"showSoftInputOnFocus",
sourceProps.showSoftInputOnFocus,
{false})),
autoCapitalize(CoreFeatures::enablePropIteratorSetter? sourceProps.autoCapitalize : convertRawProp(context, rawProps,
"autoCapitalize",
sourceProps.autoCapitalize,
Expand Down Expand Up @@ -227,7 +223,6 @@ void AndroidTextInputProps::setProp(
RAW_SET_PROP_SWITCH_CASE_BASIC(inlineImageLeft);
RAW_SET_PROP_SWITCH_CASE_BASIC(inlineImagePadding);
RAW_SET_PROP_SWITCH_CASE_BASIC(importantForAutofill);
RAW_SET_PROP_SWITCH_CASE_BASIC(showSoftInputOnFocus);
RAW_SET_PROP_SWITCH_CASE_BASIC(autoCapitalize);
RAW_SET_PROP_SWITCH_CASE_BASIC(autoCorrect);
RAW_SET_PROP_SWITCH_CASE_BASIC(allowFontScaling);
Expand Down
1 change: 0 additions & 1 deletion ...input/platform/android/react/renderer/components/androidtextinput/AndroidTextInputProps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ class AndroidTextInputProps final : public BaseTextInputProps {
std::string inlineImageLeft{};
int inlineImagePadding{0};
std::string importantForAutofill{};
bool showSoftInputOnFocus{false};
std::string autoCapitalize{};
bool autoCorrect{false};
bool allowFontScaling{false};
Expand Down