@signiphi/pdf-signer 0.2.0-beta.16 → 0.2.0-beta.18

package/dist/components/index.js

@@ -584,13 +584,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 "";
     }
@@ -903,7 +910,7 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
                 const fieldInfo = extractedFormFields?.find((f) => f.name === fieldName);
                 if (fieldInfo && hasDrawableLabel(fieldInfo)) {
                   const labelFont = await pdfDoc.embedFont(StandardFonts.HelveticaBold);
-                  const labelFontSize = Math.min(12, height * 0.6);
+                  const labelFontSize = Math.min(10, height * 0.4);
                   const labelX = x;
                   const labelY = y + height + 5;
                   page.drawText(fieldInfo.label, {
@@ -948,7 +955,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;
@@ -977,9 +984,9 @@ 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);
+                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(12, height * 0.6);
+                  const labelFontSize = Math.min(10, height * 0.4);
                   const labelX = x;
                   const labelY = y + height + 5;
                   page.drawText(fieldInfo.label, {
@@ -1060,7 +1067,7 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
               if (!result) continue;
               const { rect, page } = result;
               if (fieldInfo && hasDrawableLabel(fieldInfo)) {
-                const labelFontSize = Math.min(12, rect.height * 0.6);
+                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, {
@@ -1174,11 +1181,12 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
             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: 9,
+                  size: labelFontSize,
                   font: labelFont,
                   color: rgb(0, 0, 0)
                 });
@@ -1230,7 +1238,7 @@ async function fillPdfWithSignatures(pdfBytes, signatures, formFieldValues = {},
             if (!result) continue;
             const { rect, page } = result;
             if (fieldInfo && hasDrawableLabel(fieldInfo)) {
-              const labelFontSize = Math.min(12, rect.height * 0.6);
+              const labelFontSize = Math.min(10, rect.height * 0.4);
               const labelX = rect.x;
               const labelY = rect.y + rect.height + 5;
               page.drawText(fieldInfo.label, {
@@ -1530,6 +1538,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);
       }
     }
@@ -2309,6 +2324,7 @@ ${cssRules.join("\n")}`;
             }
           }
           logger.info(`[RADIO DETECT] Found ${Object.keys(radioGroups).length} radio groups:`, Object.keys(radioGroups));
+          const processedRadioFieldNames = new Set(Object.keys(radioGroups));
           for (const [fieldName, radioButtons] of Object.entries(radioGroups)) {
             const selectedRadio = radioButtons.find(
               (rb) => rb.data && typeof rb.data === "object" && rb.data.value === true
@@ -2334,7 +2350,7 @@ ${cssRules.join("\n")}`;
           }
           for (const [id, data] of Object.entries(storedData)) {
             const fieldName = idToNameMap[id];
-            if (fieldName && values[fieldName]) {
+            if (fieldName && (fieldName in values || processedRadioFieldNames.has(fieldName))) {
               continue;
             }
             if (fieldName) {
@@ -2351,13 +2367,13 @@ ${cssRules.join("\n")}`;
               } else if (data !== void 0 && data !== null) {
                 extractedValue = String(data);
               }
-              if (extractedValue !== void 0 && extractedValue !== "") {
+              if (extractedValue !== void 0) {
                 values[fieldName] = extractedValue;
               }
             }
           }
           for (const [name, fields] of Object.entries(fieldObjects)) {
-            if (!values[name]) {
+            if (!(name in values)) {
               const fieldArray = fields;
               const field = fieldArray[0];
               if (field && field.value !== void 0 && field.value !== null) {
@@ -5102,12 +5118,22 @@ function RadioGroupRenderer({
   className = ""
 }) {
   const options = field.options || [];
+  const [localValue, setLocalValue] = React9.useState(value);
+  React9.useEffect(() => {
+    if (value && value !== localValue) {
+      setLocalValue(value);
+    }
+  }, [value]);
+  const handleChange = (newValue) => {
+    setLocalValue(newValue);
+    onChange(newValue);
+  };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: cn("w-full", className), children: [
     /* @__PURE__ */ jsxRuntime.jsx(
       RadioGroup,
       {
-        value,
-        onValueChange: onChange,
+        value: localValue,
+        onValueChange: handleChange,
         required: field.required,
         className: "",
         children: options.map((option) => {
@@ -5116,7 +5142,7 @@ function RadioGroupRenderer({
             "div",
             {
               className: "flex items-center space-x-3 p-3 -ml-3 -mr-3 rounded-lg hover:bg-muted/50 cursor-pointer transition-colors duration-200",
-              onClick: () => onChange(option),
+              onClick: () => handleChange(option),
               children: [
                 /* @__PURE__ */ jsxRuntime.jsx(
                   RadioGroupItem,
@@ -7349,11 +7375,12 @@ async function drawFieldLabelsOnPdf(pdfDoc, fieldsToLabel, rgb) {
                 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: 9,
+                      size: radioLabelFontSize,
                       font: labelFont,
                       color: rgb(0, 0, 0)
                     });
@@ -7403,11 +7430,12 @@ async function drawFieldLabelsOnPdf(pdfDoc, fieldsToLabel, rgb) {
           const key = `${pageIndex}-${field.name}`;
           if (!drawnOnce.has(key)) {
             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)
                 });
@@ -7416,9 +7444,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);
@@ -7736,6 +7764,20 @@ function usePdfViewer(multiSignerContext) {
 }
 function useFormFields(fields = []) {
   const [fieldValues, setFieldValues] = React9.useState({});
+  const seededFieldsRef = React9.useRef(/* @__PURE__ */ new Set());
+  React9.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] = React9.useState([]);
   const [touched, setTouched] = React9.useState({});
   const updateField = React9.useCallback((fieldId, value) => {
@@ -8351,7 +8393,7 @@ function SubmissionForm({
     getFieldError,
     isFieldTouched,
     clearFields
-  } = useFormFields();
+  } = useFormFields(extractedFields);
   const {
     signatures,
     setSignature: setSignatureOriginal,
@@ -9006,6 +9048,9 @@ function SubmissionForm({
                 }
               }
             }
+            if (field.type === "radio" && (normalizedPdfValue === "true" || normalizedPdfValue === "false")) {
+              normalizedPdfValue = void 0;
+            }
             if (field.type === "date" && pdfValue) {
               const validation = parseAndValidateDate(pdfValue);
               if (!validation.isValid) {
@@ -9019,8 +9064,12 @@ function SubmissionForm({
                 normalizedPdfValue = validation.isoString;
               }
             }
-            if (normalizedPdfValue && normalizedPdfValue !== currentReactValue) {
+            const isUnresolvedRadioIndex = field.type === "radio" && normalizedPdfValue?.includes("__RADIO_OPTION_INDEX_");
+            const pdfFieldReported = field.id in pdfValues;
+            if (normalizedPdfValue && normalizedPdfValue !== currentReactValue && !isUnresolvedRadioIndex) {
               setFieldValue(field.id, normalizedPdfValue);
+            } else if (pdfFieldReported && !normalizedPdfValue && currentReactValue) {
+              setFieldValue(field.id, "");
             }
           }
           if (invalidDates.length > 0) {
@@ -9132,6 +9181,15 @@ function SubmissionForm({
     setFieldValue(currentDateField.id, dateValue);
     try {
       await setFormFieldValues({ [currentDateField.id]: dateValue });
+      const pdfApp = viewerRef.current?.getPDFViewerApplication?.();
+      const pdfDocument = pdfApp?.pdfDocument;
+      if (pdfDocument?.annotationStorage && typeof pdfDocument.getFieldObjects === "function") {
+        const fieldObjects = await pdfDocument.getFieldObjects() || {};
+        const widgets = fieldObjects[currentDateField.id];
+        if (widgets?.[0]?.id) {
+          pdfDocument.annotationStorage.setValue(widgets[0].id, { value: dateValue });
+        }
+      }
       logger.info(`[DATE SELECT] Updated PDF field ${currentDateField.id}`);
     } catch (error) {
       logger.error(`[DATE SELECT] Failed to update PDF field:`, error);
@@ -9639,6 +9697,11 @@ function SubmissionForm({
     const currentSignatures = signaturesRef.current;
     const pdfFieldValues = await getFormFieldValues();
     const allFieldValues = { ...pdfFieldValues, ...currentFieldValues };
+    for (const [fieldId, pdfVal] of Object.entries(pdfFieldValues)) {
+      if (pdfVal === "") {
+        allFieldValues[fieldId] = "";
+      }
+    }
     console.log("[VALIDATION] === MERGING SIGNATURES INTO allFieldValues ===");
     console.log("[VALIDATION] currentSignatures:", currentSignatures);
     for (const [fieldId, signatureValue] of Object.entries(currentSignatures)) {
@@ -9803,6 +9866,11 @@ function SubmissionForm({
       const currentFieldValues = fieldValuesRef.current;
       const currentSignatures = signaturesRef.current;
       const finalFieldValues = { ...pdfFieldValues, ...currentFieldValues };
+      for (const [fieldId, pdfVal] of Object.entries(pdfFieldValues)) {
+        if (pdfVal === "") {
+          finalFieldValues[fieldId] = "";
+        }
+      }
       console.log("[SUBMIT] === MERGING SIGNATURES INTO finalFieldValues FOR FLATTENING ===");
       console.log("[SUBMIT] currentSignatures:", currentSignatures);
       for (const [fieldId, signatureValue] of Object.entries(currentSignatures)) {