From 062e2e915ba4b0420b52b99a8e681996f09ef2bf Mon Sep 17 00:00:00 2001
From: Matri <matri@aifi.com>
Date: Mon, 21 Aug 2023 21:26:32 +0800
Subject: [PATCH] fix: login improvement (#941)

---
 web/app/components/base/button/index.tsx | 3 +++
 web/app/signin/normalForm.tsx            | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/web/app/components/base/button/index.tsx b/web/app/components/base/button/index.tsx
index cbf1533eb..f28f9b478 100644
--- a/web/app/components/base/button/index.tsx
+++ b/web/app/components/base/button/index.tsx
@@ -7,6 +7,7 @@ export type IButtonProps = {
   className?: string
   disabled?: boolean
   loading?: boolean
+  tabIndex?: number
   children: React.ReactNode
   onClick?: MouseEventHandler<HTMLDivElement>
 }
@@ -18,6 +19,7 @@ const Button: FC<IButtonProps> = ({
   className,
   onClick,
   loading = false,
+  tabIndex,
 }) => {
   let style = 'cursor-pointer'
   switch (type) {
@@ -35,6 +37,7 @@ const Button: FC<IButtonProps> = ({
   return (
     <div
       className={`inline-flex justify-center items-center content-center h-9 leading-5 rounded-lg px-4 py-2 text-base ${style} ${className && className}`}
+      tabIndex={tabIndex}
       onClick={disabled ? undefined : onClick}
     >
       {children}
diff --git a/web/app/signin/normalForm.tsx b/web/app/signin/normalForm.tsx
index d28c7c0ce..efb3de783 100644
--- a/web/app/signin/normalForm.tsx
+++ b/web/app/signin/normalForm.tsx
@@ -237,6 +237,10 @@ const NormalForm = () => {
                       id="password"
                       value={password}
                       onChange={e => setPassword(e.target.value)}
+                      onKeyDown={(e) => {
+                        if (e.key === 'Enter')
+                          handleEmailPasswordLogin()
+                      }}
                       type={showPassword ? 'text' : 'password'}
                       autoComplete="current-password"
                       placeholder={t('login.passwordPlaceholder') || ''}
@@ -256,6 +260,7 @@ const NormalForm = () => {
 
                 <div className='mb-2'>
                   <Button
+                    tabIndex={0}
                     type='primary'
                     onClick={handleEmailPasswordLogin}
                     disabled={isLoading}