fix: auto insert prefilled text and number fields (#2157)

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

@@ -24,7 +24,9 @@ import {
   ZCheckboxFieldMeta,
   ZDropdownFieldMeta,
   ZFieldAndMetaSchema,
+  ZNumberFieldMeta,
   ZRadioFieldMeta,
+  ZTextFieldMeta,
 } from '../../types/field-meta';
 import {
   ZWebhookDocumentSchema,
@@ -182,9 +184,18 @@ export const sendDocument = async ({
   // Validate and autoinsert fields for V2 envelopes.
   if (envelope.internalVersion === 2) {
     for (const unknownField of envelope.fields) {
+      const recipient = envelope.recipients.find((r) => r.id === unknownField.recipientId);
+
+      if (!recipient) {
+        throw new AppError(AppErrorCode.NOT_FOUND, {
+          message: 'Recipient not found',
+        });
+      }
+
       const fieldToAutoInsert = extractFieldAutoInsertValues(unknownField);
 
-      if (fieldToAutoInsert) {
+      // Only auto-insert fields if the recipient has not been sent the document yet.
+      if (fieldToAutoInsert && recipient.sendStatus !== SendStatus.SENT) {
         fieldsToAutoInsert.push(fieldToAutoInsert);
       }
     }
@@ -205,6 +216,7 @@ export const sendDocument = async ({
     if (envelope.internalVersion === 2) {
       const autoInsertedFields = await Promise.all(
         fieldsToAutoInsert.map(async (field) => {
+          // Warning: Only auto-insert fields if the recipient has not been sent the document yet.
           return await tx.field.update({
             where: {
               id: field.fieldId,
@@ -337,6 +349,31 @@ export const extractFieldAutoInsertValues = (
   const field = parsedField.data;
   const fieldId = unknownField.id;
 
+  // Auto insert text fields with prefilled values.
+  if (field.type === FieldType.TEXT) {
+    const { text } = ZTextFieldMeta.parse(field.fieldMeta);
+
+    if (text) {
+      return {
+        fieldId,
+        customText: text,
+      };
+    }
+  }
+
+  // Auto insert number fields with prefilled values.
+  if (field.type === FieldType.NUMBER) {
+    const { value } = ZNumberFieldMeta.parse(field.fieldMeta);
+
+    if (value) {
+      return {
+        fieldId,
+        customText: value,
+      };
+    }
+  }
+
+  // Auto insert radio fields with the pre-checked value.
   if (field.type === FieldType.RADIO) {
     const { values = [] } = ZRadioFieldMeta.parse(field.fieldMeta);
 
@@ -350,6 +387,7 @@ export const extractFieldAutoInsertValues = (
     }
   }
 
+  // Auto insert dropdown fields with the default value.
   if (field.type === FieldType.DROPDOWN) {
     const { defaultValue, values = [] } = ZDropdownFieldMeta.parse(field.fieldMeta);
 
@@ -361,6 +399,7 @@ export const extractFieldAutoInsertValues = (
     }
   }
 
+  // Auto insert checkbox fields with the pre-checked values.
   if (field.type === FieldType.CHECKBOX) {
     const {
       values = [],

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

@@ -48,14 +48,8 @@ const upsertFieldText = (field: FieldToRender, options: RenderFieldElementOption
   let textLineHeight = FIELD_DEFAULT_LINE_HEIGHT;
   let textLetterSpacing = FIELD_DEFAULT_LETTER_SPACING;
 
-  // Default to blank for export mode since this we want to ensure we don't show
-  // any placeholder text or labels unless actually it's inserted.
-  if (mode === 'export') {
-    textToRender = '';
-  }
-
-  // Use default values for text/number if provided.
-  if (fieldMeta?.type === 'text' || fieldMeta?.type === 'number') {
+  // Render default values for text/number if provided for editing mode.
+  if (mode === 'edit' && (fieldMeta?.type === 'text' || fieldMeta?.type === 'number')) {
     const value = fieldMeta?.type === 'text' ? fieldMeta.text : fieldMeta.value;
 
     if (value) {
@@ -68,6 +62,27 @@ const upsertFieldText = (field: FieldToRender, options: RenderFieldElementOption
     }
   }
 
+  // Default to blank for export mode since we want to ensure we don't show
+  // any placeholder text or labels unless actually it's inserted.
+  if (mode === 'export') {
+    textToRender = '';
+  }
+
+  // Fallback render readonly fields if prefilled value exists.
+  if (field?.fieldMeta?.readOnly && (fieldMeta?.type === 'text' || fieldMeta?.type === 'number')) {
+    const value = fieldMeta?.type === 'text' ? fieldMeta.text : fieldMeta.value;
+
+    if (value) {
+      textToRender = value;
+
+      textVerticalAlign = fieldMeta.verticalAlign || FIELD_DEFAULT_GENERIC_VERTICAL_ALIGN;
+      textAlign = fieldMeta.textAlign || FIELD_DEFAULT_GENERIC_ALIGN;
+      textLetterSpacing = fieldMeta.letterSpacing || FIELD_DEFAULT_LETTER_SPACING;
+      textLineHeight = fieldMeta.lineHeight || FIELD_DEFAULT_LINE_HEIGHT;
+    }
+  }
+
+  // Override everything with value if it's inserted.
   if (field.inserted) {
     textToRender = field.customText;