diff --git a/client/src/pages/auth/LoginForm.tsx b/client/src/pages/auth/LoginForm.tsx index 0da773d..e9d3f0e 100644 --- a/client/src/pages/auth/LoginForm.tsx +++ b/client/src/pages/auth/LoginForm.tsx @@ -14,6 +14,7 @@ export function LoginForm({ expired = false, signedOut = false, onSubmit }: Logi const { t } = useTranslation(); const titleRef = useRef(null); const formRef = useRef(null); + const focusPasswordAfterInvalidCredentialsRef = useRef(false); const [username, setUsername] = useState(''); const [password, setPassword] = useState(''); const [usernameError, setUsernameError] = useState(''); @@ -25,6 +26,13 @@ export function LoginForm({ expired = false, signedOut = false, onSubmit }: Logi titleRef.current?.focus(); }, []); + useEffect(() => { + if (!submitting && focusPasswordAfterInvalidCredentialsRef.current) { + focusPasswordAfterInvalidCredentialsRef.current = false; + formRef.current?.querySelector('input[name="password"]')?.focus(); + } + }, [submitting]); + function focusInput(name: string) { formRef.current?.querySelector(`input[name="${name}"]`)?.focus(); } @@ -49,7 +57,7 @@ export function LoginForm({ expired = false, signedOut = false, onSubmit }: Logi if (error instanceof ApiError && error.status === 401) { setFormError(t('auth.invalid_credentials')); setPassword(''); - focusInput('password'); + focusPasswordAfterInvalidCredentialsRef.current = true; } else { setFormError(t('auth.sign_in_failed')); }