Merge remote-tracking branch 'public-gh/master' into paperclip-company-import-export
* public-gh/master: fix: show validation error on incomplete login submit Fix Enter key not submitting login form
This commit is contained in:
@@ -57,8 +57,8 @@ export function AuthPage() {
|
|||||||
|
|
||||||
const canSubmit =
|
const canSubmit =
|
||||||
email.trim().length > 0 &&
|
email.trim().length > 0 &&
|
||||||
password.trim().length >= 8 &&
|
password.trim().length > 0 &&
|
||||||
(mode === "sign_in" || name.trim().length > 0);
|
(mode === "sign_in" || (name.trim().length > 0 && password.trim().length >= 8));
|
||||||
|
|
||||||
if (isSessionLoading) {
|
if (isSessionLoading) {
|
||||||
return (
|
return (
|
||||||
@@ -91,6 +91,11 @@ export function AuthPage() {
|
|||||||
className="mt-6 space-y-4"
|
className="mt-6 space-y-4"
|
||||||
onSubmit={(event) => {
|
onSubmit={(event) => {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
if (mutation.isPending) return;
|
||||||
|
if (!canSubmit) {
|
||||||
|
setError("Please fill in all required fields.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
mutation.mutate();
|
mutation.mutate();
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@@ -128,7 +133,12 @@ export function AuthPage() {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
{error && <p className="text-xs text-destructive">{error}</p>}
|
{error && <p className="text-xs text-destructive">{error}</p>}
|
||||||
<Button type="submit" disabled={!canSubmit || mutation.isPending} className="w-full">
|
<Button
|
||||||
|
type="submit"
|
||||||
|
disabled={mutation.isPending}
|
||||||
|
aria-disabled={!canSubmit || mutation.isPending}
|
||||||
|
className={`w-full ${!canSubmit && !mutation.isPending ? "opacity-50" : ""}`}
|
||||||
|
>
|
||||||
{mutation.isPending
|
{mutation.isPending
|
||||||
? "Working…"
|
? "Working…"
|
||||||
: mode === "sign_in"
|
: mode === "sign_in"
|
||||||
|
|||||||
Reference in New Issue
Block a user