@signiphi/pdf-signer 0.2.0-beta.17 → 0.2.0-beta.19

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 "";
     }
@@ -2317,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
@@ -2342,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) {
@@ -2359,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) {
@@ -5110,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) => {
@@ -5124,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,
@@ -9030,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) {
@@ -9043,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) {
@@ -9156,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);
@@ -9663,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)) {
@@ -9718,6 +9757,15 @@ function SubmissionForm({
         }
       }
     }
+    const alreadyCheckedTypes = /* @__PURE__ */ new Set(["date", "signature", "initials"]);
+    for (const field of filteredFields) {
+      if (!field.required || alreadyCheckedTypes.has(field.type)) continue;
+      if (field.id === "signature_field_main" || field.id === "initials_field_main") continue;
+      const value = allFieldValues[field.id];
+      if (!value || typeof value === "string" && value.trim() === "") {
+        validationErrors2.push(`${getFieldDisplayName(field)} is required`);
+      }
+    }
     const isFieldsValid = validateFields(currentSignatures);
     if (!isFieldsValid) {
       for (const field of filteredFields) {
@@ -9827,6 +9875,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)) {