Merge branch 'feat/rr7' into chore/webhook-trigger-multiselect

Add ability to enable or disable allowed signature types: 
- Drawn
- Typed
- Uploaded

**Tabbed style signature dialog**

![image](https://github.com/user-attachments/assets/a816fab6-b071-42a5-bb5c-6d4a2572431e)

**Document settings**

![image](https://github.com/user-attachments/assets/f0c1bff1-6be1-4c87-b384-1666fa25d7a6)

**Team preferences**

![image](https://github.com/user-attachments/assets/8767b05e-1463-4087-8672-f3f43d8b0f2c)

## Changes Made

- Add multiselect to select allowed signatures in document and templates
settings tab
- Add multiselect to select allowed signatures in teams preferences 
- Removed "Enable typed signatures" from document/template edit page
- Refactored signature pad to use tabs instead of an all in one
signature pad

## Testing Performed

Added E2E tests to check settings are applied correctly for documents
and templates

apps/remix/app/components/embed/embed-direct-template-client-page.tsx

@@ -3,8 +3,8 @@ import { useEffect, useLayoutEffect, useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { type DocumentData, type Field, FieldType } from '@prisma/client';
 import type { DocumentMeta, Recipient, Signature, TemplateMeta } from '@prisma/client';
+import { type DocumentData, type Field, FieldType } from '@prisma/client';
 import { LucideChevronDown, LucideChevronUp } from 'lucide-react';
 import { DateTime } from 'luxon';
 import { useSearchParams } from 'react-router';
@@ -25,12 +25,11 @@ import type {
 } from '@documenso/trpc/server/field-router/schema';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { ElementVisible } from '@documenso/ui/primitives/element-visible';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
 import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
-import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
+import { SignaturePadDialog } from '@documenso/ui/primitives/signature-pad/signature-pad-dialog';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { BrandingLogo } from '~/components/general/branding-logo';
@@ -69,16 +68,8 @@ export const EmbedDirectTemplateClientPage = ({
 
   const [searchParams] = useSearchParams();
 
-  const {
+  const { fullName, email, signature, setFullName, setEmail, setSignature } =
-    fullName,
+    useRequiredDocumentSigningContext();
-    email,
-    signature,
-    signatureValid,
-    setFullName,
-    setEmail,
-    setSignature,
-    setSignatureValid,
-  } = useRequiredDocumentSigningContext();
 
   const [hasFinishedInit, setHasFinishedInit] = useState(false);
   const [hasDocumentLoaded, setHasDocumentLoaded] = useState(false);
@@ -194,10 +185,6 @@ export const EmbedDirectTemplateClientPage = ({
 
   const onCompleteClick = async () => {
     try {
-      if (hasSignatureField && !signatureValid) {
-        return;
-      }
-
       const valid = validateFieldsInserted(pendingFields);
 
       if (!valid) {
@@ -419,34 +406,16 @@ export const EmbedDirectTemplateClientPage = ({
                       <Trans>Signature</Trans>
                     </Label>
 
-                    <Card className="mt-2" gradient degrees={-120}>
+                    <SignaturePadDialog
-                      <CardContent className="p-0">
+                      className="mt-2"
-                        <SignaturePad
+                      disabled={isThrottled || isSubmitting}
-                          className="h-44 w-full"
+                      disableAnimation
-                          disabled={isThrottled || isSubmitting}
+                      value={signature ?? ''}
-                          defaultValue={signature ?? undefined}
+                      onChange={(v) => setSignature(v ?? '')}
-                          onChange={(value) => {
+                      typedSignatureEnabled={metadata?.typedSignatureEnabled}
-                            setSignature(value);
+                      uploadSignatureEnabled={metadata?.uploadSignatureEnabled}
-                          }}
+                      drawSignatureEnabled={metadata?.drawSignatureEnabled}
-                          onValidityChange={(isValid) => {
+                    />
-                            setSignatureValid(isValid);
-                          }}
-                          allowTypedSignature={Boolean(
-                            metadata &&
-                              'typedSignatureEnabled' in metadata &&
-                              metadata.typedSignatureEnabled,
-                          )}
-                        />
-                      </CardContent>
-                    </Card>
-
-                    {hasSignatureField && !signatureValid && (
-                      <div className="text-destructive mt-2 text-sm">
-                        <Trans>
-                          Signature is too small. Please provide a more complete signature.
-                        </Trans>
-                      </div>
-                    )}
                   </div>
                 )}
               </div>

apps/remix/app/components/embed/embed-document-fields.tsx

@@ -54,6 +54,8 @@ export const EmbedDocumentFields = ({
               onSignField={onSignField}
               onUnsignField={onUnsignField}
               typedSignatureEnabled={metadata?.typedSignatureEnabled}
+              uploadSignatureEnabled={metadata?.uploadSignatureEnabled}
+              drawSignatureEnabled={metadata?.drawSignatureEnabled}
             />
           ))
           .with(FieldType.INITIALS, () => (

apps/remix/app/components/embed/embed-document-signing-page.tsx

@@ -21,13 +21,12 @@ import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with
 import { trpc } from '@documenso/trpc/react';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { ElementVisible } from '@documenso/ui/primitives/element-visible';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
 import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
 import { RadioGroup, RadioGroupItem } from '@documenso/ui/primitives/radio-group';
-import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
+import { SignaturePadDialog } from '@documenso/ui/primitives/signature-pad/signature-pad-dialog';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { BrandingLogo } from '~/components/general/branding-logo';
@@ -70,15 +69,8 @@ export const EmbedSignDocumentClientPage = ({
   const { _ } = useLingui();
   const { toast } = useToast();
 
-  const {
+  const { fullName, email, signature, setFullName, setSignature } =
-    fullName,
+    useRequiredDocumentSigningContext();
-    email,
-    signature,
-    signatureValid,
-    setFullName,
-    setSignature,
-    setSignatureValid,
-  } = useRequiredDocumentSigningContext();
 
   const [hasFinishedInit, setHasFinishedInit] = useState(false);
   const [hasDocumentLoaded, setHasDocumentLoaded] = useState(false);
@@ -129,10 +121,6 @@ export const EmbedSignDocumentClientPage = ({
 
   const onCompleteClick = async () => {
     try {
-      if (hasSignatureField && !signatureValid) {
-        return;
-      }
-
       const valid = validateFieldsInserted(fieldsRequiringValidation);
 
       if (!valid) {
@@ -432,34 +420,16 @@ export const EmbedSignDocumentClientPage = ({
                             <Trans>Signature</Trans>
                           </Label>
 
-                          <Card className="mt-2" gradient degrees={-120}>
+                          <SignaturePadDialog
-                            <CardContent className="p-0">
+                            className="mt-2"
-                              <SignaturePad
+                            disabled={isThrottled || isSubmitting}
-                                className="h-44 w-full"
+                            disableAnimation
-                                disabled={isThrottled || isSubmitting}
+                            value={signature ?? ''}
-                                defaultValue={signature ?? undefined}
+                            onChange={(v) => setSignature(v ?? '')}
-                                onChange={(value) => {
+                            typedSignatureEnabled={metadata?.typedSignatureEnabled}
-                                  setSignature(value);
+                            uploadSignatureEnabled={metadata?.uploadSignatureEnabled}
-                                }}
+                            drawSignatureEnabled={metadata?.drawSignatureEnabled}
-                                onValidityChange={(isValid) => {
+                          />
-                                  setSignatureValid(isValid);
-                                }}
-                                allowTypedSignature={Boolean(
-                                  metadata &&
-                                    'typedSignatureEnabled' in metadata &&
-                                    metadata.typedSignatureEnabled,
-                                )}
-                              />
-                            </CardContent>
-                          </Card>
-
-                          {hasSignatureField && !signatureValid && (
-                            <div className="text-destructive mt-2 text-sm">
-                              <Trans>
-                                Signature is too small. Please provide a more complete signature.
-                              </Trans>
-                            </div>
-                          )}
                         </div>
                       )}
                     </>
@@ -477,9 +447,7 @@ export const EmbedSignDocumentClientPage = ({
                 ) : (
                   <Button
                     className={allowDocumentRejection ? 'col-start-2' : 'col-span-2'}
-                    disabled={
+                    disabled={isThrottled}
-                      isThrottled || (!isAssistantMode && hasSignatureField && !signatureValid)
-                    }
                     loading={isSubmitting}
                     onClick={() => throttledOnCompleteClick()}
                   >

apps/remix/app/components/forms/profile.tsx

@@ -19,12 +19,15 @@ import {
 } from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
-import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
+import { SignaturePadDialog } from '@documenso/ui/primitives/signature-pad/signature-pad-dialog';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export const ZProfileFormSchema = z.object({
-  name: z.string().trim().min(1, { message: 'Please enter a valid name.' }),
+  name: z
-  signature: z.string().min(1, 'Signature Pad cannot be empty'),
+    .string()
+    .trim()
+    .min(1, { message: msg`Please enter a valid name.`.id }),
+  signature: z.string().min(1, { message: msg`Signature Pad cannot be empty.`.id }),
 });
 
 export const ZTwoFactorAuthTokenSchema = z.object({
@@ -109,22 +112,20 @@ export const ProfileForm = ({ className }: ProfileFormProps) => {
             </Label>
             <Input id="email" type="email" className="bg-muted mt-2" value={user.email} disabled />
           </div>
+
           <FormField
             control={form.control}
             name="signature"
-            render={({ field: { onChange } }) => (
+            render={({ field: { onChange, value } }) => (
               <FormItem>
                 <FormLabel>
                   <Trans>Signature</Trans>
                 </FormLabel>
                 <FormControl>
-                  <SignaturePad
+                  <SignaturePadDialog
-                    className="h-44 w-full"
                     disabled={isSubmitting}
-                    containerClassName={cn('rounded-lg border bg-background')}
+                    value={value}
-                    defaultValue={user.signature ?? undefined}
                     onChange={(v) => onChange(v ?? '')}
-                    allowTypedSignature={true}
                   />
                 </FormControl>
                 <FormMessage />
@@ -134,7 +135,7 @@ export const ProfileForm = ({ className }: ProfileFormProps) => {
         </fieldset>
 
         <Button type="submit" loading={isSubmitting} className="self-end">
-          {isSubmitting ? <Trans>Updating profile...</Trans> : <Trans>Update profile</Trans>}
+          <Trans>Update profile</Trans>
         </Button>
       </form>
     </Form>

apps/remix/app/components/forms/signup.tsx

@@ -30,7 +30,7 @@ import {
 } from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
 import { PasswordInput } from '@documenso/ui/primitives/password-input';
-import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
+import { SignaturePadDialog } from '@documenso/ui/primitives/signature-pad/signature-pad-dialog';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { UserProfileSkeleton } from '~/components/general/user-profile-skeleton';
@@ -353,16 +353,15 @@ export const SignUpForm = ({
                 <FormField
                   control={form.control}
                   name="signature"
-                  render={({ field: { onChange } }) => (
+                  render={({ field: { onChange, value } }) => (
                     <FormItem>
                       <FormLabel>
                         <Trans>Sign Here</Trans>
                       </FormLabel>
                       <FormControl>
-                        <SignaturePad
+                        <SignaturePadDialog
-                          className="h-36 w-full"
                           disabled={isSubmitting}
-                          containerClassName="mt-2 rounded-lg border bg-background"
+                          value={value}
                           onChange={(v) => onChange(v ?? '')}
                         />
                       </FormControl>
@@ -531,6 +530,27 @@ export const SignUpForm = ({
             </div>
           </form>
         </Form>
+        <p className="text-muted-foreground mt-6 text-xs">
+          <Trans>
+            By proceeding, you agree to our{' '}
+            <Link
+              to="https://documen.so/terms"
+              target="_blank"
+              className="text-documenso-700 duration-200 hover:opacity-70"
+            >
+              Terms of Service
+            </Link>{' '}
+            and{' '}
+            <Link
+              to="https://documen.so/privacy"
+              target="_blank"
+              className="text-documenso-700 duration-200 hover:opacity-70"
+            >
+              Privacy Policy
+            </Link>
+            .
+          </Trans>
+        </p>
       </div>
     </div>
   );

apps/remix/app/components/forms/team-branding-preferences-form.tsx

@@ -308,7 +308,7 @@ export function TeamBrandingPreferencesForm({ team, settings }: TeamBrandingPref
 
           <div className="flex flex-row justify-end space-x-4">
             <Button type="submit" loading={form.formState.isSubmitting}>
-              <Trans>Save</Trans>
+              <Trans>Update</Trans>
             </Button>
           </div>
         </fieldset>

apps/remix/app/components/forms/team-document-preferences-form.tsx

@@ -8,12 +8,15 @@ import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
 import { useSession } from '@documenso/lib/client-only/providers/session';
+import { DOCUMENT_SIGNATURE_TYPES, DocumentSignatureType } from '@documenso/lib/constants/document';
 import {
   SUPPORTED_LANGUAGES,
   SUPPORTED_LANGUAGE_CODES,
   isValidLanguageCode,
 } from '@documenso/lib/constants/i18n';
+import { extractTeamSignatureSettings } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
+import { DocumentSignatureSettingsTooltip } from '@documenso/ui/components/document/document-signature-settings-tooltip';
 import { Alert } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -23,7 +26,9 @@ import {
   FormField,
   FormItem,
   FormLabel,
+  FormMessage,
 } from '@documenso/ui/primitives/form/form';
+import { MultiSelectCombobox } from '@documenso/ui/primitives/multi-select-combobox';
 import {
   Select,
   SelectContent,
@@ -38,8 +43,10 @@ const ZTeamDocumentPreferencesFormSchema = z.object({
   documentVisibility: z.nativeEnum(DocumentVisibility),
   documentLanguage: z.enum(SUPPORTED_LANGUAGE_CODES),
   includeSenderDetails: z.boolean(),
-  typedSignatureEnabled: z.boolean(),
   includeSigningCertificate: z.boolean(),
+  signatureTypes: z.array(z.nativeEnum(DocumentSignatureType)).min(1, {
+    message: msg`At least one signature type must be enabled`.id,
+  }),
 });
 
 type TTeamDocumentPreferencesFormSchema = z.infer<typeof ZTeamDocumentPreferencesFormSchema>;
@@ -69,8 +76,8 @@ export const TeamDocumentPreferencesForm = ({
         ? settings?.documentLanguage
         : 'en',
       includeSenderDetails: settings?.includeSenderDetails ?? false,
-      typedSignatureEnabled: settings?.typedSignatureEnabled ?? true,
       includeSigningCertificate: settings?.includeSigningCertificate ?? true,
+      signatureTypes: extractTeamSignatureSettings(settings),
     },
     resolver: zodResolver(ZTeamDocumentPreferencesFormSchema),
   });
@@ -84,7 +91,7 @@ export const TeamDocumentPreferencesForm = ({
         documentLanguage,
         includeSenderDetails,
         includeSigningCertificate,
-        typedSignatureEnabled,
+        signatureTypes,
       } = data;
 
       await updateTeamDocumentPreferences({
@@ -93,8 +100,10 @@ export const TeamDocumentPreferencesForm = ({
           documentVisibility,
           documentLanguage,
           includeSenderDetails,
-          typedSignatureEnabled,
           includeSigningCertificate,
+          typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
+          uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
+          drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
         },
       });
 
@@ -190,6 +199,44 @@ export const TeamDocumentPreferencesForm = ({
             )}
           />
 
+          <FormField
+            control={form.control}
+            name="signatureTypes"
+            render={({ field }) => (
+              <FormItem className="flex-1">
+                <FormLabel className="flex flex-row items-center">
+                  <Trans>Default Signature Settings</Trans>
+                  <DocumentSignatureSettingsTooltip />
+                </FormLabel>
+
+                <FormControl>
+                  <MultiSelectCombobox
+                    options={Object.values(DOCUMENT_SIGNATURE_TYPES).map((option) => ({
+                      label: _(option.label),
+                      value: option.value,
+                    }))}
+                    selectedValues={field.value}
+                    onChange={field.onChange}
+                    className="bg-background w-full"
+                    enableSearch={false}
+                    emptySelectionPlaceholder="Select signature types"
+                    testId="signature-types-combobox"
+                  />
+                </FormControl>
+
+                {form.formState.errors.signatureTypes ? (
+                  <FormMessage />
+                ) : (
+                  <FormDescription>
+                    <Trans>
+                      Controls which signatures are allowed to be used when signing a document.
+                    </Trans>
+                  </FormDescription>
+                )}
+              </FormItem>
+            )}
+          />
+
           <FormField
             control={form.control}
             name="includeSenderDetails"
@@ -238,36 +285,6 @@ export const TeamDocumentPreferencesForm = ({
             )}
           />
 
-          <FormField
-            control={form.control}
-            name="typedSignatureEnabled"
-            render={({ field }) => (
-              <FormItem className="flex-1">
-                <FormLabel>
-                  <Trans>Enable Typed Signature</Trans>
-                </FormLabel>
-
-                <div>
-                  <FormControl className="block">
-                    <Switch
-                      ref={field.ref}
-                      name={field.name}
-                      checked={field.value}
-                      onCheckedChange={field.onChange}
-                    />
-                  </FormControl>
-                </div>
-
-                <FormDescription>
-                  <Trans>
-                    Controls whether the recipients can sign the documents using a typed signature.
-                    Enable or disable the typed signature globally.
-                  </Trans>
-                </FormDescription>
-              </FormItem>
-            )}
-          />
-
           <FormField
             control={form.control}
             name="includeSigningCertificate"
@@ -301,7 +318,7 @@ export const TeamDocumentPreferencesForm = ({
 
           <div className="flex flex-row justify-end space-x-4">
             <Button type="submit" loading={form.formState.isSubmitting}>
-              <Trans>Save</Trans>
+              <Trans>Update</Trans>
             </Button>
           </div>
         </fieldset>

apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx

@@ -24,7 +24,6 @@ import type {
 } from '@documenso/trpc/server/field-router/schema';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
 import {
   DocumentFlowFormContainerContent,
   DocumentFlowFormContainerFooter,
@@ -35,7 +34,7 @@ import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/ty
 import { ElementVisible } from '@documenso/ui/primitives/element-visible';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
-import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
+import { SignaturePadDialog } from '@documenso/ui/primitives/signature-pad/signature-pad-dialog';
 import { useStep } from '@documenso/ui/primitives/stepper';
 
 import { DocumentSigningCheckboxField } from '~/components/general/document-signing/document-signing-checkbox-field';
@@ -73,8 +72,7 @@ export const DirectTemplateSigningForm = ({
   template,
   onSubmit,
 }: DirectTemplateSigningFormProps) => {
-  const { fullName, signature, signatureValid, setFullName, setSignature } =
+  const { fullName, signature, setFullName, setSignature } = useRequiredDocumentSigningContext();
-    useRequiredDocumentSigningContext();
 
   const [localFields, setLocalFields] = useState<DirectTemplateLocalField[]>(directRecipientFields);
   const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);
@@ -135,8 +133,6 @@ export const DirectTemplateSigningForm = ({
     );
   };
 
-  const hasSignatureField = localFields.some((field) => field.type === FieldType.SIGNATURE);
-
   const uninsertedFields = useMemo(() => {
     return sortFieldsByPosition(localFields.filter((field) => !field.inserted));
   }, [localFields]);
@@ -149,10 +145,6 @@ export const DirectTemplateSigningForm = ({
   const handleSubmit = async () => {
     setValidateUninsertedFields(true);
 
-    if (hasSignatureField && !signatureValid) {
-      return;
-    }
-
     const isFieldsValid = validateFieldsInserted(localFields);
 
     if (!isFieldsValid) {
@@ -240,6 +232,8 @@ export const DirectTemplateSigningForm = ({
                   onSignField={onSignField}
                   onUnsignField={onUnsignField}
                   typedSignatureEnabled={template.templateMeta?.typedSignatureEnabled}
+                  uploadSignatureEnabled={template.templateMeta?.uploadSignatureEnabled}
+                  drawSignatureEnabled={template.templateMeta?.drawSignatureEnabled}
                 />
               ))
               .with(FieldType.INITIALS, () => (
@@ -384,19 +378,15 @@ export const DirectTemplateSigningForm = ({
                 <Trans>Signature</Trans>
               </Label>
 
-              <Card className="mt-2" gradient degrees={-120}>
+              <SignaturePadDialog
-                <CardContent className="p-0">
+                className="mt-2"
-                  <SignaturePad
+                disabled={isSubmitting}
-                    className="h-44 w-full"
+                value={signature ?? ''}
-                    disabled={isSubmitting}
+                onChange={(value) => setSignature(value)}
-                    defaultValue={signature ?? undefined}
+                typedSignatureEnabled={template.templateMeta?.typedSignatureEnabled}
-                    onChange={(value) => {
+                uploadSignatureEnabled={template.templateMeta?.uploadSignatureEnabled}
-                      setSignature(value);
+                drawSignatureEnabled={template.templateMeta?.drawSignatureEnabled}
-                    }}
+              />
-                    allowTypedSignature={template.templateMeta?.typedSignatureEnabled}
-                  />
-                </CardContent>
-              </Card>
             </div>
           </div>
         </div>

apps/remix/app/components/general/document-signing/document-signing-form.tsx

@@ -18,11 +18,10 @@ import { trpc } from '@documenso/trpc/react';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
 import { RadioGroup, RadioGroupItem } from '@documenso/ui/primitives/radio-group';
-import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
+import { SignaturePadDialog } from '@documenso/ui/primitives/signature-pad/signature-pad-dialog';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { AssistantConfirmationDialog } from '../../dialogs/assistant-confirmation-dialog';
@@ -59,8 +58,7 @@ export const DocumentSigningForm = ({
 
   const assistantSignersId = useId();
 
-  const { fullName, signature, setFullName, setSignature, signatureValid, setSignatureValid } =
+  const { fullName, signature, setFullName, setSignature } = useRequiredDocumentSigningContext();
-    useRequiredDocumentSigningContext();
 
   const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);
   const [isConfirmationDialogOpen, setIsConfirmationDialogOpen] = useState(false);
@@ -105,10 +103,6 @@ export const DocumentSigningForm = ({
 
     const isFieldsValid = validateFieldsInserted(fieldsRequiringValidation);
 
-    if (hasSignatureField && !signatureValid) {
-      return;
-    }
-
     if (!isFieldsValid) {
       return;
     }
@@ -347,32 +341,15 @@ export const DocumentSigningForm = ({
                           <Trans>Signature</Trans>
                         </Label>
 
-                        <Card className="mt-2" gradient degrees={-120}>
+                        <SignaturePadDialog
-                          <CardContent className="p-0">
+                          className="mt-2"
-                            <SignaturePad
+                          disabled={isSubmitting}
-                              className="h-44 w-full"
+                          value={signature ?? ''}
-                              disabled={isSubmitting}
+                          onChange={(v) => setSignature(v ?? '')}
-                              defaultValue={signature ?? undefined}
+                          typedSignatureEnabled={document.documentMeta?.typedSignatureEnabled}
-                              onValidityChange={(isValid) => {
+                          uploadSignatureEnabled={document.documentMeta?.uploadSignatureEnabled}
-                                setSignatureValid(isValid);
+                          drawSignatureEnabled={document.documentMeta?.drawSignatureEnabled}
-                              }}
+                        />
-                              onChange={(value) => {
-                                if (signatureValid) {
-                                  setSignature(value);
-                                }
-                              }}
-                              allowTypedSignature={document.documentMeta?.typedSignatureEnabled}
-                            />
-                          </CardContent>
-                        </Card>
-
-                        {!signatureValid && (
-                          <div className="text-destructive mt-2 text-sm">
-                            <Trans>
-                              Signature is too small. Please provide a more complete signature.
-                            </Trans>
-                          </div>
-                        )}
                       </div>
                     )}
                   </div>

apps/remix/app/components/general/document-signing/document-signing-page-view.tsx

@@ -177,6 +177,8 @@ export const DocumentSigningPageView = ({
                     key={field.id}
                     field={field}
                     typedSignatureEnabled={documentMeta?.typedSignatureEnabled}
+                    uploadSignatureEnabled={documentMeta?.uploadSignatureEnabled}
+                    drawSignatureEnabled={documentMeta?.drawSignatureEnabled}
                   />
                 ))
                 .with(FieldType.INITIALS, () => (

apps/remix/app/components/general/document-signing/document-signing-provider.tsx

@@ -1,4 +1,6 @@
-import { createContext, useContext, useEffect, useState } from 'react';
+import { createContext, useContext, useState } from 'react';
+
+import { isBase64Image } from '@documenso/lib/constants/signatures';
 
 export type DocumentSigningContextValue = {
   fullName: string;
@@ -7,8 +9,6 @@ export type DocumentSigningContextValue = {
   setEmail: (_value: string) => void;
   signature: string | null;
   setSignature: (_value: string | null) => void;
-  signatureValid: boolean;
-  setSignatureValid: (_valid: boolean) => void;
 };
 
 const DocumentSigningContext = createContext<DocumentSigningContextValue | null>(null);
@@ -31,6 +31,9 @@ export interface DocumentSigningProviderProps {
   fullName?: string | null;
   email?: string | null;
   signature?: string | null;
+  typedSignatureEnabled?: boolean;
+  uploadSignatureEnabled?: boolean;
+  drawSignatureEnabled?: boolean;
   children: React.ReactNode;
 }
 
@@ -38,18 +41,31 @@ export const DocumentSigningProvider = ({
   fullName: initialFullName,
   email: initialEmail,
   signature: initialSignature,
+  typedSignatureEnabled = true,
+  uploadSignatureEnabled = true,
+  drawSignatureEnabled = true,
   children,
 }: DocumentSigningProviderProps) => {
   const [fullName, setFullName] = useState(initialFullName || '');
   const [email, setEmail] = useState(initialEmail || '');
-  const [signature, setSignature] = useState(initialSignature || null);
-  const [signatureValid, setSignatureValid] = useState(true);
 
-  useEffect(() => {
+  // Ensure the user signature doesn't show up if it's not allowed.
-    if (initialSignature) {
+  const [signature, setSignature] = useState(
-      setSignature(initialSignature);
+    (() => {
-    }
+      const sig = initialSignature || '';
-  }, [initialSignature]);
+      const isBase64 = isBase64Image(sig);
+
+      if (isBase64 && (uploadSignatureEnabled || drawSignatureEnabled)) {
+        return sig;
+      }
+
+      if (!isBase64 && typedSignatureEnabled) {
+        return sig;
+      }
+
+      return null;
+    })(),
+  );
 
   return (
     <DocumentSigningContext.Provider
@@ -60,8 +76,6 @@ export const DocumentSigningProvider = ({
         setEmail,
         signature,
         setSignature,
-        signatureValid,
-        setSignatureValid,
       }}
     >
       {children}

apps/remix/app/components/general/document-signing/document-signing-signature-field.tsx

@@ -17,7 +17,6 @@ import type {
 } from '@documenso/trpc/server/field-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
 import { Dialog, DialogContent, DialogFooter, DialogTitle } from '@documenso/ui/primitives/dialog';
-import { Label } from '@documenso/ui/primitives/label';
 import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
@@ -29,11 +28,14 @@ import { useRequiredDocumentSigningContext } from './document-signing-provider';
 import { useDocumentSigningRecipientContext } from './document-signing-recipient-provider';
 
 type SignatureFieldState = 'empty' | 'signed-image' | 'signed-text';
+
 export type DocumentSigningSignatureFieldProps = {
   field: FieldWithSignature;
   onSignField?: (value: TSignFieldWithTokenMutationSchema) => Promise<void> | void;
   onUnsignField?: (value: TRemovedSignedFieldWithTokenMutationSchema) => Promise<void> | void;
   typedSignatureEnabled?: boolean;
+  uploadSignatureEnabled?: boolean;
+  drawSignatureEnabled?: boolean;
 };
 
 export const DocumentSigningSignatureField = ({
@@ -41,6 +43,8 @@ export const DocumentSigningSignatureField = ({
   onSignField,
   onUnsignField,
   typedSignatureEnabled,
+  uploadSignatureEnabled,
+  drawSignatureEnabled,
 }: DocumentSigningSignatureFieldProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
@@ -52,12 +56,8 @@ export const DocumentSigningSignatureField = ({
   const containerRef = useRef<HTMLDivElement>(null);
   const [fontSize, setFontSize] = useState(2);
 
-  const {
+  const { signature: providedSignature, setSignature: setProvidedSignature } =
-    signature: providedSignature,
+    useRequiredDocumentSigningContext();
-    setSignature: setProvidedSignature,
-    signatureValid,
-    setSignatureValid,
-  } = useRequiredDocumentSigningContext();
 
   const { executeActionAuthProcedure } = useRequiredDocumentSigningAuthContext();
 
@@ -89,7 +89,7 @@ export const DocumentSigningSignatureField = ({
   }, [field.inserted, signature?.signatureImageAsBase64]);
 
   const onPreSign = () => {
-    if (!providedSignature || !signatureValid) {
+    if (!providedSignature) {
       setShowSignatureModal(true);
       return false;
     }
@@ -102,6 +102,7 @@ export const DocumentSigningSignatureField = ({
   const onDialogSignClick = () => {
     setShowSignatureModal(false);
     setProvidedSignature(localSignature);
+
     if (!localSignature) {
       return;
     }
@@ -116,14 +117,14 @@ export const DocumentSigningSignatureField = ({
     try {
       const value = signature || providedSignature;
 
-      if (!value || (signature && !signatureValid)) {
+      if (!value) {
         setShowSignatureModal(true);
         return;
       }
 
       const isTypedSignature = !value.startsWith('data:image');
 
-      if (isTypedSignature && !typedSignatureEnabled) {
+      if (isTypedSignature && typedSignatureEnabled === false) {
         toast({
           title: _(msg`Error`),
           description: _(msg`Typed signatures are not allowed. Please draw your signature.`),
@@ -275,29 +276,14 @@ export const DocumentSigningSignatureField = ({
             </Trans>
           </DialogTitle>
 
-          <div className="">
+          <SignaturePad
-            <Label htmlFor="signature">
+            className="mt-2"
-              <Trans>Signature</Trans>
+            value={localSignature ?? ''}
-            </Label>
+            onChange={({ value }) => setLocalSignature(value)}
-
+            typedSignatureEnabled={typedSignatureEnabled}
-            <div className="border-border mt-2 rounded-md border">
+            uploadSignatureEnabled={uploadSignatureEnabled}
-              <SignaturePad
+            drawSignatureEnabled={drawSignatureEnabled}
-                id="signature"
+          />
-                className="h-44 w-full"
-                onChange={(value) => setLocalSignature(value)}
-                allowTypedSignature={typedSignatureEnabled}
-                onValidityChange={(isValid) => {
-                  setSignatureValid(isValid);
-                }}
-              />
-            </div>
-
-            {!signatureValid && (
-              <div className="text-destructive mt-2 text-sm">
-                <Trans>Signature is too small. Please provide a more complete signature.</Trans>
-              </div>
-            )}
-          </div>
 
           <DocumentSigningDisclosure />
 
@@ -317,7 +303,7 @@ export const DocumentSigningSignatureField = ({
               <Button
                 type="button"
                 className="flex-1"
-                disabled={!localSignature || !signatureValid}
+                disabled={!localSignature}
                 onClick={() => onDialogSignClick()}
               >
                 <Trans>Sign</Trans>

apps/remix/app/components/general/document/document-edit-form.tsx

@@ -5,6 +5,7 @@ import { useLingui } from '@lingui/react';
 import { DocumentDistributionMethod, DocumentStatus } from '@prisma/client';
 import { useNavigate, useSearchParams } from 'react-router';
 
+import { DocumentSignatureType } from '@documenso/lib/constants/document';
 import { isValidLanguageCode } from '@documenso/lib/constants/i18n';
 import {
   DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
@@ -71,7 +72,7 @@ export const DocumentEditForm = ({
 
   const { recipients, fields } = document;
 
-  const { mutateAsync: updateDocument } = trpc.document.setSettingsForDocument.useMutation({
+  const { mutateAsync: updateDocument } = trpc.document.updateDocument.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: (newData) => {
       utils.document.getDocumentWithDetailsById.setData(
@@ -174,7 +175,7 @@ export const DocumentEditForm = ({
 
   const onAddSettingsFormSubmit = async (data: TAddSettingsFormSchema) => {
     try {
-      const { timezone, dateFormat, redirectUrl, language } = data.meta;
+      const { timezone, dateFormat, redirectUrl, language, signatureTypes } = data.meta;
 
       await updateDocument({
         documentId: document.id,
@@ -190,6 +191,9 @@ export const DocumentEditForm = ({
           dateFormat,
           redirectUrl,
           language: isValidLanguageCode(language) ? language : undefined,
+          typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
+          uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
+          drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
         },
       });
 
@@ -242,14 +246,6 @@ export const DocumentEditForm = ({
         fields: data.fields,
       });
 
-      await updateDocument({
-        documentId: document.id,
-
-        meta: {
-          typedSignatureEnabled: data.typedSignatureEnabled,
-        },
-      });
-
       // Clear all field data from localStorage
       for (let i = 0; i < localStorage.length; i++) {
         const key = localStorage.key(i);
@@ -378,7 +374,6 @@ export const DocumentEditForm = ({
               fields={fields}
               onSubmit={onAddFieldsFormSubmit}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
-              typedSignatureEnabled={document.documentMeta?.typedSignatureEnabled}
               teamId={team?.id}
             />
 

apps/remix/app/components/general/template/template-edit-form.tsx

@@ -4,6 +4,7 @@ import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { useNavigate } from 'react-router';
 
+import { DocumentSignatureType } from '@documenso/lib/constants/document';
 import { isValidLanguageCode } from '@documenso/lib/constants/i18n';
 import {
   DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
@@ -124,6 +125,8 @@ export const TemplateEditForm = ({
   });
 
   const onAddSettingsFormSubmit = async (data: TAddTemplateSettingsFormSchema) => {
+    const { signatureTypes } = data.meta;
+
     try {
       await updateTemplateSettings({
         templateId: template.id,
@@ -136,6 +139,9 @@ export const TemplateEditForm = ({
         },
         meta: {
           ...data.meta,
+          typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
+          uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
+          drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
           language: isValidLanguageCode(data.meta.language) ? data.meta.language : undefined,
         },
       });
@@ -187,13 +193,6 @@ export const TemplateEditForm = ({
         fields: data.fields,
       });
 
-      await updateTemplateSettings({
-        templateId: template.id,
-        meta: {
-          typedSignatureEnabled: data.typedSignatureEnabled,
-        },
-      });
-
       // Clear all field data from localStorage
       for (let i = 0; i < localStorage.length; i++) {
         const key = localStorage.key(i);
@@ -284,7 +283,6 @@ export const TemplateEditForm = ({
               fields={fields}
               onSubmit={onAddFieldsFormSubmit}
               teamId={team?.id}
-              typedSignatureEnabled={template.templateMeta?.typedSignatureEnabled}
             />
           </Stepper>
         </DocumentFlowFormContainer>

apps/remix/app/components/general/webhook-multiselect-combobox.tsx

@@ -1,96 +1,43 @@
-import { useEffect, useState } from 'react';
-
-import { Plural, Trans } from '@lingui/react/macro';
 import { WebhookTriggerEvents } from '@prisma/client';
-import { Check, ChevronsUpDown } from 'lucide-react';
 
 import { toFriendlyWebhookEventName } from '@documenso/lib/universal/webhook/to-friendly-webhook-event-name';
-import { cn } from '@documenso/ui/lib/utils';
+import { MultipleSelector } from '@documenso/ui/primitives/multiselect';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Command,
-  CommandEmpty,
-  CommandGroup,
-  CommandInput,
-  CommandItem,
-} from '@documenso/ui/primitives/command';
-import { Popover, PopoverContent, PopoverTrigger } from '@documenso/ui/primitives/popover';
-
-import { truncateTitle } from '~/utils/truncate-title';
 
 type WebhookMultiSelectComboboxProps = {
   listValues: string[];
   onChange: (_values: string[]) => void;
 };
 
+const triggerEvents = Object.values(WebhookTriggerEvents).map((value) => ({
+  value,
+  label: toFriendlyWebhookEventName(value),
+}));
+
 export const WebhookMultiSelectCombobox = ({
   listValues,
   onChange,
 }: WebhookMultiSelectComboboxProps) => {
-  const [isOpen, setIsOpen] = useState(false);
+  const handleOnChange = (options: { value: string; label: string }[]) => {
-  const [selectedValues, setSelectedValues] = useState<string[]>([]);
+    onChange(options.map((option) => option.value));
-
-  const triggerEvents = Object.values(WebhookTriggerEvents);
-
-  useEffect(() => {
-    setSelectedValues(listValues);
-  }, [listValues]);
-
-  const allEvents = [...new Set([...triggerEvents, ...selectedValues])];
-
-  const handleSelect = (currentValue: string) => {
-    let newSelectedValues;
-
-    if (selectedValues.includes(currentValue)) {
-      newSelectedValues = selectedValues.filter((value) => value !== currentValue);
-    } else {
-      newSelectedValues = [...selectedValues, currentValue];
-    }
-
-    setSelectedValues(newSelectedValues);
-    onChange(newSelectedValues);
-    setIsOpen(false);
   };
 
+  const mappedValues = listValues.map((value) => ({
+    value,
+    label: toFriendlyWebhookEventName(value),
+  }));
+
   return (
-    <Popover open={isOpen} onOpenChange={setIsOpen}>
+    <MultipleSelector
-      <PopoverTrigger asChild>
+      commandProps={{
-        <Button
+        label: 'Select triggers',
-          variant="outline"
+      }}
-          role="combobox"
+      defaultOptions={triggerEvents}
-          aria-expanded={isOpen}
+      value={mappedValues}
-          className="w-[200px] justify-between"
+      onChange={handleOnChange}
-        >
+      placeholder="Select triggers"
-          <Plural value={selectedValues.length} zero="Select values" other="# selected..." />
+      hideClearAllButton
-          <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+      hidePlaceholderWhenSelected
-        </Button>
+      emptyIndicator={<p className="text-center text-sm">No triggers available</p>}
-      </PopoverTrigger>
+    />
-      <PopoverContent className="z-9999 w-full max-w-[280px] p-0">
-        <Command>
-          <CommandInput
-            placeholder={truncateTitle(
-              selectedValues.map((v) => toFriendlyWebhookEventName(v)).join(', '),
-              15,
-            )}
-          />
-          <CommandEmpty>
-            <Trans>No value found.</Trans>
-          </CommandEmpty>
-          <CommandGroup>
-            {allEvents.map((value: string, i: number) => (
-              <CommandItem key={i} onSelect={() => handleSelect(value)}>
-                <Check
-                  className={cn(
-                    'mr-2 h-4 w-4',
-                    selectedValues.includes(value) ? 'opacity-100' : 'opacity-0',
-                  )}
-                />
-                {toFriendlyWebhookEventName(value)}
-              </CommandItem>
-            ))}
-          </CommandGroup>
-        </Command>
-      </PopoverContent>
-    </Popover>
   );
 };

apps/remix/app/routes/_recipient+/d.$token+/_index.tsx

@@ -79,7 +79,14 @@ export default function DirectTemplatePage() {
   const { template, directTemplateRecipient } = data;
 
   return (
-    <DocumentSigningProvider email={user?.email} fullName={user?.name} signature={user?.signature}>
+    <DocumentSigningProvider
+      email={user?.email}
+      fullName={user?.name}
+      signature={user?.signature}
+      typedSignatureEnabled={template.templateMeta?.typedSignatureEnabled}
+      uploadSignatureEnabled={template.templateMeta?.uploadSignatureEnabled}
+      drawSignatureEnabled={template.templateMeta?.drawSignatureEnabled}
+    >
       <DocumentSigningAuthProvider
         documentAuthOptions={template.authOptions}
         recipient={directTemplateRecipient}

apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx

@@ -215,6 +215,9 @@ export default function SigningPage() {
       email={recipient.email}
       fullName={user?.email === recipient.email ? user?.name : recipient.name}
       signature={user?.email === recipient.email ? user?.signature : undefined}
+      typedSignatureEnabled={document.documentMeta?.typedSignatureEnabled}
+      uploadSignatureEnabled={document.documentMeta?.uploadSignatureEnabled}
+      drawSignatureEnabled={document.documentMeta?.drawSignatureEnabled}
     >
       <DocumentSigningAuthProvider
         documentAuthOptions={document.authOptions}

apps/remix/app/routes/embed+/direct.$url.tsx

@@ -131,7 +131,14 @@ export default function EmbedDirectTemplatePage() {
   } = useSuperLoaderData<typeof loader>();
 
   return (
-    <DocumentSigningProvider email={user?.email} fullName={user?.name} signature={user?.signature}>
+    <DocumentSigningProvider
+      email={user?.email}
+      fullName={user?.name}
+      signature={user?.signature}
+      typedSignatureEnabled={template.templateMeta?.typedSignatureEnabled}
+      uploadSignatureEnabled={template.templateMeta?.uploadSignatureEnabled}
+      drawSignatureEnabled={template.templateMeta?.drawSignatureEnabled}
+    >
       <DocumentSigningAuthProvider
         documentAuthOptions={template.authOptions}
         recipient={recipient}

apps/remix/app/routes/embed+/sign.$url.tsx

@@ -156,6 +156,9 @@ export default function EmbedSignDocumentPage() {
       email={recipient.email}
       fullName={user?.email === recipient.email ? user?.name : recipient.name}
       signature={user?.email === recipient.email ? user?.signature : undefined}
+      typedSignatureEnabled={document.documentMeta?.typedSignatureEnabled}
+      uploadSignatureEnabled={document.documentMeta?.uploadSignatureEnabled}
+      drawSignatureEnabled={document.documentMeta?.drawSignatureEnabled}
     >
       <DocumentSigningAuthProvider
         documentAuthOptions={document.authOptions}

packages/api/v1/implementation.ts

@@ -325,6 +325,8 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
         signingOrder: body.meta.signingOrder,
         language: body.meta.language,
         typedSignatureEnabled: body.meta.typedSignatureEnabled,
+        uploadSignatureEnabled: body.meta.uploadSignatureEnabled,
+        drawSignatureEnabled: body.meta.drawSignatureEnabled,
         distributionMethod: body.meta.distributionMethod,
         emailSettings: body.meta.emailSettings,
         requestMetadata: metadata,

packages/api/v1/schema.ts

@@ -157,6 +157,8 @@ export const ZCreateDocumentMutationSchema = z.object({
       signingOrder: z.nativeEnum(DocumentSigningOrder).optional(),
       language: z.enum(SUPPORTED_LANGUAGE_CODES).optional(),
       typedSignatureEnabled: z.boolean().optional().default(true),
+      uploadSignatureEnabled: z.boolean().optional().default(true),
+      drawSignatureEnabled: z.boolean().optional().default(true),
       distributionMethod: z.nativeEnum(DocumentDistributionMethod).optional(),
       emailSettings: ZDocumentEmailSettingsSchema.optional(),
     })
@@ -288,6 +290,8 @@ export const ZGenerateDocumentFromTemplateMutationSchema = z.object({
       language: z.enum(SUPPORTED_LANGUAGE_CODES),
       distributionMethod: z.nativeEnum(DocumentDistributionMethod),
       typedSignatureEnabled: z.boolean(),
+      uploadSignatureEnabled: z.boolean(),
+      drawSignatureEnabled: z.boolean(),
       emailSettings: ZDocumentEmailSettingsSchema,
     })
     .partial()

packages/app-tests/e2e/document-auth/action-auth.spec.ts

@@ -246,7 +246,9 @@ test('[DOCUMENT_AUTH]: should allow field signing when required for recipient au
       });
     }
 
-    await signSignaturePad(page);
+    if (fields.some((field) => field.type === FieldType.SIGNATURE)) {
+      await signSignaturePad(page);
+    }
 
     for (const field of fields) {
       await page.locator(`#field-${field.id}`).getByRole('button').click();
@@ -349,7 +351,9 @@ test('[DOCUMENT_AUTH]: should allow field signing when required for recipient an
       });
     }
 
-    await signSignaturePad(page);
+    if (fields.some((field) => field.type === FieldType.SIGNATURE)) {
+      await signSignaturePad(page);
+    }
 
     for (const field of fields) {
       await page.locator(`#field-${field.id}`).getByRole('button').click();

packages/app-tests/e2e/features/include-document-certificate.spec.ts

@@ -222,7 +222,10 @@ test.describe('Signing Certificate Tests', () => {
 
     // Toggle signing certificate setting
     await page.getByLabel('Include the Signing Certificate in the Document').click();
-    await page.getByRole('button', { name: /Save/ }).first().click();
+    await page
+      .getByRole('button', { name: /Update/ })
+      .first()
+      .click();
 
     await page.waitForTimeout(1000);
 
@@ -236,7 +239,10 @@ test.describe('Signing Certificate Tests', () => {
 
     // Toggle the setting back to true
     await page.getByLabel('Include the Signing Certificate in the Document').click();
-    await page.getByRole('button', { name: /Save/ }).first().click();
+    await page
+      .getByRole('button', { name: /Update/ })
+      .first()
+      .click();
 
     await page.waitForTimeout(1000);
 

packages/app-tests/e2e/fixtures/signature.ts

@@ -3,38 +3,12 @@ import type { Page } from '@playwright/test';
 export const signSignaturePad = async (page: Page) => {
   await page.waitForTimeout(200);
 
-  const canvas = page.getByTestId('signature-pad');
+  await page.getByTestId('signature-pad-dialog-button').click();
 
-  const box = await canvas.boundingBox();
+  // Click type tab
+  await page.getByRole('tab', { name: 'Type' }).click();
+  await page.getByTestId('signature-pad-type-input').fill('Signature');
 
-  if (!box) {
+  // Click Next button
-    throw new Error('Signature pad not found');
+  await page.getByRole('button', { name: 'Next' }).click();
-  }
-
-  // Calculate center point
-  const centerX = box.x + box.width / 2;
-  const centerY = box.y + box.height / 2;
-
-  // Calculate square size (making it slightly smaller than the canvas)
-  const squareSize = Math.min(box.width, box.height) * 0.4; // 40% of the smallest dimension
-
-  // Move to center
-  await page.mouse.move(centerX, centerY);
-  await page.mouse.down();
-
-  // Draw square clockwise from center
-  // Move right
-  await page.mouse.move(centerX + squareSize, centerY, { steps: 10 });
-  // Move down
-  await page.mouse.move(centerX + squareSize, centerY + squareSize, { steps: 10 });
-  // Move left
-  await page.mouse.move(centerX - squareSize, centerY + squareSize, { steps: 10 });
-  // Move up
-  await page.mouse.move(centerX - squareSize, centerY - squareSize, { steps: 10 });
-  // Move right
-  await page.mouse.move(centerX + squareSize, centerY - squareSize, { steps: 10 });
-  // Move down to close the square
-  await page.mouse.move(centerX + squareSize, centerY, { steps: 10 });
-
-  await page.mouse.up();
 };

packages/app-tests/e2e/teams/team-global-settings.spec.ts

@@ -23,7 +23,7 @@ test('[TEAMS]: update the default document visibility in the team global setting
   // !: Brittle selector
   await page.getByRole('combobox').first().click();
   await page.getByRole('option', { name: 'Admin' }).click();
-  await page.getByRole('button', { name: 'Save' }).first().click();
+  await page.getByRole('button', { name: 'Update' }).first().click();
 
   const toast = page.locator('li[role="status"][data-state="open"]').first();
   await expect(toast).toBeVisible();
@@ -47,7 +47,7 @@ test('[TEAMS]: update the sender details in the team global settings', async ({
 
   await expect(checkbox).toBeChecked();
 
-  await page.getByRole('button', { name: 'Save' }).first().click();
+  await page.getByRole('button', { name: 'Update' }).first().click();
 
   const toast = page.locator('li[role="status"][data-state="open"]').first();
   await expect(toast).toBeVisible();

packages/app-tests/e2e/teams/team-signature-settings.spec.ts

@@ -0,0 +1,182 @@
+import { expect, test } from '@playwright/test';
+
+import { prisma } from '@documenso/prisma';
+import {
+  seedTeamDocumentWithMeta,
+  seedTeamDocuments,
+  seedTeamTemplateWithMeta,
+} from '@documenso/prisma/seed/documents';
+
+import { apiSignin } from '../fixtures/authentication';
+
+test.describe.configure({ mode: 'parallel' });
+
+test('[TEAMS]: check that default team signature settings are all enabled', async ({ page }) => {
+  const { team } = await seedTeamDocuments();
+
+  await apiSignin({
+    page,
+    email: team.owner.email,
+    password: 'password',
+    redirectPath: `/t/${team.url}/settings/preferences`,
+  });
+
+  // Verify that the default created team settings has all signatures enabled
+  await expect(page.getByRole('combobox').filter({ hasText: 'Type' })).toBeVisible();
+  await expect(page.getByRole('combobox').filter({ hasText: 'Upload' })).toBeVisible();
+  await expect(page.getByRole('combobox').filter({ hasText: 'Draw' })).toBeVisible();
+
+  const document = await seedTeamDocumentWithMeta(team);
+
+  // Create a document and check the settings
+  await page.goto(`/t/${team.url}/documents/${document.id}/edit`);
+
+  // Verify that the settings match
+  await page.getByRole('button', { name: 'Advanced Options' }).click();
+  await expect(page.getByRole('combobox').filter({ hasText: 'Type' })).toBeVisible();
+  await expect(page.getByRole('combobox').filter({ hasText: 'Upload' })).toBeVisible();
+  await expect(page.getByRole('combobox').filter({ hasText: 'Draw' })).toBeVisible();
+
+  // Go to document and check that the signatured tabs are correct.
+  await page.goto(`/sign/${document.recipients[0].token}`);
+  await page.getByTestId('signature-pad-dialog-button').click();
+
+  // Check the tab values
+  await expect(page.getByRole('tab', { name: 'Type' })).toBeVisible();
+  await expect(page.getByRole('tab', { name: 'Upload' })).toBeVisible();
+  await expect(page.getByRole('tab', { name: 'Draw' })).toBeVisible();
+});
+
+test('[TEAMS]: check signature modes can be disabled', async ({ page }) => {
+  const { team } = await seedTeamDocuments();
+
+  await apiSignin({
+    page,
+    email: team.owner.email,
+    password: 'password',
+    redirectPath: `/t/${team.url}/settings/preferences`,
+  });
+
+  const allTabs = ['Type', 'Upload', 'Draw'];
+  const tabTest = [['Type', 'Upload', 'Draw'], ['Type', 'Upload'], ['Type']];
+
+  for (const tabs of tabTest) {
+    await page.goto(`/t/${team.url}/settings/preferences`);
+
+    // Update combobox to have the correct tabs
+    await page.getByTestId('signature-types-combobox').click();
+
+    await expect(page.getByRole('option', { name: 'Type' })).toBeVisible();
+    await expect(page.getByRole('option', { name: 'Upload' })).toBeVisible();
+    await expect(page.getByRole('option', { name: 'Draw' })).toBeVisible();
+
+    // Clear all selected items.
+    for (const tab of allTabs) {
+      const item = page.getByRole('option', { name: tab });
+
+      const isSelected = (await item.innerHTML()).includes('opacity-100');
+
+      if (isSelected) {
+        await item.click();
+      }
+    }
+
+    // Selected wanted items.
+    for (const tab of tabs) {
+      const item = page.getByRole('option', { name: tab });
+      await item.click();
+    }
+
+    await page.getByRole('button', { name: 'Update' }).first().click();
+
+    const document = await seedTeamDocumentWithMeta(team);
+
+    // Go to document and check that the signatured tabs are correct.
+    await page.goto(`/sign/${document.recipients[0].token}`);
+    await page.getByTestId('signature-pad-dialog-button').click();
+
+    // Check the tab values
+    for (const tab of allTabs) {
+      if (tabs.includes(tab)) {
+        await expect(page.getByRole('tab', { name: tab })).toBeVisible();
+      } else {
+        await expect(page.getByRole('tab', { name: tab })).not.toBeVisible();
+      }
+    }
+  }
+});
+
+test('[TEAMS]: check signature modes work for templates', async ({ page }) => {
+  const { team } = await seedTeamDocuments();
+
+  await apiSignin({
+    page,
+    email: team.owner.email,
+    password: 'password',
+    redirectPath: `/t/${team.url}/settings/preferences`,
+  });
+
+  const allTabs = ['Type', 'Upload', 'Draw'];
+  const tabTest = [['Type', 'Upload', 'Draw'], ['Type', 'Upload'], ['Type']];
+
+  for (const tabs of tabTest) {
+    await page.goto(`/t/${team.url}/settings/preferences`);
+
+    // Update combobox to have the correct tabs
+    await page.getByTestId('signature-types-combobox').click();
+
+    await expect(page.getByRole('option', { name: 'Type' })).toBeVisible();
+    await expect(page.getByRole('option', { name: 'Upload' })).toBeVisible();
+    await expect(page.getByRole('option', { name: 'Draw' })).toBeVisible();
+
+    // Clear all selected items.
+    for (const tab of allTabs) {
+      const item = page.getByRole('option', { name: tab });
+
+      const isSelected = (await item.innerHTML()).includes('opacity-100');
+
+      if (isSelected) {
+        await item.click();
+      }
+    }
+
+    // Selected wanted items.
+    for (const tab of tabs) {
+      const item = page.getByRole('option', { name: tab });
+      await item.click();
+    }
+
+    await page.getByRole('button', { name: 'Update' }).first().click();
+
+    const template = await seedTeamTemplateWithMeta(team);
+
+    await page.goto(`/t/${team.url}/templates/${template.id}`);
+    await page.getByRole('button', { name: 'Use' }).click();
+
+    // Check the send document checkbox to true
+    await page.getByLabel('Send document').click();
+    await page.getByRole('button', { name: 'Create and send' }).click();
+    await page.waitForTimeout(1000);
+
+    const document = await prisma.document.findFirst({
+      where: {
+        templateId: template.id,
+      },
+      include: {
+        documentMeta: true,
+      },
+    });
+
+    // Test kinda flaky, debug here.
+    // console.log({
+    //   tabs,
+    //   typedSignatureEnabled: document?.documentMeta?.typedSignatureEnabled,
+    //   uploadSignatureEnabled: document?.documentMeta?.uploadSignatureEnabled,
+    //   drawSignatureEnabled: document?.documentMeta?.drawSignatureEnabled,
+    // });
+
+    expect(document?.documentMeta?.typedSignatureEnabled).toEqual(tabs.includes('Type'));
+    expect(document?.documentMeta?.uploadSignatureEnabled).toEqual(tabs.includes('Upload'));
+    expect(document?.documentMeta?.drawSignatureEnabled).toEqual(tabs.includes('Draw'));
+  }
+});

packages/app-tests/e2e/templates/direct-templates.spec.ts

@@ -298,6 +298,7 @@ test('[DIRECT_TEMPLATES]: use direct template link with 2 recipients', async ({
     await page.goto(formatDirectTemplatePath(template.directLink?.token || ''));
     await expect(page.getByRole('heading', { name: 'General' })).toBeVisible();
 
+    await page.waitForTimeout(1000);
     await page.getByPlaceholder('recipient@documenso.com').fill(seedTestEmail());
 
     await page.getByRole('button', { name: 'Continue' }).click();

packages/app-tests/e2e/user/update-name.spec.ts

@@ -4,6 +4,7 @@ import { getUserByEmail } from '@documenso/lib/server-only/user/get-user-by-emai
 import { seedUser } from '@documenso/prisma/seed/users';
 
 import { apiSignin } from '../fixtures/authentication';
+import { signSignaturePad } from '../fixtures/signature';
 
 test('[USER] update full name', async ({ page }) => {
   const user = await seedUser();
@@ -12,7 +13,7 @@ test('[USER] update full name', async ({ page }) => {
 
   await page.getByLabel('Full Name').fill('John Doe');
 
-  await page.getByPlaceholder('Type your signature').fill('John Doe');
+  await signSignaturePad(page);
 
   await page.getByRole('button', { name: 'Update profile' }).click();
 

packages/lib/constants/document.ts

@@ -34,3 +34,29 @@ export const DOCUMENT_DISTRIBUTION_METHODS: Record<string, DocumentDistributionM
     description: msg`None`,
   },
 } satisfies Record<DocumentDistributionMethod, DocumentDistributionMethodTypeData>;
+
+export enum DocumentSignatureType {
+  DRAW = 'draw',
+  TYPE = 'type',
+  UPLOAD = 'upload',
+}
+
+type DocumentSignatureTypeData = {
+  label: MessageDescriptor;
+  value: DocumentSignatureType;
+};
+
+export const DOCUMENT_SIGNATURE_TYPES = {
+  [DocumentSignatureType.DRAW]: {
+    label: msg`Draw`,
+    value: DocumentSignatureType.DRAW,
+  },
+  [DocumentSignatureType.TYPE]: {
+    label: msg`Type`,
+    value: DocumentSignatureType.TYPE,
+  },
+  [DocumentSignatureType.UPLOAD]: {
+    label: msg`Upload`,
+    value: DocumentSignatureType.UPLOAD,
+  },
+} satisfies Record<DocumentSignatureType, DocumentSignatureTypeData>;

packages/lib/constants/signatures.ts

@@ -0,0 +1,4 @@
+export const SIGNATURE_CANVAS_DPI = 2;
+export const SIGNATURE_MIN_COVERAGE_THRESHOLD = 0.01;
+
+export const isBase64Image = (value: string) => value.startsWith('data:image/png;base64,');

packages/lib/jobs/definitions/emails/send-team-deleted-email.ts

@@ -23,6 +23,8 @@ const SEND_TEAM_DELETED_EMAIL_JOB_DEFINITION_SCHEMA = z.object({
         brandingHidePoweredBy: z.boolean(),
         teamId: z.number(),
         typedSignatureEnabled: z.boolean(),
+        uploadSignatureEnabled: z.boolean(),
+        drawSignatureEnabled: z.boolean(),
       })
       .nullish(),
   }),

packages/lib/server-only/document-meta/upsert-document-meta.ts

@@ -26,6 +26,8 @@ export type CreateDocumentMetaOptions = {
   signingOrder?: DocumentSigningOrder;
   distributionMethod?: DocumentDistributionMethod;
   typedSignatureEnabled?: boolean;
+  uploadSignatureEnabled?: boolean;
+  drawSignatureEnabled?: boolean;
   language?: SupportedLanguageCodes;
   requestMetadata: ApiRequestMetadata;
 };
@@ -44,6 +46,8 @@ export const upsertDocumentMeta = async ({
   emailSettings,
   distributionMethod,
   typedSignatureEnabled,
+  uploadSignatureEnabled,
+  drawSignatureEnabled,
   language,
   requestMetadata,
 }: CreateDocumentMetaOptions) => {
@@ -96,6 +100,8 @@ export const upsertDocumentMeta = async ({
         emailSettings,
         distributionMethod,
         typedSignatureEnabled,
+        uploadSignatureEnabled,
+        drawSignatureEnabled,
         language,
       },
       update: {
@@ -109,6 +115,8 @@ export const upsertDocumentMeta = async ({
         emailSettings,
         distributionMethod,
         typedSignatureEnabled,
+        uploadSignatureEnabled,
+        drawSignatureEnabled,
         language,
       },
     });

packages/lib/server-only/document/create-document-v2.ts

@@ -158,6 +158,10 @@ export const createDocumentV2 = async ({
             language: meta?.language || team?.teamGlobalSettings?.documentLanguage,
             typedSignatureEnabled:
               meta?.typedSignatureEnabled ?? team?.teamGlobalSettings?.typedSignatureEnabled,
+            uploadSignatureEnabled:
+              meta?.uploadSignatureEnabled ?? team?.teamGlobalSettings?.uploadSignatureEnabled,
+            drawSignatureEnabled:
+              meta?.drawSignatureEnabled ?? team?.teamGlobalSettings?.drawSignatureEnabled,
           },
         },
       },

packages/lib/server-only/document/create-document.ts

@@ -128,8 +128,10 @@ export const createDocument = async ({
         documentMeta: {
           create: {
             language: team?.teamGlobalSettings?.documentLanguage,
-            typedSignatureEnabled: team?.teamGlobalSettings?.typedSignatureEnabled,
             timezone: timezone,
+            typedSignatureEnabled: team?.teamGlobalSettings?.typedSignatureEnabled ?? true,
+            uploadSignatureEnabled: team?.teamGlobalSettings?.uploadSignatureEnabled ?? true,
+            drawSignatureEnabled: team?.teamGlobalSettings?.drawSignatureEnabled ?? true,
           },
         },
       },

packages/lib/server-only/field/sign-field-with-token.ts

@@ -201,7 +201,7 @@ export const signFieldWithToken = async ({
     throw new Error('Signature field must have a signature');
   }
 
-  if (isSignatureField && !documentMeta?.typedSignatureEnabled && typedSignature) {
+  if (isSignatureField && documentMeta?.typedSignatureEnabled === false && typedSignature) {
     throw new Error('Typed signatures are not allowed. Please draw your signature');
   }
 

packages/lib/server-only/team/update-team-document-settings.ts

@@ -1,73 +0,0 @@
-import type { DocumentVisibility } from '@prisma/client';
-import { TeamMemberRole } from '@prisma/client';
-import type { z } from 'zod';
-
-import { prisma } from '@documenso/prisma';
-import { TeamGlobalSettingsSchema } from '@documenso/prisma/generated/zod/modelSchema/TeamGlobalSettingsSchema';
-
-import type { SupportedLanguageCodes } from '../../constants/i18n';
-
-export type UpdateTeamDocumentSettingsOptions = {
-  userId: number;
-  teamId: number;
-
-  settings: {
-    documentVisibility: DocumentVisibility;
-    documentLanguage: SupportedLanguageCodes;
-    includeSenderDetails: boolean;
-    typedSignatureEnabled: boolean;
-    includeSigningCertificate: boolean;
-  };
-};
-
-export const ZUpdateTeamDocumentSettingsResponseSchema = TeamGlobalSettingsSchema;
-
-export type TUpdateTeamDocumentSettingsResponse = z.infer<
-  typeof ZUpdateTeamDocumentSettingsResponseSchema
->;
-
-export const updateTeamDocumentSettings = async ({
-  userId,
-  teamId,
-  settings,
-}: UpdateTeamDocumentSettingsOptions): Promise<TUpdateTeamDocumentSettingsResponse> => {
-  const {
-    documentVisibility,
-    documentLanguage,
-    includeSenderDetails,
-    includeSigningCertificate,
-    typedSignatureEnabled,
-  } = settings;
-
-  const member = await prisma.teamMember.findFirst({
-    where: {
-      userId,
-      teamId,
-    },
-  });
-
-  if (!member || member.role !== TeamMemberRole.ADMIN) {
-    throw new Error('You do not have permission to update this team.');
-  }
-
-  return await prisma.teamGlobalSettings.upsert({
-    where: {
-      teamId,
-    },
-    create: {
-      teamId,
-      documentVisibility,
-      documentLanguage,
-      includeSenderDetails,
-      typedSignatureEnabled,
-      includeSigningCertificate,
-    },
-    update: {
-      documentVisibility,
-      documentLanguage,
-      includeSenderDetails,
-      typedSignatureEnabled,
-      includeSigningCertificate,
-    },
-  });
-};

packages/lib/server-only/template/create-document-from-direct-template.ts

@@ -324,6 +324,9 @@ export const createDocumentFromDirectTemplate = async ({
             language: metaLanguage,
             signingOrder: metaSigningOrder,
             distributionMethod: template.templateMeta?.distributionMethod,
+            typedSignatureEnabled: template.templateMeta?.typedSignatureEnabled,
+            uploadSignatureEnabled: template.templateMeta?.uploadSignatureEnabled,
+            drawSignatureEnabled: template.templateMeta?.drawSignatureEnabled,
           },
         },
       },

packages/lib/server-only/template/create-document-from-template-legacy.ts

@@ -96,6 +96,9 @@ export const createDocumentFromTemplateLegacy = async ({
           signingOrder: template.templateMeta?.signingOrder ?? undefined,
           language:
             template.templateMeta?.language || template.team?.teamGlobalSettings?.documentLanguage,
+          typedSignatureEnabled: template.templateMeta?.typedSignatureEnabled,
+          uploadSignatureEnabled: template.templateMeta?.uploadSignatureEnabled,
+          drawSignatureEnabled: template.templateMeta?.drawSignatureEnabled,
         },
       },
     },

packages/lib/server-only/template/create-document-from-template.ts

@@ -82,8 +82,10 @@ export type CreateDocumentFromTemplateOptions = {
     signingOrder?: DocumentSigningOrder;
     language?: SupportedLanguageCodes;
     distributionMethod?: DocumentDistributionMethod;
-    typedSignatureEnabled?: boolean;
     emailSettings?: TDocumentEmailSettings;
+    typedSignatureEnabled?: boolean;
+    uploadSignatureEnabled?: boolean;
+    drawSignatureEnabled?: boolean;
   };
   requestMetadata: ApiRequestMetadata;
 };
@@ -404,6 +406,10 @@ export const createDocumentFromTemplate = async ({
               template.team?.teamGlobalSettings?.documentLanguage,
             typedSignatureEnabled:
               override?.typedSignatureEnabled ?? template.templateMeta?.typedSignatureEnabled,
+            uploadSignatureEnabled:
+              override?.uploadSignatureEnabled ?? template.templateMeta?.uploadSignatureEnabled,
+            drawSignatureEnabled:
+              override?.drawSignatureEnabled ?? template.templateMeta?.drawSignatureEnabled,
           },
         },
         recipients: {

packages/lib/server-only/template/create-template.ts

@@ -4,6 +4,8 @@ import { prisma } from '@documenso/prisma';
 import { TemplateSchema } from '@documenso/prisma/generated/zod/modelSchema//TemplateSchema';
 import type { TCreateTemplateMutationSchema } from '@documenso/trpc/server/template-router/schema';
 
+import { AppError, AppErrorCode } from '../../errors/app-error';
+
 export type CreateTemplateOptions = TCreateTemplateMutationSchema & {
   userId: number;
   teamId?: number;
@@ -19,8 +21,10 @@ export const createTemplate = async ({
   teamId,
   templateDocumentDataId,
 }: CreateTemplateOptions) => {
+  let team = null;
+
   if (teamId) {
-    await prisma.team.findFirstOrThrow({
+    team = await prisma.team.findFirst({
       where: {
         id: teamId,
         members: {
@@ -29,7 +33,14 @@ export const createTemplate = async ({
           },
         },
       },
+      include: {
+        teamGlobalSettings: true,
+      },
     });
+
+    if (!team) {
+      throw new AppError(AppErrorCode.NOT_FOUND);
+    }
   }
 
   return await prisma.template.create({
@@ -38,6 +49,14 @@ export const createTemplate = async ({
       userId,
       templateDocumentDataId,
       teamId,
+      templateMeta: {
+        create: {
+          language: team?.teamGlobalSettings?.documentLanguage,
+          typedSignatureEnabled: team?.teamGlobalSettings?.typedSignatureEnabled ?? true,
+          uploadSignatureEnabled: team?.teamGlobalSettings?.uploadSignatureEnabled ?? true,
+          drawSignatureEnabled: team?.teamGlobalSettings?.drawSignatureEnabled ?? true,
+        },
+      },
     },
   });
 };

packages/lib/types/document-meta.ts

@@ -0,0 +1,53 @@
+import { msg } from '@lingui/core/macro';
+import { z } from 'zod';
+
+import { DocumentMetaSchema } from '@documenso/prisma/generated/zod/modelSchema/DocumentMetaSchema';
+
+/**
+ * The full document response schema.
+ *
+ * Mainly used for returning a single document from the API.
+ */
+export const ZDocumentMetaSchema = DocumentMetaSchema.pick({
+  signingOrder: true,
+  distributionMethod: true,
+  id: true,
+  subject: true,
+  message: true,
+  timezone: true,
+  password: true,
+  dateFormat: true,
+  documentId: true,
+  redirectUrl: true,
+  typedSignatureEnabled: true,
+  uploadSignatureEnabled: true,
+  drawSignatureEnabled: true,
+  language: true,
+  emailSettings: true,
+});
+
+export type TDocumentMeta = z.infer<typeof ZDocumentMetaSchema>;
+
+/**
+ * If you update this, you must also update the schema.prisma @default value for
+ * - Template meta
+ * - Document meta
+ */
+export const ZDocumentSignatureSettingsSchema = z
+  .object({
+    typedSignatureEnabled: z.boolean(),
+    uploadSignatureEnabled: z.boolean(),
+    drawnSignatureEnabled: z.boolean(),
+  })
+  .refine(
+    (data) => {
+      return (
+        data.typedSignatureEnabled || data.uploadSignatureEnabled || data.drawnSignatureEnabled
+      );
+    },
+    {
+      message: msg`At least one signature type must be enabled`.id,
+    },
+  );
+
+export type TDocumentSignatureSettings = z.infer<typeof ZDocumentSignatureSettingsSchema>;

packages/lib/types/document.ts

@@ -51,6 +51,8 @@ export const ZDocumentSchema = DocumentSchema.pick({
     documentId: true,
     redirectUrl: true,
     typedSignatureEnabled: true,
+    uploadSignatureEnabled: true,
+    drawSignatureEnabled: true,
     language: true,
     emailSettings: true,
   }).nullable(),

packages/lib/types/template.ts

@@ -45,6 +45,8 @@ export const ZTemplateSchema = TemplateSchema.pick({
     dateFormat: true,
     signingOrder: true,
     typedSignatureEnabled: true,
+    uploadSignatureEnabled: true,
+    drawSignatureEnabled: true,
     distributionMethod: true,
     templateId: true,
     redirectUrl: true,

packages/lib/types/webhook-payload.ts

@@ -47,6 +47,8 @@ export const ZWebhookDocumentMetaSchema = z.object({
   redirectUrl: z.string().nullable(),
   signingOrder: z.nativeEnum(DocumentSigningOrder),
   typedSignatureEnabled: z.boolean(),
+  uploadSignatureEnabled: z.boolean(),
+  drawSignatureEnabled: z.boolean(),
   language: z.string(),
   distributionMethod: z.nativeEnum(DocumentDistributionMethod),
   emailSettings: z.any().nullable(),

packages/lib/utils/teams.ts

@@ -1,4 +1,5 @@
 import { NEXT_PUBLIC_WEBAPP_URL } from '../constants/app';
+import { DocumentSignatureType } from '../constants/document';
 import type { TEAM_MEMBER_ROLE_MAP } from '../constants/teams';
 import { TEAM_MEMBER_ROLE_HIERARCHY, TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '../constants/teams';
 
@@ -44,3 +45,31 @@ export const isTeamRoleWithinUserHierarchy = (
 ) => {
   return TEAM_MEMBER_ROLE_HIERARCHY[currentUserRole].some((i) => i === roleToCheck);
 };
+
+export const extractTeamSignatureSettings = (
+  settings?: {
+    typedSignatureEnabled: boolean;
+    drawSignatureEnabled: boolean;
+    uploadSignatureEnabled: boolean;
+  } | null,
+) => {
+  if (!settings) {
+    return [DocumentSignatureType.TYPE, DocumentSignatureType.UPLOAD, DocumentSignatureType.DRAW];
+  }
+
+  const signatureTypes: DocumentSignatureType[] = [];
+
+  if (settings.typedSignatureEnabled) {
+    signatureTypes.push(DocumentSignatureType.TYPE);
+  }
+
+  if (settings.drawSignatureEnabled) {
+    signatureTypes.push(DocumentSignatureType.DRAW);
+  }
+
+  if (settings.uploadSignatureEnabled) {
+    signatureTypes.push(DocumentSignatureType.UPLOAD);
+  }
+
+  return signatureTypes;
+};

packages/prisma/migrations/20250313015104_add_signatures_toggle/migration.sql

@@ -0,0 +1,11 @@
+-- AlterTable
+ALTER TABLE "DocumentMeta" ADD COLUMN     "drawSignatureEnabled" BOOLEAN NOT NULL DEFAULT true,
+ADD COLUMN     "uploadSignatureEnabled" BOOLEAN NOT NULL DEFAULT true;
+
+-- AlterTable
+ALTER TABLE "TeamGlobalSettings" ADD COLUMN     "drawSignatureEnabled" BOOLEAN NOT NULL DEFAULT true,
+ADD COLUMN     "uploadSignatureEnabled" BOOLEAN NOT NULL DEFAULT true;
+
+-- AlterTable
+ALTER TABLE "TemplateMeta" ADD COLUMN     "drawSignatureEnabled" BOOLEAN NOT NULL DEFAULT true,
+ADD COLUMN     "uploadSignatureEnabled" BOOLEAN NOT NULL DEFAULT true;

packages/prisma/prisma-middleware.ts

@@ -0,0 +1,25 @@
+import type { PrismaClient } from '@prisma/client';
+
+export function addPrismaMiddleware(prisma: PrismaClient) {
+  prisma.$use(async (params, next) => {
+    // Check if we're creating a new team
+    if (params.model === 'Team' && params.action === 'create') {
+      // Execute the team creation
+      const result = await next(params);
+
+      // Create the TeamGlobalSettings
+      await prisma.teamGlobalSettings.create({
+        data: {
+          teamId: result.id,
+        },
+      });
+
+      return result;
+    }
+
+    // For all other operations, just pass through
+    return next(params);
+  });
+
+  return prisma;
+}

packages/prisma/schema.prisma

@@ -390,20 +390,25 @@ enum DocumentDistributionMethod {
 
 /// @zod.import(["import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';"])
 model DocumentMeta {
-  id                    String                     @id @default(cuid())
+  id           String               @id @default(cuid())
-  subject               String?
+  subject      String?
-  message               String?
+  message      String?
-  timezone              String?                    @default("Etc/UTC") @db.Text
+  timezone     String?              @default("Etc/UTC") @db.Text
-  password              String?
+  password     String?
-  dateFormat            String?                    @default("yyyy-MM-dd hh:mm a") @db.Text
+  dateFormat   String?              @default("yyyy-MM-dd hh:mm a") @db.Text
-  documentId            Int                        @unique
+  documentId   Int                  @unique
-  document              Document                   @relation(fields: [documentId], references: [id], onDelete: Cascade)
+  document     Document             @relation(fields: [documentId], references: [id], onDelete: Cascade)
-  redirectUrl           String?
+  redirectUrl  String?
-  signingOrder          DocumentSigningOrder       @default(PARALLEL)
+  signingOrder DocumentSigningOrder @default(PARALLEL)
-  typedSignatureEnabled Boolean                    @default(true)
+
-  language              String                     @default("en")
+  typedSignatureEnabled  Boolean @default(true)
-  distributionMethod    DocumentDistributionMethod @default(EMAIL)
+  uploadSignatureEnabled Boolean @default(true)
-  emailSettings         Json? /// [DocumentEmailSettings] @zod.custom.use(ZDocumentEmailSettingsSchema)
+  drawSignatureEnabled   Boolean @default(true)
+
+  language           String                     @default("en")
+  distributionMethod DocumentDistributionMethod @default(EMAIL)
+
+  emailSettings Json? /// [DocumentEmailSettings] @zod.custom.use(ZDocumentEmailSettingsSchema)
 }
 
 enum ReadStatus {
@@ -544,9 +549,12 @@ model TeamGlobalSettings {
   documentVisibility        DocumentVisibility @default(EVERYONE)
   documentLanguage          String             @default("en")
   includeSenderDetails      Boolean            @default(true)
-  typedSignatureEnabled     Boolean            @default(true)
   includeSigningCertificate Boolean            @default(true)
 
+  typedSignatureEnabled  Boolean @default(true)
+  uploadSignatureEnabled Boolean @default(true)
+  drawSignatureEnabled   Boolean @default(true)
+
   brandingEnabled        Boolean @default(false)
   brandingLogo           String  @default("")
   brandingUrl            String  @default("")
@@ -660,15 +668,18 @@ enum TemplateType {
 
 /// @zod.import(["import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';"])
 model TemplateMeta {
-  id                    String                     @id @default(cuid())
+  id                 String                     @id @default(cuid())
-  subject               String?
+  subject            String?
-  message               String?
+  message            String?
-  timezone              String?                    @default("Etc/UTC") @db.Text
+  timezone           String?                    @default("Etc/UTC") @db.Text
-  password              String?
+  password           String?
-  dateFormat            String?                    @default("yyyy-MM-dd hh:mm a") @db.Text
+  dateFormat         String?                    @default("yyyy-MM-dd hh:mm a") @db.Text
-  signingOrder          DocumentSigningOrder?      @default(PARALLEL)
+  signingOrder       DocumentSigningOrder?      @default(PARALLEL)
-  typedSignatureEnabled Boolean                    @default(true)
+  distributionMethod DocumentDistributionMethod @default(EMAIL)
-  distributionMethod    DocumentDistributionMethod @default(EMAIL)
+
+  typedSignatureEnabled  Boolean @default(true)
+  uploadSignatureEnabled Boolean @default(true)
+  drawSignatureEnabled   Boolean @default(true)
 
   templateId    Int      @unique
   template      Template @relation(fields: [templateId], references: [id], onDelete: Cascade)

packages/prisma/seed/documents.ts

@@ -1,9 +1,12 @@
-import type { Document, User } from '@prisma/client';
+import type { Document, Team, User } from '@prisma/client';
 import { nanoid } from 'nanoid';
 import fs from 'node:fs';
 import path from 'node:path';
 import { match } from 'ts-pattern';
 
+import { createDocument } from '@documenso/lib/server-only/document/create-document';
+import { createTemplate } from '@documenso/lib/server-only/template/create-template';
+
 import { prisma } from '..';
 import {
   DocumentDataType,
@@ -87,6 +90,145 @@ export const unseedDocument = async (documentId: number) => {
   });
 };
 
+export const seedTeamDocumentWithMeta = async (team: Team) => {
+  const documentData = await prisma.documentData.create({
+    data: {
+      type: DocumentDataType.BYTES_64,
+      data: examplePdf,
+      initialData: examplePdf,
+    },
+  });
+
+  const document = await createDocument({
+    userId: team.ownerUserId,
+    teamId: team.id,
+    title: `[TEST] Document ${nanoid(8)} - Draft`,
+    documentDataId: documentData.id,
+    normalizePdf: true,
+    requestMetadata: {
+      auth: null,
+      requestMetadata: {},
+      source: 'app',
+    },
+  });
+
+  const owner = await prisma.user.findFirstOrThrow({
+    where: {
+      id: team.ownerUserId,
+    },
+  });
+
+  await prisma.document.update({
+    where: {
+      id: document.id,
+    },
+    data: {
+      status: DocumentStatus.PENDING,
+    },
+  });
+
+  await prisma.recipient.create({
+    data: {
+      email: owner.email,
+      name: owner.name ?? '',
+      token: nanoid(),
+      readStatus: ReadStatus.OPENED,
+      sendStatus: SendStatus.SENT,
+      signingStatus: SigningStatus.NOT_SIGNED,
+      signedAt: new Date(),
+      document: {
+        connect: {
+          id: document.id,
+        },
+      },
+      fields: {
+        create: {
+          page: 1,
+          type: FieldType.SIGNATURE,
+          inserted: false,
+          customText: '',
+          positionX: new Prisma.Decimal(1),
+          positionY: new Prisma.Decimal(1),
+          width: new Prisma.Decimal(5),
+          height: new Prisma.Decimal(5),
+          documentId: document.id,
+        },
+      },
+    },
+  });
+
+  return await prisma.document.findFirstOrThrow({
+    where: {
+      id: document.id,
+    },
+    include: {
+      recipients: true,
+    },
+  });
+};
+
+export const seedTeamTemplateWithMeta = async (team: Team) => {
+  const documentData = await prisma.documentData.create({
+    data: {
+      type: DocumentDataType.BYTES_64,
+      data: examplePdf,
+      initialData: examplePdf,
+    },
+  });
+
+  const template = await createTemplate({
+    title: `[TEST] Template ${nanoid(8)} - Draft`,
+    userId: team.ownerUserId,
+    teamId: team.id,
+    templateDocumentDataId: documentData.id,
+  });
+
+  const owner = await prisma.user.findFirstOrThrow({
+    where: {
+      id: team.ownerUserId,
+    },
+  });
+
+  await prisma.recipient.create({
+    data: {
+      email: owner.email,
+      name: owner.name ?? '',
+      token: nanoid(),
+      readStatus: ReadStatus.OPENED,
+      sendStatus: SendStatus.SENT,
+      signingStatus: SigningStatus.NOT_SIGNED,
+      signedAt: new Date(),
+      template: {
+        connect: {
+          id: template.id,
+        },
+      },
+      fields: {
+        create: {
+          page: 1,
+          type: FieldType.SIGNATURE,
+          inserted: false,
+          customText: '',
+          positionX: new Prisma.Decimal(1),
+          positionY: new Prisma.Decimal(1),
+          width: new Prisma.Decimal(5),
+          height: new Prisma.Decimal(5),
+          templateId: template.id,
+        },
+      },
+    },
+  });
+
+  return await prisma.document.findFirstOrThrow({
+    where: {
+      id: template.id,
+    },
+    include: {
+      recipients: true,
+    },
+  });
+};
+
 export const seedDraftDocument = async (
   sender: User,
   recipients: (User | string)[],

packages/tailwind-config/index.cjs

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const { fontFamily } = require('tailwindcss/defaultTheme');
+const { default: flattenColorPalette } = require('tailwindcss/lib/util/flattenColorPalette');
 
 /** @type {import('tailwindcss').Config} */
 module.exports = {
@@ -14,6 +15,9 @@ module.exports = {
       zIndex: {
         9999: '9999',
       },
+      aspectRatio: {
+        'signature-pad': '16 / 7',
+      },
       colors: {
         border: 'hsl(var(--border))',
         'field-border': 'hsl(var(--field-border))',
@@ -147,5 +151,17 @@ module.exports = {
     require('tailwindcss-animate'),
     require('@tailwindcss/typography'),
     require('@tailwindcss/container-queries'),
+    addVariablesForColors,
   ],
 };
+
+function addVariablesForColors({ addBase, theme }) {
+  let allColors = flattenColorPalette(theme('colors'));
+  let newVars = Object.fromEntries(
+    Object.entries(allColors).map(([key, val]) => [`--${key}`, val]),
+  );
+
+  addBase({
+    ':root': newVars,
+  });
+}

packages/trpc/server/document-router/router.ts

@@ -56,9 +56,12 @@ import {
   ZSearchDocumentsMutationSchema,
   ZSetSigningOrderForDocumentMutationSchema,
   ZSuccessResponseSchema,
+} from './schema';
+import { updateDocumentRoute } from './update-document';
+import {
   ZUpdateDocumentRequestSchema,
   ZUpdateDocumentResponseSchema,
-} from './schema';
+} from './update-document.types';
 
 export const documentRouter = router({
   /**
@@ -335,20 +338,12 @@ export const documentRouter = router({
       });
     }),
 
+  updateDocument: updateDocumentRoute,
+
   /**
-   * @public
+   * @deprecated Delete this after updateDocument endpoint is deployed
-   *
-   * Todo: Refactor to updateDocument.
    */
   setSettingsForDocument: authenticatedProcedure
-    .meta({
-      openapi: {
-        method: 'POST',
-        path: '/document/update',
-        summary: 'Update document',
-        tags: ['Document'],
-      },
-    })
     .input(ZUpdateDocumentRequestSchema)
     .output(ZUpdateDocumentResponseSchema)
     .mutation(async ({ input, ctx }) => {
@@ -368,6 +363,8 @@ export const documentRouter = router({
           dateFormat: meta.dateFormat,
           language: meta.language,
           typedSignatureEnabled: meta.typedSignatureEnabled,
+          uploadSignatureEnabled: meta.uploadSignatureEnabled,
+          drawSignatureEnabled: meta.drawSignatureEnabled,
           redirectUrl: meta.redirectUrl,
           distributionMethod: meta.distributionMethod,
           signingOrder: meta.signingOrder,

packages/trpc/server/document-router/schema.ts

@@ -109,6 +109,14 @@ export const ZDocumentMetaTypedSignatureEnabledSchema = z
   .boolean()
   .describe('Whether to allow recipients to sign using a typed signature.');
 
+export const ZDocumentMetaDrawSignatureEnabledSchema = z
+  .boolean()
+  .describe('Whether to allow recipients to sign using a draw signature.');
+
+export const ZDocumentMetaUploadSignatureEnabledSchema = z
+  .boolean()
+  .describe('Whether to allow recipients to sign using an uploaded signature.');
+
 export const ZFindDocumentsRequestSchema = ZFindSearchParamsSchema.extend({
   templateId: z
     .number()
@@ -233,6 +241,8 @@ export const ZCreateDocumentV2RequestSchema = z.object({
       redirectUrl: ZDocumentMetaRedirectUrlSchema.optional(),
       language: ZDocumentMetaLanguageSchema.optional(),
       typedSignatureEnabled: ZDocumentMetaTypedSignatureEnabledSchema.optional(),
+      drawSignatureEnabled: ZDocumentMetaDrawSignatureEnabledSchema.optional(),
+      uploadSignatureEnabled: ZDocumentMetaUploadSignatureEnabledSchema.optional(),
       emailSettings: ZDocumentEmailSettingsSchema.optional(),
     })
     .optional(),
@@ -249,35 +259,6 @@ export const ZCreateDocumentV2ResponseSchema = z.object({
     ),
 });
 
-export const ZUpdateDocumentRequestSchema = z.object({
-  documentId: z.number(),
-  data: z
-    .object({
-      title: ZDocumentTitleSchema.optional(),
-      externalId: ZDocumentExternalIdSchema.nullish(),
-      visibility: ZDocumentVisibilitySchema.optional(),
-      globalAccessAuth: ZDocumentAccessAuthTypesSchema.nullish(),
-      globalActionAuth: ZDocumentActionAuthTypesSchema.nullish(),
-    })
-    .optional(),
-  meta: z
-    .object({
-      subject: ZDocumentMetaSubjectSchema.optional(),
-      message: ZDocumentMetaMessageSchema.optional(),
-      timezone: ZDocumentMetaTimezoneSchema.optional(),
-      dateFormat: ZDocumentMetaDateFormatSchema.optional(),
-      distributionMethod: ZDocumentMetaDistributionMethodSchema.optional(),
-      signingOrder: z.nativeEnum(DocumentSigningOrder).optional(),
-      redirectUrl: ZDocumentMetaRedirectUrlSchema.optional(),
-      language: ZDocumentMetaLanguageSchema.optional(),
-      typedSignatureEnabled: ZDocumentMetaTypedSignatureEnabledSchema.optional(),
-      emailSettings: ZDocumentEmailSettingsSchema.optional(),
-    })
-    .optional(),
-});
-
-export const ZUpdateDocumentResponseSchema = ZDocumentLiteSchema;
-
 export const ZSetFieldsForDocumentMutationSchema = z.object({
   documentId: z.number(),
   fields: z.array(

packages/trpc/server/document-router/update-document.ts

@@ -0,0 +1,52 @@
+import { upsertDocumentMeta } from '@documenso/lib/server-only/document-meta/upsert-document-meta';
+import { updateDocument } from '@documenso/lib/server-only/document/update-document';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZUpdateDocumentRequestSchema,
+  ZUpdateDocumentResponseSchema,
+} from './update-document.types';
+import { updateDocumentMeta } from './update-document.types';
+
+/**
+ * Public route.
+ */
+export const updateDocumentRoute = authenticatedProcedure
+  .meta(updateDocumentMeta)
+  .input(ZUpdateDocumentRequestSchema)
+  .output(ZUpdateDocumentResponseSchema)
+  .mutation(async ({ input, ctx }) => {
+    const { teamId } = ctx;
+    const { documentId, data, meta = {} } = input;
+
+    const userId = ctx.user.id;
+
+    if (Object.values(meta).length > 0) {
+      await upsertDocumentMeta({
+        userId: ctx.user.id,
+        teamId,
+        documentId,
+        subject: meta.subject,
+        message: meta.message,
+        timezone: meta.timezone,
+        dateFormat: meta.dateFormat,
+        language: meta.language,
+        typedSignatureEnabled: meta.typedSignatureEnabled,
+        uploadSignatureEnabled: meta.uploadSignatureEnabled,
+        drawSignatureEnabled: meta.drawSignatureEnabled,
+        redirectUrl: meta.redirectUrl,
+        distributionMethod: meta.distributionMethod,
+        signingOrder: meta.signingOrder,
+        emailSettings: meta.emailSettings,
+        requestMetadata: ctx.metadata,
+      });
+    }
+
+    return await updateDocument({
+      userId,
+      teamId,
+      documentId,
+      data,
+      requestMetadata: ctx.metadata,
+    });
+  });

packages/trpc/server/document-router/update-document.types.ts

@@ -0,0 +1,67 @@
+import { DocumentSigningOrder } from '@prisma/client';
+// import type { OpenApiMeta } from 'trpc-to-openapi';
+import { z } from 'zod';
+
+import { ZDocumentLiteSchema } from '@documenso/lib/types/document';
+import {
+  ZDocumentAccessAuthTypesSchema,
+  ZDocumentActionAuthTypesSchema,
+} from '@documenso/lib/types/document-auth';
+import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';
+
+import type { TrpcRouteMeta } from '../trpc';
+import {
+  ZDocumentExternalIdSchema,
+  ZDocumentMetaDateFormatSchema,
+  ZDocumentMetaDistributionMethodSchema,
+  ZDocumentMetaDrawSignatureEnabledSchema,
+  ZDocumentMetaLanguageSchema,
+  ZDocumentMetaMessageSchema,
+  ZDocumentMetaRedirectUrlSchema,
+  ZDocumentMetaSubjectSchema,
+  ZDocumentMetaTimezoneSchema,
+  ZDocumentMetaTypedSignatureEnabledSchema,
+  ZDocumentMetaUploadSignatureEnabledSchema,
+  ZDocumentTitleSchema,
+  ZDocumentVisibilitySchema,
+} from './schema';
+
+export const updateDocumentMeta: TrpcRouteMeta = {
+  openapi: {
+    method: 'POST',
+    path: '/document/update',
+    summary: 'Update document',
+    tags: ['Document'],
+  },
+};
+
+export const ZUpdateDocumentRequestSchema = z.object({
+  documentId: z.number(),
+  data: z
+    .object({
+      title: ZDocumentTitleSchema.optional(),
+      externalId: ZDocumentExternalIdSchema.nullish(),
+      visibility: ZDocumentVisibilitySchema.optional(),
+      globalAccessAuth: ZDocumentAccessAuthTypesSchema.nullish(),
+      globalActionAuth: ZDocumentActionAuthTypesSchema.nullish(),
+    })
+    .optional(),
+  meta: z
+    .object({
+      subject: ZDocumentMetaSubjectSchema.optional(),
+      message: ZDocumentMetaMessageSchema.optional(),
+      timezone: ZDocumentMetaTimezoneSchema.optional(),
+      dateFormat: ZDocumentMetaDateFormatSchema.optional(),
+      distributionMethod: ZDocumentMetaDistributionMethodSchema.optional(),
+      signingOrder: z.nativeEnum(DocumentSigningOrder).optional(),
+      redirectUrl: ZDocumentMetaRedirectUrlSchema.optional(),
+      language: ZDocumentMetaLanguageSchema.optional(),
+      typedSignatureEnabled: ZDocumentMetaTypedSignatureEnabledSchema.optional(),
+      uploadSignatureEnabled: ZDocumentMetaUploadSignatureEnabledSchema.optional(),
+      drawSignatureEnabled: ZDocumentMetaDrawSignatureEnabledSchema.optional(),
+      emailSettings: ZDocumentEmailSettingsSchema.optional(),
+    })
+    .optional(),
+});
+
+export const ZUpdateDocumentResponseSchema = ZDocumentLiteSchema;

packages/trpc/server/team-router/router.ts

@@ -33,7 +33,6 @@ import { resendTeamEmailVerification } from '@documenso/lib/server-only/team/res
 import { resendTeamMemberInvitation } from '@documenso/lib/server-only/team/resend-team-member-invitation';
 import { updateTeam } from '@documenso/lib/server-only/team/update-team';
 import { updateTeamBrandingSettings } from '@documenso/lib/server-only/team/update-team-branding-settings';
-import { updateTeamDocumentSettings } from '@documenso/lib/server-only/team/update-team-document-settings';
 import { updateTeamEmail } from '@documenso/lib/server-only/team/update-team-email';
 import { updateTeamMember } from '@documenso/lib/server-only/team/update-team-member';
 import { updateTeamPublicProfile } from '@documenso/lib/server-only/team/update-team-public-profile';
@@ -66,12 +65,12 @@ import {
   ZResendTeamEmailVerificationMutationSchema,
   ZResendTeamMemberInvitationMutationSchema,
   ZUpdateTeamBrandingSettingsMutationSchema,
-  ZUpdateTeamDocumentSettingsMutationSchema,
   ZUpdateTeamEmailMutationSchema,
   ZUpdateTeamMemberMutationSchema,
   ZUpdateTeamMutationSchema,
   ZUpdateTeamPublicProfileMutationSchema,
 } from './schema';
+import { updateTeamDocumentSettingsRoute } from './update-team-document-settings';
 
 export const teamRouter = router({
   // Internal endpoint for now.
@@ -571,18 +570,7 @@ export const teamRouter = router({
     return await getTeamPrices();
   }),
 
-  // Internal endpoint. Use updateTeam instead.
+  updateTeamDocumentSettings: updateTeamDocumentSettingsRoute,
-  updateTeamDocumentSettings: authenticatedProcedure
-    .input(ZUpdateTeamDocumentSettingsMutationSchema)
-    .mutation(async ({ ctx, input }) => {
-      const { teamId, settings } = input;
-
-      return await updateTeamDocumentSettings({
-        userId: ctx.user.id,
-        teamId,
-        settings,
-      });
-    }),
 
   // Internal endpoint for now.
   acceptTeamInvitation: authenticatedProcedure

packages/trpc/server/team-router/schema.ts

@@ -1,7 +1,6 @@
-import { DocumentVisibility, TeamMemberRole } from '@prisma/client';
+import { TeamMemberRole } from '@prisma/client';
 import { z } from 'zod';
 
-import { SUPPORTED_LANGUAGE_CODES } from '@documenso/lib/constants/i18n';
 import { PROTECTED_TEAM_URLS } from '@documenso/lib/constants/teams';
 import { ZFindSearchParamsSchema } from '@documenso/lib/types/search-params';
 
@@ -195,20 +194,6 @@ export const ZUpdateTeamBrandingSettingsMutationSchema = z.object({
   }),
 });
 
-export const ZUpdateTeamDocumentSettingsMutationSchema = z.object({
-  teamId: z.number(),
-  settings: z.object({
-    documentVisibility: z
-      .nativeEnum(DocumentVisibility)
-      .optional()
-      .default(DocumentVisibility.EVERYONE),
-    documentLanguage: z.enum(SUPPORTED_LANGUAGE_CODES).optional().default('en'),
-    includeSenderDetails: z.boolean().optional().default(false),
-    typedSignatureEnabled: z.boolean().optional().default(true),
-    includeSigningCertificate: z.boolean().optional().default(true),
-  }),
-});
-
 export type TCreateTeamMutationSchema = z.infer<typeof ZCreateTeamMutationSchema>;
 export type TCreateTeamEmailVerificationMutationSchema = z.infer<
   typeof ZCreateTeamEmailVerificationMutationSchema
@@ -247,6 +232,3 @@ export type TResendTeamMemberInvitationMutationSchema = z.infer<
 export type TUpdateTeamBrandingSettingsMutationSchema = z.infer<
   typeof ZUpdateTeamBrandingSettingsMutationSchema
 >;
-export type TUpdateTeamDocumentSettingsMutationSchema = z.infer<
-  typeof ZUpdateTeamDocumentSettingsMutationSchema
->;

packages/trpc/server/team-router/update-team-document-settings.ts

@@ -0,0 +1,71 @@
+import { TEAM_MEMBER_ROLE_PERMISSIONS_MAP } from '@documenso/lib/constants/teams';
+import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
+import { prisma } from '@documenso/prisma';
+
+import { authenticatedProcedure } from '../trpc';
+import {
+  ZUpdateTeamDocumentSettingsRequestSchema,
+  ZUpdateTeamDocumentSettingsResponseSchema,
+} from './update-team-document-settings.types';
+
+/**
+ * Private route.
+ */
+export const updateTeamDocumentSettingsRoute = authenticatedProcedure
+  .input(ZUpdateTeamDocumentSettingsRequestSchema)
+  .output(ZUpdateTeamDocumentSettingsResponseSchema)
+  .mutation(async ({ ctx, input }) => {
+    const { user } = ctx;
+    const { teamId, settings } = input;
+
+    const {
+      documentVisibility,
+      documentLanguage,
+      includeSenderDetails,
+      includeSigningCertificate,
+      typedSignatureEnabled,
+      uploadSignatureEnabled,
+      drawSignatureEnabled,
+    } = settings;
+
+    const member = await prisma.teamMember.findFirst({
+      where: {
+        userId: user.id,
+        teamId,
+        role: {
+          in: TEAM_MEMBER_ROLE_PERMISSIONS_MAP.MANAGE_TEAM,
+        },
+      },
+    });
+
+    if (!member) {
+      throw new AppError(AppErrorCode.UNAUTHORIZED, {
+        message: 'You do not have permission to update this team.',
+      });
+    }
+
+    return await prisma.teamGlobalSettings.upsert({
+      where: {
+        teamId,
+      },
+      create: {
+        teamId,
+        documentVisibility,
+        documentLanguage,
+        includeSenderDetails,
+        includeSigningCertificate,
+        typedSignatureEnabled,
+        uploadSignatureEnabled,
+        drawSignatureEnabled,
+      },
+      update: {
+        documentVisibility,
+        documentLanguage,
+        includeSenderDetails,
+        includeSigningCertificate,
+        typedSignatureEnabled,
+        uploadSignatureEnabled,
+        drawSignatureEnabled,
+      },
+    });
+  });

packages/trpc/server/team-router/update-team-document-settings.types.ts

@@ -0,0 +1,23 @@
+import { z } from 'zod';
+
+import { SUPPORTED_LANGUAGE_CODES } from '@documenso/lib/constants/i18n';
+import { DocumentVisibility } from '@documenso/lib/types/document-visibility';
+import TeamGlobalSettingsSchema from '@documenso/prisma/generated/zod/modelSchema/TeamGlobalSettingsSchema';
+
+export const ZUpdateTeamDocumentSettingsRequestSchema = z.object({
+  teamId: z.number(),
+  settings: z.object({
+    documentVisibility: z
+      .nativeEnum(DocumentVisibility)
+      .optional()
+      .default(DocumentVisibility.EVERYONE),
+    documentLanguage: z.enum(SUPPORTED_LANGUAGE_CODES).optional().default('en'),
+    includeSenderDetails: z.boolean().optional().default(false),
+    includeSigningCertificate: z.boolean().optional().default(true),
+    typedSignatureEnabled: z.boolean().optional().default(true),
+    uploadSignatureEnabled: z.boolean().optional().default(true),
+    drawSignatureEnabled: z.boolean().optional().default(true),
+  }),
+});
+
+export const ZUpdateTeamDocumentSettingsResponseSchema = TeamGlobalSettingsSchema;

packages/trpc/server/template-router/schema.ts

@@ -19,12 +19,14 @@ import { TemplateDirectLinkSchema } from '@documenso/prisma/generated/zod/modelS
 import {
   ZDocumentMetaDateFormatSchema,
   ZDocumentMetaDistributionMethodSchema,
+  ZDocumentMetaDrawSignatureEnabledSchema,
   ZDocumentMetaLanguageSchema,
   ZDocumentMetaMessageSchema,
   ZDocumentMetaRedirectUrlSchema,
   ZDocumentMetaSubjectSchema,
   ZDocumentMetaTimezoneSchema,
   ZDocumentMetaTypedSignatureEnabledSchema,
+  ZDocumentMetaUploadSignatureEnabledSchema,
 } from '../document-router/schema';
 import { ZSignFieldWithTokenMutationSchema } from '../field-router/schema';
 
@@ -164,6 +166,8 @@ export const ZUpdateTemplateRequestSchema = z.object({
       redirectUrl: ZDocumentMetaRedirectUrlSchema.optional(),
       language: ZDocumentMetaLanguageSchema.optional(),
       typedSignatureEnabled: ZDocumentMetaTypedSignatureEnabledSchema.optional(),
+      uploadSignatureEnabled: ZDocumentMetaUploadSignatureEnabledSchema.optional(),
+      drawSignatureEnabled: ZDocumentMetaDrawSignatureEnabledSchema.optional(),
       signingOrder: z.nativeEnum(DocumentSigningOrder).optional(),
     })
     .optional(),

packages/trpc/server/trpc.ts

@@ -9,8 +9,8 @@ import { isAdmin } from '@documenso/lib/utils/is-admin';
 
 import type { TrpcContext } from './context';
 
-// Can't import type from trpc-to-openapi because it breaks nextjs build, not sure why.
+// Can't import type from trpc-to-openapi because it breaks build, not sure why.
-type OpenApiMeta = {
+export type TrpcRouteMeta = {
   openapi?: {
     enabled?: boolean;
     method: 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE';
@@ -30,7 +30,7 @@ type OpenApiMeta = {
 } & Record<string, unknown>;
 
 const t = initTRPC
-  .meta<OpenApiMeta>()
+  .meta<TrpcRouteMeta>()
   .context<TrpcContext>()
   .create({
     transformer: SuperJSON,

packages/ui/components/document/document-signature-settings-tooltip.tsx

@@ -0,0 +1,58 @@
+import { Trans } from '@lingui/react/macro';
+import { InfoIcon } from 'lucide-react';
+
+import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
+
+export const DocumentSignatureSettingsTooltip = () => {
+  return (
+    <Tooltip>
+      <TooltipTrigger>
+        <InfoIcon className="mx-2 h-4 w-4" />
+      </TooltipTrigger>
+
+      <TooltipContent className="text-foreground max-w-md space-y-2 p-4">
+        <h2>
+          <strong>
+            <Trans>Signature types</Trans>
+          </strong>
+        </h2>
+
+        <p>
+          <Trans>
+            The types of signatures that recipients are allowed to use when signing the document.
+          </Trans>
+        </p>
+
+        <ul className="ml-3.5 list-outside list-disc space-y-0.5 py-2">
+          <li>
+            <Trans>
+              <strong>
+                <Trans>Drawn</Trans>
+              </strong>
+              {' - '}
+              <Trans>A signature that is drawn using a mouse or stylus.</Trans>
+            </Trans>
+          </li>
+          <li>
+            <Trans>
+              <strong>
+                <Trans>Typed</Trans>
+              </strong>
+              {' - '}
+              <Trans>A signature that is typed using a keyboard.</Trans>
+            </Trans>
+          </li>
+          <li>
+            <Trans>
+              <strong>
+                <Trans>Uploaded</Trans>
+              </strong>
+              {' - '}
+              <Trans>A signature that is uploaded from a file.</Trans>
+            </Trans>
+          </li>
+        </ul>
+      </TooltipContent>
+    </Tooltip>
+  );
+};

packages/ui/primitives/document-flow/add-fields.tsx

@@ -47,9 +47,8 @@ import { cn } from '../../lib/utils';
 import { Alert, AlertDescription } from '../alert';
 import { Button } from '../button';
 import { Card, CardContent } from '../card';
-import { Checkbox } from '../checkbox';
 import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem } from '../command';
-import { Form, FormControl, FormField, FormItem, FormLabel } from '../form/form';
+import { Form } from '../form/form';
 import { Popover, PopoverContent, PopoverTrigger } from '../popover';
 import { useStep } from '../stepper';
 import { Tooltip, TooltipContent, TooltipTrigger } from '../tooltip';
@@ -94,7 +93,6 @@ export type AddFieldsFormProps = {
   onSubmit: (_data: TAddFieldsFormSchema) => void;
   canGoBack?: boolean;
   isDocumentPdfLoaded: boolean;
-  typedSignatureEnabled?: boolean;
   teamId?: number;
 };
 
@@ -106,7 +104,6 @@ export const AddFieldsFormPartial = ({
   onSubmit,
   canGoBack = false,
   isDocumentPdfLoaded,
-  typedSignatureEnabled,
   teamId,
 }: AddFieldsFormProps) => {
   const { toast } = useToast();
@@ -137,7 +134,6 @@ export const AddFieldsFormPartial = ({
           recipients.find((recipient) => recipient.id === field.recipientId)?.email ?? '',
         fieldMeta: field.fieldMeta ? ZFieldMetaSchema.parse(field.fieldMeta) : undefined,
       })),
-      typedSignatureEnabled: typedSignatureEnabled ?? false,
     },
   });
 
@@ -787,31 +783,6 @@ export const AddFieldsFormPartial = ({
               )}
 
               <Form {...form}>
-                <FormField
-                  control={form.control}
-                  name="typedSignatureEnabled"
-                  render={({ field: { value, ...field } }) => (
-                    <FormItem className="mb-6 flex flex-row items-center space-x-2 space-y-0">
-                      <FormControl>
-                        <Checkbox
-                          {...field}
-                          id="typedSignatureEnabled"
-                          checked={value}
-                          onCheckedChange={(checked) => field.onChange(checked)}
-                          disabled={form.formState.isSubmitting}
-                        />
-                      </FormControl>
-
-                      <FormLabel
-                        htmlFor="typedSignatureEnabled"
-                        className="text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                      >
-                        <Trans>Enable Typed Signatures</Trans>
-                      </FormLabel>
-                    </FormItem>
-                  )}
-                />
-
                 <div className="-mx-2 flex-1 overflow-y-auto px-2">
                   <fieldset disabled={isFieldsDisabled} className="my-2 grid grid-cols-3 gap-4">
                     <button

packages/ui/primitives/document-flow/add-fields.types.ts

@@ -18,7 +18,6 @@ export const ZAddFieldsFormSchema = z.object({
       fieldMeta: ZFieldMetaSchema,
     }),
   ),
-  typedSignatureEnabled: z.boolean(),
 });
 
 export type TAddFieldsFormSchema = z.infer<typeof ZAddFieldsFormSchema>;

packages/ui/primitives/document-flow/add-settings.tsx

@@ -2,6 +2,7 @@ import { useEffect } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
 import { Trans } from '@lingui/react/macro';
+import { useLingui } from '@lingui/react/macro';
 import { DocumentVisibility, TeamMemberRole } from '@prisma/client';
 import { DocumentStatus, type Field, type Recipient, SendStatus } from '@prisma/client';
 import { InfoIcon } from 'lucide-react';
@@ -9,10 +10,12 @@ import { useForm } from 'react-hook-form';
 import { match } from 'ts-pattern';
 
 import { DATE_FORMATS, DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
+import { DOCUMENT_SIGNATURE_TYPES } from '@documenso/lib/constants/document';
 import { SUPPORTED_LANGUAGES } from '@documenso/lib/constants/i18n';
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import type { TDocument } from '@documenso/lib/types/document';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
+import { extractTeamSignatureSettings } from '@documenso/lib/utils/teams';
 import {
   DocumentGlobalAuthAccessSelect,
   DocumentGlobalAuthAccessTooltip,
@@ -39,7 +42,9 @@ import {
   FormLabel,
   FormMessage,
 } from '@documenso/ui/primitives/form/form';
+import { MultiSelectCombobox } from '@documenso/ui/primitives/multi-select-combobox';
 
+import { DocumentSignatureSettingsTooltip } from '../../components/document/document-signature-settings-tooltip';
 import { Combobox } from '../combobox';
 import { Input } from '../input';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../select';
@@ -78,6 +83,8 @@ export const AddSettingsFormPartial = ({
   currentTeamMemberRole,
   onSubmit,
 }: AddSettingsFormProps) => {
+  const { t } = useLingui();
+
   const { documentAuthOption } = extractDocumentAuthMethods({
     documentAuth: document.authOptions,
   });
@@ -90,6 +97,7 @@ export const AddSettingsFormPartial = ({
       visibility: document.visibility || '',
       globalAccessAuth: documentAuthOption?.globalAccessAuth || undefined,
       globalActionAuth: documentAuthOption?.globalActionAuth || undefined,
+
       meta: {
         timezone:
           TIME_ZONES.find((timezone) => timezone === document.documentMeta?.timezone) ??
@@ -99,6 +107,7 @@ export const AddSettingsFormPartial = ({
             ?.value ?? DEFAULT_DOCUMENT_DATE_FORMAT,
         redirectUrl: document.documentMeta?.redirectUrl ?? '',
         language: document.documentMeta?.language ?? 'en',
+        signatureTypes: extractTeamSignatureSettings(document.documentMeta),
       },
     },
   });
@@ -189,9 +198,11 @@ export const AddSettingsFormPartial = ({
                       </TooltipTrigger>
 
                       <TooltipContent className="text-foreground max-w-md space-y-2 p-4">
-                        Controls the language for the document, including the language to be used
+                        <Trans>
-                        for email notifications, and the final certificate that is generated and
+                          Controls the language for the document, including the language to be used
-                        attached to the document.
+                          for email notifications, and the final certificate that is generated and
+                          attached to the document.
+                        </Trans>
                       </TooltipContent>
                     </Tooltip>
                   </FormLabel>
@@ -314,6 +325,34 @@ export const AddSettingsFormPartial = ({
                       )}
                     />
 
+                    <FormField
+                      control={form.control}
+                      name="meta.signatureTypes"
+                      render={({ field }) => (
+                        <FormItem>
+                          <FormLabel className="flex flex-row items-center">
+                            <Trans>Allowed Signature Types</Trans>
+                            <DocumentSignatureSettingsTooltip />
+                          </FormLabel>
+
+                          <FormControl>
+                            <MultiSelectCombobox
+                              options={Object.values(DOCUMENT_SIGNATURE_TYPES).map((option) => ({
+                                label: t(option.label),
+                                value: option.value,
+                              }))}
+                              selectedValues={field.value}
+                              onChange={field.onChange}
+                              className="bg-background w-full"
+                              emptySelectionPlaceholder="Select signature types"
+                            />
+                          </FormControl>
+
+                          <FormMessage />
+                        </FormItem>
+                      )}
+                    />
+
                     <FormField
                       control={form.control}
                       name="meta.dateFormat"

packages/ui/primitives/document-flow/add-settings.types.ts

@@ -1,7 +1,9 @@
+import { msg } from '@lingui/core/macro';
 import { DocumentVisibility } from '@prisma/client';
 import { z } from 'zod';
 
 import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
+import { DocumentSignatureType } from '@documenso/lib/constants/document';
 import { SUPPORTED_LANGUAGE_CODES } from '@documenso/lib/constants/i18n';
 import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';
 import {
@@ -26,7 +28,10 @@ export const ZMapNegativeOneToUndefinedSchema = z
   });
 
 export const ZAddSettingsFormSchema = z.object({
-  title: z.string().trim().min(1, { message: "Title can't be empty" }),
+  title: z
+    .string()
+    .trim()
+    .min(1, { message: msg`Title cannot be empty`.id }),
   externalId: z.string().optional(),
   visibility: z.nativeEnum(DocumentVisibility).optional(),
   globalAccessAuth: ZMapNegativeOneToUndefinedSchema.pipe(
@@ -49,6 +54,9 @@ export const ZAddSettingsFormSchema = z.object({
       .union([z.string(), z.enum(SUPPORTED_LANGUAGE_CODES)])
       .optional()
       .default('en'),
+    signatureTypes: z.array(z.nativeEnum(DocumentSignatureType)).min(1, {
+      message: msg`At least one signature type must be enabled`.id,
+    }),
   }),
 });
 

packages/ui/primitives/multi-select-combobox.tsx

@@ -24,11 +24,14 @@ type ComboBoxOption<T = OptionValue> = {
 type MultiSelectComboboxProps<T = OptionValue> = {
   emptySelectionPlaceholder?: React.ReactElement | string;
   enableClearAllButton?: boolean;
+  enableSearch?: boolean;
+  className?: string;
   loading?: boolean;
   inputPlaceholder?: MessageDescriptor;
   onChange: (_values: T[]) => void;
   options: ComboBoxOption<T>[];
   selectedValues: T[];
+  testId?: string;
 };
 
 /**
@@ -41,11 +44,14 @@ type MultiSelectComboboxProps<T = OptionValue> = {
 export function MultiSelectCombobox<T = OptionValue>({
   emptySelectionPlaceholder = 'Select values...',
   enableClearAllButton,
+  enableSearch = true,
+  className,
   inputPlaceholder,
   loading,
   onChange,
   options,
   selectedValues,
+  testId,
 }: MultiSelectComboboxProps<T>) {
   const { _ } = useLingui();
 
@@ -59,8 +65,6 @@ export function MultiSelectCombobox<T = OptionValue>({
     }
 
     onChange(newSelectedOptions);
-
-    setOpen(false);
   };
 
   const selectedOptions = React.useMemo(() => {
@@ -107,7 +111,8 @@ export function MultiSelectCombobox<T = OptionValue>({
             role="combobox"
             disabled={loading}
             aria-expanded={open}
-            className="w-[200px] px-3"
+            className={cn('w-[200px] px-3', className)}
+            data-testid={testId}
           >
             <AnimatePresence>
               {loading ? (
@@ -146,7 +151,7 @@ export function MultiSelectCombobox<T = OptionValue>({
 
       <PopoverContent className="w-[200px] p-0">
         <Command>
-          <CommandInput placeholder={inputPlaceholder && _(inputPlaceholder)} />
+          {enableSearch && <CommandInput placeholder={inputPlaceholder && _(inputPlaceholder)} />}
           <CommandEmpty>
             <Trans>No value found.</Trans>
           </CommandEmpty>

packages/ui/primitives/multiselect.tsx

@@ -0,0 +1,587 @@
+import * as React from 'react';
+import { forwardRef, useEffect } from 'react';
+
+import { Command as CommandPrimitive, useCommandState } from 'cmdk';
+import { X } from 'lucide-react';
+
+import { cn } from '../lib/utils';
+import { Command, CommandGroup, CommandItem, CommandList } from './command';
+
+export interface Option {
+  value: string;
+  label: string;
+  disable?: boolean;
+  fixed?: boolean;
+  [key: string]: string | boolean | undefined;
+}
+interface GroupOption {
+  [key: string]: Option[];
+}
+
+interface MultipleSelectorProps {
+  value?: Option[];
+  defaultOptions?: Option[];
+  options?: Option[];
+  placeholder?: string;
+  loadingIndicator?: React.ReactNode;
+  emptyIndicator?: React.ReactNode;
+  delay?: number;
+  triggerSearchOnFocus?: boolean;
+  onSearch?: (value: string) => Promise<Option[]>;
+  onSearchSync?: (value: string) => Option[];
+  onChange?: (options: Option[]) => void;
+  maxSelected?: number;
+  onMaxSelected?: (maxLimit: number) => void;
+  hidePlaceholderWhenSelected?: boolean;
+  disabled?: boolean;
+  groupBy?: string;
+  className?: string;
+  badgeClassName?: string;
+  selectFirstItem?: boolean;
+  creatable?: boolean;
+  commandProps?: React.ComponentPropsWithoutRef<typeof Command>;
+  inputProps?: Omit<
+    React.ComponentPropsWithoutRef<typeof CommandPrimitive.Input>,
+    'value' | 'placeholder' | 'disabled'
+  >;
+  hideClearAllButton?: boolean;
+}
+
+export interface MultipleSelectorRef {
+  selectedValue: Option[];
+  input: HTMLInputElement;
+  focus: () => void;
+  reset: () => void;
+}
+
+export function useDebounce<T>(value: T, delay?: number): T {
+  const [debouncedValue, setDebouncedValue] = React.useState<T>(value);
+
+  useEffect(() => {
+    const timer = setTimeout(() => setDebouncedValue(value), delay || 500);
+
+    return () => {
+      clearTimeout(timer);
+    };
+  }, [value, delay]);
+
+  return debouncedValue;
+}
+
+function transToGroupOption(options: Option[], groupBy?: string) {
+  if (options.length === 0) {
+    return {};
+  }
+  if (!groupBy) {
+    return {
+      '': options,
+    };
+  }
+
+  const groupOption: GroupOption = {};
+  options.forEach((option) => {
+    const key = (option[groupBy] as string) || '';
+    if (!groupOption[key]) {
+      groupOption[key] = [];
+    }
+    groupOption[key].push(option);
+  });
+  return groupOption;
+}
+
+function removePickedOption(groupOption: GroupOption, picked: Option[]) {
+  const cloneOption = JSON.parse(JSON.stringify(groupOption)) as GroupOption;
+
+  for (const [key, value] of Object.entries(cloneOption)) {
+    cloneOption[key] = value.filter((val) => !picked.find((p) => p.value === val.value));
+  }
+  return cloneOption;
+}
+
+function isOptionsExist(groupOption: GroupOption, targetOption: Option[]) {
+  for (const [, value] of Object.entries(groupOption)) {
+    if (value.some((option) => targetOption.find((p) => p.value === option.value))) {
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * The `CommandEmpty` of shadcn/ui will cause the cmdk empty not rendering correctly.
+ * So we create one and copy the `Empty` implementation from `cmdk`.
+ *
+ * @reference: https://github.com/hsuanyi-chou/shadcn-ui-expansions/issues/34#issuecomment-1949561607
+ **/
+const CommandEmpty = forwardRef<
+  HTMLDivElement,
+  React.ComponentProps<typeof CommandPrimitive.Empty>
+>(({ className, ...props }, forwardedRef) => {
+  const render = useCommandState((state) => state.filtered.count === 0);
+
+  if (!render) return null;
+
+  return (
+    <div
+      ref={forwardedRef}
+      className={cn('px-2 py-4 text-center text-sm', className)}
+      cmdk-empty=""
+      role="presentation"
+      {...props}
+    />
+  );
+});
+
+CommandEmpty.displayName = 'CommandEmpty';
+
+const MultipleSelector = React.forwardRef<MultipleSelectorRef, MultipleSelectorProps>(
+  (
+    {
+      value,
+      onChange,
+      placeholder,
+      defaultOptions: arrayDefaultOptions = [],
+      options: arrayOptions,
+      delay,
+      onSearch,
+      onSearchSync,
+      loadingIndicator,
+      emptyIndicator,
+      maxSelected = Number.MAX_SAFE_INTEGER,
+      onMaxSelected,
+      hidePlaceholderWhenSelected,
+      disabled,
+      groupBy,
+      className,
+      badgeClassName,
+      selectFirstItem = true,
+      creatable = false,
+      triggerSearchOnFocus = false,
+      commandProps,
+      inputProps,
+      hideClearAllButton = false,
+    }: MultipleSelectorProps,
+    ref: React.Ref<MultipleSelectorRef>,
+  ) => {
+    const inputRef = React.useRef<HTMLInputElement>(null);
+    const [open, setOpen] = React.useState(false);
+    const [onScrollbar, setOnScrollbar] = React.useState(false);
+    const [isLoading, setIsLoading] = React.useState(false);
+    const dropdownRef = React.useRef<HTMLDivElement>(null); // Added this
+
+    const [selected, setSelected] = React.useState<Option[]>(value || []);
+    const [options, setOptions] = React.useState<GroupOption>(
+      transToGroupOption(arrayDefaultOptions, groupBy),
+    );
+    const [inputValue, setInputValue] = React.useState('');
+    const debouncedSearchTerm = useDebounce(inputValue, delay || 500);
+
+    React.useImperativeHandle(
+      ref,
+      () => ({
+        selectedValue: [...selected],
+        input: inputRef.current as HTMLInputElement,
+        focus: () => inputRef?.current?.focus(),
+        reset: () => setSelected([]),
+      }),
+      [selected],
+    );
+
+    const handleClickOutside = (event: MouseEvent | TouchEvent) => {
+      if (
+        dropdownRef.current &&
+        !dropdownRef.current.contains(event.target as Node) &&
+        inputRef.current &&
+        !inputRef.current.contains(event.target as Node)
+      ) {
+        setOpen(false);
+        inputRef.current.blur();
+      }
+    };
+
+    const handleUnselect = React.useCallback(
+      (option: Option) => {
+        const newOptions = selected.filter((s) => s.value !== option.value);
+        setSelected(newOptions);
+        onChange?.(newOptions);
+      },
+      [onChange, selected],
+    );
+
+    const handleKeyDown = React.useCallback(
+      (e: React.KeyboardEvent<HTMLDivElement>) => {
+        const input = inputRef.current;
+        if (input) {
+          if (e.key === 'Delete' || e.key === 'Backspace') {
+            if (input.value === '' && selected.length > 0) {
+              const lastSelectOption = selected[selected.length - 1];
+              // If last item is fixed, we should not remove it.
+              if (!lastSelectOption.fixed) {
+                handleUnselect(selected[selected.length - 1]);
+              }
+            }
+          }
+          // This is not a default behavior of the <input /> field
+          if (e.key === 'Escape') {
+            input.blur();
+          }
+        }
+      },
+      [handleUnselect, selected],
+    );
+
+    useEffect(() => {
+      if (open) {
+        document.addEventListener('mousedown', handleClickOutside);
+        document.addEventListener('touchend', handleClickOutside);
+      } else {
+        document.removeEventListener('mousedown', handleClickOutside);
+        document.removeEventListener('touchend', handleClickOutside);
+      }
+
+      return () => {
+        document.removeEventListener('mousedown', handleClickOutside);
+        document.removeEventListener('touchend', handleClickOutside);
+      };
+    }, [open]);
+
+    useEffect(() => {
+      if (value) {
+        setSelected(value);
+      }
+    }, [value]);
+
+    useEffect(() => {
+      /** If `onSearch` is provided, do not trigger options updated. */
+      if (!arrayOptions || onSearch) {
+        return;
+      }
+      const newOption = transToGroupOption(arrayOptions || [], groupBy);
+      if (JSON.stringify(newOption) !== JSON.stringify(options)) {
+        setOptions(newOption);
+      }
+    }, [arrayDefaultOptions, arrayOptions, groupBy, onSearch, options]);
+
+    useEffect(() => {
+      /** sync search */
+
+      const doSearchSync = () => {
+        const res = onSearchSync?.(debouncedSearchTerm);
+        setOptions(transToGroupOption(res || [], groupBy));
+      };
+
+      const exec = () => {
+        if (!onSearchSync || !open) return;
+
+        if (triggerSearchOnFocus) {
+          doSearchSync();
+        }
+
+        if (debouncedSearchTerm) {
+          doSearchSync();
+        }
+      };
+
+      void exec();
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [debouncedSearchTerm, groupBy, open, triggerSearchOnFocus]);
+
+    useEffect(() => {
+      /** async search */
+
+      const doSearch = async () => {
+        setIsLoading(true);
+        const res = await onSearch?.(debouncedSearchTerm);
+        setOptions(transToGroupOption(res || [], groupBy));
+        setIsLoading(false);
+      };
+
+      const exec = async () => {
+        if (!onSearch || !open) return;
+
+        if (triggerSearchOnFocus) {
+          await doSearch();
+        }
+
+        if (debouncedSearchTerm) {
+          await doSearch();
+        }
+      };
+
+      void exec();
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [debouncedSearchTerm, groupBy, open, triggerSearchOnFocus]);
+
+    const CreatableItem = () => {
+      if (!creatable) return undefined;
+      if (
+        isOptionsExist(options, [{ value: inputValue, label: inputValue }]) ||
+        selected.find((s) => s.value === inputValue)
+      ) {
+        return undefined;
+      }
+
+      const Item = (
+        <CommandItem
+          value={inputValue}
+          className="cursor-pointer"
+          onMouseDown={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+          }}
+          onSelect={(value: string) => {
+            if (selected.length >= maxSelected) {
+              onMaxSelected?.(selected.length);
+              return;
+            }
+            setInputValue('');
+            const newOptions = [...selected, { value, label: value }];
+            setSelected(newOptions);
+            onChange?.(newOptions);
+          }}
+        >
+          {`Create "${inputValue}"`}
+        </CommandItem>
+      );
+
+      // For normal creatable
+      if (!onSearch && inputValue.length > 0) {
+        return Item;
+      }
+
+      // For async search creatable. avoid showing creatable item before loading at first.
+      if (onSearch && debouncedSearchTerm.length > 0 && !isLoading) {
+        return Item;
+      }
+
+      return undefined;
+    };
+
+    const EmptyItem = React.useCallback(() => {
+      if (!emptyIndicator) return undefined;
+
+      // For async search that showing emptyIndicator
+      if (onSearch && !creatable && Object.keys(options).length === 0) {
+        return (
+          <CommandItem value="-" disabled>
+            {emptyIndicator}
+          </CommandItem>
+        );
+      }
+
+      return <CommandEmpty>{emptyIndicator}</CommandEmpty>;
+    }, [creatable, emptyIndicator, onSearch, options]);
+
+    const selectables = React.useMemo<GroupOption>(
+      () => removePickedOption(options, selected),
+      [options, selected],
+    );
+
+    /** Avoid Creatable Selector freezing or lagging when paste a long string. */
+    const commandFilter = React.useCallback(() => {
+      if (commandProps?.filter) {
+        return commandProps.filter;
+      }
+
+      if (creatable) {
+        return (value: string, search: string) => {
+          return value.toLowerCase().includes(search.toLowerCase()) ? 1 : -1;
+        };
+      }
+      // Using default filter in `cmdk`. We don&lsquo;t have to provide it.
+      return undefined;
+    }, [creatable, commandProps?.filter]);
+
+    return (
+      <Command
+        ref={dropdownRef}
+        {...commandProps}
+        onKeyDown={(e) => {
+          handleKeyDown(e);
+          commandProps?.onKeyDown?.(e);
+        }}
+        className={cn('h-auto overflow-visible bg-transparent', commandProps?.className)}
+        shouldFilter={
+          commandProps?.shouldFilter !== undefined ? commandProps.shouldFilter : !onSearch
+        } // When onSearch is provided, we don&lsquo;t want to filter the options. You can still override it.
+        filter={commandFilter()}
+      >
+        <div
+          className={cn(
+            'border-input focus-within:border-ring focus-within:ring-ring/20 relative min-h-[38px] rounded-lg border text-sm transition-shadow focus-within:outline-none focus-within:ring-[3px] has-[:disabled]:cursor-not-allowed has-[:disabled]:opacity-50',
+            {
+              'p-1': selected.length !== 0,
+              'cursor-text': !disabled && selected.length !== 0,
+            },
+            !hideClearAllButton && 'pe-9',
+            className,
+          )}
+          onClick={() => {
+            if (disabled) return;
+            inputRef?.current?.focus();
+          }}
+        >
+          <div className="flex flex-wrap gap-1">
+            {selected.map((option) => {
+              return (
+                <div
+                  key={option.value}
+                  className={cn(
+                    'animate-fadeIn border-border bg-background text-secondary-foreground hover:bg-background relative inline-flex h-7 cursor-default items-center rounded-md border pe-7 pl-2 ps-2 text-xs font-medium transition-all disabled:cursor-not-allowed disabled:opacity-50 data-[fixed]:pe-2',
+                    badgeClassName,
+                  )}
+                  data-fixed={option.fixed}
+                  data-disabled={disabled || undefined}
+                >
+                  {option.label}
+                  <button
+                    className="text-muted-foreground/80 hover:text-foreground focus-visible:outline-ring/70 absolute -inset-y-px -end-px flex size-7 items-center justify-center rounded-e-lg border border-transparent p-0 outline-0 transition-colors focus-visible:outline focus-visible:outline-2"
+                    onKeyDown={(e) => {
+                      if (e.key === 'Enter') {
+                        handleUnselect(option);
+                      }
+                    }}
+                    onMouseDown={(e) => {
+                      e.preventDefault();
+                      e.stopPropagation();
+                    }}
+                    onClick={() => handleUnselect(option)}
+                    aria-label="Remove"
+                  >
+                    <X size={14} strokeWidth={2} aria-hidden="true" />
+                  </button>
+                </div>
+              );
+            })}
+            {/* Avoid having the "Search" Icon */}
+            <CommandPrimitive.Input
+              {...inputProps}
+              ref={inputRef}
+              value={inputValue}
+              disabled={disabled}
+              onValueChange={(value) => {
+                setInputValue(value);
+                inputProps?.onValueChange?.(value);
+              }}
+              onBlur={(event) => {
+                if (!onScrollbar) {
+                  setOpen(false);
+                }
+                inputProps?.onBlur?.(event);
+              }}
+              onFocus={(event) => {
+                setOpen(true);
+                if (triggerSearchOnFocus) {
+                  void onSearch?.(debouncedSearchTerm);
+                }
+                inputProps?.onFocus?.(event);
+              }}
+              placeholder={hidePlaceholderWhenSelected && selected.length !== 0 ? '' : placeholder}
+              className={cn(
+                'placeholder:text-muted-foreground flex-1 bg-transparent outline-none disabled:cursor-not-allowed',
+                {
+                  'w-full': hidePlaceholderWhenSelected,
+                  'px-3 py-2': selected.length === 0,
+                  'ml-1': selected.length !== 0,
+                },
+                inputProps?.className,
+              )}
+            />
+            <button
+              type="button"
+              onClick={() => {
+                setSelected(selected.filter((s) => s.fixed));
+                onChange?.(selected.filter((s) => s.fixed));
+              }}
+              className={cn(
+                'text-muted-foreground/80 hover:text-foreground focus-visible:outline-ring/70 absolute end-0 top-0 flex size-9 items-center justify-center rounded-lg border border-transparent transition-colors focus-visible:outline focus-visible:outline-2',
+                (hideClearAllButton ||
+                  disabled ||
+                  selected.length < 1 ||
+                  selected.filter((s) => s.fixed).length === selected.length) &&
+                  'hidden',
+              )}
+              aria-label="Clear all"
+            >
+              <X size={16} strokeWidth={2} aria-hidden="true" />
+            </button>
+          </div>
+        </div>
+        <div className="relative">
+          <div
+            className={cn(
+              'border-input absolute top-2 z-10 w-full overflow-hidden rounded-lg border',
+              'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95',
+              !open && 'hidden',
+            )}
+            data-state={open ? 'open' : 'closed'}
+          >
+            {open && (
+              <CommandList
+                className="bg-popover text-popover-foreground shadow-lg shadow-black/5 outline-none"
+                onMouseLeave={() => {
+                  setOnScrollbar(false);
+                }}
+                onMouseEnter={() => {
+                  setOnScrollbar(true);
+                }}
+                onMouseUp={() => {
+                  inputRef?.current?.focus();
+                }}
+              >
+                {isLoading ? (
+                  <>{loadingIndicator}</>
+                ) : (
+                  <>
+                    {EmptyItem()}
+                    {CreatableItem()}
+                    {!selectFirstItem && <CommandItem value="-" className="hidden" />}
+                    {Object.entries(selectables).map(([key, dropdowns]) => (
+                      <CommandGroup key={key} heading={key} className="h-full overflow-auto">
+                        <>
+                          {dropdowns.map((option) => {
+                            return (
+                              <CommandItem
+                                key={option.value}
+                                value={option.value}
+                                disabled={option.disable}
+                                onMouseDown={(e) => {
+                                  e.preventDefault();
+                                  e.stopPropagation();
+                                }}
+                                onSelect={() => {
+                                  if (selected.length >= maxSelected) {
+                                    onMaxSelected?.(selected.length);
+                                    return;
+                                  }
+                                  setInputValue('');
+                                  const newOptions = [...selected, option];
+                                  setSelected(newOptions);
+                                  onChange?.(newOptions);
+                                }}
+                                className={cn(
+                                  'cursor-pointer',
+                                  option.disable && 'cursor-not-allowed opacity-50',
+                                )}
+                              >
+                                {option.label}
+                              </CommandItem>
+                            );
+                          })}
+                        </>
+                      </CommandGroup>
+                    ))}
+                  </>
+                )}
+              </CommandList>
+            )}
+          </div>
+        </div>
+      </Command>
+    );
+  },
+);
+
+MultipleSelector.displayName = 'MultipleSelector';
+
+export { MultipleSelector };

packages/ui/primitives/signature-pad/canvas.ts

@@ -1,3 +1,5 @@
+import { SIGNATURE_CANVAS_DPI } from '@documenso/lib/constants/signatures';
+
 import { Point } from './point';
 
 export class Canvas {
@@ -14,7 +16,7 @@ export class Canvas {
   private lastVelocity = 0;
 
   private readonly VELOCITY_FILTER_WEIGHT = 0.5;
-  private readonly DPI = 2;
+  private readonly DPI = SIGNATURE_CANVAS_DPI;
 
   constructor(canvas: HTMLCanvasElement) {
     this.$canvas = canvas;

packages/ui/primitives/signature-pad/signature-pad-color-picker.tsx

@@ -0,0 +1,63 @@
+import { Trans } from '@lingui/react/macro';
+
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
+
+import { cn } from '../../lib/utils';
+
+export type SignaturePadColorPickerProps = {
+  selectedColor: string;
+  setSelectedColor: (color: string) => void;
+  className?: string;
+};
+
+export const SignaturePadColorPicker = ({
+  selectedColor,
+  setSelectedColor,
+  className,
+}: SignaturePadColorPickerProps) => {
+  return (
+    <div className={cn('text-foreground absolute right-2 top-2 filter', className)}>
+      <Select defaultValue={selectedColor} onValueChange={(value) => setSelectedColor(value)}>
+        <SelectTrigger className="h-auto w-auto border-none p-0.5">
+          <SelectValue placeholder="" />
+        </SelectTrigger>
+
+        <SelectContent className="w-[100px]" align="end">
+          <SelectItem value="black">
+            <div className="text-muted-foreground flex items-center text-[0.688rem]">
+              <div className="border-border mr-1 h-4 w-4 rounded-full border-2 bg-black shadow-sm" />
+              <Trans>Black</Trans>
+            </div>
+          </SelectItem>
+
+          <SelectItem value="red">
+            <div className="text-muted-foreground flex items-center text-[0.688rem]">
+              <div className="border-border mr-1 h-4 w-4 rounded-full border-2 bg-[red] shadow-sm" />
+              <Trans>Red</Trans>
+            </div>
+          </SelectItem>
+
+          <SelectItem value="blue">
+            <div className="text-muted-foreground flex items-center text-[0.688rem]">
+              <div className="border-border mr-1 h-4 w-4 rounded-full border-2 bg-[blue] shadow-sm" />
+              <Trans>Blue</Trans>
+            </div>
+          </SelectItem>
+
+          <SelectItem value="green">
+            <div className="text-muted-foreground flex items-center text-[0.688rem]">
+              <div className="border-border mr-1 h-4 w-4 rounded-full border-2 bg-[green] shadow-sm" />
+              <Trans>Green</Trans>
+            </div>
+          </SelectItem>
+        </SelectContent>
+      </Select>
+    </div>
+  );
+};

packages/ui/primitives/signature-pad/signature-pad-dialog.tsx

@@ -0,0 +1,150 @@
+import type { HTMLAttributes } from 'react';
+import { useState } from 'react';
+
+import type { MessageDescriptor } from '@lingui/core';
+import { Trans, useLingui } from '@lingui/react/macro';
+import { motion } from 'framer-motion';
+
+import { parseMessageDescriptor } from '@documenso/lib/utils/i18n';
+import { Dialog, DialogClose, DialogContent, DialogFooter } from '@documenso/ui/primitives/dialog';
+
+import { cn } from '../../lib/utils';
+import { Button } from '../button';
+import { SignaturePad } from './signature-pad';
+import { SignatureRender } from './signature-render';
+
+export type SignaturePadDialogProps = Omit<HTMLAttributes<HTMLCanvasElement>, 'onChange'> & {
+  disabled?: boolean;
+  value?: string;
+  onChange: (_value: string) => void;
+  dialogConfirmText?: MessageDescriptor | string;
+  disableAnimation?: boolean;
+  typedSignatureEnabled?: boolean;
+  uploadSignatureEnabled?: boolean;
+  drawSignatureEnabled?: boolean;
+};
+
+export const SignaturePadDialog = ({
+  className,
+  value,
+  onChange,
+  disabled = false,
+  disableAnimation = false,
+  typedSignatureEnabled,
+  uploadSignatureEnabled,
+  drawSignatureEnabled,
+  dialogConfirmText,
+}: SignaturePadDialogProps) => {
+  const { i18n } = useLingui();
+
+  const [showSignatureModal, setShowSignatureModal] = useState(false);
+  const [signature, setSignature] = useState<string>(value ?? '');
+
+  return (
+    <div
+      className={cn(
+        'aspect-signature-pad bg-background relative block w-full select-none rounded-lg border',
+        className,
+        {
+          'pointer-events-none opacity-50': disabled,
+        },
+      )}
+    >
+      {value && (
+        <div className="inset-0 h-full w-full">
+          <SignatureRender value={value} />
+        </div>
+      )}
+
+      <motion.button
+        data-testid="signature-pad-dialog-button"
+        type="button"
+        disabled={disabled}
+        className="absolute inset-0 flex items-center justify-center bg-transparent"
+        onClick={() => setShowSignatureModal(true)}
+        whileHover="onHover"
+      >
+        {!value && !disableAnimation && (
+          <motion.svg
+            width="120"
+            height="120"
+            viewBox="0 0 16 16"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+            className="text-muted-foreground/60"
+            variants={{
+              onHover: {
+                scale: 1.1,
+                transition: {
+                  type: 'spring',
+                  stiffness: 300,
+                  damping: 12,
+                  mass: 0.8,
+                  restDelta: 0.001,
+                },
+              },
+            }}
+          >
+            <motion.path
+              d="M1.5 11H14.5M1.5 14C1.5 14 8.72 2 4.86938 2H4.875C2.01 2 1.97437 14.0694 8 6.51188V6.5C8 6.5 9 11.3631 11.5 7.52375V7.5C11.5 7.5 11.5 9 14.5 9"
+              stroke="currentColor"
+              strokeWidth="1.1"
+              strokeLinecap="round"
+              strokeLinejoin="round"
+              initial={{ pathLength: 0, opacity: 0 }}
+              animate={{
+                pathLength: 1,
+                opacity: 1,
+                transition: {
+                  pathLength: {
+                    duration: 2,
+                    ease: 'easeInOut',
+                  },
+                  opacity: { duration: 0.6 },
+                },
+              }}
+            />
+          </motion.svg>
+        )}
+      </motion.button>
+
+      <Dialog open={showSignatureModal} onOpenChange={disabled ? undefined : setShowSignatureModal}>
+        <DialogContent hideClose={true} className="p-6 pt-4">
+          <SignaturePad
+            id="signature"
+            value={value}
+            className={className}
+            disabled={disabled}
+            onChange={({ value }) => setSignature(value)}
+            typedSignatureEnabled={typedSignatureEnabled}
+            uploadSignatureEnabled={uploadSignatureEnabled}
+            drawSignatureEnabled={drawSignatureEnabled}
+          />
+
+          <DialogFooter>
+            <DialogClose asChild>
+              <Button type="button" variant="ghost">
+                <Trans>Cancel</Trans>
+              </Button>
+            </DialogClose>
+
+            <Button
+              type="button"
+              disabled={!signature}
+              onClick={() => {
+                onChange(signature);
+                setShowSignatureModal(false);
+              }}
+            >
+              {dialogConfirmText ? (
+                parseMessageDescriptor(i18n._, dialogConfirmText)
+              ) : (
+                <Trans>Next</Trans>
+              )}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </div>
+  );
+};

packages/ui/primitives/signature-pad/signature-pad-draw.tsx

@@ -0,0 +1,327 @@
+import type { MouseEvent, PointerEvent, RefObject, TouchEvent } from 'react';
+import { useMemo, useRef, useState } from 'react';
+
+import { Trans } from '@lingui/react/macro';
+import { Undo2 } from 'lucide-react';
+import type { StrokeOptions } from 'perfect-freehand';
+import { getStroke } from 'perfect-freehand';
+
+import { unsafe_useEffectOnce } from '@documenso/lib/client-only/hooks/use-effect-once';
+import {
+  SIGNATURE_CANVAS_DPI,
+  SIGNATURE_MIN_COVERAGE_THRESHOLD,
+} from '@documenso/lib/constants/signatures';
+
+import { cn } from '../../lib/utils';
+import { getSvgPathFromStroke } from './helper';
+import { Point } from './point';
+import { SignaturePadColorPicker } from './signature-pad-color-picker';
+
+const checkSignatureValidity = (element: RefObject<HTMLCanvasElement>) => {
+  if (!element.current) {
+    return false;
+  }
+
+  const ctx = element.current.getContext('2d');
+
+  if (!ctx) {
+    return false;
+  }
+
+  const imageData = ctx.getImageData(0, 0, element.current.width, element.current.height);
+  const data = imageData.data;
+  let filledPixels = 0;
+  const totalPixels = data.length / 4;
+
+  for (let i = 0; i < data.length; i += 4) {
+    if (data[i + 3] > 0) filledPixels++;
+  }
+
+  const filledPercentage = filledPixels / totalPixels;
+  const isValid = filledPercentage > SIGNATURE_MIN_COVERAGE_THRESHOLD;
+
+  return isValid;
+};
+
+export type SignaturePadDrawProps = {
+  className?: string;
+  value: string;
+  onChange: (_signatureDataUrl: string) => void;
+};
+
+export const SignaturePadDraw = ({
+  className,
+  value,
+  onChange,
+  ...props
+}: SignaturePadDrawProps) => {
+  const $el = useRef<HTMLCanvasElement>(null);
+
+  const $imageData = useRef<ImageData | null>(null);
+  const $fileInput = useRef<HTMLInputElement>(null);
+
+  const [isPressed, setIsPressed] = useState(false);
+  const [lines, setLines] = useState<Point[][]>([]);
+  const [currentLine, setCurrentLine] = useState<Point[]>([]);
+  const [isSignatureValid, setIsSignatureValid] = useState<boolean | null>(null);
+
+  const [selectedColor, setSelectedColor] = useState('black');
+
+  const perfectFreehandOptions = useMemo(() => {
+    const size = $el.current ? Math.min($el.current.height, $el.current.width) * 0.03 : 10;
+
+    return {
+      size,
+      thinning: 0.25,
+      streamline: 0.5,
+      smoothing: 0.5,
+      end: {
+        taper: size * 2,
+      },
+    } satisfies StrokeOptions;
+  }, []);
+
+  const onMouseDown = (event: MouseEvent | PointerEvent | TouchEvent) => {
+    if (event.cancelable) {
+      event.preventDefault();
+    }
+
+    setIsPressed(true);
+
+    const point = Point.fromEvent(event, SIGNATURE_CANVAS_DPI, $el.current);
+
+    setCurrentLine([point]);
+  };
+
+  const onMouseMove = (event: MouseEvent | PointerEvent | TouchEvent) => {
+    if (event.cancelable) {
+      event.preventDefault();
+    }
+
+    if (!isPressed) {
+      return;
+    }
+
+    const point = Point.fromEvent(event, SIGNATURE_CANVAS_DPI, $el.current);
+    const lastPoint = currentLine[currentLine.length - 1];
+
+    if (lastPoint && point.distanceTo(lastPoint) > 5) {
+      setCurrentLine([...currentLine, point]);
+
+      // Update the canvas here to draw the lines
+      if ($el.current) {
+        const ctx = $el.current.getContext('2d');
+
+        if (ctx) {
+          ctx.restore();
+          ctx.imageSmoothingEnabled = true;
+          ctx.imageSmoothingQuality = 'high';
+          ctx.fillStyle = selectedColor;
+
+          lines.forEach((line) => {
+            const pathData = new Path2D(
+              getSvgPathFromStroke(getStroke(line, perfectFreehandOptions)),
+            );
+
+            ctx.fill(pathData);
+          });
+
+          const pathData = new Path2D(
+            getSvgPathFromStroke(getStroke([...currentLine, point], perfectFreehandOptions)),
+          );
+          ctx.fill(pathData);
+        }
+      }
+    }
+  };
+
+  const onMouseUp = (event: MouseEvent | PointerEvent | TouchEvent, addLine = true) => {
+    if (event.cancelable) {
+      event.preventDefault();
+    }
+
+    setIsPressed(false);
+
+    const point = Point.fromEvent(event, SIGNATURE_CANVAS_DPI, $el.current);
+
+    const newLines = [...lines];
+
+    if (addLine && currentLine.length > 0) {
+      newLines.push([...currentLine, point]);
+      setCurrentLine([]);
+    }
+
+    setLines(newLines);
+
+    if ($el.current && newLines.length > 0) {
+      const ctx = $el.current.getContext('2d');
+
+      if (ctx) {
+        ctx.restore();
+        ctx.imageSmoothingEnabled = true;
+        ctx.imageSmoothingQuality = 'high';
+        ctx.fillStyle = selectedColor;
+
+        newLines.forEach((line) => {
+          const pathData = new Path2D(
+            getSvgPathFromStroke(getStroke(line, perfectFreehandOptions)),
+          );
+          ctx.fill(pathData);
+        });
+
+        const isValidSignature = checkSignatureValidity($el);
+
+        setIsSignatureValid(isValidSignature);
+
+        if (isValidSignature) {
+          onChange?.($el.current.toDataURL());
+        }
+        ctx.save();
+      }
+    }
+  };
+
+  const onMouseEnter = (event: MouseEvent | PointerEvent | TouchEvent) => {
+    if (event.cancelable) {
+      event.preventDefault();
+    }
+
+    if ('buttons' in event && event.buttons === 1) {
+      onMouseDown(event);
+    }
+  };
+
+  const onMouseLeave = (event: MouseEvent | PointerEvent | TouchEvent) => {
+    if (event.cancelable) {
+      event.preventDefault();
+    }
+
+    if (isPressed) {
+      onMouseUp(event, true);
+    } else {
+      onMouseUp(event, false);
+    }
+  };
+
+  const onClearClick = () => {
+    if ($el.current) {
+      const ctx = $el.current.getContext('2d');
+
+      ctx?.clearRect(0, 0, $el.current.width, $el.current.height);
+      $imageData.current = null;
+    }
+
+    if ($fileInput.current) {
+      $fileInput.current.value = '';
+    }
+
+    onChange('');
+
+    setLines([]);
+    setCurrentLine([]);
+    setIsPressed(false);
+  };
+
+  const onUndoClick = () => {
+    if (lines.length === 0 || !$el.current) {
+      return;
+    }
+
+    const newLines = lines.slice(0, -1);
+    setLines(newLines);
+
+    // Clear and redraw the canvas
+    const ctx = $el.current.getContext('2d');
+    const { width, height } = $el.current;
+    ctx?.clearRect(0, 0, width, height);
+
+    if ($imageData.current) {
+      ctx?.putImageData($imageData.current, 0, 0);
+    }
+
+    newLines.forEach((line) => {
+      const pathData = new Path2D(getSvgPathFromStroke(getStroke(line, perfectFreehandOptions)));
+      ctx?.fill(pathData);
+    });
+
+    onChange?.($el.current.toDataURL());
+  };
+
+  unsafe_useEffectOnce(() => {
+    if ($el.current) {
+      $el.current.width = $el.current.clientWidth * SIGNATURE_CANVAS_DPI;
+      $el.current.height = $el.current.clientHeight * SIGNATURE_CANVAS_DPI;
+    }
+
+    if ($el.current && value) {
+      const ctx = $el.current.getContext('2d');
+
+      const { width, height } = $el.current;
+
+      const img = new Image();
+
+      img.onload = () => {
+        ctx?.drawImage(img, 0, 0, Math.min(width, img.width), Math.min(height, img.height));
+
+        const defaultImageData = ctx?.getImageData(0, 0, width, height) || null;
+
+        $imageData.current = defaultImageData;
+      };
+
+      img.src = value;
+    }
+  });
+
+  return (
+    <div className={cn('h-full w-full', className)}>
+      <canvas
+        data-testid="signature-pad-draw"
+        ref={$el}
+        className={cn('h-full w-full', {
+          'dark:hue-rotate-180 dark:invert': selectedColor === 'black',
+        })}
+        style={{ touchAction: 'none' }}
+        onPointerMove={(event) => onMouseMove(event)}
+        onPointerDown={(event) => onMouseDown(event)}
+        onPointerUp={(event) => onMouseUp(event)}
+        onPointerLeave={(event) => onMouseLeave(event)}
+        onPointerEnter={(event) => onMouseEnter(event)}
+        {...props}
+      />
+
+      <SignaturePadColorPicker selectedColor={selectedColor} setSelectedColor={setSelectedColor} />
+
+      <div className="absolute bottom-3 right-3 flex gap-2">
+        <button
+          type="button"
+          className="focus-visible:ring-ring ring-offset-background text-muted-foreground/60 hover:text-muted-foreground rounded-full p-0 text-[0.688rem] focus-visible:outline-none focus-visible:ring-2"
+          onClick={() => onClearClick()}
+        >
+          <Trans>Clear Signature</Trans>
+        </button>
+      </div>
+
+      {isSignatureValid === false && (
+        <div className="absolute bottom-4 left-4 flex gap-2">
+          <span className="text-destructive text-xs">
+            <Trans>Signature is too small</Trans>
+          </span>
+        </div>
+      )}
+
+      {isSignatureValid && lines.length > 0 && (
+        <div className="absolute bottom-4 left-4 flex gap-2">
+          <button
+            type="button"
+            title="undo"
+            className="focus-visible:ring-ring ring-offset-background text-muted-foreground/60 hover:text-muted-foreground rounded-full p-0 text-[0.688rem] focus-visible:outline-none focus-visible:ring-2"
+            onClick={onUndoClick}
+          >
+            <Undo2 className="h-4 w-4" />
+            <span className="sr-only">Undo</span>
+          </button>
+        </div>
+      )}
+    </div>
+  );
+};

packages/ui/primitives/signature-pad/signature-pad-type.tsx

@@ -0,0 +1,29 @@
+import { useState } from 'react';
+
+import { cn } from '../../lib/utils';
+
+export type SignaturePadTypeProps = {
+  className?: string;
+  value?: string;
+  onChange: (_value: string) => void;
+};
+
+export const SignaturePadType = ({ className, value, onChange }: SignaturePadTypeProps) => {
+  // Colors don't actually work for text.
+  const [selectedColor, setSelectedColor] = useState('black');
+
+  return (
+    <div className={cn('flex h-full w-full items-center justify-center', className)}>
+      <input
+        data-testid="signature-pad-type-input"
+        placeholder="Type your signature"
+        className="font-signature w-full bg-transparent px-4 text-center text-7xl text-black placeholder:text-4xl focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0 dark:text-white"
+        // style={{ color: selectedColor }}
+        value={value}
+        onChange={(event) => onChange(event.target.value.trimStart())}
+      />
+
+      {/* <SignaturePadColorPicker selectedColor={selectedColor} setSelectedColor={setSelectedColor} /> */}
+    </div>
+  );
+};

packages/ui/primitives/signature-pad/signature-pad-upload.tsx

@@ -0,0 +1,166 @@
+import { useRef } from 'react';
+
+import { Trans } from '@lingui/react/macro';
+import { motion } from 'framer-motion';
+import { UploadCloudIcon } from 'lucide-react';
+
+import { unsafe_useEffectOnce } from '@documenso/lib/client-only/hooks/use-effect-once';
+import { SIGNATURE_CANVAS_DPI } from '@documenso/lib/constants/signatures';
+
+import { cn } from '../../lib/utils';
+
+const loadImage = async (file: File | undefined): Promise<HTMLImageElement> => {
+  if (!file) {
+    throw new Error('No file selected');
+  }
+
+  if (!file.type.startsWith('image/')) {
+    throw new Error('Invalid file type');
+  }
+
+  if (file.size > 5 * 1024 * 1024) {
+    throw new Error('Image size should be less than 5MB');
+  }
+
+  return new Promise((resolve, reject) => {
+    const img = new Image();
+    const objectUrl = URL.createObjectURL(file);
+
+    img.onload = () => {
+      URL.revokeObjectURL(objectUrl);
+      resolve(img);
+    };
+
+    img.onerror = () => {
+      URL.revokeObjectURL(objectUrl);
+      reject(new Error('Failed to load image'));
+    };
+
+    img.src = objectUrl;
+  });
+};
+
+const loadImageOntoCanvas = (
+  image: HTMLImageElement,
+  canvas: HTMLCanvasElement,
+  ctx: CanvasRenderingContext2D,
+): ImageData => {
+  const scale = Math.min((canvas.width * 0.8) / image.width, (canvas.height * 0.8) / image.height);
+
+  const x = (canvas.width - image.width * scale) / 2;
+  const y = (canvas.height - image.height * scale) / 2;
+
+  ctx.clearRect(0, 0, canvas.width, canvas.height);
+
+  ctx.save();
+  ctx.imageSmoothingEnabled = true;
+  ctx.imageSmoothingQuality = 'high';
+
+  ctx.drawImage(image, x, y, image.width * scale, image.height * scale);
+
+  ctx.restore();
+
+  const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
+
+  return imageData;
+};
+
+export type SignaturePadUploadProps = {
+  className?: string;
+  value: string;
+  onChange: (_signatureDataUrl: string) => void;
+};
+
+export const SignaturePadUpload = ({
+  className,
+  value,
+  onChange,
+  ...props
+}: SignaturePadUploadProps) => {
+  const $el = useRef<HTMLCanvasElement>(null);
+  const $imageData = useRef<ImageData | null>(null);
+  const $fileInput = useRef<HTMLInputElement>(null);
+
+  const handleImageUpload = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    try {
+      const img = await loadImage(event.target.files?.[0]);
+
+      if (!$el.current) return;
+
+      const ctx = $el.current.getContext('2d');
+      if (!ctx) return;
+
+      $imageData.current = loadImageOntoCanvas(img, $el.current, ctx);
+      onChange?.($el.current.toDataURL());
+    } catch (error) {
+      console.error(error);
+    }
+  };
+
+  unsafe_useEffectOnce(() => {
+    // Todo: Not really sure if this is required for uploaded images.
+    if ($el.current) {
+      $el.current.width = $el.current.clientWidth * SIGNATURE_CANVAS_DPI;
+      $el.current.height = $el.current.clientHeight * SIGNATURE_CANVAS_DPI;
+    }
+
+    if ($el.current && value) {
+      const ctx = $el.current.getContext('2d');
+
+      const { width, height } = $el.current;
+
+      const img = new Image();
+
+      img.onload = () => {
+        ctx?.drawImage(img, 0, 0, Math.min(width, img.width), Math.min(height, img.height));
+
+        const defaultImageData = ctx?.getImageData(0, 0, width, height) || null;
+
+        $imageData.current = defaultImageData;
+      };
+
+      img.src = value;
+    }
+  });
+
+  return (
+    <div className={cn('relative h-full w-full', className)}>
+      <canvas
+        data-testid="signature-pad-upload"
+        ref={$el}
+        className="h-full w-full dark:hue-rotate-180 dark:invert"
+        style={{ touchAction: 'none' }}
+        {...props}
+      />
+
+      <input
+        ref={$fileInput}
+        type="file"
+        accept="image/*"
+        className="hidden"
+        onChange={handleImageUpload}
+      />
+
+      <motion.button
+        className="absolute inset-0 flex h-full w-full items-center justify-center"
+        initial="initial"
+        animate="animate"
+        whileHover="hover"
+        onClick={() => $fileInput.current?.click()}
+      >
+        {!value && (
+          <motion.div>
+            <div className="text-muted-foreground flex flex-col items-center justify-center">
+              <div className="flex flex-col items-center">
+                <UploadCloudIcon className="h-8 w-8" />
+                <span className="text-lg font-semibold">
+                  <Trans>Upload Signature</Trans>
+                </span>
+              </div>
+            </div>
+          </motion.div>
+        )}
+      </motion.button>
+    </div>
+  );
+};

packages/ui/primitives/signature-pad/signature-pad.tsx

@@ -1,591 +1,199 @@
-import type { HTMLAttributes, MouseEvent, PointerEvent, TouchEvent } from 'react';
+import type { HTMLAttributes } from 'react';
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useState } from 'react';
 
-import { Trans } from '@lingui/react/macro';
+import { KeyboardIcon, UploadCloudIcon } from 'lucide-react';
-import { Undo2, Upload } from 'lucide-react';
+import { match } from 'ts-pattern';
-import type { StrokeOptions } from 'perfect-freehand';
-import { getStroke } from 'perfect-freehand';
 
-import { unsafe_useEffectOnce } from '@documenso/lib/client-only/hooks/use-effect-once';
+import { DocumentSignatureType } from '@documenso/lib/constants/document';
-import { Input } from '@documenso/ui/primitives/input';
+import { isBase64Image } from '@documenso/lib/constants/signatures';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@documenso/ui/primitives/select';
 
+import { SignatureIcon } from '../../icons/signature';
 import { cn } from '../../lib/utils';
-import { getSvgPathFromStroke } from './helper';
+import { SignaturePadDraw } from './signature-pad-draw';
-import { Point } from './point';
+import { SignaturePadType } from './signature-pad-type';
+import { SignaturePadUpload } from './signature-pad-upload';
+import { Tabs, TabsContent, TabsList, TabsTrigger } from './signature-tabs';
 
-const DPI = 2;
+export type SignaturePadValue = {
-
+  type: DocumentSignatureType;
-const isBase64Image = (value: string) => value.startsWith('data:image/png;base64,');
+  value: string;
-
-const loadImage = async (file: File | undefined): Promise<HTMLImageElement> => {
-  if (!file) {
-    throw new Error('No file selected');
-  }
-
-  if (!file.type.startsWith('image/')) {
-    throw new Error('Invalid file type');
-  }
-
-  if (file.size > 5 * 1024 * 1024) {
-    throw new Error('Image size should be less than 5MB');
-  }
-
-  return new Promise((resolve, reject) => {
-    const img = new Image();
-    const objectUrl = URL.createObjectURL(file);
-
-    img.onload = () => {
-      URL.revokeObjectURL(objectUrl);
-      resolve(img);
-    };
-
-    img.onerror = () => {
-      URL.revokeObjectURL(objectUrl);
-      reject(new Error('Failed to load image'));
-    };
-
-    img.src = objectUrl;
-  });
-};
-
-const loadImageOntoCanvas = (
-  image: HTMLImageElement,
-  canvas: HTMLCanvasElement,
-  ctx: CanvasRenderingContext2D,
-): ImageData => {
-  const scale = Math.min((canvas.width * 0.8) / image.width, (canvas.height * 0.8) / image.height);
-
-  const x = (canvas.width - image.width * scale) / 2;
-  const y = (canvas.height - image.height * scale) / 2;
-
-  ctx.clearRect(0, 0, canvas.width, canvas.height);
-
-  ctx.save();
-  ctx.imageSmoothingEnabled = true;
-  ctx.imageSmoothingQuality = 'high';
-
-  ctx.drawImage(image, x, y, image.width * scale, image.height * scale);
-
-  ctx.restore();
-
-  const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
-
-  return imageData;
 };
 
 export type SignaturePadProps = Omit<HTMLAttributes<HTMLCanvasElement>, 'onChange'> & {
-  onChange?: (_signatureDataUrl: string | null) => void;
+  value?: string;
-  containerClassName?: string;
+  onChange?: (_value: SignaturePadValue) => void;
+
   disabled?: boolean;
-  allowTypedSignature?: boolean;
+
-  defaultValue?: string;
+  typedSignatureEnabled?: boolean;
+  uploadSignatureEnabled?: boolean;
+  drawSignatureEnabled?: boolean;
+
   onValidityChange?: (isValid: boolean) => void;
-  minCoverageThreshold?: number;
 };
 
 export const SignaturePad = ({
-  className,
+  value = '',
-  containerClassName,
-  defaultValue,
   onChange,
   disabled = false,
-  allowTypedSignature,
+  typedSignatureEnabled = true,
-  onValidityChange,
+  uploadSignatureEnabled = true,
-  minCoverageThreshold = 0.01,
+  drawSignatureEnabled = true,
-  ...props
 }: SignaturePadProps) => {
-  const $el = useRef<HTMLCanvasElement>(null);
+  const [imageSignature, setImageSignature] = useState(isBase64Image(value) ? value : '');
-  const $imageData = useRef<ImageData | null>(null);
+  const [drawSignature, setDrawSignature] = useState(isBase64Image(value) ? value : '');
-  const $fileInput = useRef<HTMLInputElement>(null);
+  const [typedSignature, setTypedSignature] = useState(isBase64Image(value) ? '' : value);
 
-  const [isPressed, setIsPressed] = useState(false);
+  /**
-  const [lines, setLines] = useState<Point[][]>([]);
+   * This is cooked.
-  const [currentLine, setCurrentLine] = useState<Point[]>([]);
+   *
-  const [selectedColor, setSelectedColor] = useState('black');
+   * Get the first enabled tab that has a signature if possible, otherwise just get
-  const [typedSignature, setTypedSignature] = useState(
+   * the first enabled tab.
-    defaultValue && !isBase64Image(defaultValue) ? defaultValue : '',
+   */
+  const [tab, setTab] = useState(
+    ((): 'draw' | 'text' | 'image' => {
+      // First passthrough to check to see if there's a signature for a given tab.
+      if (drawSignatureEnabled && drawSignature) {
+        return 'draw';
+      }
+
+      if (typedSignatureEnabled && typedSignature) {
+        return 'text';
+      }
+
+      if (uploadSignatureEnabled && imageSignature) {
+        return 'image';
+      }
+
+      // Second passthrough to just select the first avaliable tab.
+      if (drawSignatureEnabled) {
+        return 'draw';
+      }
+
+      if (typedSignatureEnabled) {
+        return 'text';
+      }
+
+      if (uploadSignatureEnabled) {
+        return 'image';
+      }
+
+      throw new Error('No signature enabled');
+    })(),
   );
 
-  const perfectFreehandOptions = useMemo(() => {
+  const onImageSignatureChange = (value: string) => {
-    const size = $el.current ? Math.min($el.current.height, $el.current.width) * 0.03 : 10;
+    setImageSignature(value);
 
-    return {
+    onChange?.({
-      size,
+      type: DocumentSignatureType.UPLOAD,
-      thinning: 0.25,
+      value,
-      streamline: 0.5,
+    });
-      smoothing: 0.5,
-      end: {
-        taper: size * 2,
-      },
-    } satisfies StrokeOptions;
-  }, []);
-
-  const checkSignatureValidity = () => {
-    if ($el.current) {
-      const ctx = $el.current.getContext('2d');
-
-      if (ctx) {
-        const imageData = ctx.getImageData(0, 0, $el.current.width, $el.current.height);
-        const data = imageData.data;
-        let filledPixels = 0;
-        const totalPixels = data.length / 4;
-
-        for (let i = 0; i < data.length; i += 4) {
-          if (data[i + 3] > 0) filledPixels++;
-        }
-
-        const filledPercentage = filledPixels / totalPixels;
-        const isValid = filledPercentage > minCoverageThreshold;
-        onValidityChange?.(isValid);
-
-        return isValid;
-      }
-    }
   };
 
-  const onMouseDown = (event: MouseEvent | PointerEvent | TouchEvent) => {
+  const onDrawSignatureChange = (value: string) => {
-    if (event.cancelable) {
+    setDrawSignature(value);
-      event.preventDefault();
-    }
 
-    setIsPressed(true);
+    onChange?.({
-
+      type: DocumentSignatureType.DRAW,
-    if (typedSignature) {
+      value,
-      setTypedSignature('');
+    });
-      if ($el.current) {
-        const ctx = $el.current.getContext('2d');
-        ctx?.clearRect(0, 0, $el.current.width, $el.current.height);
-      }
-    }
-
-    const point = Point.fromEvent(event, DPI, $el.current);
-
-    setCurrentLine([point]);
   };
 
-  const onMouseMove = (event: MouseEvent | PointerEvent | TouchEvent) => {
+  const onTypedSignatureChange = (value: string) => {
-    if (event.cancelable) {
+    setTypedSignature(value);
-      event.preventDefault();
-    }
 
-    if (!isPressed) {
+    onChange?.({
+      type: DocumentSignatureType.TYPE,
+      value,
+    });
+  };
+
+  const onTabChange = (value: 'draw' | 'text' | 'image') => {
+    if (disabled) {
       return;
     }
 
-    const point = Point.fromEvent(event, DPI, $el.current);
+    setTab(value);
-    const lastPoint = currentLine[currentLine.length - 1];
 
-    if (lastPoint && point.distanceTo(lastPoint) > 5) {
+    match(value)
-      setCurrentLine([...currentLine, point]);
+      .with('draw', () => {
-
+        onDrawSignatureChange(drawSignature);
-      // Update the canvas here to draw the lines
+      })
-      if ($el.current) {
+      .with('text', () => {
-        const ctx = $el.current.getContext('2d');
+        onTypedSignatureChange(typedSignature);
-
+      })
-        if (ctx) {
+      .with('image', () => {
-          ctx.restore();
+        onImageSignatureChange(imageSignature);
-          ctx.imageSmoothingEnabled = true;
+      })
-          ctx.imageSmoothingQuality = 'high';
+      .exhaustive();
-          ctx.fillStyle = selectedColor;
-
-          lines.forEach((line) => {
-            const pathData = new Path2D(
-              getSvgPathFromStroke(getStroke(line, perfectFreehandOptions)),
-            );
-
-            ctx.fill(pathData);
-          });
-
-          const pathData = new Path2D(
-            getSvgPathFromStroke(getStroke([...currentLine, point], perfectFreehandOptions)),
-          );
-          ctx.fill(pathData);
-        }
-      }
-    }
   };
 
-  const onMouseUp = (event: MouseEvent | PointerEvent | TouchEvent, addLine = true) => {
+  if (!drawSignatureEnabled && !typedSignatureEnabled && !uploadSignatureEnabled) {
-    if (event.cancelable) {
+    return null;
-      event.preventDefault();
+  }
-    }
-
-    setIsPressed(false);
-
-    const point = Point.fromEvent(event, DPI, $el.current);
-
-    const newLines = [...lines];
-
-    if (addLine && currentLine.length > 0) {
-      newLines.push([...currentLine, point]);
-      setCurrentLine([]);
-    }
-
-    setLines(newLines);
-
-    if ($el.current && newLines.length > 0) {
-      const ctx = $el.current.getContext('2d');
-
-      if (ctx) {
-        ctx.restore();
-        ctx.imageSmoothingEnabled = true;
-        ctx.imageSmoothingQuality = 'high';
-        ctx.fillStyle = selectedColor;
-
-        newLines.forEach((line) => {
-          const pathData = new Path2D(
-            getSvgPathFromStroke(getStroke(line, perfectFreehandOptions)),
-          );
-          ctx.fill(pathData);
-        });
-
-        const isValidSignature = checkSignatureValidity();
-
-        if (isValidSignature) {
-          onChange?.($el.current.toDataURL());
-        }
-        ctx.save();
-      }
-    }
-  };
-
-  const onMouseEnter = (event: MouseEvent | PointerEvent | TouchEvent) => {
-    if (event.cancelable) {
-      event.preventDefault();
-    }
-
-    if ('buttons' in event && event.buttons === 1) {
-      onMouseDown(event);
-    }
-  };
-
-  const onMouseLeave = (event: MouseEvent | PointerEvent | TouchEvent) => {
-    if (event.cancelable) {
-      event.preventDefault();
-    }
-
-    if (isPressed) {
-      onMouseUp(event, true);
-    } else {
-      onMouseUp(event, false);
-    }
-  };
-
-  const onClearClick = () => {
-    if ($el.current) {
-      const ctx = $el.current.getContext('2d');
-
-      ctx?.clearRect(0, 0, $el.current.width, $el.current.height);
-      $imageData.current = null;
-    }
-
-    if ($fileInput.current) {
-      $fileInput.current.value = '';
-    }
-
-    onChange?.(null);
-
-    setTypedSignature('');
-    setLines([]);
-    setCurrentLine([]);
-    setIsPressed(false);
-  };
-
-  const renderTypedSignature = () => {
-    if ($el.current && typedSignature) {
-      const ctx = $el.current.getContext('2d');
-
-      if (ctx) {
-        const canvasWidth = $el.current.width;
-        const canvasHeight = $el.current.height;
-        const fontFamily = 'Caveat';
-
-        ctx.clearRect(0, 0, canvasWidth, canvasHeight);
-        ctx.textAlign = 'center';
-        ctx.textBaseline = 'middle';
-        ctx.fillStyle = selectedColor;
-
-        // Calculate the desired width (25ch)
-        const desiredWidth = canvasWidth * 0.85; // 85% of canvas width
-
-        // Start with a base font size
-        let fontSize = 18;
-        ctx.font = `${fontSize}px ${fontFamily}`;
-
-        // Measure 10 characters and calculate scale factor
-        const characterWidth = ctx.measureText('m'.repeat(10)).width;
-        const scaleFactor = desiredWidth / characterWidth;
-
-        // Apply scale factor to font size
-        fontSize = fontSize * scaleFactor;
-
-        // Adjust font size if it exceeds canvas width
-        ctx.font = `${fontSize}px ${fontFamily}`;
-
-        const textWidth = ctx.measureText(typedSignature).width;
-
-        if (textWidth > desiredWidth) {
-          fontSize = fontSize * (desiredWidth / textWidth);
-        }
-
-        // Set final font and render text
-        ctx.font = `${fontSize}px ${fontFamily}`;
-        ctx.fillText(typedSignature, canvasWidth / 2, canvasHeight / 2);
-      }
-    }
-  };
-
-  const handleTypedSignatureChange = (event: React.ChangeEvent<HTMLInputElement>) => {
-    const newValue = event.target.value;
-
-    // Deny input while drawing.
-    if (isPressed) {
-      return;
-    }
-
-    if (lines.length > 0) {
-      setLines([]);
-      setCurrentLine([]);
-    }
-
-    setTypedSignature(newValue);
-
-    if ($el.current) {
-      const ctx = $el.current.getContext('2d');
-      ctx?.clearRect(0, 0, $el.current.width, $el.current.height);
-    }
-
-    if (newValue.trim() !== '') {
-      onChange?.(newValue);
-      onValidityChange?.(true);
-    } else {
-      onChange?.(null);
-      onValidityChange?.(false);
-    }
-  };
-
-  const handleImageUpload = async (event: React.ChangeEvent<HTMLInputElement>) => {
-    try {
-      const img = await loadImage(event.target.files?.[0]);
-
-      if (!$el.current) return;
-
-      const ctx = $el.current.getContext('2d');
-      if (!ctx) return;
-
-      $imageData.current = loadImageOntoCanvas(img, $el.current, ctx);
-      onChange?.($el.current.toDataURL());
-
-      setLines([]);
-      setCurrentLine([]);
-      setTypedSignature('');
-    } catch (error) {
-      console.error(error);
-    }
-  };
-
-  useEffect(() => {
-    if (typedSignature.trim() !== '' && !isBase64Image(typedSignature)) {
-      renderTypedSignature();
-      onChange?.(typedSignature);
-    }
-  }, [typedSignature, selectedColor]);
-
-  const onUndoClick = () => {
-    if (lines.length === 0 && typedSignature.length === 0) {
-      return;
-    }
-
-    if (typedSignature.length > 0) {
-      const newTypedSignature = typedSignature.slice(0, -1);
-      setTypedSignature(newTypedSignature);
-      // You might want to call onChange here as well
-      // onChange?.(newTypedSignature);
-    } else {
-      const newLines = lines.slice(0, -1);
-      setLines(newLines);
-
-      // Clear and redraw the canvas
-      if ($el.current) {
-        const ctx = $el.current.getContext('2d');
-        const { width, height } = $el.current;
-        ctx?.clearRect(0, 0, width, height);
-
-        if (typeof defaultValue === 'string' && $imageData.current) {
-          ctx?.putImageData($imageData.current, 0, 0);
-        }
-
-        newLines.forEach((line) => {
-          const pathData = new Path2D(
-            getSvgPathFromStroke(getStroke(line, perfectFreehandOptions)),
-          );
-          ctx?.fill(pathData);
-        });
-
-        onChange?.($el.current.toDataURL());
-      }
-    }
-  };
-
-  useEffect(() => {
-    if ($el.current) {
-      $el.current.width = $el.current.clientWidth * DPI;
-      $el.current.height = $el.current.clientHeight * DPI;
-    }
-
-    if (defaultValue && typedSignature) {
-      renderTypedSignature();
-    }
-  }, []);
-
-  unsafe_useEffectOnce(() => {
-    if ($el.current && typeof defaultValue === 'string') {
-      const ctx = $el.current.getContext('2d');
-
-      const { width, height } = $el.current;
-
-      const img = new Image();
-
-      img.onload = () => {
-        ctx?.drawImage(img, 0, 0, Math.min(width, img.width), Math.min(height, img.height));
-
-        const defaultImageData = ctx?.getImageData(0, 0, width, height) || null;
-
-        $imageData.current = defaultImageData;
-      };
-
-      img.src = defaultValue;
-    }
-  });
 
   return (
-    <div
+    <Tabs
-      className={cn('relative block select-none', containerClassName, {
+      defaultValue={tab}
-        'pointer-events-none opacity-50': disabled,
+      className={cn({
+        'pointer-events-none': disabled,
       })}
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      onValueChange={(value) => onTabChange(value as 'draw' | 'text' | 'image')}
     >
-      <canvas
+      <TabsList>
-        data-testid="signature-pad"
+        {drawSignatureEnabled && (
-        ref={$el}
+          <TabsTrigger value="draw">
-        className={cn(
+            <SignatureIcon className="mr-2 size-4" />
-          'relative block',
+            Draw
-          {
+          </TabsTrigger>
-            'dark:hue-rotate-180 dark:invert': selectedColor === 'black',
-          },
-          className,
         )}
-        style={{ touchAction: 'none' }}
-        onPointerMove={(event) => onMouseMove(event)}
-        onPointerDown={(event) => onMouseDown(event)}
-        onPointerUp={(event) => onMouseUp(event)}
-        onPointerLeave={(event) => onMouseLeave(event)}
-        onPointerEnter={(event) => onMouseEnter(event)}
-        {...props}
-      />
 
-      {allowTypedSignature && (
+        {typedSignatureEnabled && (
-        <div
+          <TabsTrigger value="text">
-          className={cn('ml-4 pb-1', {
+            <KeyboardIcon className="mr-2 size-4" />
-            'ml-10': lines.length > 0 || typedSignature.length > 0,
+            Type
-          })}
+          </TabsTrigger>
-        >
+        )}
-          <Input
-            placeholder="Type your signature"
-            className="w-1/2 border-none p-0 focus-visible:outline-none focus-visible:ring-0 focus-visible:ring-offset-0"
-            value={typedSignature}
-            onChange={handleTypedSignatureChange}
-          />
-        </div>
-      )}
 
-      <div className="text-foreground absolute left-3 top-3 filter">
+        {uploadSignatureEnabled && (
-        <div
+          <TabsTrigger value="image">
-          className="focus-visible:ring-ring ring-offset-background text-muted-foreground/60 hover:text-muted-foreground flex cursor-pointer flex-row gap-2 rounded-full p-0 text-[0.688rem] focus-visible:outline-none focus-visible:ring-2"
+            <UploadCloudIcon className="mr-2 size-4" />
-          onClick={() => $fileInput.current?.click()}
+            Upload
-        >
+          </TabsTrigger>
-          <Input
+        )}
-            ref={$fileInput}
+      </TabsList>
-            type="file"
-            accept="image/*"
-            className="hidden"
-            onChange={handleImageUpload}
-            disabled={disabled}
-          />
-          <Upload className="h-4 w-4" />
-          <span>
-            <Trans>Upload Signature</Trans>
-          </span>
-        </div>
-      </div>
 
-      <div className="text-foreground absolute right-2 top-2 filter">
+      <TabsContent
-        <Select defaultValue={selectedColor} onValueChange={(value) => setSelectedColor(value)}>
+        value="draw"
-          <SelectTrigger className="h-auto w-auto border-none p-0.5">
+        className="border-border aspect-signature-pad dark:bg-background relative flex items-center justify-center rounded-md border bg-neutral-50 text-center"
-            <SelectValue placeholder="" />
+      >
-          </SelectTrigger>
+        <SignaturePadDraw
+          className="h-full w-full"
+          onChange={onDrawSignatureChange}
+          value={drawSignature}
+        />
+      </TabsContent>
 
-          <SelectContent className="w-[100px]" align="end">
+      <TabsContent
-            <SelectItem value="black">
+        value="text"
-              <div className="text-muted-foreground flex items-center text-[0.688rem]">
+        className="border-border aspect-signature-pad dark:bg-background relative flex items-center justify-center rounded-md border bg-neutral-50 text-center"
-                <div className="border-border mr-1 h-4 w-4 rounded-full border-2 bg-black shadow-sm" />
+      >
-                <Trans>Black</Trans>
+        <SignaturePadType value={typedSignature} onChange={onTypedSignatureChange} />
-              </div>
+      </TabsContent>
-            </SelectItem>
 
-            <SelectItem value="red">
+      <TabsContent
-              <div className="text-muted-foreground flex items-center text-[0.688rem]">
+        value="image"
-                <div className="border-border mr-1 h-4 w-4 rounded-full border-2 bg-[red] shadow-sm" />
+        className={cn(
-                <Trans>Red</Trans>
+          'border-border aspect-signature-pad dark:bg-background relative rounded-md border bg-neutral-50',
-              </div>
+          {
-            </SelectItem>
+            'bg-white': imageSignature,
-
+          },
-            <SelectItem value="blue">
+        )}
-              <div className="text-muted-foreground flex items-center text-[0.688rem]">
+      >
-                <div className="border-border mr-1 h-4 w-4 rounded-full border-2 bg-[blue] shadow-sm" />
+        <SignaturePadUpload value={imageSignature} onChange={onImageSignatureChange} />
-                <Trans>Blue</Trans>
+      </TabsContent>
-              </div>
+    </Tabs>
-            </SelectItem>
-
-            <SelectItem value="green">
-              <div className="text-muted-foreground flex items-center text-[0.688rem]">
-                <div className="border-border mr-1 h-4 w-4 rounded-full border-2 bg-[green] shadow-sm" />
-                <Trans>Green</Trans>
-              </div>
-            </SelectItem>
-          </SelectContent>
-        </Select>
-      </div>
-
-      <div className="absolute bottom-3 right-3 flex gap-2">
-        <button
-          type="button"
-          className="focus-visible:ring-ring ring-offset-background text-muted-foreground/60 hover:text-muted-foreground rounded-full p-0 text-[0.688rem] focus-visible:outline-none focus-visible:ring-2"
-          onClick={() => onClearClick()}
-        >
-          <Trans>Clear Signature</Trans>
-        </button>
-      </div>
-
-      {(lines.length > 0 || typedSignature.length > 0) && (
-        <div className="absolute bottom-4 left-4 flex gap-2">
-          <button
-            type="button"
-            title="undo"
-            className="focus-visible:ring-ring ring-offset-background text-muted-foreground/60 hover:text-muted-foreground rounded-full p-0 text-[0.688rem] focus-visible:outline-none focus-visible:ring-2"
-            onClick={onUndoClick}
-          >
-            <Undo2 className="h-4 w-4" />
-            <span className="sr-only">Undo</span>
-          </button>
-        </div>
-      )}
-    </div>
   );
 };

packages/ui/primitives/signature-pad/signature-render.tsx

@@ -0,0 +1,128 @@
+import { useEffect, useRef } from 'react';
+
+import { SIGNATURE_CANVAS_DPI, isBase64Image } from '@documenso/lib/constants/signatures';
+
+import { cn } from '../../lib/utils';
+
+export type SignatureRenderProps = {
+  className?: string;
+  value: string;
+};
+
+/**
+ * Renders a typed, uploaded or drawn signature.
+ */
+export const SignatureRender = ({ className, value }: SignatureRenderProps) => {
+  const $el = useRef<HTMLCanvasElement>(null);
+  const $imageData = useRef<ImageData | null>(null);
+
+  const renderTypedSignature = () => {
+    if (!$el.current) {
+      return;
+    }
+
+    const ctx = $el.current.getContext('2d');
+
+    if (!ctx) {
+      return;
+    }
+
+    ctx.clearRect(0, 0, $el.current.width, $el.current.height);
+
+    const canvasWidth = $el.current.width;
+    const canvasHeight = $el.current.height;
+    const fontFamily = 'Caveat';
+
+    ctx.clearRect(0, 0, canvasWidth, canvasHeight);
+    ctx.textAlign = 'center';
+    ctx.textBaseline = 'middle';
+    // ctx.fillStyle = selectedColor; // Todo: Color not implemented...
+
+    // Calculate the desired width (25ch)
+    const desiredWidth = canvasWidth * 0.85; // 85% of canvas width
+
+    // Start with a base font size
+    let fontSize = 18;
+    ctx.font = `${fontSize}px ${fontFamily}`;
+
+    // Measure 10 characters and calculate scale factor
+    const characterWidth = ctx.measureText('m'.repeat(10)).width;
+    const scaleFactor = desiredWidth / characterWidth;
+
+    // Apply scale factor to font size
+    fontSize = fontSize * scaleFactor;
+
+    // Adjust font size if it exceeds canvas width
+    ctx.font = `${fontSize}px ${fontFamily}`;
+
+    const textWidth = ctx.measureText(value).width;
+
+    if (textWidth > desiredWidth) {
+      fontSize = fontSize * (desiredWidth / textWidth);
+    }
+
+    // Set final font and render text
+    ctx.font = `${fontSize}px ${fontFamily}`;
+    ctx.fillText(value, canvasWidth / 2, canvasHeight / 2);
+  };
+
+  const renderImageSignature = () => {
+    if (!$el.current || typeof value !== 'string') {
+      return;
+    }
+
+    const ctx = $el.current.getContext('2d');
+
+    if (!ctx) {
+      return;
+    }
+
+    ctx.clearRect(0, 0, $el.current.width, $el.current.height);
+
+    const { width, height } = $el.current;
+
+    const img = new Image();
+
+    img.onload = () => {
+      // Calculate the scaled dimensions while maintaining aspect ratio
+      const scale = Math.min(width / img.width, height / img.height);
+      const scaledWidth = img.width * scale;
+      const scaledHeight = img.height * scale;
+
+      // Calculate center position
+      const x = (width - scaledWidth) / 2;
+      const y = (height - scaledHeight) / 2;
+
+      ctx?.drawImage(img, x, y, scaledWidth, scaledHeight);
+
+      const defaultImageData = ctx?.getImageData(0, 0, width, height) || null;
+
+      $imageData.current = defaultImageData;
+    };
+
+    img.src = value;
+  };
+
+  useEffect(() => {
+    if ($el.current) {
+      $el.current.width = $el.current.clientWidth * SIGNATURE_CANVAS_DPI;
+      $el.current.height = $el.current.clientHeight * SIGNATURE_CANVAS_DPI;
+    }
+  }, []);
+
+  useEffect(() => {
+    if (isBase64Image(value)) {
+      renderImageSignature();
+    } else {
+      renderTypedSignature();
+    }
+  }, [value]);
+
+  return (
+    <canvas
+      ref={$el}
+      className={cn('h-full w-full dark:hue-rotate-180 dark:invert', className)}
+      style={{ touchAction: 'none' }}
+    />
+  );
+};

packages/ui/primitives/signature-pad/signature-tabs.tsx

@@ -0,0 +1,147 @@
+import * as React from 'react';
+
+import { motion } from 'framer-motion';
+
+import { cn } from '../../lib/utils';
+
+interface TabsProps extends React.HTMLAttributes<HTMLDivElement> {
+  defaultValue?: string;
+  value?: string;
+  onValueChange?: (value: string) => void;
+  children: React.ReactNode;
+}
+
+interface TabsContextValue {
+  value: string;
+  onValueChange: (value: string) => void;
+}
+
+const TabsContext = React.createContext<TabsContextValue | undefined>(undefined);
+
+function useTabs() {
+  const context = React.useContext(TabsContext);
+  if (!context) {
+    throw new Error('useTabs must be used within a Tabs provider');
+  }
+  return context;
+}
+
+export function Tabs({
+  defaultValue,
+  value,
+  onValueChange,
+  children,
+  className,
+  ...props
+}: TabsProps) {
+  const [tabValue, setTabValue] = React.useState(defaultValue || '');
+
+  const handleValueChange = React.useCallback(
+    (newValue: string) => {
+      setTabValue(newValue);
+      onValueChange?.(newValue);
+    },
+    [onValueChange],
+  );
+
+  const contextValue = React.useMemo(
+    () => ({
+      value: value !== undefined ? value : tabValue,
+      onValueChange: handleValueChange,
+    }),
+    [value, tabValue, handleValueChange],
+  );
+
+  return (
+    <TabsContext.Provider value={contextValue}>
+      <div className={cn('w-full', className)} {...props}>
+        {children}
+      </div>
+    </TabsContext.Provider>
+  );
+}
+
+interface TabsListProps extends React.HTMLAttributes<HTMLDivElement> {
+  children: React.ReactNode;
+}
+
+export function TabsList({ children, className, ...props }: TabsListProps) {
+  return (
+    <div
+      className={cn('border-border flex flex-wrap border-b', className)}
+      role="tabslist"
+      {...props}
+    >
+      {children}
+    </div>
+  );
+}
+
+interface TabsTriggerProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+  value: string;
+  icon?: React.ReactNode;
+  children: React.ReactNode;
+}
+
+export function TabsTrigger({ value, icon, children, className, ...props }: TabsTriggerProps) {
+  const { value: selectedValue, onValueChange } = useTabs();
+  const isSelected = selectedValue === value;
+
+  return (
+    <button
+      role="tab"
+      type="button"
+      aria-selected={isSelected}
+      data-state={isSelected ? 'active' : 'inactive'}
+      onClick={() => onValueChange(value)}
+      className={cn(
+        'relative flex items-center px-4 py-3 text-sm font-medium transition-all',
+        'focus-visible:ring-ring focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2',
+        isSelected ? 'text-foreground' : 'text-muted-foreground hover:text-foreground',
+        className,
+      )}
+      {...props}
+    >
+      {icon && <span className="flex items-center">{icon}</span>}
+      {children}
+      {isSelected && (
+        <motion.div
+          layoutId="activeTabIndicator"
+          className="bg-foreground/40 absolute bottom-0 left-0 h-0.5 w-full rounded-full"
+          initial={{ opacity: 0 }}
+          animate={{ opacity: 1 }}
+          transition={{
+            type: 'spring',
+            stiffness: 500,
+            damping: 50,
+          }}
+        />
+      )}
+    </button>
+  );
+}
+
+interface TabsContentProps extends React.HTMLAttributes<HTMLDivElement> {
+  value: string;
+  children: React.ReactNode;
+}
+
+export function TabsContent({ value, children, className, ...props }: TabsContentProps) {
+  const { value: selectedValue } = useTabs();
+  const isSelected = selectedValue === value;
+
+  if (!isSelected) {
+    return null;
+  }
+
+  return (
+    <div
+      role="tabpanel"
+      data-state={isSelected ? 'active' : 'inactive'}
+      className={cn('mt-4', className)}
+      {...props}
+    >
+      {children}
+    </div>
+  );
+}

packages/ui/primitives/template-flow/add-template-fields.tsx

@@ -54,10 +54,9 @@ import { Popover, PopoverContent, PopoverTrigger } from '@documenso/ui/primitive
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { getSignerColorStyles, useSignerColors } from '../../lib/signer-colors';
-import { Checkbox } from '../checkbox';
 import type { FieldFormType } from '../document-flow/add-fields';
 import { FieldAdvancedSettings } from '../document-flow/field-item-advanced-settings';
-import { Form, FormControl, FormField, FormItem, FormLabel } from '../form/form';
+import { Form } from '../form/form';
 import { useStep } from '../stepper';
 import type { TAddTemplateFieldsFormSchema } from './add-template-fields.types';
 
@@ -74,7 +73,6 @@ export type AddTemplateFieldsFormProps = {
   fields: Field[];
   onSubmit: (_data: TAddTemplateFieldsFormSchema) => void;
   teamId?: number;
-  typedSignatureEnabled?: boolean;
 };
 
 export const AddTemplateFieldsFormPartial = ({
@@ -84,7 +82,6 @@ export const AddTemplateFieldsFormPartial = ({
   fields,
   onSubmit,
   teamId,
-  typedSignatureEnabled,
 }: AddTemplateFieldsFormProps) => {
   const { _ } = useLingui();
   const { toast } = useToast();
@@ -119,7 +116,6 @@ export const AddTemplateFieldsFormPartial = ({
           recipients.find((recipient) => recipient.id === field.recipientId)?.token ?? '',
         fieldMeta: field.fieldMeta ? ZFieldMetaSchema.parse(field.fieldMeta) : undefined,
       })),
-      typedSignatureEnabled: typedSignatureEnabled ?? false,
     },
   });
 
@@ -483,12 +479,6 @@ export const AddTemplateFieldsFormPartial = ({
     form.setValue('fields', updatedFields);
   };
 
-  const isTypedSignatureEnabled = form.watch('typedSignatureEnabled');
-
-  const handleTypedSignatureChange = (value: boolean) => {
-    form.setValue('typedSignatureEnabled', value, { shouldDirty: true });
-  };
-
   return (
     <>
       {showAdvancedSettings && currentField ? (
@@ -662,31 +652,6 @@ export const AddTemplateFieldsFormPartial = ({
               )}
 
               <Form {...form}>
-                <FormField
-                  control={form.control}
-                  name="typedSignatureEnabled"
-                  render={({ field: { value, ...field } }) => (
-                    <FormItem className="mb-6 flex flex-row items-center space-x-2 space-y-0">
-                      <FormControl>
-                        <Checkbox
-                          {...field}
-                          id="typedSignatureEnabled"
-                          checked={value}
-                          onCheckedChange={(checked) => field.onChange(checked)}
-                          disabled={form.formState.isSubmitting}
-                        />
-                      </FormControl>
-
-                      <FormLabel
-                        htmlFor="typedSignatureEnabled"
-                        className="text-sm leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
-                      >
-                        <Trans>Enable Typed Signatures</Trans>
-                      </FormLabel>
-                    </FormItem>
-                  )}
-                />
-
                 <div className="-mx-2 flex-1 overflow-y-auto px-2">
                   <fieldset className="my-2 grid grid-cols-3 gap-4">
                     <button

packages/ui/primitives/template-flow/add-template-fields.types.ts

@@ -20,7 +20,6 @@ export const ZAddTemplateFieldsFormSchema = z.object({
       fieldMeta: ZFieldMetaSchema,
     }),
   ),
-  typedSignatureEnabled: z.boolean(),
 });
 
 export type TAddTemplateFieldsFormSchema = z.infer<typeof ZAddTemplateFieldsFormSchema>;

packages/ui/primitives/template-flow/add-template-settings.tsx

@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import { useLingui } from '@lingui/react';
+import { useLingui } from '@lingui/react/macro';
 import { Trans } from '@lingui/react/macro';
 import { DocumentVisibility, TeamMemberRole } from '@prisma/client';
 import { DocumentDistributionMethod, type Field, type Recipient } from '@prisma/client';
@@ -10,12 +10,16 @@ import { useForm } from 'react-hook-form';
 import { match } from 'ts-pattern';
 
 import { DATE_FORMATS, DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
-import { DOCUMENT_DISTRIBUTION_METHODS } from '@documenso/lib/constants/document';
+import {
+  DOCUMENT_DISTRIBUTION_METHODS,
+  DOCUMENT_SIGNATURE_TYPES,
+} from '@documenso/lib/constants/document';
 import { SUPPORTED_LANGUAGES } from '@documenso/lib/constants/i18n';
 import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';
 import type { TTemplate } from '@documenso/lib/types/template';
 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
+import { extractTeamSignatureSettings } from '@documenso/lib/utils/teams';
 import type { TDocumentMetaDateFormat } from '@documenso/trpc/server/document-router/schema';
 import {
   DocumentGlobalAuthAccessSelect,
@@ -46,6 +50,7 @@ import {
 } from '@documenso/ui/primitives/form/form';
 
 import { DocumentEmailCheckboxes } from '../../components/document/document-email-checkboxes';
+import { DocumentSignatureSettingsTooltip } from '../../components/document/document-signature-settings-tooltip';
 import { Combobox } from '../combobox';
 import {
   DocumentFlowFormContainerActions,
@@ -57,6 +62,7 @@ import {
 import { ShowFieldItem } from '../document-flow/show-field-item';
 import type { DocumentFlowStep } from '../document-flow/types';
 import { Input } from '../input';
+import { MultiSelectCombobox } from '../multi-select-combobox';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../select';
 import { useStep } from '../stepper';
 import { Textarea } from '../textarea';
@@ -85,7 +91,7 @@ export const AddTemplateSettingsFormPartial = ({
   currentTeamMemberRole,
   onSubmit,
 }: AddTemplateSettingsFormProps) => {
-  const { _ } = useLingui();
+  const { t, i18n } = useLingui();
 
   const { documentAuthOption } = extractDocumentAuthMethods({
     documentAuth: template.authOptions,
@@ -111,6 +117,7 @@ export const AddTemplateSettingsFormPartial = ({
         redirectUrl: template.templateMeta?.redirectUrl ?? '',
         language: template.templateMeta?.language ?? 'en',
         emailSettings: ZDocumentEmailSettingsSchema.parse(template?.templateMeta?.emailSettings),
+        signatureTypes: extractTeamSignatureSettings(template?.templateMeta),
       },
     },
   });
@@ -314,7 +321,7 @@ export const AddTemplateSettingsFormPartial = ({
                         {Object.values(DOCUMENT_DISTRIBUTION_METHODS).map(
                           ({ value, description }) => (
                             <SelectItem key={value} value={value}>
-                              {_(description)}
+                              {i18n._(description)}
                             </SelectItem>
                           ),
                         )}
@@ -325,6 +332,34 @@ export const AddTemplateSettingsFormPartial = ({
               )}
             />
 
+            <FormField
+              control={form.control}
+              name="meta.signatureTypes"
+              render={({ field }) => (
+                <FormItem>
+                  <FormLabel className="flex flex-row items-center">
+                    <Trans>Allowed Signature Types</Trans>
+                    <DocumentSignatureSettingsTooltip />
+                  </FormLabel>
+
+                  <FormControl>
+                    <MultiSelectCombobox
+                      options={Object.values(DOCUMENT_SIGNATURE_TYPES).map((option) => ({
+                        label: t(option.label),
+                        value: option.value,
+                      }))}
+                      selectedValues={field.value}
+                      onChange={field.onChange}
+                      className="bg-background w-full"
+                      emptySelectionPlaceholder="Select signature types"
+                    />
+                  </FormControl>
+
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
             {isEnterprise && (
               <FormField
                 control={form.control}

packages/ui/primitives/template-flow/add-template-settings.types.tsx

@@ -1,8 +1,10 @@
+import { msg } from '@lingui/core/macro';
 import { DocumentDistributionMethod } from '@prisma/client';
 import { DocumentVisibility } from '@prisma/client';
 import { z } from 'zod';
 
 import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
+import { DocumentSignatureType } from '@documenso/lib/constants/document';
 import { SUPPORTED_LANGUAGE_CODES } from '@documenso/lib/constants/i18n';
 import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';
 import {
@@ -49,6 +51,9 @@ export const ZAddTemplateSettingsFormSchema = z.object({
       .optional()
       .default('en'),
     emailSettings: ZDocumentEmailSettingsSchema,
+    signatureTypes: z.array(z.nativeEnum(DocumentSignatureType)).min(1, {
+      message: msg`At least one signature type must be enabled`.id,
+    }),
   }),
 });