@signiphi/pdf-signer 0.2.0-beta.2 → 0.2.0-beta.21

package/dist/hooks/index.js

@@ -77,6 +77,7 @@ function validatePdfBytes(pdfBytes) {
 }
 function isAutoGeneratedLabel(label) {
   if (!label || !label.trim()) return true;
+  const trimmed = label.trim();
   const autoLabels = [
     "Signature",
     "Initials",
@@ -87,7 +88,65 @@ function isAutoGeneratedLabel(label) {
     "Option",
     "Radio"
   ];
-  return autoLabels.includes(label.trim());
+  if (autoLabels.includes(trimmed)) return true;
+  if (/^\d{10,}$/.test(trimmed)) return true;
+  const typeTimestampPattern = new RegExp(
+    `^(${autoLabels.join("|")})[\\s_-]?\\d{10,}$`,
+    "i"
+  );
+  if (typeTimestampPattern.test(trimmed)) return true;
+  const typeNumberPattern = new RegExp(
+    `^(${autoLabels.join("|")})[\\s_-]?\\d{1,3}$`,
+    "i"
+  );
+  if (typeNumberPattern.test(trimmed)) return true;
+  const typeWordsJoined = autoLabels.join("|");
+  const corruptedPattern = new RegExp(
+    `^(${typeWordsJoined})[\\s_-]?\\d{10,}[\\s_-]?(${typeWordsJoined})+`,
+    "i"
+  );
+  if (corruptedPattern.test(trimmed)) return true;
+  const repeatedTypePattern = new RegExp(
+    `^((${typeWordsJoined})[\\s_-]+)+(${typeWordsJoined})$`,
+    "i"
+  );
+  if (repeatedTypePattern.test(trimmed)) return true;
+  return false;
+}
+function hasDrawableLabel(field) {
+  if (!field.label || !field.label.trim()) return false;
+  if (field.isLabelAutoGenerated) return false;
+  if (isAutoGeneratedLabel(field.label)) return false;
+  return true;
+}
+function getFieldDisplayName(field) {
+  if (field.label && !isAutoGeneratedLabel(field.label)) {
+    return field.label;
+  }
+  const typeNames = {
+    "text": "Text field",
+    "signature": "Signature",
+    "initials": "Initials",
+    "date": "Date field",
+    "checkbox": "Checkbox",
+    "dropdown": "Dropdown",
+    "radio": "Radio selection",
+    "radiogroup": "Radio selection",
+    "text_label": "Text label"
+  };
+  if (field.type) {
+    const typeName = typeNames[field.type.toLowerCase()];
+    if (typeName) {
+      return typeName;
+    }
+  }
+  if (field.name) {
+    let cleaned = field.name.replace(/_?(signature|initials|date)$/i, "").replace(/[_-]\d{10,}$/, "").replace(/[_-]/g, " ").trim();
+    if (cleaned && !isAutoGeneratedLabel(cleaned)) {
+      return cleaned.replace(/\b\w/g, (l) => l.toUpperCase());
+    }
+  }
+  return "This field";
 }
 function validateFieldValues(values) {
   const errors = [];
@@ -234,18 +293,15 @@ function isFieldVisibleToSigner(field, multiSignerContext) {
   if (!multiSignerContext.isMultiSigner) {
     return true;
   }
-  const { currentSignerEmail, isPrimarySigner, isFinalSigner } = multiSignerContext;
+  const { currentSignerEmail } = multiSignerContext;
   if (!field.assignedSignerEmail) {
-    return isFinalSigner;
+    return true;
   }
   if (field.assignedSignerEmail === currentSignerEmail) {
     return true;
   }
-  if (field.assignedSignerEmail.includes("recipients")) {
-    return isPrimarySigner;
-  }
-  if (field.assignedSignerEmail.includes("signers")) {
-    return isFinalSigner;
+  if (field.assignedSignerEmail === "to-recipients" || field.assignedSignerEmail === "additional-signers") {
+    return true;
   }
   return false;
 }
@@ -259,18 +315,15 @@ function shouldFlattenField(field, multiSignerContext) {
   if (!multiSignerContext.isMultiSigner) {
     return true;
   }
-  const { currentSignerEmail, isPrimarySigner, isFinalSigner } = multiSignerContext;
+  const { currentSignerEmail } = multiSignerContext;
   if (!field.assignedSignerEmail) {
-    return isFinalSigner;
+    return true;
   }
   if (field.assignedSignerEmail === currentSignerEmail) {
     return true;
   }
-  if (field.assignedSignerEmail.includes("recipients")) {
-    return isPrimarySigner;
-  }
-  if (field.assignedSignerEmail.includes("signers")) {
-    return isFinalSigner;
+  if (field.assignedSignerEmail === "to-recipients" || field.assignedSignerEmail === "additional-signers") {
+    return true;
   }
   return false;
 }
@@ -310,18 +363,23 @@ function findPageIndexWithFallback(pages, pageRef) {
 
 // src/utils/pdf-field-type-helpers.ts
 function detectFieldType(field) {
-  const typeName = field.constructor.name;
-  if (typeName === "PDFTextField") {
-    return "text";
-  } else if (typeName === "PDFCheckBox") {
+  const f = field;
+  if (typeof f.check === "function" && typeof f.uncheck === "function") {
     return "checkbox";
-  } else if (typeName === "PDFDropdown") {
+  }
+  if (typeof f.select === "function" && typeof f.getOptions === "function" && typeof f.check !== "function" && typeof f.setOptions !== "function") {
+    return "radiogroup";
+  }
+  if (typeof f.select === "function" && typeof f.getOptions === "function" && (typeof f.setOptions === "function" || typeof f.addOptions === "function")) {
     return "dropdown";
-  } else if (typeName === "PDFOptionList") {
+  }
+  if (typeof f.getOptions === "function" && typeof f.setOptions === "function" && typeof f.select !== "function") {
     return "optionlist";
-  } else if (typeName === "PDFRadioGroup") {
-    return "radiogroup";
-  } else if (typeName === "PDFSignature") {
+  }
+  if (typeof f.getText === "function" && typeof f.setText === "function") {
+    return "text";
+  }
+  if (typeof f.getText !== "function" && typeof f.check !== "function" && typeof f.select !== "function") {
     return "signature";
   }
   return "unknown";
@@ -330,13 +388,20 @@ function extractFieldValue(field, fieldType) {
   try {
     switch (fieldType) {
       case "text":
+      case "date":
         return field.getText?.() || "";
       case "checkbox":
         return field.isChecked?.() ? "true" : "false";
       case "dropdown":
-      case "optionlist":
+      case "optionlist": {
+        const selected = field.getSelected?.();
+        return Array.isArray(selected) ? selected[0] || "" : String(selected || "");
+      }
       case "radiogroup":
-        return field.getSelected?.()?.[0] || "";
+      case "radio": {
+        const radioSelected = field.getSelected?.();
+        return radioSelected ? String(radioSelected) : "";
+      }
       default:
         return "";
     }
@@ -408,12 +473,16 @@ async function validatePdfFormFields(pdfBytes, fieldValues, signatures, extracte
     const errors = [];
     for (const field of pdfFormFields) {
       if (field.required) {
+        const extractedField = extractedFields?.find((f) => f.name === field.name);
         if (multiSignerContext?.isMultiSigner && extractedFields) {
-          const extractedField = extractedFields.find((f) => f.name === field.name);
           if (!extractedField) {
             continue;
           }
         }
+        const logicalType = extractedField?.type || field.type;
+        if (logicalType === "date" || logicalType === "signature" || logicalType === "initials") {
+          continue;
+        }
         let hasValue = false;
         const fieldValue = fieldValues[field.name];
         const signatureValue = signatures[field.name];
@@ -423,16 +492,17 @@ async function validatePdfFormFields(pdfBytes, fieldValues, signatures, extracte
           hasValue = !!(signatureValue || fieldValue || mainSignature);
         } else if (field.name.includes("initials")) {
           hasValue = !!(signatureValue || fieldValue || mainInitials);
+        } else if (field.type === "checkbox" || logicalType === "checkbox") {
+          hasValue = fieldValue === "true" || field.value === "true";
         } else {
           hasValue = !!(fieldValue || field.value);
         }
         if (!hasValue) {
-          let friendlyName = field.name.replace(/[_-]/g, " ").replace(/\b\w/g, (l) => l.toUpperCase());
-          if (field.name.includes("signature")) {
-            friendlyName = "Signature";
-          } else if (field.name.includes("initials")) {
-            friendlyName = "Initials";
-          }
+          const friendlyName = getFieldDisplayName({
+            label: extractedField?.label,
+            name: field.name,
+            type: logicalType
+          });
           errors.push(`${friendlyName} is required`);
         }
       }
@@ -443,7 +513,80 @@ async function validatePdfFormFields(pdfBytes, fieldValues, signatures, extracte
     return ["Unable to validate form fields. Please ensure all required fields are completed."];
   }
 }
-async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {}, currentSignerEmail, extractedFormFields, metadata, auditTrail, multiSignerContext) {
+function extractFieldFontSize(fieldName, field, extractedFormFields) {
+  const DEFAULT_FONT_SIZE = 10;
+  const MIN_FONT_SIZE = 8;
+  const MAX_FONT_SIZE = 72;
+  const fieldInfo = extractedFormFields?.find((f) => f.name === fieldName);
+  if (fieldInfo?.fontSize && fieldInfo.fontSize >= MIN_FONT_SIZE && fieldInfo.fontSize <= MAX_FONT_SIZE) {
+    return fieldInfo.fontSize;
+  }
+  const daFontSize = extractFromDAField(field);
+  if (daFontSize !== null) {
+    return daFontSize;
+  }
+  const tuFontSize = extractFromTUField(field);
+  if (tuFontSize !== null) {
+    return tuFontSize;
+  }
+  return DEFAULT_FONT_SIZE;
+}
+function extractFromDAField(field) {
+  try {
+    const fieldWithAcro = field;
+    const dict = fieldWithAcro.acroField?.dict;
+    if (!dict) return null;
+    const daKey = dict.context?.obj?.("DA") || "DA";
+    const daEntry = dict.lookup?.(daKey) || dict.get?.(daKey);
+    if (!daEntry) return null;
+    let daValue = "";
+    if (typeof daEntry.decodeText === "function") {
+      daValue = daEntry.decodeText();
+    } else if (typeof daEntry.asString === "function") {
+      daValue = daEntry.asString();
+    } else {
+      daValue = String(daEntry);
+    }
+    const daMatch = daValue.match(/\s+(\d+)\s+Tf/i);
+    if (daMatch?.[1]) {
+      const fontSize = parseInt(daMatch[1], 10);
+      if (fontSize >= 8 && fontSize <= 72) {
+        return fontSize;
+      }
+    }
+  } catch {
+  }
+  return null;
+}
+function extractFromTUField(field) {
+  try {
+    const fieldWithAcro = field;
+    const dict = fieldWithAcro.acroField?.dict;
+    if (!dict) return null;
+    const tuKey = dict.context?.obj?.("TU") || "TU";
+    const tuEntry = dict.lookup?.(tuKey) || dict.get?.(tuKey);
+    if (!tuEntry) return null;
+    let tuValue = "";
+    if (typeof tuEntry.decodeText === "function") {
+      tuValue = tuEntry.decodeText();
+    } else if (typeof tuEntry.asString === "function") {
+      tuValue = tuEntry.asString();
+    } else {
+      tuValue = String(tuEntry);
+    }
+    tuValue = tuValue.replace(/^\(|\)$|^<|>$/g, "");
+    const match = tuValue.match(/\|fontSize:(\d+)$/);
+    if (match?.[1]) {
+      const fontSize = parseInt(match[1], 10);
+      if (fontSize >= 8 && fontSize <= 72) {
+        return fontSize;
+      }
+    }
+  } catch {
+  }
+  return null;
+}
+async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {}, _currentSignerEmail, extractedFormFields, metadata, auditTrail, multiSignerContext) {
   try {
     const { PDFDocument, rgb, StandardFonts } = await loadPdfLib();
     const pdfDoc = await PDFDocument.load(pdfBytes);
@@ -460,39 +603,39 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
         continue;
       }
       try {
-        const fieldTypeName = field.constructor.name;
-        if (fieldTypeName === "PDFTextField" || fieldTypeName === "PDFTextField2") {
-          const textField = field;
-          textField.setText?.(fieldValue);
-        } else if (fieldTypeName === "PDFCheckBox" || fieldTypeName === "PDFCheckBox2") {
-          const checkBox = field;
+        const f = field;
+        const isTextField = typeof f.getText === "function" && typeof f.setText === "function";
+        const isCheckbox = typeof f.check === "function" && typeof f.uncheck === "function";
+        const isRadio = typeof f.select === "function" && typeof f.getOptions === "function" && typeof f.check !== "function" && typeof f.setOptions !== "function";
+        const isDropdown = typeof f.select === "function" && (typeof f.setOptions === "function" || typeof f.addOptions === "function");
+        if (isTextField) {
+          f.setText?.(fieldValue);
+        } else if (isCheckbox) {
           if (fieldValue === "true" || fieldValue === "Yes" || fieldValue === "checked" || fieldValue === "On") {
-            checkBox.check?.();
+            f.check?.();
           } else {
-            checkBox.uncheck?.();
+            f.uncheck?.();
           }
-        } else if (fieldTypeName === "PDFRadioGroup" || fieldTypeName === "PDFRadioGroup2") {
-          const radioGroup = field;
+        } else if (isRadio) {
           if (fieldValue === "true" || fieldValue === "false") {
             continue;
           }
           const idxMatch = fieldValue.match(/__RADIO_OPTION_INDEX_(\d+)__/);
           if (idxMatch && idxMatch[1]) {
             const selectedIndex = parseInt(idxMatch[1], 10);
-            const options = radioGroup.getOptions?.() || [];
+            const options = f.getOptions?.() || [];
             if (selectedIndex >= 0 && selectedIndex < options.length) {
-              radioGroup.select?.(options[selectedIndex]);
+              f.select?.(options[selectedIndex]);
             }
           } else {
-            const options = radioGroup.getOptions?.() || [];
+            const options = f.getOptions?.() || [];
             if (options.includes(fieldValue)) {
-              radioGroup.select?.(fieldValue);
+              f.select?.(fieldValue);
             } else {
             }
           }
-        } else if (fieldTypeName === "PDFDropdown" || fieldTypeName === "PDFDropdown2") {
-          const dropdown = field;
-          dropdown.select?.(fieldValue);
+        } else if (isDropdown) {
+          f.select?.(fieldValue);
         }
       } catch (fieldError) {
         logger.error(`Error setting field "${fieldName}":`, fieldError);
@@ -500,11 +643,6 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
     }
     try {
       form.updateFieldAppearances();
-      const PDFName3 = pdfLib.PDFName;
-      const acroForm = pdfDoc.catalog.lookup(PDFName3.of("AcroForm"));
-      if (acroForm && typeof acroForm === "object" && "set" in acroForm) {
-        acroForm.set(PDFName3.of("NeedAppearances"), false);
-      }
     } catch (appearanceError) {
       logger.warn("Could not update field appearances:", appearanceError);
     }
@@ -573,6 +711,20 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
                 const y = fieldPosition.y;
                 const width = Math.max(fieldPosition.width, 80);
                 const height = Math.max(fieldPosition.height, 30);
+                const fieldInfo = extractedFormFields?.find((f) => f.name === fieldName);
+                if (fieldInfo && hasDrawableLabel(fieldInfo)) {
+                  const labelFont = await pdfDoc.embedFont(StandardFonts.HelveticaBold);
+                  const labelFontSize = Math.min(10, height * 0.4);
+                  const labelX = x;
+                  const labelY = y + height + 5;
+                  page.drawText(fieldInfo.label, {
+                    x: labelX,
+                    y: labelY,
+                    size: labelFontSize,
+                    font: labelFont,
+                    color: rgb(0, 0, 0)
+                  });
+                }
                 const signatureDims = signatureImage.scaleToFit(width - 4, height - 4);
                 const finalX = x;
                 const finalY = y;
@@ -607,7 +759,7 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
       console.log("[FLATTEN] After pattern matching in fieldPageMap:", foundInitialsFields);
       if (extractedFormFields && extractedFormFields.length > 0) {
         foundInitialsFields = foundInitialsFields.filter((fieldName) => {
-          const fieldInfo = extractedFormFields.find((f) => f.name === fieldName);
+          const fieldInfo = extractedFormFields.find((f) => f.name === fieldName) || extractedFormFields.find((f) => f.name === fieldName.replace(/_initials$/i, "")) || extractedFormFields.find((f) => fieldName.startsWith(f.name));
           if (!fieldInfo) return false;
           const isActualInitialsField = fieldInfo.type === "initials" || fieldName.toLowerCase().includes("initials");
           if (!isActualInitialsField) return false;
@@ -636,6 +788,19 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
                 const y = fieldPosition.y;
                 const height = Math.max(fieldPosition.height, 20);
                 const fontSize = Math.min(height * 0.7, 14);
+                const fieldInfo = extractedFormFields?.find((f) => f.name === fieldName) || extractedFormFields?.find((f) => f.name === fieldName.replace(/_initials$/i, "")) || extractedFormFields?.find((f) => fieldName.startsWith(f.name)) || extractedFormFields?.find((f) => f.fieldId && fieldName.includes(f.fieldId)) || extractedFormFields?.find((f) => f.type === "initials" && f.name !== "initials_field_main");
+                if (fieldInfo && hasDrawableLabel(fieldInfo)) {
+                  const labelFontSize = Math.min(10, height * 0.4);
+                  const labelX = x;
+                  const labelY = y + height + 5;
+                  page.drawText(fieldInfo.label, {
+                    x: labelX,
+                    y: labelY,
+                    size: labelFontSize,
+                    font,
+                    color: rgb(0, 0, 0)
+                  });
+                }
                 const finalX = x + 2;
                 const finalY = y + (height - fontSize) / 2;
                 console.log("[FLATTEN]   \u2705 Drawing initials at:", { x: finalX, y: finalY, fontSize, text: mainInitialsData });
@@ -678,11 +843,16 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
     let flattenedCount = 0;
     for (const field of fieldsToFlatten) {
       const fieldName = field.getName();
-      const fieldType = field.constructor.name;
+      const f = field;
+      const isCheckboxField = typeof f.check === "function" && typeof f.uncheck === "function";
+      const isRadioField = typeof f.select === "function" && typeof f.getOptions === "function" && typeof f.check !== "function" && typeof f.setOptions !== "function";
+      const isDropdownField = typeof f.select === "function" && (typeof f.setOptions === "function" || typeof f.addOptions === "function");
+      const isTextField = typeof f.getText === "function" && typeof f.setText === "function";
+      const isSignatureType = !isCheckboxField && !isRadioField && !isDropdownField && !isTextField;
       try {
         const userEnteredValue = formFieldValues[fieldName];
-        const isSignatureField = fieldName.toLowerCase().includes("signature") || fieldType.includes("Signature");
-        const isInitialsField = fieldName.toLowerCase().includes("initials") || fieldType.includes("Initials");
+        const isSignatureField = fieldName.toLowerCase().includes("signature") || isSignatureType;
+        const isInitialsField = fieldName.toLowerCase().includes("initials");
         if (isSignatureField || isInitialsField) {
           form.removeField(field);
           flattenedCount++;
@@ -690,15 +860,29 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
         }
         const fieldWithWidgets = field;
         const widgets = fieldWithWidgets.acroField?.getWidgets?.() || [];
-        if (fieldType === "PDFCheckBox" || fieldType === "PDFCheckBox2") {
+        if (isCheckboxField) {
           const stringValue = String(userEnteredValue || "");
           const isChecked = stringValue === "true" || stringValue === "Yes" || stringValue === "On" || stringValue === "checked";
+          const fieldInfo = extractedFormFields?.find((f2) => f2.name === fieldName);
+          const labelFont = await pdfDoc.embedFont(StandardFonts.HelveticaBold);
           if (isChecked) {
             for (const widget of widgets) {
               const result = getWidgetRectangleAndPage(widget, pages);
               if (!result) continue;
               const { rect, page } = result;
-              const checkboxSize = Math.min(rect.width, rect.height) * 0.6;
+              if (fieldInfo && hasDrawableLabel(fieldInfo)) {
+                const labelFontSize = Math.min(10, rect.height * 0.4);
+                const labelX = rect.x + rect.width + 5;
+                const labelY = rect.y + (rect.height - labelFontSize) / 2;
+                page.drawText(fieldInfo.label, {
+                  x: labelX,
+                  y: labelY,
+                  size: labelFontSize,
+                  font: labelFont,
+                  color: rgb(0, 0, 0)
+                });
+              }
+              const checkboxSize = Math.min(rect.width, rect.height);
               const checkboxX = rect.x + (rect.width - checkboxSize) / 2;
               const checkboxY = rect.y + (rect.height - checkboxSize) / 2;
               page.drawRectangle({
@@ -709,21 +893,51 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
                 borderColor: rgb(0, 0, 0),
                 borderWidth: 1
               });
-              const checkSize = checkboxSize * 0.6;
-              const textWidth = checkSize * 0.6;
-              const textHeight = checkSize * 0.8;
+              const checkFont = await pdfDoc.embedFont(StandardFonts.HelveticaBold);
+              const checkFontSize = checkboxSize * 0.7;
+              const textWidth = checkFont.widthOfTextAtSize("X", checkFontSize);
+              const textHeight = checkFont.heightAtSize(checkFontSize);
               page.drawText("X", {
                 x: checkboxX + (checkboxSize - textWidth) / 2,
-                y: checkboxY + (checkboxSize - textHeight) / 2 + textHeight * 0.2,
-                size: checkSize,
-                font: await pdfDoc.embedFont(StandardFonts.HelveticaBold),
+                y: checkboxY + (checkboxSize - textHeight) / 2 + textHeight * 0.15,
+                size: checkFontSize,
+                font: checkFont,
                 color: rgb(0, 0, 0)
               });
             }
+          } else {
+            for (const widget of widgets) {
+              const result = getWidgetRectangleAndPage(widget, pages);
+              if (!result) continue;
+              const { rect, page } = result;
+              const checkboxSize = Math.min(rect.width, rect.height);
+              const checkboxX = rect.x + (rect.width - checkboxSize) / 2;
+              const checkboxY = rect.y + (rect.height - checkboxSize) / 2;
+              page.drawRectangle({
+                x: checkboxX,
+                y: checkboxY,
+                width: checkboxSize,
+                height: checkboxSize,
+                borderColor: rgb(0, 0, 0),
+                borderWidth: 1
+              });
+              if (fieldInfo && hasDrawableLabel(fieldInfo)) {
+                const labelFontSize = Math.min(12, rect.height * 0.6);
+                const labelX = rect.x + rect.width + 5;
+                const labelY = rect.y + (rect.height - labelFontSize) / 2;
+                page.drawText(fieldInfo.label, {
+                  x: labelX,
+                  y: labelY,
+                  size: labelFontSize,
+                  font: labelFont,
+                  color: rgb(0, 0, 0)
+                });
+              }
+            }
           }
-        } else if (fieldType === "PDFRadioGroup" || fieldType === "PDFRadioGroup2") {
-          const radioGroup = field;
-          const fieldInfo = extractedFormFields?.find((f) => f.name === fieldName);
+        } else if (isRadioField) {
+          const radioGroup = f;
+          const fieldInfo = extractedFormFields?.find((f2) => f2.name === fieldName);
           let actualSelectedValue = "";
           try {
             actualSelectedValue = radioGroup.getSelected?.() || "";
@@ -768,14 +982,15 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
             const result = getWidgetRectangleAndPage(widget, pages);
             if (!result) continue;
             const { rect, page, pageIndex } = result;
-            if (i === 0 && fieldInfo?.label && fieldInfo.label.trim() && !isAutoGeneratedLabel(fieldInfo.label)) {
+            if (i === 0 && fieldInfo && hasDrawableLabel(fieldInfo)) {
               const groupLabelKey = `${pageIndex}-${fieldName}-grouplabel`;
               if (!drawnGroupLabels.has(groupLabelKey)) {
+                const labelFontSize = Math.min(10, rect.height * 0.4);
                 const labelY = rect.y + rect.height + 3;
                 page.drawText(fieldInfo.label, {
                   x: rect.x,
                   y: labelY,
-                  size: 8,
+                  size: labelFontSize,
                   font: labelFont,
                   color: rgb(0, 0, 0)
                 });
@@ -783,22 +998,21 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
               }
             } else if (i === 0 && isAutoGeneratedLabel(fieldInfo?.label || "")) {
             }
-            const radioSize = Math.min(rect.width, rect.height) * 0.5;
-            const radioX = rect.x + (rect.width - radioSize) / 2;
-            const radioY = rect.y + (rect.height - radioSize) / 2;
+            const radioSize = Math.min(rect.width, rect.height);
+            const centerX = rect.x + rect.width / 2;
+            const centerY = rect.y + rect.height / 2;
             page.drawCircle({
-              x: radioX + radioSize / 2,
-              y: radioY + radioSize / 2,
-              size: radioSize,
+              x: centerX,
+              y: centerY,
+              size: radioSize / 2,
               borderColor: rgb(0, 0, 0),
               borderWidth: 1
             });
             if (i === selectedIndex) {
-              const circleSize = radioSize * 0.5;
               page.drawCircle({
-                x: radioX + radioSize / 2,
-                y: radioY + radioSize / 2,
-                size: circleSize,
+                x: centerX,
+                y: centerY,
+                size: radioSize / 4,
                 color: rgb(0, 0, 0)
               });
             }
@@ -808,8 +1022,8 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
               if (optionText && !drawnOptionLabels.has(optionKey)) {
                 page.drawText(optionText, {
                   x: rect.x + rect.width + 4,
-                  y: rect.y + (rect.height - 8) / 2,
-                  size: 8,
+                  y: rect.y + (rect.height - 7) / 2,
+                  size: 7,
                   font: labelFont,
                   color: rgb(0, 0, 0)
                 });
@@ -819,17 +1033,31 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
           }
           if (fieldInfo?.options) {
           }
-        } else if (fieldType === "PDFDropdown" || fieldType === "PDFDropdown2") {
+        } else if (isDropdownField) {
           const selectedValue = userEnteredValue ? String(userEnteredValue) : "";
-          if (selectedValue && selectedValue.trim()) {
-            for (const widget of widgets) {
-              const result = getWidgetRectangleAndPage(widget, pages);
-              if (!result) continue;
-              const { rect, page } = result;
+          const fieldInfo = extractedFormFields?.find((f2) => f2.name === fieldName);
+          const labelFont = await pdfDoc.embedFont(StandardFonts.HelveticaBold);
+          for (const widget of widgets) {
+            const result = getWidgetRectangleAndPage(widget, pages);
+            if (!result) continue;
+            const { rect, page } = result;
+            if (fieldInfo && hasDrawableLabel(fieldInfo)) {
+              const labelFontSize = Math.min(10, rect.height * 0.4);
+              const labelX = rect.x;
+              const labelY = rect.y + rect.height + 5;
+              page.drawText(fieldInfo.label, {
+                x: labelX,
+                y: labelY,
+                size: labelFontSize,
+                font: labelFont,
+                color: rgb(0, 0, 0)
+              });
+            }
+            if (selectedValue && selectedValue.trim()) {
               page.drawText(selectedValue, {
                 x: rect.x + 2,
                 y: rect.y + 2,
-                size: 10,
+                size: 14,
                 font: await pdfDoc.embedFont(StandardFonts.Helvetica),
                 color: rgb(0, 0, 0)
               });
@@ -837,15 +1065,31 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
           }
         } else {
           const fieldValue = userEnteredValue ? String(userEnteredValue) : "";
-          if (fieldValue && fieldValue.trim()) {
-            for (const widget of widgets) {
-              const result = getWidgetRectangleAndPage(widget, pages);
-              if (!result) continue;
-              const { rect, page } = result;
+          const fieldInfo = extractedFormFields?.find((f2) => f2.name === fieldName);
+          const labelFont = await pdfDoc.embedFont(StandardFonts.HelveticaBold);
+          const isDateField = fieldName.toLowerCase().includes("date") || fieldName.toLowerCase().includes("_date");
+          const fontSize = isDateField ? 14 : extractFieldFontSize(fieldName, field, extractedFormFields);
+          for (const widget of widgets) {
+            const result = getWidgetRectangleAndPage(widget, pages);
+            if (!result) continue;
+            const { rect, page } = result;
+            if (fieldInfo && hasDrawableLabel(fieldInfo)) {
+              const labelFontSize = Math.min(10, rect.height * 0.4);
+              const labelX = rect.x;
+              const labelY = rect.y + rect.height + 5;
+              page.drawText(fieldInfo.label, {
+                x: labelX,
+                y: labelY,
+                size: labelFontSize,
+                font: labelFont,
+                color: rgb(0, 0, 0)
+              });
+            }
+            if (fieldValue && fieldValue.trim()) {
               page.drawText(fieldValue, {
                 x: rect.x + 2,
                 y: rect.y + 2,
-                size: 10,
+                size: fontSize,
                 font: await pdfDoc.embedFont(StandardFonts.Helvetica),
                 color: rgb(0, 0, 0)
               });
@@ -1003,7 +1247,6 @@ async function extractVisibleFormFields(pdfBytes, currentSignerEmail) {
     const fields = form.getFields();
     const visibleFields = [];
     let hasAnyInitialsFields = false;
-    let hasInitialsFieldsForCurrentSigner = false;
     for (const field of fields) {
       const fieldName = field.getName();
       const fieldWithExtensions = field;
@@ -1029,28 +1272,31 @@ async function extractVisibleFormFields(pdfBytes, currentSignerEmail) {
           };
         })();
         let fieldType = "text" /* TEXT */;
-        const fieldTypeName = field.constructor.name;
+        const f = field;
+        const isCheckboxField = typeof f.check === "function" && typeof f.uncheck === "function";
+        const isRadioField = typeof f.select === "function" && typeof f.getOptions === "function" && typeof f.check !== "function" && typeof f.setOptions !== "function";
+        const isDropdownField = typeof f.select === "function" && (typeof f.setOptions === "function" || typeof f.addOptions === "function");
+        const isTextField = typeof f.getText === "function" && typeof f.setText === "function";
+        const isSignatureType = !isCheckboxField && !isRadioField && !isDropdownField && !isTextField;
         const cleanFieldName = fieldName.replace(/_signature$|_initials$|_date$/i, "");
-        const isActualSignatureField = fieldTypeName.includes("Signature") || cleanFieldName.toLowerCase().includes("signature") && !fieldTypeName.includes("CheckBox") && !fieldTypeName.includes("Radio");
-        const isActualInitialsField = cleanFieldName.toLowerCase().includes("initials") && !fieldTypeName.includes("CheckBox") && !fieldTypeName.includes("Radio");
+        const isActualSignatureField = isSignatureType || cleanFieldName.toLowerCase().includes("signature") && !isCheckboxField && !isRadioField;
+        const isActualInitialsField = cleanFieldName.toLowerCase().includes("initials") && !isCheckboxField && !isRadioField;
         if (isActualSignatureField) {
           fieldType = "signature" /* SIGNATURE */;
         } else if (isActualInitialsField) {
           fieldType = "initials" /* INITIALS */;
           hasAnyInitialsFields = true;
-          if (currentSignerEmail && fieldMetadata.signer === currentSignerEmail) {
-            hasInitialsFieldsForCurrentSigner = true;
-          }
         } else if (cleanFieldName.toLowerCase().includes("date")) {
           fieldType = "date" /* DATE */;
-        } else if (fieldTypeName.includes("CheckBox")) {
+        } else if (isCheckboxField) {
           fieldType = "checkbox" /* CHECKBOX */;
-        } else if (fieldTypeName.toLowerCase().includes("dropdown")) {
+        } else if (isDropdownField) {
           fieldType = "dropdown" /* DROPDOWN */;
-        } else if (fieldTypeName.includes("Radio")) {
+        } else if (isRadioField) {
           fieldType = "radio" /* RADIO */;
         }
         let displayLabel = fieldMetadata.label || "";
+        let isLabelAutoGenerated = false;
         if (!displayLabel || !displayLabel.trim()) {
           try {
             const tuLabel = extractTULabel(fieldWithExtensions);
@@ -1062,6 +1308,7 @@ async function extractVisibleFormFields(pdfBytes, currentSignerEmail) {
         }
         if (!displayLabel || !displayLabel.trim()) {
           displayLabel = generateFallbackLabel(cleanFieldName, fieldType);
+          isLabelAutoGenerated = true;
         }
         const esignField = {
           id: fieldName,
@@ -1073,6 +1320,8 @@ async function extractVisibleFormFields(pdfBytes, currentSignerEmail) {
           type: fieldType,
           label: displayLabel,
           // Use friendly label for display
+          isLabelAutoGenerated,
+          // True when label was generated from field name (should not be drawn on PDF)
           position: { x: 0, y: 0, width: 100, height: 30, page: 1 },
           // Default position
           required: fieldWithExtensions.isRequired?.() ?? false,
@@ -1093,6 +1342,13 @@ async function extractVisibleFormFields(pdfBytes, currentSignerEmail) {
             logger.warn("Error extracting options for field:", error);
           }
         }
+        try {
+          const currentValue = extractFieldValue(f, esignField.type);
+          if (currentValue) {
+            esignField.defaultValue = currentValue;
+          }
+        } catch {
+        }
         visibleFields.push(esignField);
       }
     }
@@ -1109,11 +1365,8 @@ async function extractVisibleFormFields(pdfBytes, currentSignerEmail) {
       placeholder: "Draw or upload your signature",
       assignedSignerEmail: currentSignerEmail
     });
-    const shouldCreateInitialsField = hasInitialsFieldsForCurrentSigner || hasAnyInitialsFields && !currentSignerEmail;
+    const shouldCreateInitialsField = hasAnyInitialsFields;
     if (shouldCreateInitialsField) {
-      if (hasInitialsFieldsForCurrentSigner) {
-      } else {
-      }
       mainFields.push({
         id: "initials_field_main",
         fieldId: "initials_field_main",
@@ -1200,8 +1453,12 @@ function decodeFieldName(fieldName) {
 }
 function generateFallbackLabel(decodedFieldName, fieldType) {
   let displayLabel = decodedFieldName;
-  displayLabel = displayLabel.replace(/_signature$/i, "").replace(/_initials$/i, "").replace(/_date$/i, "");
-  if (/^(text|signature|initials|date)_\d+$/i.test(displayLabel)) {
+  let prevLabel = "";
+  while (displayLabel !== prevLabel) {
+    prevLabel = displayLabel;
+    displayLabel = displayLabel.replace(/_signature$/i, "").replace(/_initials$/i, "").replace(/_date$/i, "");
+  }
+  if (/^(text|signature|initials|date|checkbox|radio|dropdown)_\d+/i.test(displayLabel)) {
     if (fieldType === "signature" /* SIGNATURE */) return "Signature";
     if (fieldType === "initials" /* INITIALS */) return "Initials";
     if (fieldType === "date" /* DATE */) return "Date";
@@ -1209,9 +1466,9 @@ function generateFallbackLabel(decodedFieldName, fieldType) {
     if (fieldType === "checkbox" /* CHECKBOX */) return "Checkbox";
     if (fieldType === "dropdown" /* DROPDOWN */) return "Dropdown";
     if (fieldType === "radio" /* RADIO */) return "Option";
-  } else {
-    displayLabel = displayLabel.replace(/_/g, " ").replace(/\s+\d+$/g, "").trim().split(" ").map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(" ");
+    if (fieldType === "text_label" /* TEXT_LABEL */) return "Text Label";
   }
+  displayLabel = displayLabel.replace(/_/g, " ").replace(/\s+\d+$/g, "").trim().split(" ").map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase()).join(" ");
   return displayLabel;
 }
 function extractTULabel(field) {
@@ -1306,13 +1563,13 @@ var PdfProcessingError = class _PdfProcessingError extends Error {
 
 // src/utils/attachment-validators.ts
 var DEFAULT_ATTACHMENT_CONSTRAINTS = {
-  maxFileSize: 10 * 1024 * 1024,
-  // 10MB
+  maxFileSize: 25 * 1024 * 1024,
+  // 25MB
   maxTotalSize: 50 * 1024 * 1024,
   // 50MB
   maxFiles: 10,
   allowedTypes: ["image/*", "application/pdf", "application/msword", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"],
-  allowedExtensions: [".pdf", ".jpg", ".jpeg", ".png", ".gif", ".doc", ".docx"]
+  allowedExtensions: [".pdf", ".jpg", ".jpeg", ".png", ".gif", ".bmp", ".webp", ".doc", ".docx"]
 };
 function validateFile(file, constraints = DEFAULT_ATTACHMENT_CONSTRAINTS) {
   const errors = [];
@@ -1376,6 +1633,35 @@ function isValidISODate(value) {
 }
 
 // src/utils/pdf-viewer-filter.ts
+function robustlyRemoveField(form, field) {
+  try {
+    const fieldWithAcro = field;
+    if (fieldWithAcro.acroField && typeof fieldWithAcro.acroField.getWidgets === "function") {
+      let widgets = fieldWithAcro.acroField.getWidgets() || [];
+      let safetyCounter = 0;
+      const maxIterations = widgets.length + 5;
+      while (widgets.length > 0 && safetyCounter < maxIterations) {
+        try {
+          const widgetIndex = widgets.length - 1;
+          fieldWithAcro.acroField.removeWidget?.(widgetIndex);
+          widgets = fieldWithAcro.acroField.getWidgets() || [];
+        } catch {
+          break;
+        }
+        safetyCounter++;
+      }
+    }
+    form.removeField(field);
+    return true;
+  } catch (error) {
+    try {
+      form.removeField(field);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
 async function drawFieldLabelsOnPdf(pdfDoc, fieldsToLabel, rgb) {
   try {
     const labelFont = await pdfDoc.embedFont("Helvetica-Bold");
@@ -1385,8 +1671,7 @@ async function drawFieldLabelsOnPdf(pdfDoc, fieldsToLabel, rgb) {
     for (const field of fieldsToLabel) {
       const isRadioField = field.type === "radio" /* RADIO */;
       const hasRadioOptions = isRadioField && field.options && field.options.length > 0;
-      const hasCustomLabel = field.label && field.label.trim() && !isAutoGeneratedLabel(field.label);
-      if (!hasCustomLabel && !hasRadioOptions) {
+      if (!hasDrawableLabel(field) && !hasRadioOptions) {
         continue;
       }
       const pdfField = form.getFieldMaybe(field.name);
@@ -1397,27 +1682,30 @@ async function drawFieldLabelsOnPdf(pdfDoc, fieldsToLabel, rgb) {
       const widgets = fieldWithExtensions.acroField?.getWidgets?.() || [];
       if (widgets.length === 0) continue;
       if (isRadioField) {
-        if (field.label && field.label.trim() && !isAutoGeneratedLabel(field.label)) {
+        if (hasDrawableLabel(field)) {
           const firstWidget = widgets[0];
-          if (!firstWidget) continue;
-          const firstRect = firstWidget.getRectangle?.();
-          if (firstRect) {
-            const pageRef = firstWidget.P?.();
-            const pageIndex = findPageIndexWithFallback(pages, pageRef);
-            if (pageIndex >= 0) {
-              const page = pages[pageIndex];
-              if (!page) continue;
-              const groupLabelKey = `${pageIndex}-${field.name}-grouplabel`;
-              if (!drawnOnce.has(groupLabelKey)) {
-                const labelY = firstRect.y + firstRect.height + 5;
-                page.drawText(field.label, {
-                  x: firstRect.x,
-                  y: labelY,
-                  size: 10,
-                  font: labelFont,
-                  color: rgb(0, 0, 0)
-                });
-                drawnOnce.add(groupLabelKey);
+          if (firstWidget) {
+            const firstRect = firstWidget.getRectangle?.();
+            if (firstRect) {
+              const pageRef = firstWidget.P?.();
+              const pageIndex = findPageIndexWithFallback(pages, pageRef);
+              if (pageIndex >= 0) {
+                const page = pages[pageIndex];
+                if (page) {
+                  const groupLabelKey = `${pageIndex}-${field.name}-grouplabel`;
+                  if (!drawnOnce.has(groupLabelKey)) {
+                    const radioLabelFontSize = Math.min(10, firstRect.height * 0.4);
+                    const labelY = firstRect.y + firstRect.height + 5;
+                    page.drawText(field.label, {
+                      x: firstRect.x,
+                      y: labelY,
+                      size: radioLabelFontSize,
+                      font: labelFont,
+                      color: rgb(0, 0, 0)
+                    });
+                    drawnOnce.add(groupLabelKey);
+                  }
+                }
               }
             }
           }
@@ -1430,17 +1718,16 @@ async function drawFieldLabelsOnPdf(pdfDoc, fieldsToLabel, rgb) {
             if (!rect) continue;
             const pageRef = widget.P?.();
             const pageIndex = findPageIndexWithFallback(pages, pageRef);
-            if (pageIndex >= 0) {
+            if (pageIndex >= 0 && pageIndex < pages.length) {
               const page = pages[pageIndex];
               if (!page) continue;
-              const optionTexts = field.options;
-              const optionText = optionTexts[i] || optionTexts[0];
+              const optionText = field.options[i];
               const optionKey = `${pageIndex}-${field.name}-opt-${i}`;
               if (optionText && !drawnOnce.has(optionKey)) {
                 page.drawText(optionText, {
-                  x: rect.x + rect.width + 6,
-                  y: rect.y + (rect.height - 10) / 2,
-                  size: 10,
+                  x: rect.x + rect.width + 4,
+                  y: rect.y + (rect.height - 7) / 2,
+                  size: 7,
                   font: labelFont,
                   color: rgb(0, 0, 0)
                 });
@@ -1461,12 +1748,13 @@ async function drawFieldLabelsOnPdf(pdfDoc, fieldsToLabel, rgb) {
           if (!page) continue;
           const key = `${pageIndex}-${field.name}`;
           if (!drawnOnce.has(key)) {
-            if (!isAutoGeneratedLabel(field.label)) {
+            if (hasDrawableLabel(field)) {
+              const labelFontSize = Math.min(10, rect.height * 0.4);
               if (field.type === "checkbox" /* CHECKBOX */) {
                 page.drawText(field.label, {
                   x: rect.x + rect.width + 5,
-                  y: rect.y + rect.height * 0.2,
-                  size: 10,
+                  y: rect.y + (rect.height - labelFontSize) / 2,
+                  size: labelFontSize,
                   font: labelFont,
                   color: rgb(0, 0, 0)
                 });
@@ -1475,9 +1763,9 @@ async function drawFieldLabelsOnPdf(pdfDoc, fieldsToLabel, rgb) {
                 page.drawText(field.label, {
                   x: rect.x,
                   y: labelY,
-                  size: 9,
+                  size: labelFontSize,
                   font: labelFont,
-                  color: rgb(0.3, 0.3, 0.3)
+                  color: rgb(0, 0, 0)
                 });
               }
               drawnOnce.add(key);
@@ -1538,7 +1826,7 @@ async function filterPdfForCurrentSigner(pdfBytes, allFields, multiSignerContext
     try {
       const pdfField = form.getFieldMaybe(field.name);
       if (pdfField) {
-        form.removeField(pdfField);
+        robustlyRemoveField(form, pdfField);
         removedCount++;
       } else {
         notFoundCount++;
@@ -1572,7 +1860,7 @@ function usePdfViewer(multiSignerContext) {
   const [originalPdfBytes, setOriginalPdfBytes] = react.useState(null);
   const [_viewerPdfBytes, setViewerPdfBytes] = react.useState(null);
   const [extractedFields, setExtractedFields] = react.useState([]);
-  const loadPdf = react.useCallback(async (url) => {
+  const loadPdf = react.useCallback(async (url, signerEmailForExtraction) => {
     setIsLoading(true);
     setError(null);
     setIsLoaded(false);
@@ -1585,8 +1873,22 @@ function usePdfViewer(multiSignerContext) {
       }
       const bytes = await urlToPdfBytes(url);
       setOriginalPdfBytes(bytes);
-      setViewerPdfBytes(bytes);
-      await viewerRef.current?.loadPdf(url);
+      const fields = await extractVisibleFormFields(bytes, signerEmailForExtraction);
+      setExtractedFields(fields);
+      const filteredBytes = await filterPdfForCurrentSigner(
+        bytes,
+        fields,
+        multiSignerContext || {
+          isMultiSigner: false,
+          currentSigner: null,
+          currentSignerEmail: "",
+          isPrimarySigner: true,
+          isFinalSigner: true
+        }
+      );
+      setViewerPdfBytes(filteredBytes);
+      const blobUrl = createPdfBlobUrl(filteredBytes);
+      await viewerRef.current?.loadPdf(blobUrl);
     } catch (err) {
       const errorMessage = err instanceof Error ? err.message : "Failed to load PDF";
       logger.error("Error loading PDF:", err);
@@ -1594,7 +1896,7 @@ function usePdfViewer(multiSignerContext) {
       setOriginalPdfBytes(null);
       setViewerPdfBytes(null);
     }
-  }, []);
+  }, [multiSignerContext]);
   const handleLoad = react.useCallback(() => {
     setIsLoading(false);
     setIsLoaded(true);
@@ -1630,52 +1932,15 @@ function usePdfViewer(multiSignerContext) {
     return await viewerRef.current.saveDocument();
   }, []);
   const extractFormFields = react.useCallback(
-    async (currentSignerEmail) => {
-      if (!originalPdfBytes) {
-        throw new Error("No PDF loaded");
-      }
-      try {
-        const fields = await extractVisibleFormFields(
-          originalPdfBytes,
-          currentSignerEmail
-        );
-        setExtractedFields(fields);
-        if (multiSignerContext?.isMultiSigner) {
-          const filteredBytes = await filterPdfForCurrentSigner(
-            originalPdfBytes,
-            fields,
-            multiSignerContext
-          );
-          setViewerPdfBytes(filteredBytes);
-          const filteredBlobUrl = createPdfBlobUrl(filteredBytes);
-          await viewerRef.current?.loadPdf(filteredBlobUrl);
-        } else {
-          const labeledBytes = await filterPdfForCurrentSigner(
-            originalPdfBytes,
-            fields,
-            multiSignerContext || {
-              isMultiSigner: false,
-              currentSigner: null,
-              currentSignerEmail: "",
-              isPrimarySigner: true,
-              isFinalSigner: true
-            }
-          );
-          setViewerPdfBytes(labeledBytes);
-          const labeledBlobUrl = createPdfBlobUrl(labeledBytes);
-          await viewerRef.current?.loadPdf(labeledBlobUrl);
-        }
-        if (viewerRef.current && fields.length > 0) {
-          await new Promise((resolve) => setTimeout(resolve, 100));
-          viewerRef.current.injectPlaceholders(fields);
-        }
-        return fields;
-      } catch (err) {
-        const errorMessage = err instanceof Error ? err.message : "Failed to extract form fields";
-        throw new Error(errorMessage);
+    async (_currentSignerEmail) => {
+      if (viewerRef.current && extractedFields.length > 0) {
+        await new Promise((resolve) => setTimeout(resolve, 100));
+        viewerRef.current.injectPlaceholders(extractedFields);
+        viewerRef.current.injectRadioLabels(extractedFields);
       }
+      return extractedFields;
     },
-    [originalPdfBytes, multiSignerContext]
+    [extractedFields]
   );
   const fillPdf = react.useCallback(
     async (fieldValues, signatures, currentSignerEmail, metadata, auditTrail) => {
@@ -1818,6 +2083,20 @@ function usePdfViewer(multiSignerContext) {
 }
 function useFormFields(fields = []) {
   const [fieldValues, setFieldValues] = react.useState({});
+  const seededFieldsRef = react.useRef(/* @__PURE__ */ new Set());
+  react.useEffect(() => {
+    if (fields.length === 0) return;
+    const defaults = {};
+    for (const field of fields) {
+      if (field.defaultValue && field.defaultValue.trim() && !seededFieldsRef.current.has(field.id)) {
+        defaults[field.id] = field.defaultValue;
+        seededFieldsRef.current.add(field.id);
+      }
+    }
+    if (Object.keys(defaults).length > 0) {
+      setFieldValues((prev) => ({ ...defaults, ...prev }));
+    }
+  }, [fields]);
   const [errors, setErrors] = react.useState([]);
   const [touched, setTouched] = react.useState({});
   const updateField = react.useCallback((fieldId, value) => {
@@ -1857,14 +2136,14 @@ function useFormFields(fields = []) {
         if (!value || value.trim() === "") {
           newErrors.push({
             field: fieldId,
-            message: `${field.label || field.name} is required`
+            message: `${getFieldDisplayName(field)} is required`
           });
         }
       }
       if (value && field.maxLength && value.length > field.maxLength) {
         newErrors.push({
           field: fieldId,
-          message: `${field.label || field.name} must be at most ${field.maxLength} characters`
+          message: `${getFieldDisplayName(field)} must be at most ${field.maxLength} characters`
         });
       }
       if (value && field.type === "date") {
@@ -1890,13 +2169,13 @@ function useFormFields(fields = []) {
             if (!signatures[field.id]) {
               newErrors.push({
                 field: field.id,
-                message: `${field.label || field.name} is required`
+                message: `${getFieldDisplayName(field)} is required`
               });
             }
           } else if (!value2 || value2.trim() === "") {
             newErrors.push({
               field: field.id,
-              message: `${field.label || field.name} is required`
+              message: `${getFieldDisplayName(field)} is required`
             });
           }
         }
@@ -1904,7 +2183,7 @@ function useFormFields(fields = []) {
         if (value && field.maxLength && value.length > field.maxLength) {
           newErrors.push({
             field: field.id,
-            message: `${field.label || field.name} must be at most ${field.maxLength} characters`
+            message: `${getFieldDisplayName(field)} must be at most ${field.maxLength} characters`
           });
         }
         if (value && field.type === "date") {
@@ -2078,7 +2357,7 @@ function useSignatures() {
       for (const field of fields) {
         if (field.required && (field.type === "signature" || field.type === "initials")) {
           if (!signaturesToCheck[field.id]) {
-            errors.push(`${field.label || field.name} is required`);
+            errors.push(`${getFieldDisplayName(field)} is required`);
           }
         }
       }
@@ -2196,6 +2475,13 @@ function useAttachments(options = {}) {
           errors.push(...validation.errors);
           continue;
         }
+        const isDuplicate = [...attachments, ...newAttachments].some(
+          (att) => att.name.toLowerCase() === file.name.toLowerCase()
+        );
+        if (isDuplicate) {
+          errors.push(`"${file.name}" is already attached`);
+          continue;
+        }
         const currentTotalSize = [...attachments, ...newAttachments].reduce((sum, att) => sum + att.size, 0);
         if (currentTotalSize + file.size > constraints.maxTotalSize) {
           const maxTotalMB = (constraints.maxTotalSize / 1024 / 1024).toFixed(1);
@@ -2246,6 +2532,9 @@ function useAttachments(options = {}) {
     setAttachments([]);
     setValidationErrors([]);
   }, []);
+  const clearValidationErrors = react.useCallback(() => {
+    setValidationErrors([]);
+  }, []);
   const getTotalSize = react.useCallback(() => {
     return attachments.reduce((sum, att) => sum + att.size, 0);
   }, [attachments]);
@@ -2277,6 +2566,7 @@ function useAttachments(options = {}) {
     addFiles,
     removeAttachment,
     clearAttachments,
+    clearValidationErrors,
     // Utilities
     getTotalSize,
     formatSize,
@@ -2309,6 +2599,10 @@ function useAcknowledgements(fields) {
   const [acknowledgedMap, setAcknowledgedMap] = react.useState(
     /* @__PURE__ */ new Map()
   );
+  const acknowledgedMapRef = react.useRef(acknowledgedMap);
+  react.useEffect(() => {
+    acknowledgedMapRef.current = acknowledgedMap;
+  }, [acknowledgedMap]);
   const getFieldsWithAcknowledgements = react.useCallback((fieldsToFilter) => {
     return fieldsToFilter.filter(
       (field) => field.acknowledgements && field.acknowledgements.length > 0
@@ -2320,26 +2614,27 @@ function useAcknowledgements(fields) {
       const fieldAcks = newMap.get(fieldId) || /* @__PURE__ */ new Set();
       fieldAcks.add(ackId);
       newMap.set(fieldId, fieldAcks);
+      acknowledgedMapRef.current = newMap;
       return newMap;
     });
   }, []);
   const isAcknowledged = react.useCallback((fieldId, ackId) => {
-    const fieldAcks = acknowledgedMap.get(fieldId);
+    const fieldAcks = acknowledgedMapRef.current.get(fieldId);
     if (!fieldAcks) return false;
     if (ackId) {
       return fieldAcks.has(ackId);
     }
     return fieldAcks.size > 0;
-  }, [acknowledgedMap]);
+  }, []);
   const isFieldFullyAcknowledged = react.useCallback((fieldId) => {
     const field = fields.find((f) => f.id === fieldId);
     if (!field || !field.acknowledgements || field.acknowledgements.length === 0) {
       return true;
     }
-    const fieldAcks = acknowledgedMap.get(fieldId);
+    const fieldAcks = acknowledgedMapRef.current.get(fieldId);
     if (!fieldAcks) return false;
     return field.acknowledgements.every((ack) => fieldAcks.has(ack.id));
-  }, [fields, acknowledgedMap]);
+  }, [fields]);
   const getFieldAcknowledgementProgress = react.useCallback((fieldId) => {
     const field = fields.find((f) => f.id === fieldId);
     if (!field || !field.acknowledgements || field.acknowledgements.length === 0) {