rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Password toggle triggering on Enter when checkbox is focused (#767)

Browse Source
This commit is contained in:
Aman Harwara
2021-12-09 23:18:52 +05:30
committed by GitHub
parent 0f05da435c
commit 024d44f1ff
1 changed files with 64 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/assets/javascripts/components/AccountMenu/SignIn.tsx
View File

@@ -34,7 +34,7 @@ export const SignInPane: FunctionComponent<Props> = observer(
useEffect(() => {
if (emailInputRef?.current) {
emailInputRef.current!.focus();
emailInputRef.current?.focus();
}
}, []);
@@ -73,8 +73,8 @@ export const SignInPane: FunctionComponent<Props> = observer(
const signIn = () => {
setIsSigningIn(true);
emailInputRef?.current!.blur();
passwordInputRef?.current!.blur();
emailInputRef?.current?.blur();
passwordInputRef?.current?.blur();
application
.signIn(email, password, isStrictSignin, isEphemeral, shouldMergeLocal)
@@ -92,7 +92,7 @@ export const SignInPane: FunctionComponent<Props> = observer(
application.alertService.alert(err);
}
setPassword('');
passwordInputRef?.current!.blur();
passwordInputRef?.current?.blur();
})
.finally(() => {
setIsSigningIn(false);
@@ -109,12 +109,12 @@ export const SignInPane: FunctionComponent<Props> = observer(
e.preventDefault();
if (!email || email.length === 0) {
emailInputRef?.current!.focus();
emailInputRef?.current?.focus();
return;
}
if (!password || password.length === 0) {
passwordInputRef?.current!.focus();
passwordInputRef?.current?.focus();
return;
}
@@ -134,7 +134,6 @@ export const SignInPane: FunctionComponent<Props> = observer(
/>
<div className="sn-account-menu-headline">Sign in</div>
</div>
<form onSubmit={handleSignInFormSubmit}>
<div className="px-3 mb-1">
<InputWithIcon
className={`mb-2 ${isInvalid ? 'border-dark-red' : null}`}
@@ -196,7 +195,6 @@ export const SignInPane: FunctionComponent<Props> = observer(
/>
) : null}
</div>
</form>
<div className="h-1px my-2 bg-border"></div>
<AdvancedOptions
appState={appState}