Skip to content

The Open Source DocuSign Alternative.

feat: jump to next field

Catalin Pitfface15a2200
diff --git a/apps/web/src/app/(signing)/sign/[token]/form.tsx b/apps/web/src/app/(signing)/sign/[token]/form.tsx
index 4f20a8199..f5c94e6ec 100644
--- a/apps/web/src/app/(signing)/sign/[token]/form.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/form.tsx
@@ -49,6 +49,11 @@ export const SigningForm = ({ document, recipient, fields }: SigningFormProps) =
return sortFieldsByPosition(fields.filter((field) => !field.inserted));
}, [fields]);
+ const fieldsValidated = () => {
+ setValidateUninsertedFields(true);
+ validateFieldsInserted(fields);
+ };
+
const onFormSubmit = async () => {
setValidateUninsertedFields(true);
@@ -154,6 +159,7 @@ export const SigningForm = ({ document, recipient, fields }: SigningFormProps) =
onSignatureComplete={handleSubmit(onFormSubmit)}
document={document}
fields={fields}
+ fieldsValidated={fieldsValidated}
/>
</div>
</div>
diff --git a/apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx b/apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx
index faecf5d7e..6e01aa3cf 100644
--- a/apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/sign-dialog.tsx
@@ -15,6 +15,7 @@ export type SignDialogProps = {
isSubmitting: boolean;
document: Document;
fields: Field[];
+ fieldsValidated: () => void | Promise<void>;
onSignatureComplete: () => void | Promise<void>;
};
@@ -22,6 +23,7 @@ export const SignDialog = ({
isSubmitting,
document,
fields,
+ fieldsValidated,
onSignatureComplete,
}: SignDialogProps) => {
const [showDialog, setShowDialog] = useState(false);
@@ -29,16 +31,17 @@ export const SignDialog = ({
const isComplete = fields.every((field) => field.inserted);
return (
- <Dialog open={showDialog} onOpenChange={setShowDialog}>
+ <Dialog open={showDialog && isComplete} onOpenChange={isComplete ? setShowDialog : undefined}>
<DialogTrigger asChild>
<Button
className="w-full"
type="button"
size="lg"
- disabled={!isComplete}
+ variant={isComplete ? 'default' : 'outline'}
+ onClick={fieldsValidated}
loading={isSubmitting}
>
- Complete
+ {isComplete ? 'Complete' : 'Fill fields'}
</Button>
</DialogTrigger>
<DialogContent>