@hubsync/esign-web-sdk 6.5.3 → 6.5.5

package/dist/collection/components/embeds/verdocs-sign/verdocs-sign.js

@@ -411,6 +411,8 @@ export class VerdocsSign {
                 if (e.detail === null) {
                     console.log('[SIGN] Clearing initial');
                     const updateResult = await updateEnvelopeField(this.endpoint, this.envelopeId, this.roleId, field.name, null, false);
+                    updateResult.value = null;
+                    this.initialId = null;
                     return this.updateRecipientFieldValue(field.name, updateResult);
                 }
                 // If we already have an initials block, apply it
@@ -451,6 +453,8 @@ export class VerdocsSign {
                 if (e.detail === null) {
                     console.log('[SIGN] Clearing signature');
                     const updateResult = await updateEnvelopeField(this.endpoint, this.envelopeId, this.roleId, field.name, null, false);
+                    updateResult.value = null;
+                    this.signatureId = null;
                     return this.updateRecipientFieldValue(field.name, updateResult);
                 }
                 // If we already have a signature block, apply it
@@ -520,13 +524,13 @@ export class VerdocsSign {
             }
             return;
         }
-        const nextRequiredField = this.getNextRequiredField();
-        if (nextRequiredField) {
-            const id = getFieldId(nextRequiredField);
+        const nextField = this.getNextFieldInOrder();
+        if (nextField) {
+            const id = getFieldId(nextField);
             const el = document.getElementById(id);
             el === null || el === void 0 ? void 0 : el.scrollIntoView({ behavior: 'smooth', block: 'center', inline: 'center' });
             el === null || el === void 0 ? void 0 : el.focusField();
-            this.focusedField = nextRequiredField.name;
+            this.focusedField = nextField.name;
         }
     }
     getRecipientFields() {
@@ -548,24 +552,36 @@ export class VerdocsSign {
         }
         this.updateAllFlags();
     }
-    getNextRequiredField() {
-        // Find and focus the next incomplete field (that is fillable)
-        const emptyFields = this.getSortedFillableFields().filter(field => field.required && !isFieldFilled(field, this.getRecipientFields()));
-        sortFields(emptyFields);
-        // console.log(
-        //   '[SIGN] Pending fields',
-        //   emptyFields.map(f => `${f.name} (${f.type}) req=${f.required}`),
-        // );
-        if (emptyFields.length === 0) {
-            const allUnfilled = this.getSortedFillableFields().filter(field => !isFieldFilled(field, this.getRecipientFields()));
-            sortFields(allUnfilled);
-            if (allUnfilled.length > 0) {
-                // If we are here, there are no required fields left, but there are optional ones.
-                return this.getNextFieldFromList(allUnfilled);
-            }
+    getNextFieldInOrder() {
+        // Find the next incomplete field in overall order (required + optional).
+        const fields = this.getSortedFillableFields();
+        if (fields.length === 0)
             return null;
+        const recipientFields = this.getRecipientFields();
+        const focusedIndex = fields.findIndex(field => field.name === this.focusedField);
+        const startIndex = focusedIndex >= 0 ? focusedIndex + 1 : 0;
+        for (let i = 0; i < fields.length; i++) {
+            const idx = (startIndex + i) % fields.length;
+            const field = fields[idx];
+            if (!this.isFieldFilledForNav(field, recipientFields)) {
+                return field;
+            }
+        }
+        return null;
+    }
+    isFieldFilledForNav(field, recipientFields) {
+        if (field.type === 'signature' || field.type === 'initial') {
+            const value = typeof field.value === 'string' ? field.value.trim() : field.value;
+            if (!value)
+                return false;
+            if (value === 'signed' || value === 'initialed')
+                return false;
+            return true;
+        }
+        if (field.type === 'dropdown') {
+            return isFieldFilled(field, recipientFields) && !!field.value;
         }
-        return this.getNextFieldFromList(emptyFields);
+        return isFieldFilled(field, recipientFields);
     }
     getNextFieldFromList(fields) {
         const focusedIndex = fields.findIndex(field => field.name === this.focusedField);
@@ -603,12 +619,12 @@ export class VerdocsSign {
         // Remove existing flags
         const existingFlags = controlsDiv.querySelectorAll('.verdocs-flag-instance');
         existingFlags.forEach(el => el.remove());
-        let nextField = this.getNextRequiredField();
+        let nextField = this.getNextFieldInOrder();
         const focusedFieldObj = this.getRecipientFields().find(f => f.name === this.focusedField);
         // If the currently focused field is unfilled, we should point the flag to IT, not the next one.
-        // getNextRequiredField() is designed for the "Next" button (skipping current), but the visual flag
+        // getNextFieldInOrder() is designed for the "Next" button (skipping current), but the visual flag
         // should guide the user to the current task if it's incomplete.
-        if (focusedFieldObj && !isFieldFilled(focusedFieldObj, this.getRecipientFields())) {
+        if (focusedFieldObj && !this.isFieldFilledForNav(focusedFieldObj, this.getRecipientFields())) {
             nextField = focusedFieldObj;
         }
         if (nextField && nextField.page === pageInfo.pageNumber && nextField.document_id === pageInfo.documentId) {
@@ -626,13 +642,6 @@ export class VerdocsSign {
                 onSkip: () => {
                     this.handleNext();
                 },
-                onClick: () => {
-                    var _a;
-                    const id = getFieldId(nextField);
-                    const el = document.getElementById(id);
-                    el === null || el === void 0 ? void 0 : el.scrollIntoView({ behavior: 'smooth', block: 'center' });
-                    (_a = el === null || el === void 0 ? void 0 : el.focusField) === null || _a === void 0 ? void 0 : _a.call(el);
-                },
             });
         }
     }
@@ -949,7 +958,7 @@ export class VerdocsSign {
             }
             return (h("verdocs-signing-progress", { mode: mode, current: Math.max(1, currentIndex), total: totalFields, remainingFields: remainingFields, progress: progress, fieldLabel: getFieldLabel(focusedFieldObj), fieldCompleted: focusedFieldObj ? !!isFilled(focusedFieldObj) : false, onStarted: () => {
                     this.adoptingSignature = true;
-                    // this.handleNext();
+                    this.handleNext();
                 }, onNext: () => this.handleNext(), onPrevious: () => this.handlePrev(), onExit: () => this.handleNext() }));
         })(), h("div", { class: `document signed-document-container zoom-${this.zoomLevel}` }, (this.envelope.documents || []).map(envelopeDocument => {
             const pageNumbers = integerSequence(1, envelopeDocument.pages);