@hubsync/esign-web-sdk 6.9.16 → 6.9.17

package/dist/components/verdocs-sign.js

@@ -101,6 +101,7 @@ const VerdocsSign$1 = /*@__PURE__*/ proxyCustomElement(class VerdocsSign extends
         this.agreed = false;
         this.signatureId = null;
         this.initialId = null;
+        this.skippedFields = [];
         this.documentsSingularPlural = 'document';
         this.authStep = null;
         this.authMethodStates = {};
@@ -411,6 +412,10 @@ const VerdocsSign$1 = /*@__PURE__*/ proxyCustomElement(class VerdocsSign extends
                 updateDocumentFieldValue(oldField);
                 this.fieldUpdateCounter++;
                 this.markEnvelopeStarted();
+                // If a previously skipped field gets filled, remove it from the skipped list
+                if (this.skippedFields.includes(fieldName)) {
+                    this.skippedFields = this.skippedFields.filter(n => n !== fieldName);
+                }
                 this.checkRecipientFields();
             }
         });
@@ -624,7 +629,8 @@ const VerdocsSign$1 = /*@__PURE__*/ proxyCustomElement(class VerdocsSign extends
             // save is async, so the local value hasn't updated by the time onClick fires.
             const allFields = this.getSortedFillableFields();
             const requiredIncomplete = allFields.some(f => f.required && !this.isFieldActuallyFilled(f));
-            if (requiredIncomplete) {
+            const optionalUnaddressed = allFields.some(f => !f.required && !this.isFieldActuallyFilled(f) && !this.skippedFields.includes(f.name));
+            if (requiredIncomplete || optionalUnaddressed) {
                 this.nextSubmits = false;
                 this.nextButtonLabel = 'Next';
                 const currentField = allFields.find(f => f.name === this.focusedField);
@@ -657,7 +663,7 @@ const VerdocsSign$1 = /*@__PURE__*/ proxyCustomElement(class VerdocsSign extends
             this.focusFieldElement(next);
     }
     handleNextOptional() {
-        const unfilledOptional = this.getSortedFillableFields().filter(f => !f.required && !this.isFieldActuallyFilled(f));
+        const unfilledOptional = this.getSortedFillableFields().filter(f => !f.required && !this.isFieldActuallyFilled(f) && !this.skippedFields.includes(f.name));
         const next = this.getNextFieldFromList(unfilledOptional);
         if (next) {
             this.focusFieldElement(next);
@@ -674,14 +680,15 @@ const VerdocsSign$1 = /*@__PURE__*/ proxyCustomElement(class VerdocsSign extends
         return this.getSortedFillableFields().filter(f => f.required && this.isFieldActuallyFilled(f)).length;
     }
     getOptionalUnfilledCount() {
-        return this.getSortedFillableFields().filter(f => !f.required && !this.isFieldActuallyFilled(f)).length;
+        return this.getSortedFillableFields().filter(f => !f.required && !this.isFieldActuallyFilled(f) && !this.skippedFields.includes(f.name)).length;
     }
     // See if everything that "needs to be" filled in is, and all "fillable fields" are valid
     checkRecipientFields() {
         const allFields = this.getSortedFillableFields();
         const requiredIncomplete = allFields.some(f => f.required && !this.isFieldActuallyFilled(f));
+        const optionalUnaddressed = allFields.some(f => !f.required && !this.isFieldActuallyFilled(f) && !this.skippedFields.includes(f.name));
         const invalidFilled = allFields.some(f => this.isFieldActuallyFilled(f) && !isFieldValid(f, this.getRecipientFields()));
-        if (!requiredIncomplete && !invalidFilled) {
+        if (!requiredIncomplete && !optionalUnaddressed && !invalidFilled) {
             this.nextButtonLabel = 'Finish';
             if (!this.nextSubmits) {
                 this.nextSubmits = true;
@@ -728,12 +735,13 @@ const VerdocsSign$1 = /*@__PURE__*/ proxyCustomElement(class VerdocsSign extends
     getNextUnfilledField(after) {
         const allFields = this.getSortedFillableFields();
         const startIndex = after ? allFields.findIndex(f => f.name === after.name) + 1 : 0;
+        const isUnaddressed = (f) => !this.isFieldActuallyFilled(f) && !this.skippedFields.includes(f.name);
         // Look forward from current position first
-        const nextAfter = allFields.slice(startIndex).find(f => !this.isFieldActuallyFilled(f));
+        const nextAfter = allFields.slice(startIndex).find(isUnaddressed);
         if (nextAfter)
             return nextAfter;
-        // Wrap to beginning if nothing unfilled ahead
-        return allFields.slice(0, startIndex).find(f => !this.isFieldActuallyFilled(f)) || null;
+        // Wrap to beginning if nothing unaddressed ahead
+        return allFields.slice(0, startIndex).find(isUnaddressed) || null;
     }
     getNextFieldFromList(fields) {
         const focusedIndex = fields.findIndex(field => field.name === this.focusedField);
@@ -815,7 +823,11 @@ const VerdocsSign$1 = /*@__PURE__*/ proxyCustomElement(class VerdocsSign extends
                 label,
                 showSkip,
                 onSkip: () => {
+                    if (!this.skippedFields.includes(nextField.name)) {
+                        this.skippedFields = [...this.skippedFields, nextField.name];
+                    }
                     this.focusedField = nextField.name;
+                    this.checkRecipientFields();
                     this.handleNext();
                 },
                 onClick: () => {
@@ -1265,6 +1277,7 @@ const VerdocsSign$1 = /*@__PURE__*/ proxyCustomElement(class VerdocsSign extends
         "agreed": [32],
         "signatureId": [32],
         "initialId": [32],
+        "skippedFields": [32],
         "documentsSingularPlural": [32],
         "authStep": [32],
         "authMethodStates": [32],