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

Fix keyboard doesn't show when magic code page is shown #51453

Merged
merged 4 commits into from
Nov 13, 2024
Merged

Fix keyboard doesn't show when magic code page is shown #51453

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e88680b
disable immediate autofocus, except for mobile safari
bernhardoj Oct 25, 2024
6a58b10
Merge branch 'main' into fix/51279-keyboard-doesn't-show
bernhardoj Oct 29, 2024
3b1e41b
add comment
bernhardoj Oct 29, 2024
d23fc21
Merge branch 'main' into fix/51279-keyboard-doesn't-show
bernhardoj Nov 13, 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
14 changes: 11 additions & 3 deletions src/components/ValidateCodeActionModal/ValidateCodeForm/BaseValidateCodeForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import useNetwork from '@hooks/useNetwork';
import useStyleUtils from '@hooks/useStyleUtils';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import * as Browser from '@libs/Browser';
import * as ErrorUtils from '@libs/ErrorUtils';
import * as ValidationUtils from '@libs/ValidationUtils';
import * as User from '@userActions/User';
Expand Down Expand Up @@ -120,9 +121,16 @@ function BaseValidateCodeForm({
if (focusTimeoutRef.current) {
clearTimeout(focusTimeoutRef.current);
}
focusTimeoutRef.current = setTimeout(() => {

// Keyboard won't show if we focus the input with a delay, so we need to focus immediately.
if (!Browser.isMobileSafari()) {
focusTimeoutRef.current = setTimeout(() => {
inputValidateCodeRef.current?.focusLastSelected();
}, CONST.ANIMATED_TRANSITION);
} else {
inputValidateCodeRef.current?.focusLastSelected();
}, CONST.ANIMATED_TRANSITION);
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Mobile safari can't auto focus with delay, otherwise the keyboard won't show.
ref: #10414

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for this comment. Can you put it as a code comment in the code?


return () => {
if (!focusTimeoutRef.current) {
return;
Expand Down Expand Up @@ -205,7 +213,7 @@ function BaseValidateCodeForm({
errorText={formError?.validateCode ? translate(formError?.validateCode) : ErrorUtils.getLatestErrorMessage(account ?? {})}
hasError={!isEmptyObject(validateError)}
onFulfill={validateAndSubmitForm}
autoFocus
autoFocus={false}
/>
{shouldShowTimer && (
<Text style={[styles.mt5]}>
Expand Down
Loading