fix: wip

apps/remix/app/components/dialogs/envelope-distribute-dialog.tsx

@@ -127,12 +127,12 @@ export const EnvelopeDistributeDialog = ({ envelope, trigger }: EnvelopeDistribu
 
   const distributionMethod = watch('meta.distributionMethod');
 
-  const everySignerHasSignature = useMemo(
+  const recipientsMissingSignatureFields = useMemo(
     () =>
-      envelope.recipients
+      envelope.recipients.filter(
-        .filter((recipient) => recipient.role === RecipientRole.SIGNER)
+        (recipient) =>
-        .every((recipient) =>
+          recipient.role === RecipientRole.SIGNER &&
-          envelope.fields.some(
+          !envelope.fields.some(
             (field) => field.type === FieldType.SIGNATURE && field.recipientId === recipient.id,
           ),
       ),
@@ -178,7 +178,7 @@ export const EnvelopeDistributeDialog = ({ envelope, trigger }: EnvelopeDistribu
             <Trans>Recipients will be able to sign the document once sent</Trans>
           </DialogDescription>
         </DialogHeader>
-        {everySignerHasSignature ? (
+        {recipientsMissingSignatureFields.length === 0 ? (
           <Form {...form}>
             <form onSubmit={handleSubmit(onFormSubmit)}>
               <fieldset disabled={isSubmitting}>
@@ -350,6 +350,8 @@ export const EnvelopeDistributeDialog = ({ envelope, trigger }: EnvelopeDistribu
                           </div>
                         ) : (
                           <ul className="text-muted-foreground divide-y">
+                            {/* Todo: Envelopes - I don't think this section shows up */}
+
                             {recipients.length === 0 && (
                               <li className="flex flex-col items-center justify-center py-6 text-sm">
                                 <Trans>No recipients</Trans>
@@ -427,10 +429,13 @@ export const EnvelopeDistributeDialog = ({ envelope, trigger }: EnvelopeDistribu
           <>
             <Alert variant="warning">
               <AlertDescription>
-                <Trans>
+                <Trans>The following signers are missing signature fields:</Trans>
-                  Some signers have not been assigned a signature field. Please assign at least 1
+
-                  signature field to each signer before proceeding.
+                <ul className="ml-2 mt-1 list-inside list-disc">
-                </Trans>
+                  {recipientsMissingSignatureFields.map((recipient) => (
+                    <li key={recipient.id}>{recipient.email}</li>
+                  ))}
+                </ul>
               </AlertDescription>
             </Alert>
 

apps/remix/app/components/dialogs/sign-field-dropdown-dialog.tsx

@@ -1,40 +1,15 @@
-import { zodResolver } from '@hookform/resolvers/zod';
+import { useLingui } from '@lingui/react/macro';
-import { msg } from '@lingui/core/macro';
-import { Trans, useLingui } from '@lingui/react/macro';
 import { createCallable } from 'react-call';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
 
 import type { TDropdownFieldMeta } from '@documenso/lib/types/field-meta';
-import { Button } from '@documenso/ui/primitives/button';
 import {
-  Dialog,
+  CommandDialog,
-  DialogContent,
+  CommandEmpty,
-  DialogDescription,
+  CommandGroup,
-  DialogFooter,
+  CommandInput,
-  DialogHeader,
+  CommandItem,
-  DialogTitle,
+  CommandList,
-} from '@documenso/ui/primitives/dialog';
+} from '@documenso/ui/primitives/command';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@documenso/ui/primitives/select';
-
-const ZSignFieldDropdownFormSchema = z.object({
-  dropdown: z.string().min(1, { message: msg`Option is required`.id }),
-});
-
-type TSignFieldDropdownFormSchema = z.infer<typeof ZSignFieldDropdownFormSchema>;
 
 export type SignFieldDropdownDialogProps = {
   fieldMeta: TDropdownFieldMeta;
@@ -46,72 +21,20 @@ export const SignFieldDropdownDialog = createCallable<SignFieldDropdownDialogPro
 
     const values = fieldMeta.values?.map((value) => value.value) ?? [];
 
-    const form = useForm<TSignFieldDropdownFormSchema>({
-      resolver: zodResolver(ZSignFieldDropdownFormSchema),
-      defaultValues: {
-        dropdown: fieldMeta.defaultValue,
-      },
-    });
-
     return (
-      <Dialog open={true} onOpenChange={(value) => (!value ? call.end(null) : null)}>
+      <CommandDialog open={true} onOpenChange={(value) => (!value ? call.end(null) : null)}>
-        <DialogContent position="center">
+        <CommandInput placeholder={t`Select an option`} />
-          <DialogHeader>
+        <CommandList>
-            <DialogTitle>
+          <CommandEmpty>No results found.</CommandEmpty>
-              <Trans>Sign Dropdown Field</Trans>
+          <CommandGroup heading={t`Options`}>
-            </DialogTitle>
-
-            <DialogDescription className="mt-4">
-              <Trans>Select a value to sign into the field</Trans>
-            </DialogDescription>
-          </DialogHeader>
-
-          <Form {...form}>
-            <form onSubmit={form.handleSubmit((data) => call.end(data.dropdown))}>
-              <fieldset
-                className="flex h-full flex-col space-y-4"
-                disabled={form.formState.isSubmitting}
-              >
-                <FormField
-                  control={form.control}
-                  name="dropdown"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormControl>
-                        <Select {...field} onValueChange={field.onChange}>
-                          <SelectTrigger className="bg-background">
-                            <SelectValue placeholder={t`Select an option`} />
-                          </SelectTrigger>
-
-                          <SelectContent>
             {values.map((value, i) => (
-                              <SelectItem key={i} value={value}>
+              <CommandItem onSelect={() => call.end(value)} key={i} value={value}>
                 {value}
-                              </SelectItem>
+              </CommandItem>
             ))}
-                          </SelectContent>
+          </CommandGroup>
-                        </Select>
+        </CommandList>
-                      </FormControl>
+      </CommandDialog>
-
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <DialogFooter>
-                  <Button type="button" variant="secondary" onClick={() => call.end(null)}>
-                    <Trans>Cancel</Trans>
-                  </Button>
-
-                  <Button type="submit">
-                    <Trans>Sign</Trans>
-                  </Button>
-                </DialogFooter>
-              </fieldset>
-            </form>
-          </Form>
-        </DialogContent>
-      </Dialog>
     );
   },
 );

apps/remix/app/components/forms/editor/editor-field-dropdown-form.tsx

@@ -45,26 +45,32 @@ const ZDropdownFieldFormSchema = z
       .min(1, {
         message: msg`Dropdown must have at least one option`.id,
       })
-      .refine(
+      .superRefine((values, ctx) => {
-        (data) => {
+        const seen = new Map<string, number[]>(); // value → indices
-          // Todo: Envelopes - This doesn't work.
+        values.forEach((item, index) => {
-          console.log({
+          const key = item.value;
-            data,
+          if (!seen.has(key)) {
+            seen.set(key, []);
+          }
+          seen.get(key)!.push(index);
         });
 
-          if (data) {
+        for (const [key, indices] of seen) {
-            const values = data.map((item) => item.value);
+          if (indices.length > 1 && key.trim() !== '') {
-            return new Set(values).size === values.length;
+            for (const i of indices) {
+              ctx.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: msg`Duplicate values are not allowed`.id,
+                path: [i, 'value'],
+              });
             }
-          return true;
+          }
-        },
+        }
-        {
+      }),
-          message: 'Duplicate values are not allowed',
-        },
-      ),
     required: z.boolean().optional(),
     readOnly: z.boolean().optional(),
   })
+  // Todo: Envelopes - This doesn't work
   .refine(
     (data) => {
       // Default value must be one of the available options
@@ -111,7 +117,20 @@ export const EditorFieldDropdownForm = ({
 
   const addValue = () => {
     const currentValues = form.getValues('values') || [];
-    const newValues = [...currentValues, { value: 'New option' }];
+
+    let newValue = 'New option';
+
+    // Iterate to create a unique value
+    for (let i = 0; i < currentValues.length; i++) {
+      newValue = `New option ${i + 1}`;
+      if (currentValues.some((item) => item.value === `New option ${i + 1}`)) {
+        newValue = `New option ${i + 1}`;
+      } else {
+        break;
+      }
+    }
+
+    const newValues = [...currentValues, { value: newValue }];
 
     form.setValue('values', newValues);
   };
@@ -127,6 +146,10 @@ export const EditorFieldDropdownForm = ({
     newValues.splice(index, 1);
 
     form.setValue('values', newValues);
+
+    if (form.getValues('defaultValue') === newValues[index].value) {
+      form.setValue('defaultValue', undefined);
+    }
   };
 
   useEffect(() => {
@@ -163,20 +186,26 @@ export const EditorFieldDropdownForm = ({
                 </FormLabel>
                 <FormControl>
                   <Select
-                    // Todo: Envelopes - This is buggy, removing/adding should update the default value.
                     {...field}
-                    value={field.value}
+                    value={field.value === null ? '-1' : field.value}
-                    onValueChange={(val) => field.onChange(val)}
+                    onValueChange={(value) => field.onChange(value === undefined ? null : value)}
                   >
+                    {/* Todo: Envelopes - THis is cooked */}
                     <SelectTrigger className="text-muted-foreground bg-background w-full">
                       <SelectValue placeholder={t`Default Value`} />
                     </SelectTrigger>
                     <SelectContent position="popper">
-                      {(formValues.values || []).map((item, index) => (
+                      {(formValues.values || [])
+                        .filter((item) => item.value)
+                        .map((item, index) => (
                           <SelectItem key={index} value={item.value || ''}>
                             {item.value}
                           </SelectItem>
                         ))}
+
+                      <SelectItem value={'-1'}>
+                        <Trans>None</Trans>
+                      </SelectItem>
                     </SelectContent>
                   </Select>
                 </FormControl>

apps/remix/app/components/forms/editor/editor-field-radio-form.tsx

@@ -1,15 +1,32 @@
 import { useEffect } from 'react';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Trans } from '@lingui/react/macro';
+import { Trans, useLingui } from '@lingui/react/macro';
 import { PlusIcon, Trash } from 'lucide-react';
 import { useForm, useWatch } from 'react-hook-form';
-import { z } from 'zod';
+import type { z } from 'zod';
 
-import { type TRadioFieldMeta as RadioFieldMeta } from '@documenso/lib/types/field-meta';
+import {
+  type TRadioFieldMeta as RadioFieldMeta,
+  ZRadioFieldMeta,
+} from '@documenso/lib/types/field-meta';
 import { Checkbox } from '@documenso/ui/primitives/checkbox';
-import { Form, FormControl, FormField, FormItem } from '@documenso/ui/primitives/form/form';
+import {
+  Form,
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormMessage,
+} from '@documenso/ui/primitives/form/form';
 import { Input } from '@documenso/ui/primitives/input';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
 import { Separator } from '@documenso/ui/primitives/separator';
 
 import {
@@ -17,19 +34,13 @@ import {
   EditorGenericRequiredField,
 } from './editor-field-generic-field-forms';
 
-const ZRadioFieldFormSchema = z
+const ZRadioFieldFormSchema = ZRadioFieldMeta.pick({
-  .object({
+  label: true,
-    label: z.string().optional(),
+  direction: true,
-    values: z
+  values: true,
-      .object({ id: z.number(), checked: z.boolean(), value: z.string() })
+  required: true,
-      .array()
+  readOnly: true,
-      .min(1)
+}).refine(
-      .optional(),
-    required: z.boolean().optional(),
-    readOnly: z.boolean().optional(),
-    direction: z.enum(['vertical', 'horizontal']).optional(),
-  })
-  .refine(
   (data) => {
     // There cannot be more than one checked option
     if (data.values) {
@@ -42,7 +53,7 @@ const ZRadioFieldFormSchema = z
     message: 'There cannot be more than one checked option',
     path: ['values'],
   },
-  );
+);
 
 type TRadioFieldFormSchema = z.infer<typeof ZRadioFieldFormSchema>;
 
@@ -58,6 +69,8 @@ export const EditorFieldRadioForm = ({
   },
   onValueChange,
 }: EditorFieldRadioFormProps) => {
+  const { t } = useLingui();
+
   const form = useForm<TRadioFieldFormSchema>({
     resolver: zodResolver(ZRadioFieldFormSchema),
     mode: 'onChange',
@@ -103,7 +116,6 @@ export const EditorFieldRadioForm = ({
       onValueChange({
         type: 'radio',
         ...validatedFormValues.data,
-        direction: validatedFormValues.data.direction || 'vertical',
       });
     }
   }, [formValues]);
@@ -111,7 +123,35 @@ export const EditorFieldRadioForm = ({
   return (
     <Form {...form}>
       <form>
-        <fieldset className="flex flex-col gap-2 pb-2">
+        <fieldset className="flex flex-col gap-2">
+          <FormField
+            control={form.control}
+            name="direction"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>
+                  <Trans>Direction</Trans>
+                </FormLabel>
+                <FormControl>
+                  <Select value={field.value} onValueChange={field.onChange}>
+                    <SelectTrigger className="text-muted-foreground bg-background w-full">
+                      <SelectValue placeholder={t`Select direction`} />
+                    </SelectTrigger>
+                    <SelectContent position="popper">
+                      <SelectItem value="vertical">
+                        <Trans>Vertical</Trans>
+                      </SelectItem>
+                      <SelectItem value="horizontal">
+                        <Trans>Horizontal</Trans>
+                      </SelectItem>
+                    </SelectContent>
+                  </Select>
+                </FormControl>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
           <EditorGenericRequiredField formControl={form.control} />
 
           <EditorGenericReadOnlyField formControl={form.control} />

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

@@ -14,7 +14,6 @@ import type {
   TRemovedSignedFieldWithTokenMutationSchema,
   TSignFieldWithTokenMutationSchema,
 } from '@documenso/trpc/server/field-router/schema';
-import { cn } from '@documenso/ui/lib/utils';
 import { Label } from '@documenso/ui/primitives/label';
 import { RadioGroup, RadioGroupItem } from '@documenso/ui/primitives/radio-group';
 import { useToast } from '@documenso/ui/primitives/use-toast';
@@ -157,12 +156,7 @@ export const DocumentSigningRadioField = ({
       {!field.inserted && (
         <RadioGroup
           onValueChange={(value) => handleSelectItem(value)}
-          className={cn(
+          className="z-10 my-0.5 gap-y-1"
-            'z-10 my-0.5 gap-1',
-            parsedFieldMeta.direction === 'horizontal'
-              ? 'flex flex-row flex-wrap'
-              : 'flex flex-col gap-y-1',
-          )}
         >
           {values?.map((item, index) => (
             <div key={index} className="flex items-center">
@@ -187,14 +181,7 @@ export const DocumentSigningRadioField = ({
       )}
 
       {field.inserted && (
-        <RadioGroup
+        <RadioGroup className="my-0.5 gap-y-1">
-          className={cn(
-            'my-0.5 gap-1',
-            parsedFieldMeta.direction === 'horizontal'
-              ? 'flex flex-row flex-wrap'
-              : 'flex flex-col gap-y-1',
-          )}
-        >
           {values?.map((item, index) => (
             <div key={index} className="flex items-center">
               <RadioGroupItem

apps/remix/app/components/general/envelope-editor/envelope-editor-fields-drag-drop.tsx

@@ -96,7 +96,7 @@ export const EnvelopeEditorFieldDragDrop = ({
   selectedRecipientId,
   selectedEnvelopeItemId,
 }: EnvelopeEditorFieldDragDropProps) => {
-  const { envelope, editorFields, isTemplate } = useCurrentEnvelopeEditor();
+  const { envelope, editorFields, isTemplate, getRecipientColorKey } = useCurrentEnvelopeEditor();
 
   const { t } = useLingui();
 
@@ -262,6 +262,10 @@ export const EnvelopeEditorFieldDragDrop = ({
     };
   }, [onMouseClick, onMouseMove, selectedField]);
 
+  const selectedRecipientColor = useMemo(() => {
+    return selectedRecipientId ? getRecipientColorKey(selectedRecipientId) : 'green';
+  }, [selectedRecipientId, getRecipientColorKey]);
+
   return (
     <>
       <div className="grid grid-cols-2 gap-x-2 gap-y-2.5">
@@ -273,12 +277,23 @@ export const EnvelopeEditorFieldDragDrop = ({
             onClick={() => setSelectedField(field.type)}
             onMouseDown={() => setSelectedField(field.type)}
             data-selected={selectedField === field.type ? true : undefined}
-            className="group flex h-12 cursor-pointer items-center justify-center rounded-lg border border-gray-200 px-4 transition-colors hover:border-blue-300 hover:bg-blue-50"
+            className={cn(
+              'group flex h-12 cursor-pointer items-center justify-center rounded-lg border border-gray-200 px-4 transition-colors',
+              RECIPIENT_COLOR_STYLES[selectedRecipientColor].fieldButton,
+            )}
           >
             <p
               className={cn(
                 'text-muted-foreground group-data-[selected]:text-foreground flex items-center justify-center gap-x-1.5 text-sm font-normal',
                 field.className,
+                {
+                  'group-hover:text-recipient-green': selectedRecipientColor === 'green',
+                  'group-hover:text-recipient-blue': selectedRecipientColor === 'blue',
+                  'group-hover:text-recipient-purple': selectedRecipientColor === 'purple',
+                  'group-hover:text-recipient-orange': selectedRecipientColor === 'orange',
+                  'group-hover:text-recipient-yellow': selectedRecipientColor === 'yellow',
+                  'group-hover:text-recipient-pink': selectedRecipientColor === 'pink',
+                },
               )}
             >
               {field.type !== FieldType.SIGNATURE && <field.icon className="h-4 w-4" />}
@@ -292,8 +307,7 @@ export const EnvelopeEditorFieldDragDrop = ({
         <div
           className={cn(
             'text-muted-foreground dark:text-muted-background pointer-events-none fixed z-50 flex cursor-pointer flex-col items-center justify-center rounded-[2px] bg-white ring-2 transition duration-200 [container-type:size]',
-            // selectedSignerStyles?.base,
+            RECIPIENT_COLOR_STYLES[selectedRecipientColor].base,
-            RECIPIENT_COLOR_STYLES.yellow.base, // Todo: Envelopes
             {
               '-rotate-6 scale-90 opacity-50 dark:bg-black/20': !isFieldWithinBounds,
               'dark:text-black/60': isFieldWithinBounds,

apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page-renderer.tsx

@@ -3,15 +3,12 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import { useLingui } from '@lingui/react/macro';
 import type { FieldType } from '@prisma/client';
 import Konva from 'konva';
-import type { Layer } from 'konva/lib/Layer';
 import type { KonvaEventObject } from 'konva/lib/Node';
 import type { Transformer } from 'konva/lib/shapes/Transformer';
 import { CopyPlusIcon, SquareStackIcon, TrashIcon } from 'lucide-react';
-import type { RenderParameters } from 'pdfjs-dist/types/src/display/api';
-import { usePageContext } from 'react-pdf';
 
-import { getBoundingClientRect } from '@documenso/lib/client-only/get-bounding-client-rect';
 import type { TLocalField } from '@documenso/lib/client-only/hooks/use-editor-fields';
+import { usePageRenderer } from '@documenso/lib/client-only/hooks/use-page-renderer';
 import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
 import { useCurrentEnvelopeRender } from '@documenso/lib/client-only/providers/envelope-render-provider';
 import { FIELD_META_DEFAULT_VALUES } from '@documenso/lib/types/field-meta';
@@ -26,27 +23,10 @@ import { canRecipientFieldsBeModified } from '@documenso/lib/utils/recipients';
 import { fieldButtonList } from './envelope-editor-fields-drag-drop';
 
 export default function EnvelopeEditorFieldsPageRenderer() {
-  const pageContext = usePageContext();
-
-  if (!pageContext) {
-    throw new Error('Unable to find Page context.');
-  }
-
-  const { _className, page, rotate, scale } = pageContext;
-
-  if (!page) {
-    throw new Error('Attempted to render page canvas, but no page was specified.');
-  }
-
   const { t } = useLingui();
   const { envelope, editorFields, getRecipientColorKey } = useCurrentEnvelopeEditor();
   const { currentEnvelopeItem } = useCurrentEnvelopeRender();
 
-  const canvasElement = useRef<HTMLCanvasElement>(null);
-  const konvaContainer = useRef<HTMLDivElement>(null);
-
-  const stage = useRef<Konva.Stage | null>(null);
-  const pageLayer = useRef<Layer | null>(null);
   const interactiveTransformer = useRef<Transformer | null>(null);
 
   const [selectedKonvaFieldGroups, setSelectedKonvaFieldGroups] = useState<Konva.Group[]>([]);
@@ -54,10 +34,17 @@ export default function EnvelopeEditorFieldsPageRenderer() {
   const [isFieldChanging, setIsFieldChanging] = useState(false);
   const [pendingFieldCreation, setPendingFieldCreation] = useState<Konva.Rect | null>(null);
 
-  const viewport = useMemo(
+  const {
-    () => page.getViewport({ scale, rotation: rotate }),
+    stage,
-    [page, rotate, scale],
+    pageLayer,
-  );
+    canvasElement,
+    konvaContainer,
+    pageContext,
+    scaledViewport,
+    unscaledViewport,
+  } = usePageRenderer(({ stage, pageLayer }) => createPageCanvas(stage, pageLayer));
+
+  const { _className, scale } = pageContext;
 
   const localPageFields = useMemo(
     () =>
@@ -68,44 +55,6 @@ export default function EnvelopeEditorFieldsPageRenderer() {
     [editorFields.localFields, pageContext.pageNumber],
   );
 
-  // Custom renderer from Konva examples.
-  useEffect(
-    function drawPageOnCanvas() {
-      if (!page) {
-        return;
-      }
-
-      const { current: canvas } = canvasElement;
-      const { current: container } = konvaContainer;
-
-      if (!canvas || !container) {
-        return;
-      }
-
-      const renderContext: RenderParameters = {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        canvasContext: canvas.getContext('2d', { alpha: false }) as CanvasRenderingContext2D,
-        viewport,
-      };
-
-      const cancellable = page.render(renderContext);
-      const runningTask = cancellable;
-
-      cancellable.promise.catch(() => {
-        // Intentionally empty
-      });
-
-      void cancellable.promise.then(() => {
-        createPageCanvas(container);
-      });
-
-      return () => {
-        runningTask.cancel();
-      };
-    },
-    [page, viewport],
-  );
-
   const handleResizeOrMove = (event: KonvaEventObject<Event>) => {
     console.log('Field resized or moved');
 
@@ -120,6 +69,7 @@ export default function EnvelopeEditorFieldsPageRenderer() {
     const fieldGroup = event.target as Konva.Group;
     const fieldFormId = fieldGroup.id();
 
+    // Note: This values are scaled.
     const {
       width: fieldPixelWidth,
       height: fieldPixelHeight,
@@ -130,7 +80,8 @@ export default function EnvelopeEditorFieldsPageRenderer() {
       skipShadow: true,
     });
 
-    const { height: pageHeight, width: pageWidth } = getBoundingClientRect(container);
+    const pageHeight = scaledViewport.height;
+    const pageWidth = scaledViewport.width;
 
     // Calculate x and y as a percentage of the page width and height
     const positionPercentX = (fieldX / pageWidth) * 100;
@@ -165,7 +116,7 @@ export default function EnvelopeEditorFieldsPageRenderer() {
   };
 
   const renderFieldOnLayer = (field: TLocalField) => {
-    if (!pageLayer.current || !interactiveTransformer.current) {
+    if (!pageLayer.current) {
       console.error('Layer not loaded yet');
       return;
     }
@@ -174,7 +125,8 @@ export default function EnvelopeEditorFieldsPageRenderer() {
     const isFieldEditable =
       recipient !== undefined && canRecipientFieldsBeModified(recipient, envelope.fields);
 
-    const { fieldGroup, isFirstRender } = renderField({
+    const { fieldGroup } = renderField({
+      scale,
       pageLayer: pageLayer.current,
       field: {
         renderId: field.formId,
@@ -183,8 +135,8 @@ export default function EnvelopeEditorFieldsPageRenderer() {
         inserted: false,
         fieldMeta: field.fieldMeta,
       },
-      pageWidth: viewport.width,
+      pageWidth: unscaledViewport.width,
-      pageHeight: viewport.height,
+      pageHeight: unscaledViewport.height,
       color: getRecipientColorKey(field.recipientId),
       editable: isFieldEditable,
       mode: 'edit',
@@ -210,24 +162,14 @@ export default function EnvelopeEditorFieldsPageRenderer() {
   };
 
   /**
-   * Create the initial Konva page canvas and initialize all fields and interactions.
+   * Initialize the Konva page canvas and all fields and interactions.
    */
-  const createPageCanvas = (container: HTMLDivElement) => {
+  const createPageCanvas = (currentStage: Konva.Stage, currentPageLayer: Konva.Layer) => {
-    stage.current = new Konva.Stage({
-      container,
-      width: viewport.width,
-      height: viewport.height,
-    });
-
-    // Create the main layer for interactive elements.
-    pageLayer.current = new Konva.Layer();
-    stage.current?.add(pageLayer.current);
-
     // Initialize snap guides layer
     // snapGuideLayer.current = initializeSnapGuides(stage.current);
 
     // Add transformer for resizing and rotating.
-    interactiveTransformer.current = createInteractiveTransformer(stage.current, pageLayer.current);
+    interactiveTransformer.current = createInteractiveTransformer(currentStage, currentPageLayer);
 
     // Render the fields.
     for (const field of localPageFields) {
@@ -235,12 +177,12 @@ export default function EnvelopeEditorFieldsPageRenderer() {
     }
 
     // Handle stage click to deselect.
-    stage.current?.on('click', (e) => {
+    currentStage.on('click', (e) => {
       removePendingField();
 
       if (e.target === stage.current) {
         setSelectedFields([]);
-        pageLayer.current?.batchDraw();
+        currentPageLayer.batchDraw();
       }
     });
 
@@ -267,12 +209,12 @@ export default function EnvelopeEditorFieldsPageRenderer() {
       setSelectedFields([e.target]);
     };
 
-    stage.current?.on('dragstart', onDragStartOrEnd);
+    currentStage.on('dragstart', onDragStartOrEnd);
-    stage.current?.on('dragend', onDragStartOrEnd);
+    currentStage.on('dragend', onDragStartOrEnd);
-    stage.current?.on('transformstart', () => setIsFieldChanging(true));
+    currentStage.on('transformstart', () => setIsFieldChanging(true));
-    stage.current?.on('transformend', () => setIsFieldChanging(false));
+    currentStage.on('transformend', () => setIsFieldChanging(false));
 
-    pageLayer.current.batchDraw();
+    currentPageLayer.batchDraw();
   };
 
   /**
@@ -284,7 +226,10 @@ export default function EnvelopeEditorFieldsPageRenderer() {
    * - Selecting multiple fields
    * - Selecting empty area to create fields
    */
-  const createInteractiveTransformer = (stage: Konva.Stage, layer: Konva.Layer) => {
+  const createInteractiveTransformer = (
+    currentStage: Konva.Stage,
+    currentPageLayer: Konva.Layer,
+  ) => {
     const transformer = new Konva.Transformer({
       rotateEnabled: false,
       keepRatio: false,
@@ -301,36 +246,39 @@ export default function EnvelopeEditorFieldsPageRenderer() {
       },
     });
 
-    layer.add(transformer);
+    currentPageLayer.add(transformer);
 
     // Add selection rectangle.
     const selectionRectangle = new Konva.Rect({
       fill: 'rgba(24, 160, 251, 0.3)',
       visible: false,
     });
-    layer.add(selectionRectangle);
+    currentPageLayer.add(selectionRectangle);
 
     let x1: number;
     let y1: number;
     let x2: number;
     let y2: number;
 
-    stage.on('mousedown touchstart', (e) => {
+    currentStage.on('mousedown touchstart', (e) => {
       // do nothing if we mousedown on any shape
-      if (e.target !== stage) {
+      if (e.target !== currentStage) {
         return;
       }
 
-      const pointerPosition = stage.getPointerPosition();
+      const pointerPosition = currentStage.getPointerPosition();
 
       if (!pointerPosition) {
         return;
       }
 
-      x1 = pointerPosition.x;
+      console.log(`pointerPosition.x: ${pointerPosition.x}`);
-      y1 = pointerPosition.y;
+      console.log(`pointerPosition.y: ${pointerPosition.y}`);
-      x2 = pointerPosition.x;
+
-      y2 = pointerPosition.y;
+      x1 = pointerPosition.x / scale;
+      y1 = pointerPosition.y / scale;
+      x2 = pointerPosition.x / scale;
+      y2 = pointerPosition.y / scale;
 
       selectionRectangle.setAttrs({
         x: x1,
@@ -341,7 +289,7 @@ export default function EnvelopeEditorFieldsPageRenderer() {
       });
     });
 
-    stage.on('mousemove touchmove', () => {
+    currentStage.on('mousemove touchmove', () => {
       // do nothing if we didn't start selection
       if (!selectionRectangle.visible()) {
         return;
@@ -349,14 +297,14 @@ export default function EnvelopeEditorFieldsPageRenderer() {
 
       selectionRectangle.moveToTop();
 
-      const pointerPosition = stage.getPointerPosition();
+      const pointerPosition = currentStage.getPointerPosition();
 
       if (!pointerPosition) {
         return;
       }
 
-      x2 = pointerPosition.x;
+      x2 = pointerPosition.x / scale;
-      y2 = pointerPosition.y;
+      y2 = pointerPosition.y / scale;
 
       selectionRectangle.setAttrs({
         x: Math.min(x1, x2),
@@ -366,7 +314,7 @@ export default function EnvelopeEditorFieldsPageRenderer() {
       });
     });
 
-    stage.on('mouseup touchend', () => {
+    currentStage.on('mouseup touchend', () => {
       // do nothing if we didn't start selection
       if (!selectionRectangle.visible()) {
         return;
@@ -377,38 +325,41 @@ export default function EnvelopeEditorFieldsPageRenderer() {
         selectionRectangle.visible(false);
       });
 
-      const stageFieldGroups = stage.find('.field-group') || [];
+      const stageFieldGroups = currentStage.find('.field-group') || [];
       const box = selectionRectangle.getClientRect();
       const selectedFieldGroups = stageFieldGroups.filter(
         (shape) => Konva.Util.haveIntersection(box, shape.getClientRect()) && shape.draggable(),
       );
       setSelectedFields(selectedFieldGroups);
 
+      const unscaledBoxWidth = box.width / scale;
+      const unscaledBoxHeight = box.height / scale;
+
       // Create a field if no items are selected or the size is too small.
       if (
         selectedFieldGroups.length === 0 &&
         canvasElement.current &&
-        box.width > MIN_FIELD_WIDTH_PX &&
+        unscaledBoxWidth > MIN_FIELD_WIDTH_PX &&
-        box.height > MIN_FIELD_HEIGHT_PX &&
+        unscaledBoxHeight > MIN_FIELD_HEIGHT_PX &&
         editorFields.selectedRecipient &&
         canRecipientFieldsBeModified(editorFields.selectedRecipient, envelope.fields)
       ) {
         const pendingFieldCreation = new Konva.Rect({
           name: 'pending-field-creation',
-          x: box.x,
+          x: box.x / scale,
-          y: box.y,
+          y: box.y / scale,
-          width: box.width,
+          width: unscaledBoxWidth,
-          height: box.height,
+          height: unscaledBoxHeight,
           fill: 'rgba(24, 160, 251, 0.3)',
         });
 
-        layer.add(pendingFieldCreation);
+        currentPageLayer.add(pendingFieldCreation);
         setPendingFieldCreation(pendingFieldCreation);
       }
     });
 
     // Clicks should select/deselect shapes
-    stage.on('click tap', function (e) {
+    currentStage.on('click tap', function (e) {
       // if we are selecting with rect, do nothing
       if (
         selectionRectangle.visible() &&
@@ -419,7 +370,7 @@ export default function EnvelopeEditorFieldsPageRenderer() {
       }
 
       // If empty area clicked, remove all selections
-      if (e.target === stage) {
+      if (e.target === stage.current) {
         setSelectedFields([]);
         return;
       }
@@ -555,15 +506,13 @@ export default function EnvelopeEditorFieldsPageRenderer() {
       return;
     }
 
-    const { height: pageHeight, width: pageWidth } = getBoundingClientRect(canvasElement.current);
-
     const { fieldX, fieldY, fieldWidth, fieldHeight } = convertPixelToPercentage({
       width: pixelWidth,
       height: pixelHeight,
       positionX: pixelX,
       positionY: pixelY,
-      pageWidth,
+      pageWidth: unscaledViewport.width,
-      pageHeight,
+      pageHeight: unscaledViewport.height,
     });
 
     editorFields.addField({
@@ -597,7 +546,10 @@ export default function EnvelopeEditorFieldsPageRenderer() {
   }
 
   return (
-    <div className="relative" key={`${currentEnvelopeItem.id}-renderer-${pageContext.pageNumber}`}>
+    <div
+      className="relative w-full"
+      key={`${currentEnvelopeItem.id}-renderer-${pageContext.pageNumber}`}
+    >
       {selectedKonvaFieldGroups.length > 0 &&
         interactiveTransformer.current &&
         !isFieldChanging && (
@@ -654,8 +606,15 @@ export default function EnvelopeEditorFieldsPageRenderer() {
         <div
           style={{
             position: 'absolute',
-            top: pendingFieldCreation.y() + pendingFieldCreation.getClientRect().height + 5 + 'px',
+            top:
-            left: pendingFieldCreation.x() + pendingFieldCreation.getClientRect().width / 2 + 'px',
+              pendingFieldCreation.y() * scale +
+              pendingFieldCreation.getClientRect().height +
+              5 +
+              'px',
+            left:
+              pendingFieldCreation.x() * scale +
+              pendingFieldCreation.getClientRect().width / 2 +
+              'px',
             transform: 'translateX(-50%)',
             zIndex: 50,
           }}
@@ -673,13 +632,15 @@ export default function EnvelopeEditorFieldsPageRenderer() {
         </div>
       )}
 
-      <div className="konva-container absolute inset-0 z-10" ref={konvaContainer}></div>
+      {/* The element Konva will inject it's canvas into. */}
+      <div className="konva-container absolute inset-0 z-10 w-full" ref={konvaContainer}></div>
 
+      {/* Canvas the PDF will be rendered on. */}
       <canvas
         className={`${_className}__canvas z-0`}
-        height={viewport.height}
         ref={canvasElement}
-        width={viewport.width}
+        height={scaledViewport.height}
+        width={scaledViewport.width}
       />
     </div>
   );

apps/remix/app/components/general/envelope-editor/envelope-editor-fields-page.tsx

@@ -60,7 +60,7 @@ const FieldSettingsTypeTranslations: Record<FieldType, MessageDescriptor> = {
   [FieldType.DROPDOWN]: msg`Dropdown Settings`,
 };
 
-export const EnvelopeEditorPageFields = () => {
+export const EnvelopeEditorFieldsPage = () => {
   const { envelope, editorFields } = useCurrentEnvelopeEditor();
 
   const { currentEnvelopeItem } = useCurrentEnvelopeRender();
@@ -109,7 +109,7 @@ export const EnvelopeEditorPageFields = () => {
         <EnvelopeRendererFileSelector fields={editorFields.localFields} />
 
         {/* Document View */}
-        <div className="mt-4 flex justify-center">
+        <div className="mt-4 flex justify-center p-4">
           {currentEnvelopeItem !== null ? (
             <PDFViewerKonvaLazy customPageRenderer={EnvelopeEditorFieldsPageRenderer} />
           ) : (

apps/remix/app/components/general/envelope-editor/envelope-editor-page-preview-renderer.tsx

@@ -1,176 +0,0 @@
-import { useEffect, useMemo, useRef } from 'react';
-
-import Konva from 'konva';
-import type { Layer } from 'konva/lib/Layer';
-import type { RenderParameters } from 'pdfjs-dist/types/src/display/api';
-import { usePageContext } from 'react-pdf';
-
-import type { TLocalField } from '@documenso/lib/client-only/hooks/use-editor-fields';
-import { useCurrentEnvelopeEditor } from '@documenso/lib/client-only/providers/envelope-editor-provider';
-import { useCurrentEnvelopeRender } from '@documenso/lib/client-only/providers/envelope-render-provider';
-import { renderField } from '@documenso/lib/universal/field-renderer/render-field';
-
-export default function EnvelopeEditorPagePreviewRenderer() {
-  const pageContext = usePageContext();
-
-  if (!pageContext) {
-    throw new Error('Unable to find Page context.');
-  }
-
-  const { _className, page, rotate, scale } = pageContext;
-
-  if (!page) {
-    throw new Error('Attempted to render page canvas, but no page was specified.');
-  }
-
-  const { editorFields, getRecipientColorKey } = useCurrentEnvelopeEditor();
-  const { currentEnvelopeItem } = useCurrentEnvelopeRender();
-
-  const canvasElement = useRef<HTMLCanvasElement>(null);
-  const konvaContainer = useRef<HTMLDivElement>(null);
-
-  const stage = useRef<Konva.Stage | null>(null);
-  const pageLayer = useRef<Layer | null>(null);
-
-  const viewport = useMemo(
-    () => page.getViewport({ scale, rotation: rotate }),
-    [page, rotate, scale],
-  );
-
-  const localPageFields = useMemo(
-    () =>
-      editorFields.localFields.filter(
-        (field) =>
-          field.page === pageContext.pageNumber && field.envelopeItemId === currentEnvelopeItem?.id,
-      ),
-    [editorFields.localFields, pageContext.pageNumber],
-  );
-
-  // Custom renderer from Konva examples.
-  useEffect(
-    function drawPageOnCanvas() {
-      if (!page) {
-        return;
-      }
-
-      const { current: canvas } = canvasElement;
-      const { current: container } = konvaContainer;
-
-      if (!canvas || !container) {
-        return;
-      }
-
-      const renderContext: RenderParameters = {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        canvasContext: canvas.getContext('2d', { alpha: false }) as CanvasRenderingContext2D,
-        viewport,
-      };
-
-      const cancellable = page.render(renderContext);
-      const runningTask = cancellable;
-
-      cancellable.promise.catch(() => {
-        // Intentionally empty
-      });
-
-      void cancellable.promise.then(() => {
-        createPageCanvas(container);
-      });
-
-      return () => {
-        runningTask.cancel();
-      };
-    },
-    [page, viewport],
-  );
-
-  const renderFieldOnLayer = (field: TLocalField) => {
-    if (!pageLayer.current) {
-      console.error('Layer not loaded yet');
-      return;
-    }
-
-    renderField({
-      pageLayer: pageLayer.current,
-      field: {
-        renderId: field.formId,
-        ...field,
-        customText: '',
-        inserted: false,
-        fieldMeta: field.fieldMeta,
-      },
-      pageWidth: viewport.width,
-      pageHeight: viewport.height,
-      color: getRecipientColorKey(field.recipientId),
-      editable: false,
-      mode: 'export',
-    });
-  };
-
-  /**
-   * Create the initial Konva page canvas and initialize all fields and interactions.
-   */
-  const createPageCanvas = (container: HTMLDivElement) => {
-    stage.current = new Konva.Stage({
-      container,
-      width: viewport.width,
-      height: viewport.height,
-    });
-
-    // Create the main layer for interactive elements.
-    pageLayer.current = new Konva.Layer();
-    stage.current?.add(pageLayer.current);
-
-    // Render the fields.
-    for (const field of localPageFields) {
-      renderFieldOnLayer(field);
-    }
-
-    pageLayer.current.batchDraw();
-  };
-
-  /**
-   * Render fields when they are added or removed from the localFields.
-   */
-  useEffect(() => {
-    if (!pageLayer.current || !stage.current) {
-      return;
-    }
-
-    // If doesn't exist in localFields, destroy it since it's been deleted.
-    pageLayer.current.find('Group').forEach((group) => {
-      if (
-        group.name() === 'field-group' &&
-        !localPageFields.some((field) => field.formId === group.id())
-      ) {
-        console.log('Field removed, removing from canvas');
-        group.destroy();
-      }
-    });
-
-    // If it exists, rerender.
-    localPageFields.forEach((field) => {
-      console.log('Field created/updated, rendering on canvas');
-      renderFieldOnLayer(field);
-    });
-
-    pageLayer.current.batchDraw();
-  }, [localPageFields]);
-
-  if (!currentEnvelopeItem) {
-    return null;
-  }
-
-  return (
-    <div className="relative" key={`${currentEnvelopeItem.id}-renderer-${pageContext.pageNumber}`}>
-      <div className="konva-container absolute inset-0 z-10" ref={konvaContainer}></div>
-
-      <canvas
-        className={`${_className}__canvas z-0`}
-        height={viewport.height}
-        ref={canvasElement}
-        width={viewport.width}
-      />
-    </div>
-  );
-}

apps/remix/app/components/general/envelope-editor/envelope-editor-preview-page.tsx

@@ -13,11 +13,9 @@ import { Separator } from '@documenso/ui/primitives/separator';
 
 import { EnvelopeRendererFileSelector } from './envelope-file-selector';
 
-const EnvelopeEditorPagePreviewRenderer = lazy(
+const EnvelopeGenericPageRenderer = lazy(async () => import('./envelope-generic-page-renderer'));
-  async () => import('./envelope-editor-page-preview-renderer'),
-);
 
-export const EnvelopeEditorPagePreview = () => {
+export const EnvelopeEditorPreviewPage = () => {
   const { envelope, editorFields } = useCurrentEnvelopeEditor();
 
   const { currentEnvelopeItem } = useCurrentEnvelopeRender();
@@ -51,7 +49,7 @@ export const EnvelopeEditorPagePreview = () => {
           </Alert>
 
           {currentEnvelopeItem !== null ? (
-            <PDFViewerKonvaLazy customPageRenderer={EnvelopeEditorPagePreviewRenderer} />
+            <PDFViewerKonvaLazy customPageRenderer={EnvelopeGenericPageRenderer} />
           ) : (
             <div className="flex flex-col items-center justify-center py-32">
               <FileTextIcon className="text-muted-foreground h-10 w-10" />

apps/remix/app/components/general/envelope-editor/envelope-editor-upload-page.tsx

@@ -41,7 +41,7 @@ type LocalFile = {
   isError: boolean;
 };
 
-export const EnvelopeEditorPageUpload = () => {
+export const EnvelopeEditorUploadPage = () => {
   const team = useCurrentTeam();
   const { t } = useLingui();
 
@@ -224,8 +224,12 @@ export const EnvelopeEditorPageUpload = () => {
     <div className="mx-auto max-w-4xl space-y-6 p-8">
       <Card backdropBlur={false} className="border">
         <CardHeader className="pb-3">
-          <CardTitle>Documents</CardTitle>
+          <CardTitle>
-          <CardDescription>Add and configure multiple documents</CardDescription>
+            <Trans>Documents</Trans>
+          </CardTitle>
+          <CardDescription>
+            <Trans>Add and configure multiple documents</Trans>
+          </CardDescription>
         </CardHeader>
 
         <CardContent>

apps/remix/app/components/general/envelope-editor/envelope-editor.tsx

@@ -39,10 +39,10 @@ import { TemplateDirectLinkDialog } from '~/components/dialogs/template-direct-l
 import { EnvelopeEditorSettingsDialog } from '~/components/general/envelope-editor/envelope-editor-settings-dialog';
 import { useCurrentTeam } from '~/providers/team';
 
+import { EnvelopeEditorFieldsPage } from './envelope-editor-fields-page';
 import EnvelopeEditorHeader from './envelope-editor-header';
-import { EnvelopeEditorPageFields } from './envelope-editor-page-fields';
+import { EnvelopeEditorPreviewPage } from './envelope-editor-preview-page';
-import { EnvelopeEditorPagePreview } from './envelope-editor-page-preview';
+import { EnvelopeEditorUploadPage } from './envelope-editor-upload-page';
-import { EnvelopeEditorPageUpload } from './envelope-editor-page-upload';
 
 type EnvelopeEditorStep = 'upload' | 'addFields' | 'preview';
 
@@ -128,6 +128,18 @@ export default function EnvelopeEditor() {
     }
   };
 
+  // Watch the URL params and setStep if the step changes.
+  useEffect(() => {
+    const stepParam = searchParams.get('step') || envelopeEditorSteps[0].id;
+
+    const foundStep = envelopeEditorSteps.find((step) => step.id === stepParam);
+
+    if (foundStep && foundStep.id !== currentStep) {
+      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+      navigateToStep(foundStep.id as EnvelopeEditorStep);
+    }
+  }, [searchParams]);
+
   useEffect(() => {
     if (!isAutosaving) {
       setIsStepLoading(false);
@@ -151,7 +163,9 @@ export default function EnvelopeEditor() {
               {isDocument ? <Trans>Document Editor</Trans> : <Trans>Template Editor</Trans>}
 
               <span className="text-muted-foreground ml-2 rounded border bg-gray-50 px-2 py-0.5 text-xs">
+                <Trans context="The step counter">
                   Step {currentStepData.order}/{envelopeEditorSteps.length}
+                </Trans>
               </span>
             </h3>
 
@@ -340,13 +354,12 @@ export default function EnvelopeEditor() {
 
         {/* Main Content - Changes based on current step */}
         <div className="flex-1 overflow-y-auto">
-          <p>{isAutosaving ? 'Autosaving...' : 'Not autosaving'}</p>
           <AnimateGenericFadeInOut key={currentStep}>
             {match({ currentStep, isStepLoading })
               .with({ isStepLoading: true }, () => <SpinnerBox className="py-32" />)
-              .with({ currentStep: 'upload' }, () => <EnvelopeEditorPageUpload />)
+              .with({ currentStep: 'upload' }, () => <EnvelopeEditorUploadPage />)
-              .with({ currentStep: 'addFields' }, () => <EnvelopeEditorPageFields />)
+              .with({ currentStep: 'addFields' }, () => <EnvelopeEditorFieldsPage />)
-              .with({ currentStep: 'preview' }, () => <EnvelopeEditorPagePreview />)
+              .with({ currentStep: 'preview' }, () => <EnvelopeEditorPreviewPage />)
               .exhaustive()}
           </AnimateGenericFadeInOut>
         </div>

apps/remix/app/components/general/envelope-editor/envelope-generic-page-renderer.tsx

@@ -1,41 +1,31 @@
-import { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo } from 'react';
 
 import { useLingui } from '@lingui/react/macro';
-import Konva from 'konva';
+import type Konva from 'konva';
-import type { Layer } from 'konva/lib/Layer';
-import type { RenderParameters } from 'pdfjs-dist/types/src/display/api';
-import { usePageContext } from 'react-pdf';
 
+import { usePageRenderer } from '@documenso/lib/client-only/hooks/use-page-renderer';
 import { useCurrentEnvelopeRender } from '@documenso/lib/client-only/providers/envelope-render-provider';
 import type { TEnvelope } from '@documenso/lib/types/envelope';
 import { renderField } from '@documenso/lib/universal/field-renderer/render-field';
 
 export default function EnvelopeGenericPageRenderer() {
-  const pageContext = usePageContext();
-
-  if (!pageContext) {
-    throw new Error('Unable to find Page context.');
-  }
-
-  const { _className, page, rotate, scale } = pageContext;
-
-  if (!page) {
-    throw new Error('Attempted to render page canvas, but no page was specified.');
-  }
-
   const { t } = useLingui();
+
   const { currentEnvelopeItem, fields } = useCurrentEnvelopeRender();
 
-  const canvasElement = useRef<HTMLCanvasElement>(null);
+  const {
-  const konvaContainer = useRef<HTMLDivElement>(null);
+    stage,
+    pageLayer,
+    canvasElement,
+    konvaContainer,
+    pageContext,
+    scaledViewport,
+    unscaledViewport,
+  } = usePageRenderer(({ stage, pageLayer }) => {
+    createPageCanvas(stage, pageLayer);
+  });
 
-  const stage = useRef<Konva.Stage | null>(null);
+  const { _className, scale } = pageContext;
-  const pageLayer = useRef<Layer | null>(null);
-
-  const viewport = useMemo(
-    () => page.getViewport({ scale, rotation: rotate }),
-    [page, rotate, scale],
-  );
 
   const localPageFields = useMemo(
     () =>
@@ -46,44 +36,6 @@ export default function EnvelopeGenericPageRenderer() {
     [fields, pageContext.pageNumber],
   );
 
-  // Custom renderer from Konva examples.
-  useEffect(
-    function drawPageOnCanvas() {
-      if (!page) {
-        return;
-      }
-
-      const { current: canvas } = canvasElement;
-      const { current: container } = konvaContainer;
-
-      if (!canvas || !container) {
-        return;
-      }
-
-      const renderContext: RenderParameters = {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        canvasContext: canvas.getContext('2d', { alpha: false }) as CanvasRenderingContext2D,
-        viewport,
-      };
-
-      const cancellable = page.render(renderContext);
-      const runningTask = cancellable;
-
-      cancellable.promise.catch(() => {
-        // Intentionally empty
-      });
-
-      void cancellable.promise.then(() => {
-        createPageCanvas(container);
-      });
-
-      return () => {
-        runningTask.cancel();
-      };
-    },
-    [page, viewport],
-  );
-
   const renderFieldOnLayer = (field: TEnvelope['fields'][number]) => {
     if (!pageLayer.current) {
       console.error('Layer not loaded yet');
@@ -91,6 +43,7 @@ export default function EnvelopeGenericPageRenderer() {
     }
 
     renderField({
+      scale,
       pageLayer: pageLayer.current,
       field: {
         renderId: field.id.toString(),
@@ -103,8 +56,8 @@ export default function EnvelopeGenericPageRenderer() {
         inserted: false,
         fieldMeta: field.fieldMeta,
       },
-      pageWidth: viewport.width,
+      pageWidth: unscaledViewport.width,
-      pageHeight: viewport.height,
+      pageHeight: unscaledViewport.height,
       // color: getRecipientColorKey(field.recipientId),
       color: 'purple', // Todo
       editable: false,
@@ -113,25 +66,15 @@ export default function EnvelopeGenericPageRenderer() {
   };
 
   /**
-   * Create the initial Konva page canvas and initialize all fields and interactions.
+   * Initialize the Konva page canvas and all fields and interactions.
    */
-  const createPageCanvas = (container: HTMLDivElement) => {
+  const createPageCanvas = (_currentStage: Konva.Stage, currentPageLayer: Konva.Layer) => {
-    stage.current = new Konva.Stage({
-      container,
-      width: viewport.width,
-      height: viewport.height,
-    });
-
-    // Create the main layer for interactive elements.
-    pageLayer.current = new Konva.Layer();
-    stage.current?.add(pageLayer.current);
-
     // Render the fields.
     for (const field of localPageFields) {
       renderFieldOnLayer(field);
     }
 
-    pageLayer.current.batchDraw();
+    currentPageLayer.batchDraw();
   };
 
   /**
@@ -167,14 +110,19 @@ export default function EnvelopeGenericPageRenderer() {
   }
 
   return (
-    <div className="relative" key={`${currentEnvelopeItem.id}-renderer-${pageContext.pageNumber}`}>
+    <div
-      <div className="konva-container absolute inset-0 z-10" ref={konvaContainer}></div>
+      className="relative w-full"
+      key={`${currentEnvelopeItem.id}-renderer-${pageContext.pageNumber}`}
+    >
+      {/* The element Konva will inject it's canvas into. */}
+      <div className="konva-container absolute inset-0 z-10 w-full" ref={konvaContainer}></div>
 
+      {/* Canvas the PDF will be rendered on. */}
       <canvas
         className={`${_className}__canvas z-0`}
-        height={viewport.height}
         ref={canvasElement}
-        width={viewport.width}
+        height={scaledViewport.height}
+        width={scaledViewport.width}
       />
     </div>
   );

apps/remix/app/components/general/envelope-signing/envelope-signer-page-renderer.tsx

@@ -1,14 +1,12 @@
-import { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo } from 'react';
 
 import { useLingui } from '@lingui/react/macro';
-import { type Field, FieldType } from '@prisma/client';
+import { type Field, FieldType, type Signature } from '@prisma/client';
-import Konva from 'konva';
+import type Konva from 'konva';
-import type { Layer } from 'konva/lib/Layer';
 import type { KonvaEventObject } from 'konva/lib/Node';
-import type { RenderParameters } from 'pdfjs-dist/types/src/display/api';
-import { usePageContext } from 'react-pdf';
 import { match } from 'ts-pattern';
 
+import { usePageRenderer } from '@documenso/lib/client-only/hooks/use-page-renderer';
 import { useCurrentEnvelopeRender } from '@documenso/lib/client-only/providers/envelope-render-provider';
 import { ZFullFieldSchema } from '@documenso/lib/types/field';
 import { createSpinner } from '@documenso/lib/universal/field-renderer/field-generic-items';
@@ -28,18 +26,6 @@ import { handleTextFieldClick } from '~/utils/field-signing/text-field';
 import { useRequiredEnvelopeSigningContext } from '../document-signing/envelope-signing-provider';
 
 export default function EnvelopeSignerPageRenderer() {
-  const pageContext = usePageContext();
-
-  if (!pageContext) {
-    throw new Error('Unable to find Page context.');
-  }
-
-  const { _className, page, rotate, scale } = pageContext;
-
-  if (!page) {
-    throw new Error('Attempted to render page canvas, but no page was specified.');
-  }
-
   const { t } = useLingui();
 
   const { currentEnvelopeItem } = useCurrentEnvelopeRender();
@@ -58,21 +44,20 @@ export default function EnvelopeSignerPageRenderer() {
     setSignature,
   } = useRequiredEnvelopeSigningContext();
 
-  console.log({ fullName });
+  const {
+    stage,
+    pageLayer,
+    canvasElement,
+    konvaContainer,
+    pageContext,
+    scaledViewport,
+    unscaledViewport,
+  } = usePageRenderer(({ stage, pageLayer }) => createPageCanvas(stage, pageLayer));
+
+  const { _className, scale } = pageContext;
 
   const { envelope } = envelopeData;
 
-  const canvasElement = useRef<HTMLCanvasElement>(null);
-  const konvaContainer = useRef<HTMLDivElement>(null);
-
-  const stage = useRef<Konva.Stage | null>(null);
-  const pageLayer = useRef<Layer | null>(null);
-
-  const viewport = useMemo(
-    () => page.getViewport({ scale, rotation: rotate }),
-    [page, rotate, scale],
-  );
-
   const localPageFields = useMemo(
     () =>
       recipientFields.filter(
@@ -82,45 +67,7 @@ export default function EnvelopeSignerPageRenderer() {
     [recipientFields, pageContext.pageNumber],
   );
 
-  // Custom renderer from Konva examples.
+  const renderFieldOnLayer = (unparsedField: Field & { signature?: Signature | null }) => {
-  useEffect(
-    function drawPageOnCanvas() {
-      if (!page) {
-        return;
-      }
-
-      const { current: canvas } = canvasElement;
-      const { current: container } = konvaContainer;
-
-      if (!canvas || !container) {
-        return;
-      }
-
-      const renderContext: RenderParameters = {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        canvasContext: canvas.getContext('2d', { alpha: false }) as CanvasRenderingContext2D,
-        viewport,
-      };
-
-      const cancellable = page.render(renderContext);
-      const runningTask = cancellable;
-
-      cancellable.promise.catch(() => {
-        // Intentionally empty
-      });
-
-      void cancellable.promise.then(() => {
-        createPageCanvas(container);
-      });
-
-      return () => {
-        runningTask.cancel();
-      };
-    },
-    [page, viewport],
-  );
-
-  const renderFieldOnLayer = (unparsedField: Field) => {
     if (!pageLayer.current) {
       console.error('Layer not loaded yet');
       return;
@@ -137,6 +84,7 @@ export default function EnvelopeSignerPageRenderer() {
     }
 
     const { fieldGroup } = renderField({
+      scale,
       pageLayer: pageLayer.current,
       field: {
         renderId: fieldToRender.id.toString(),
@@ -145,9 +93,10 @@ export default function EnvelopeSignerPageRenderer() {
         height: Number(fieldToRender.height),
         positionX: Number(fieldToRender.positionX),
         positionY: Number(fieldToRender.positionY),
+        signature: unparsedField.signature,
       },
-      pageWidth: viewport.width,
+      pageWidth: unscaledViewport.width,
-      pageHeight: viewport.height,
+      pageHeight: unscaledViewport.height,
       color,
       mode: 'sign',
     });
@@ -357,29 +306,19 @@ export default function EnvelopeSignerPageRenderer() {
   };
 
   /**
-   * Create the initial Konva page canvas and initialize all fields and interactions.
+   * Initialize the Konva page canvas and all fields and interactions.
    */
-  const createPageCanvas = (container: HTMLDivElement) => {
+  const createPageCanvas = (currentStage: Konva.Stage, currentPageLayer: Konva.Layer) => {
-    stage.current = new Konva.Stage({
-      container,
-      width: viewport.width,
-      height: viewport.height,
-    });
-
-    // Create the main layer for interactive elements.
-    pageLayer.current = new Konva.Layer();
-    stage.current?.add(pageLayer.current);
-
     console.log({
       localPageFields,
     });
 
     // Render the fields.
     for (const field of localPageFields) {
-      renderFieldOnLayer(field);
+      renderFieldOnLayer(field); // Todo: Envelopes - [CRITICAL] Handle errors which prevent rendering
     }
 
-    pageLayer.current.batchDraw();
+    currentPageLayer.batchDraw();
   };
 
   /**
@@ -392,7 +331,7 @@ export default function EnvelopeSignerPageRenderer() {
 
     localPageFields.forEach((field) => {
       console.log('Field changed/inserted, rendering on canvas');
-      renderFieldOnLayer(field);
+      renderFieldOnLayer(field); // Todo: Envelopes - [CRITICAL] Handle errors which prevent rendering
     });
 
     pageLayer.current.batchDraw();
@@ -403,14 +342,19 @@ export default function EnvelopeSignerPageRenderer() {
   }
 
   return (
-    <div className="relative" key={`${currentEnvelopeItem.id}-renderer-${pageContext.pageNumber}`}>
+    <div
+      className="relative w-full"
+      key={`${currentEnvelopeItem.id}-renderer-${pageContext.pageNumber}`}
+    >
+      {/* The element Konva will inject it's canvas into. */}
       <div className="konva-container absolute inset-0 z-10 w-full" ref={konvaContainer}></div>
 
+      {/* Canvas the PDF will be rendered on. */}
       <canvas
         className={`${_className}__canvas z-0`}
-        height={viewport.height}
         ref={canvasElement}
-        width={viewport.width}
+        height={scaledViewport.height}
+        width={scaledViewport.width}
       />
     </div>
   );

apps/remix/app/components/general/folder/folder-grid.tsx

@@ -19,6 +19,8 @@ import { DocumentUploadButton } from '~/components/general/document/document-upl
 import { FolderCard, FolderCardEmpty } from '~/components/general/folder/folder-card';
 import { useCurrentTeam } from '~/providers/team';
 
+import { EnvelopeUploadButton } from '../document/envelope-upload-button';
+
 export type FolderGridProps = {
   type: FolderType;
   parentId: string | null;
@@ -98,7 +100,7 @@ export const FolderGrid = ({ type, parentId }: FolderGridProps) => {
 
         <div className="flex gap-4 sm:flex-row sm:justify-end">
           {/* Todo: Envelopes - Feature flag */}
-          {/* <EnvelopeUploadButton type={type} folderId={parentId || undefined} /> */}
+          <EnvelopeUploadButton type={type} folderId={parentId || undefined} />
 
           {type === FolderType.DOCUMENT ? (
             <DocumentUploadButton />

packages/lib/client-only/hooks/use-editor-fields.ts

@@ -136,6 +136,7 @@ export const useEditorFields = ({
       const field: TLocalField = {
         ...fieldData,
         formId: nanoid(12),
+        ...restrictFieldPosValues(fieldData),
       };
 
       append(field);
@@ -165,7 +166,15 @@ export const useEditorFields = ({
       const index = localFields.findIndex((field) => field.formId === formId);
 
       if (index !== -1) {
-        update(index, { ...localFields[index], ...updates });
+        const updatedField = {
+          ...localFields[index],
+          ...updates,
+        };
+
+        update(index, {
+          ...updatedField,
+          ...restrictFieldPosValues(updatedField),
+        });
         triggerFieldsUpdate();
       }
     },
@@ -279,3 +288,14 @@ export const useEditorFields = ({
     setSelectedRecipient,
   };
 };
+
+const restrictFieldPosValues = (
+  field: Pick<TLocalField, 'positionX' | 'positionY' | 'width' | 'height'>,
+) => {
+  return {
+    positionX: Math.max(0, Math.min(100, field.positionX)),
+    positionY: Math.max(0, Math.min(100, field.positionY)),
+    width: Math.max(0, Math.min(100, field.width)),
+    height: Math.max(0, Math.min(100, field.height)),
+  };
+};

packages/lib/client-only/hooks/use-page-renderer.ts

@@ -0,0 +1,105 @@
+import { useEffect, useMemo, useRef } from 'react';
+
+import Konva from 'konva';
+import type { RenderParameters } from 'pdfjs-dist/types/src/display/api';
+import { usePageContext } from 'react-pdf';
+
+type RenderFunction = (props: { stage: Konva.Stage; pageLayer: Konva.Layer }) => void;
+
+export function usePageRenderer(renderFunction: RenderFunction) {
+  const pageContext = usePageContext();
+
+  if (!pageContext) {
+    throw new Error('Unable to find Page context.');
+  }
+
+  const { page, rotate, scale } = pageContext;
+
+  if (!page) {
+    throw new Error('Attempted to render page canvas, but no page was specified.');
+  }
+
+  const canvasElement = useRef<HTMLCanvasElement>(null);
+  const konvaContainer = useRef<HTMLDivElement>(null);
+
+  const stage = useRef<Konva.Stage | null>(null);
+  const pageLayer = useRef<Konva.Layer | null>(null);
+
+  const unscaledViewport = useMemo(
+    () => page.getViewport({ scale: 1, rotation: rotate }),
+    [page, rotate, scale],
+  );
+
+  const scaledViewport = useMemo(
+    () => page.getViewport({ scale, rotation: rotate }),
+    [page, rotate, scale],
+  );
+
+  /**
+   * Render the PDF and create the scaled Konva stage.
+   */
+  useEffect(
+    function drawPageOnCanvas() {
+      if (!page) {
+        return;
+      }
+
+      const { current: canvas } = canvasElement;
+      const { current: kContainer } = konvaContainer;
+
+      if (!canvas || !kContainer) {
+        return;
+      }
+
+      const renderContext: RenderParameters = {
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        canvasContext: canvas.getContext('2d', { alpha: false }) as CanvasRenderingContext2D,
+        viewport: scaledViewport,
+      };
+
+      const cancellable = page.render(renderContext);
+      const runningTask = cancellable;
+
+      cancellable.promise.catch(() => {
+        // Intentionally empty
+      });
+
+      void cancellable.promise.then(() => {
+        stage.current = new Konva.Stage({
+          container: kContainer,
+          width: scaledViewport.width,
+          height: scaledViewport.height,
+          scale: {
+            x: scale,
+            y: scale,
+          },
+        });
+
+        // Create the main layer for interactive elements.
+        pageLayer.current = new Konva.Layer();
+
+        stage.current.add(pageLayer.current);
+
+        renderFunction({
+          stage: stage.current,
+          pageLayer: pageLayer.current,
+        });
+      });
+
+      return () => {
+        runningTask.cancel();
+      };
+    },
+    [page, scaledViewport],
+  );
+
+  return {
+    canvasElement,
+    konvaContainer,
+    stage,
+    pageLayer,
+    unscaledViewport,
+    scaledViewport,
+    pageContext,
+  };
+}

packages/lib/client-only/providers/envelope-editor-provider.tsx

@@ -135,7 +135,12 @@ export const EnvelopeEditorProvider = ({
   });
 
   const envelopeRecipientSetMutationQuery = trpc.envelope.recipient.set.useMutation({
-    onSuccess: () => {
+    onSuccess: ({ recipients }) => {
+      setEnvelope((prev) => ({
+        ...prev,
+        recipients,
+      }));
+
       setAutosaveError(false);
     },
     onError: (error) => {
@@ -215,14 +220,15 @@ export const EnvelopeEditorProvider = ({
 
   const getRecipientColorKey = useCallback(
     (recipientId: number) => {
-      // Todo: Envelopes - Local recipients
       const recipientIndex = envelope.recipients.findIndex(
         (recipient) => recipient.id === recipientId,
       );
 
-      return AVAILABLE_RECIPIENT_COLORS[Math.max(recipientIndex, 0)];
+      return AVAILABLE_RECIPIENT_COLORS[
+        Math.max(recipientIndex, 0) % AVAILABLE_RECIPIENT_COLORS.length
+      ];
     },
-    [envelope.recipients], // Todo: Envelopes - Local recipients
+    [envelope.recipients],
   );
 
   const { refetch: reloadEnvelope, isLoading: isReloadingEnvelope } = trpc.envelope.get.useQuery(

packages/lib/server-only/document/send-completed-email.ts

@@ -87,7 +87,6 @@ export const sendCompletedEmail = async ({ id, requestMetadata }: SendDocumentOp
       return {
         fileName: document.title.endsWith('.pdf') ? document.title : document.title + '.pdf',
         content: Buffer.from(file),
-        contentType: 'application/pdf',
       };
     }),
   );

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

@@ -56,6 +56,7 @@ export const sendDocument = async ({
       recipients: {
         orderBy: [{ signingOrder: { sort: 'asc', nulls: 'last' } }, { id: 'asc' }],
       },
+      fields: true,
       documentMeta: true,
       envelopeItems: {
         select: {
@@ -165,6 +166,16 @@ export const sendDocument = async ({
     });
   }
 
+  const fieldsToAutoInsert = [];
+
+  // Todo: Envelopes - Handle auto-signing
+  if (envelope.internalVersion === 2) {
+    // fieldsToAutoInsert = envelope.fields.filter((field) => !field.inserted);
+    // if (fieldsToAutoInsert.length > 0) {
+    //   //
+    // }
+  }
+
   const updatedEnvelope = await prisma.$transaction(async (tx) => {
     if (envelope.status === DocumentStatus.DRAFT) {
       await tx.documentAuditLog.create({

packages/lib/server-only/field/set-fields-for-document.ts

@@ -156,9 +156,11 @@ export const setFieldsForDocument = async ({
 
         if (field.type === FieldType.NUMBER && field.fieldMeta) {
           const numberFieldParsedMeta = ZNumberFieldMeta.parse(field.fieldMeta);
+
           const errors = validateNumberField(
             String(numberFieldParsedMeta.value),
             numberFieldParsedMeta,
+            false,
           );
 
           if (errors.length > 0) {

packages/lib/server-only/pdf/insert-field-in-pdf-v1.ts

@@ -331,57 +331,18 @@ export const insertFieldInPDFV1 = async (pdf: PDFDocument, field: FieldWithSigna
       }));
 
       const selected = field.customText.split(',');
-      const direction = meta.data.direction ?? 'vertical';
 
       const topPadding = 12;
       const leftRadioPadding = 8;
       const leftRadioLabelPadding = 12;
       const radioSpaceY = 13;
 
-      if (direction === 'horizontal') {
-        let currentX = leftRadioPadding;
-        let currentY = topPadding;
-        const maxWidth = pageWidth - fieldX - leftRadioPadding * 2;
-
-        for (const [index, item] of (values ?? []).entries()) {
-          const radio = pdf.getForm().createRadioGroup(`radio.${field.secondaryId}.${index}`);
-
-          const labelText = item.value.includes('empty-value-') ? '' : item.value;
-          const labelWidth = font.widthOfTextAtSize(labelText, 12);
-          const itemWidth = leftRadioLabelPadding + labelWidth + 16;
-
-          if (currentX + itemWidth > maxWidth && index > 0) {
-            currentX = leftRadioPadding;
-            currentY += radioSpaceY;
-          }
-
-          page.drawText(labelText, {
-            x: fieldX + currentX + leftRadioLabelPadding,
-            y: pageHeight - (fieldY + currentY),
-            size: 12,
-            font,
-            rotate: degrees(pageRotationInDegrees),
-          });
-
-          radio.addOptionToPage(item.value, page, {
-            x: fieldX + currentX,
-            y: pageHeight - (fieldY + currentY),
-            height: 8,
-            width: 8,
-          });
-
-          if (selected.includes(item.value)) {
-            radio.select(item.value);
-          }
-
-          currentX += itemWidth;
-        }
-      } else {
       for (const [index, item] of (values ?? []).entries()) {
         const offsetY = index * radioSpaceY + topPadding;
 
         const radio = pdf.getForm().createRadioGroup(`radio.${field.secondaryId}.${index}`);
 
+        // Draw label.
         page.drawText(item.value.includes('empty-value-') ? '' : item.value, {
           x: fieldX + leftRadioPadding + leftRadioLabelPadding,
           y: pageHeight - (fieldY + offsetY),
@@ -390,6 +351,7 @@ export const insertFieldInPDFV1 = async (pdf: PDFDocument, field: FieldWithSigna
           rotate: degrees(pageRotationInDegrees),
         });
 
+        // Draw radio button.
         radio.addOptionToPage(item.value, page, {
           x: fieldX + leftRadioPadding,
           y: pageHeight - (fieldY + offsetY),
@@ -401,7 +363,6 @@ export const insertFieldInPDFV1 = async (pdf: PDFDocument, field: FieldWithSigna
           radio.select(item.value);
         }
       }
-      }
     })
     .otherwise((field) => {
       const fieldMetaParsers = {

packages/lib/server-only/pdf/insert-field-in-pdf-v2.ts

@@ -3,7 +3,6 @@ import { RotationTypes, radiansToDegrees } from '@cantoo/pdf-lib';
 import fontkit from '@pdf-lib/fontkit';
 import Konva from 'konva';
 import 'konva/skia-backend';
-import fs from 'node:fs';
 import type { Canvas } from 'skia-canvas';
 import { match } from 'ts-pattern';
 
@@ -86,6 +85,7 @@ export const insertFieldInPDFV2 = async (pdf: PDFDocument, field: FieldWithSigna
 
   // Will render onto the layer.
   renderField({
+    scale: 1,
     field: {
       renderId: field.id.toString(),
       ...field,
@@ -105,10 +105,10 @@ export const insertFieldInPDFV2 = async (pdf: PDFDocument, field: FieldWithSigna
 
   const renderedField = await canvas.toBuffer('svg');
 
-  fs.writeFileSync(
+  // fs.writeFileSync(
-    `rendered-field-${field.envelopeId}--${field.id}.svg`,
+  //   `rendered-field-${field.envelopeId}--${field.id}.svg`,
-    renderedField.toString('utf-8'),
+  //   renderedField.toString('utf-8'),
-  );
+  // );
 
   // Embed the SVG into the PDF
   const svgElement = await pdf.embedSvg(renderedField.toString('utf-8'));

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

@@ -203,7 +203,6 @@ const getUpdatedFieldMeta = (field: Field, prefillField?: TFieldMetaPrefillField
         type: 'radio',
         label: field.label,
         values: newValues,
-        direction: radioMeta.direction ?? 'vertical',
       };
 
       return meta;

packages/lib/universal/field-renderer/field-generic-items.ts

@@ -12,7 +12,7 @@ export const upsertFieldGroup = (
   field: FieldToRender,
   options: RenderFieldElementOptions,
 ): Konva.Group => {
-  const { pageWidth, pageHeight, pageLayer, editable } = options;
+  const { pageWidth, pageHeight, pageLayer, editable, scale } = options;
 
   const { fieldX, fieldY, fieldWidth, fieldHeight } = calculateFieldPosition(
     field,
@@ -27,6 +27,9 @@ export const upsertFieldGroup = (
       name: 'field-group',
     });
 
+  const maxXPosition = (pageWidth - fieldWidth) * scale;
+  const maxYPosition = (pageHeight - fieldHeight) * scale;
+
   fieldGroup.setAttrs({
     scaleX: 1,
     scaleY: 1,
@@ -34,8 +37,9 @@ export const upsertFieldGroup = (
     y: fieldY,
     draggable: editable,
     dragBoundFunc: (pos) => {
-      const newX = Math.max(0, Math.min(pageWidth - fieldWidth, pos.x));
+      const newX = Math.max(0, Math.min(maxXPosition, pos.x));
-      const newY = Math.max(0, Math.min(pageHeight - fieldHeight, pos.y));
+      const newY = Math.max(0, Math.min(maxYPosition, pos.y));
+
       return { x: newX, y: newY };
     },
   } satisfies Partial<Konva.GroupConfig>);

packages/lib/universal/field-renderer/field-renderer.ts

@@ -26,8 +26,9 @@ export type RenderFieldElementOptions = {
   pageLayer: Konva.Layer;
   pageWidth: number;
   pageHeight: number;
-  mode?: 'edit' | 'sign' | 'export';
+  mode: 'edit' | 'sign' | 'export';
   editable?: boolean;
+  scale: number;
   color?: TRecipientColor;
 };
 
@@ -107,6 +108,11 @@ type CalculateMultiItemPositionOptions = {
    */
   fieldPadding: number;
 
+  /**
+   * The direction of the items.
+   */
+  direction: 'horizontal' | 'vertical';
+
   type: 'checkbox' | 'radio';
 };
 
@@ -122,6 +128,7 @@ export const calculateMultiItemPosition = (options: CalculateMultiItemPositionOp
     itemSize,
     spacingBetweenItemAndText,
     fieldPadding,
+    direction,
     type,
   } = options;
 
@@ -130,6 +137,39 @@ export const calculateMultiItemPosition = (options: CalculateMultiItemPositionOp
   const innerFieldX = fieldPadding;
   const innerFieldY = fieldPadding;
 
+  if (direction === 'horizontal') {
+    const itemHeight = innerFieldHeight;
+    const itemWidth = innerFieldWidth / itemCount;
+
+    const y = innerFieldY;
+    const x = itemIndex * itemWidth + innerFieldX;
+
+    let itemInputY = y + itemHeight / 2 - itemSize / 2;
+    let itemInputX = x;
+
+    // We need a little different logic to center the radio circle icon.
+    if (type === 'radio') {
+      itemInputX = x + itemSize / 2;
+      itemInputY = y + itemHeight / 2;
+    }
+
+    const textX = x + itemSize + spacingBetweenItemAndText;
+    const textY = y;
+
+    // Multiplied by 2 for extra padding on the right hand side of the text and the next item.
+    const textWidth = itemWidth - itemSize - spacingBetweenItemAndText * 2;
+    const textHeight = itemHeight;
+
+    return {
+      itemInputX,
+      itemInputY,
+      textX,
+      textY,
+      textWidth,
+      textHeight,
+    };
+  }
+
   const itemHeight = innerFieldHeight / itemCount;
 
   const y = itemIndex * itemHeight + innerFieldY;
@@ -137,6 +177,7 @@ export const calculateMultiItemPosition = (options: CalculateMultiItemPositionOp
   let itemInputY = y + itemHeight / 2 - itemSize / 2;
   let itemInputX = innerFieldX;
 
+  // We need a little different logic to center the radio circle icon.
   if (type === 'radio') {
     itemInputX = innerFieldX + itemSize / 2;
     itemInputY = y + itemHeight / 2;

packages/lib/universal/field-renderer/render-checkbox-field.ts

@@ -1,4 +1,5 @@
 import Konva from 'konva';
+import { match } from 'ts-pattern';
 
 import { DEFAULT_STANDARD_FONT_SIZE } from '../../constants/pdf';
 import type { TCheckboxFieldMeta } from '../../types/field-meta';
@@ -21,13 +22,18 @@ export const renderCheckboxFieldElement = (
 
   const fieldGroup = upsertFieldGroup(field, options);
 
-  // Clear previous children to re-render fresh
+  // Clear previous children and listeners to re-render fresh.
   fieldGroup.removeChildren();
+  fieldGroup.off('transform');
 
   fieldGroup.add(upsertFieldRect(field, options));
 
+  const checkboxMeta: TCheckboxFieldMeta | null = (field.fieldMeta as TCheckboxFieldMeta) || null;
+  const checkboxValues = checkboxMeta?.values || [];
+
   if (isFirstRender) {
     pageLayer.add(fieldGroup);
+  }
 
   // Handle rescaling items during transforms.
   fieldGroup.on('transform', () => {
@@ -72,6 +78,7 @@ export const renderCheckboxFieldElement = (
           itemSize: checkboxSize,
           spacingBetweenItemAndText: spacingBetweenCheckboxAndText,
           fieldPadding: checkboxFieldPadding,
+          direction: checkboxMeta?.direction || 'vertical',
           type: 'checkbox',
         });
 
@@ -111,14 +118,16 @@ export const renderCheckboxFieldElement = (
 
     pageLayer.batchDraw();
   });
-  }
-
-  const checkboxMeta: TCheckboxFieldMeta | null = (field.fieldMeta as TCheckboxFieldMeta) || null;
-  const checkboxValues = checkboxMeta?.values || [];
 
   const { fieldWidth, fieldHeight } = calculateFieldPosition(field, pageWidth, pageHeight);
 
   checkboxValues.forEach(({ id, value, checked }, index) => {
+    const isCheckboxChecked = match(mode)
+      .with('edit', () => checked)
+      .with('sign', () => value === field.customText)
+      .with('export', () => value === field.customText)
+      .exhaustive();
+
     const { itemInputX, itemInputY, textX, textY, textWidth, textHeight } =
       calculateMultiItemPosition({
         fieldWidth,
@@ -128,6 +137,7 @@ export const renderCheckboxFieldElement = (
         itemSize: checkboxSize,
         spacingBetweenItemAndText: spacingBetweenCheckboxAndText,
         fieldPadding: checkboxFieldPadding,
+        direction: checkboxMeta?.direction || 'vertical',
         type: 'checkbox',
       });
 
@@ -156,7 +166,7 @@ export const renderCheckboxFieldElement = (
       strokeWidth: 2,
       stroke: '#111827',
       points: [3, 8, 7, 12, 13, 4],
-      visible: checked,
+      visible: isCheckboxChecked,
     });
 
     const text = new Konva.Text({

packages/lib/universal/field-renderer/render-field.ts

@@ -47,6 +47,7 @@ type RenderFieldOptions = {
    */
   mode: 'edit' | 'sign' | 'export';
 
+  scale: number;
   editable?: boolean;
 };
 
@@ -56,6 +57,7 @@ export const renderField = ({
   pageWidth,
   pageHeight,
   mode,
+  scale,
   editable,
   color,
 }: RenderFieldOptions) => {
@@ -66,6 +68,7 @@ export const renderField = ({
     mode,
     color,
     editable,
+    scale,
   };
 
   return match(field.type)

packages/lib/universal/field-renderer/render-radio-field.ts

@@ -1,4 +1,5 @@
 import Konva from 'konva';
+import { match } from 'ts-pattern';
 
 import { DEFAULT_STANDARD_FONT_SIZE } from '../../constants/pdf';
 import type { TRadioFieldMeta } from '../../types/field-meta';
@@ -26,8 +27,14 @@ export const renderRadioFieldElement = (
 
   fieldGroup.add(upsertFieldRect(field, options));
 
+  const radioMeta: TRadioFieldMeta | null = (field.fieldMeta as TRadioFieldMeta) || null;
+  const radioValues = radioMeta?.values || [];
+
   if (isFirstRender) {
     pageLayer.add(fieldGroup);
+  }
+
+  fieldGroup.off('transform');
 
   // Handle rescaling items during transforms.
   fieldGroup.on('transform', () => {
@@ -66,6 +73,7 @@ export const renderRadioFieldElement = (
           spacingBetweenItemAndText: spacingBetweenRadioAndText,
           fieldPadding: radioFieldPadding,
           type: 'radio',
+          direction: radioMeta?.direction || 'vertical',
         });
 
       circleElement.setAttrs({
@@ -102,14 +110,16 @@ export const renderRadioFieldElement = (
 
     pageLayer.batchDraw();
   });
-  }
-
-  const radioMeta: TRadioFieldMeta | null = (field.fieldMeta as TRadioFieldMeta) || null;
-  const radioValues = radioMeta?.values || [];
 
   const { fieldWidth, fieldHeight } = calculateFieldPosition(field, pageWidth, pageHeight);
 
   radioValues.forEach(({ value, checked }, index) => {
+    const isRadioValueChecked = match(mode)
+      .with('edit', () => checked)
+      .with('sign', () => value === field.customText)
+      .with('export', () => value === field.customText)
+      .exhaustive();
+
     const { itemInputX, itemInputY, textX, textY, textWidth, textHeight } =
       calculateMultiItemPosition({
         fieldWidth,
@@ -120,6 +130,7 @@ export const renderRadioFieldElement = (
         spacingBetweenItemAndText: spacingBetweenRadioAndText,
         fieldPadding: radioFieldPadding,
         type: 'radio',
+        direction: radioMeta?.direction || 'vertical',
       });
 
     // Circle which represents the radio button.
@@ -144,9 +155,7 @@ export const renderRadioFieldElement = (
       y: itemInputY,
       radius: radioSize / 4,
       fill: '#111827',
-      // Todo: Envelopes
+      visible: isRadioValueChecked,
-      visible: value === field.customText,
-      // visible: checked,
     });
 
     const text = new Konva.Text({

packages/lib/universal/field-renderer/render-signature-field.ts

@@ -96,17 +96,21 @@ export const renderSignatureFieldElement = (
 
   const fieldGroup = upsertFieldGroup(field, options);
 
-  // ABOVE IS GENERIC, EXTRACT IT.
+  // Clear previous children and listeners to re-render fresh.
+  fieldGroup.removeChildren();
+  fieldGroup.off('transform');
+
+  // Assign elements to group and any listeners that should only be run on initialization.
+  if (isFirstRender) {
+    pageLayer.add(fieldGroup);
+  }
 
   // Render the field background and text.
   const fieldRect = upsertFieldRect(field, options);
   const fieldText = upsertFieldText(field, options);
 
-  // Assign elements to group and any listeners that should only be run on initialization.
-  if (isFirstRender) {
   fieldGroup.add(fieldRect);
   fieldGroup.add(fieldText);
-    pageLayer.add(fieldGroup);
 
   // This is to keep the text inside the field at the same size
   // when the field is resized. Without this the text would be stretched.
@@ -166,7 +170,6 @@ export const renderSignatureFieldElement = (
     // fieldGroup.draw();
     fieldGroup.getLayer()?.batchDraw();
   });
-  }
 
   // Handle export mode.
   if (mode === 'export') {

packages/lib/universal/field-renderer/render-text-field.ts

@@ -121,17 +121,21 @@ export const renderTextFieldElement = (
 
   const fieldGroup = upsertFieldGroup(field, options);
 
-  // ABOVE IS GENERIC, EXTRACT IT.
+  // Clear previous children and listeners to re-render fresh.
+  fieldGroup.removeChildren();
+  fieldGroup.off('transform');
+
+  // Assign elements to group and any listeners that should only be run on initialization.
+  if (isFirstRender) {
+    pageLayer.add(fieldGroup);
+  }
 
   // Render the field background and text.
   const fieldRect = upsertFieldRect(field, options);
   const fieldText = upsertFieldText(field, options);
 
-  // Assign elements to group and any listeners that should only be run on initialization.
-  if (isFirstRender) {
   fieldGroup.add(fieldRect);
   fieldGroup.add(fieldText);
-    pageLayer.add(fieldGroup);
 
   // This is to keep the text inside the field at the same size
   // when the field is resized. Without this the text would be stretched.
@@ -191,7 +195,6 @@ export const renderTextFieldElement = (
     // fieldGroup.draw();
     fieldGroup.getLayer()?.batchDraw();
   });
-  }
 
   // Handle export mode.
   if (mode === 'export') {

packages/ui/components/pdf-viewer/pdf-viewer-konva.tsx

@@ -91,11 +91,11 @@ export const PdfViewerKonva = ({
   }, []);
 
   return (
-    <div ref={$el} className={cn('w-[800px] overflow-hidden', className)} {...props}>
+    <div ref={$el} className={cn('w-full max-w-[800px]', className)} {...props}>
       {envelopeItemFile && Konva ? (
         <PDFDocument
           file={envelopeItemFile}
-          className={cn('w-full overflow-hidden rounded', {
+          className={cn('w-full rounded', {
             'h-[80vh] max-h-[60rem]': numPages === 0,
           })}
           onLoadSuccess={(d) => onDocumentLoaded(d)}
@@ -138,7 +138,7 @@ export const PdfViewerKonva = ({
             .fill(null)
             .map((_, i) => (
               <div key={i} className="last:-mb-2">
-                <div className="border-border overflow-hidden rounded border will-change-transform">
+                <div className="border-border rounded border will-change-transform">
                   <PDFPage
                     pageNumber={i + 1}
                     width={width}

packages/ui/lib/recipient-colors.ts

@@ -9,6 +9,7 @@ export type RecipientColorStyles = {
   base: string;
   baseRing: string;
   baseRingHover: string;
+  fieldButton: string;
   fieldItem: string;
   fieldItemInitials: string;
   comboxBoxTrigger: string;
@@ -23,6 +24,7 @@ export const RECIPIENT_COLOR_STYLES = {
     base: 'ring-neutral-400',
     baseRing: 'rgba(176, 176, 176, 1)',
     baseRingHover: 'rgba(176, 176, 176, 1)',
+    fieldButton: 'border-neutral-400 hover:border-neutral-400',
     fieldItem: 'group/field-item rounded-[2px]',
     fieldItemInitials: '',
     comboxBoxTrigger:
@@ -34,6 +36,7 @@ export const RECIPIENT_COLOR_STYLES = {
     base: 'ring-recipient-green hover:bg-recipient-green/30',
     baseRing: 'rgba(122, 195, 85, 1)',
     baseRingHover: 'rgba(122, 195, 85, 0.3)',
+    fieldButton: 'hover:border-recipient-green hover:bg-recipient-green/30 ',
     fieldItem: 'group/field-item rounded-[2px]',
     fieldItemInitials: 'group-hover/field-item:bg-recipient-green',
     comboxBoxTrigger:
@@ -45,6 +48,7 @@ export const RECIPIENT_COLOR_STYLES = {
     base: 'ring-recipient-blue hover:bg-recipient-blue/30',
     baseRing: 'rgba(56, 123, 199, 1)',
     baseRingHover: 'rgba(56, 123, 199, 0.3)',
+    fieldButton: 'hover:border-recipient-blue hover:bg-recipient-blue/30',
     fieldItem: 'group/field-item rounded-[2px]',
     fieldItemInitials: 'group-hover/field-item:bg-recipient-blue',
     comboxBoxTrigger:
@@ -56,6 +60,7 @@ export const RECIPIENT_COLOR_STYLES = {
     base: 'ring-recipient-purple hover:bg-recipient-purple/30',
     baseRing: 'rgba(151, 71, 255, 1)',
     baseRingHover: 'rgba(151, 71, 255, 0.3)',
+    fieldButton: 'hover:border-recipient-purple hover:bg-recipient-purple/30',
     fieldItem: 'group/field-item rounded-[2px]',
     fieldItemInitials: 'group-hover/field-item:bg-recipient-purple',
     comboxBoxTrigger:
@@ -67,6 +72,7 @@ export const RECIPIENT_COLOR_STYLES = {
     base: 'ring-recipient-orange hover:bg-recipient-orange/30',
     baseRing: 'rgba(246, 159, 30, 1)',
     baseRingHover: 'rgba(246, 159, 30, 0.3)',
+    fieldButton: 'hover:border-recipient-orange hover:bg-recipient-orange/30',
     fieldItem: 'group/field-item rounded-[2px]',
     fieldItemInitials: 'group-hover/field-item:bg-recipient-orange',
     comboxBoxTrigger:
@@ -78,6 +84,7 @@ export const RECIPIENT_COLOR_STYLES = {
     base: 'ring-recipient-yellow hover:bg-recipient-yellow/30',
     baseRing: 'rgba(219, 186, 0, 1)',
     baseRingHover: 'rgba(219, 186, 0, 0.3)',
+    fieldButton: 'hover:border-recipient-yellow hover:bg-recipient-yellow/30',
     fieldItem: 'group/field-item rounded-[2px]',
     fieldItemInitials: 'group-hover/field-item:bg-recipient-yellow',
     comboxBoxTrigger:
@@ -89,6 +96,7 @@ export const RECIPIENT_COLOR_STYLES = {
     base: 'ring-recipient-pink hover:bg-recipient-pink/30',
     baseRing: 'rgba(217, 74, 186, 1)',
     baseRingHover: 'rgba(217, 74, 186, 0.3)',
+    fieldButton: 'hover:border-recipient-pink hover:bg-recipient-pink/30',
     fieldItem: 'group/field-item rounded-[2px]',
     fieldItemInitials: 'group-hover/field-item:bg-recipient-pink',
     comboxBoxTrigger:

packages/ui/primitives/document-flow/field-content.tsx

@@ -108,15 +108,8 @@ export const FieldContent = ({ field, documentMeta }: FieldIconProps) => {
     field.fieldMeta.values.length > 0
   ) {
     return (
-      <div className="py-0.5">
+      <div className="flex flex-col gap-y-2 py-0.5">
-        <RadioGroup
+        <RadioGroup className="gap-y-1">
-          className={cn(
-            'gap-1',
-            field.fieldMeta.direction === 'horizontal'
-              ? 'flex flex-row flex-wrap'
-              : 'flex flex-col gap-y-1',
-          )}
-        >
           {field.fieldMeta.values.map((item, index) => (
             <div key={index} className="flex items-center">
               <RadioGroupItem

packages/ui/primitives/document-flow/field-item-advanced-settings.tsx

@@ -122,7 +122,6 @@ const getDefaultState = (fieldType: FieldType): FieldMeta => {
         values: [],
         required: false,
         readOnly: false,
-        direction: 'vertical',
       };
     case FieldType.CHECKBOX:
       return {

packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx

@@ -11,13 +11,6 @@ import { Button } from '@documenso/ui/primitives/button';
 import { Checkbox } from '@documenso/ui/primitives/checkbox';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@documenso/ui/primitives/select';
 import { Switch } from '@documenso/ui/primitives/switch';
 
 export type RadioFieldAdvancedSettingsProps = {
@@ -42,9 +35,6 @@ export const RadioFieldAdvancedSettings = ({
   );
   const [readOnly, setReadOnly] = useState(fieldState.readOnly ?? false);
   const [required, setRequired] = useState(fieldState.required ?? false);
-  const [direction, setDirection] = useState<'vertical' | 'horizontal'>(
-    fieldState.direction ?? 'vertical',
-  );
 
   const addValue = () => {
     const newId = values.length > 0 ? Math.max(...values.map((val) => val.id)) + 1 : 1;
@@ -79,19 +69,10 @@ export const RadioFieldAdvancedSettings = ({
   const handleToggleChange = (field: keyof RadioFieldMeta, value: string | boolean) => {
     const readOnly = field === 'readOnly' ? Boolean(value) : Boolean(fieldState.readOnly);
     const required = field === 'required' ? Boolean(value) : Boolean(fieldState.required);
-    const currentDirection =
-      field === 'direction' && String(value) === 'horizontal' ? 'horizontal' : 'vertical';
     setReadOnly(readOnly);
     setRequired(required);
-    setDirection(currentDirection);
 
-    const errors = validateRadioField(String(value), {
+    const errors = validateRadioField(String(value), { readOnly, required, values, type: 'radio' });
-      readOnly,
-      required,
-      values,
-      type: 'radio',
-      direction: currentDirection,
-    });
     handleErrors(errors);
 
     handleFieldChange(field, value);
@@ -116,13 +97,7 @@ export const RadioFieldAdvancedSettings = ({
   }, [fieldState.values]);
 
   useEffect(() => {
-    const errors = validateRadioField(undefined, {
+    const errors = validateRadioField(undefined, { readOnly, required, values, type: 'radio' });
-      readOnly,
-      required,
-      values,
-      type: 'radio',
-      direction,
-    });
     handleErrors(errors);
   }, [values]);
 
@@ -141,27 +116,6 @@ export const RadioFieldAdvancedSettings = ({
             onChange={(e) => handleFieldChange('label', e.target.value)}
           />
         </div>
-        <div>
-          <Label>
-            <Trans>Direction</Trans>
-          </Label>
-          <Select
-            value={fieldState.direction ?? 'vertical'}
-            onValueChange={(val) => handleToggleChange('direction', val)}
-          >
-            <SelectTrigger className="text-muted-foreground bg-background mt-2 w-full">
-              <SelectValue placeholder={_(msg`Select direction`)} />
-            </SelectTrigger>
-            <SelectContent position="popper">
-              <SelectItem value="vertical">
-                <Trans>Vertical</Trans>
-              </SelectItem>
-              <SelectItem value="horizontal">
-                <Trans>Horizontal</Trans>
-              </SelectItem>
-            </SelectContent>
-          </Select>
-        </div>
         <div className="flex flex-row items-center gap-2">
           <Switch
             className="bg-background"