diff --git a/packages/client/src/react-redux-firebase-auth/ui/flows/EmailFlow.tsx b/packages/client/src/react-redux-firebase-auth/ui/flows/EmailFlow.tsx index e3e2b0230..8c33136fb 100644 --- a/packages/client/src/react-redux-firebase-auth/ui/flows/EmailFlow.tsx +++ b/packages/client/src/react-redux-firebase-auth/ui/flows/EmailFlow.tsx @@ -203,15 +203,15 @@ const titleLookup = { */ const fieldsLookup: AuthTextFieldLookup = { [EmailAuthStep.SignInWithEmail]: [ - { name: "email", label: "Email", type: "email" }, + { name: "email", label: "Email", type: "email", autoFocus: true }, ], [EmailAuthStep.SignInWithEmailPassword]: [ { name: "email", label: "Email", type: "email" }, - { name: "password", label: "Password", type: "password" }, + { name: "password", label: "Password", type: "password", autoFocus: true }, ], [EmailAuthStep.CreateAccountEmailPassword]: [ { name: "email", label: "Email", type: "email" }, - { name: "password", label: "Password", type: "password" }, + { name: "password", label: "Password", type: "password", autoFocus: true }, ], [EmailAuthStep.RecoverEmailPassword]: [ { name: "email", label: "Email", type: "email" }, diff --git a/packages/client/src/react-redux-firebase-auth/ui/flows/EmailLinkFlow.tsx b/packages/client/src/react-redux-firebase-auth/ui/flows/EmailLinkFlow.tsx index 79679396c..1e007f766 100644 --- a/packages/client/src/react-redux-firebase-auth/ui/flows/EmailLinkFlow.tsx +++ b/packages/client/src/react-redux-firebase-auth/ui/flows/EmailLinkFlow.tsx @@ -205,7 +205,9 @@ const fieldsLookup: AuthTextFieldLookup = Object.values( ? { ...acc, // all auth steps except for `EmailLinkAuthStep.CheckSignInEmail` have the same (email) input field - [authStep]: [{ name: "email", label: "Email", type: "email" }], + [authStep]: [ + { name: "email", label: "Email", type: "email", autoFocus: true }, + ], } : acc, {} diff --git a/packages/client/src/react-redux-firebase-auth/ui/flows/PhoneFlow.tsx b/packages/client/src/react-redux-firebase-auth/ui/flows/PhoneFlow.tsx index 0013ab373..6412f5a68 100644 --- a/packages/client/src/react-redux-firebase-auth/ui/flows/PhoneFlow.tsx +++ b/packages/client/src/react-redux-firebase-auth/ui/flows/PhoneFlow.tsx @@ -200,6 +200,7 @@ const fieldsLookup: AuthTextFieldLookup = { label: "Phone", type: "tel", inputMode: "tel", + autoFocus: true, }, ], [PhoneAuthStep.EnterSMSCode]: [ @@ -209,6 +210,7 @@ const fieldsLookup: AuthTextFieldLookup = { label: "SMS Code", type: "text", inputMode: "numeric", + autoFocus: true, }, ], };