@verdocs/web-sdk 6.5.0-beta.12 → 6.5.0-beta.14

package/dist/collection/components/dialogs/verdocs-upload-dialog/verdocs-upload-dialog.js

@@ -80,7 +80,7 @@ export class VerdocsUploadDialog {
     render() {
         var _a;
         const existingFile = ((_a = this.existingFile) === null || _a === void 0 ? void 0 : _a.name) ? this.existingFile : null;
-        return (h(Host, { key: '843499d5b646fdbf747b0318bf6e13aa706f5724' }, h("div", { key: '7e7969c45dbb6d67c8c45461c0d4d3a916a407ca', class: "background-overlay", onClick: e => this.handleDismiss(e) }, h("div", { key: '7117469891120f42c8b93b485102c8b06269bc84', class: "upload-dialog-content" }, h("div", { key: 'ba7d5e3406c2fa86901753c001280a8fb705c586', class: "heading" }, "Upload attachment"), this.selectedFiles.length < 1 && existingFile && (h(Fragment, { key: '25579c7d5865fd143d9f59e2ce21d37c16e9bc53' }, h("div", { key: '575aa6e844ca1f9b4d41d9fbf19065a9209c54ff', class: "current-label" }, "Current Attachment"), h("div", { key: 'c5f7bae9b77f8280b23c3580e5dcf66d877ae1ba', class: "attachments", style: { marginTop: '0' } }, h("div", { key: '265252d53839d17681307b962d2dddfeac15cbf8', class: "attachment" }, h("div", { key: '4d6855f62c4807af7cfb122625a28177ca37d90c', class: "icon", innerHTML: PaperclipIcon }), h("div", { key: '51e2d99e831b50cac8a4887928da4aa2d4decdb8', class: "name" }, existingFile.name), h("div", { key: '0e7e2f03ac728fdd8ee84a453227cf61e5278774', class: "icon trash", innerHTML: TrashIcon, onClick: () => (this.confirmDelete = true) }))))), this.selectedFiles.length < 1 && !existingFile && (h("div", { key: 'ae210f48d52c18435be4ef4ae7bf5213d35907c6', class: { 'drop-target': true, 'dragging-over': this.draggingOver }, onDragOver: e => this.handleDragOver(e), onDragLeave: e => this.handleDragLeave(e), onDrop: e => this.handleDrop(e) }, h("p", { key: 'cbc4e2a630399f639a29657352c1d72f963e37ee' }, "Drag and drop your files here"), h("p", { key: '6680d0710223a65ef4ad151ed82ee876e38de738', class: "subscript" }, "Supported files: PDF, Word, JPG, PNG"), h("verdocs-button", { key: '7c8c5a5a0a67e3f12196c34904dcd857cb9bf892', label: !!existingFile ? 'Replace files' : 'Select files', onClick: () => this.handleSelectFile() }), h("input", { key: '76da7fdd9843ca050b02fb594c27ded080626b93', type: "file", ref: el => (this.fileInput = el), style: { display: 'none' }, accept: ".pdf,application/pdf,.doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,image/*", onChange: () => this.handleFileChange() }))), this.selectedFiles.length > 0 && (h("div", { key: 'ad2e850cf6342e652bcd0ebdeddb132b6e0cfc19', class: "attachments" }, this.selectedFiles.map((file, index) => (h("div", { class: "attachment" }, h("div", { class: "icon", innerHTML: PaperclipIcon }), h("div", { class: "name" }, file.name), h("div", { class: "icon trash", innerHTML: TrashIcon, onClick: () => this.handleRemoveAttachment(index) })))))), !!this.errorMessage && h("div", { key: '264641264875c440f2940b809eecfbda6cd28d7f', class: "error" }, this.errorMessage), h("div", { key: '7e77662b11700c28b3fc9cd5144dce96ed5c5cb5', class: "buttons" }, h("verdocs-button", { key: 'f812edc70b96ef9d2d2548fd419cc63fc31f104e', label: "Cancel", variant: "outline", onClick: () => this.handleCancel() }), h("verdocs-button", { key: '6445677eeb1527adc95852f4f545b75b9bbcc1a1', label: "Upload", onClick: () => this.handleDone(), disabled: !!this.errorMessage || this.selectedFiles.length < 1 })))), this.confirmDelete && (h("verdocs-ok-dialog", { key: '606d2978c28ac3ebe35f88d836702fa5519167bb', heading: "Delete Attachment?", message: "Are you sure you wish to delete this attachment? This action cannot be undone.", showCancel: true, onExit: e => {
+        return (h(Host, { key: '5b396c6557d7173c6b78d9103b5c56a0eabbf3a9' }, h("div", { key: 'd680a6fba710528bd0771f9a4536c3aaad0eb5bf', class: "background-overlay", onClick: e => this.handleDismiss(e) }, h("div", { key: '081997e0aca8902180aba46af1c1d3bbf407e629', class: "upload-dialog-content" }, h("div", { key: 'a09d62316347e230b58f31a1a1738d3ccaf8ffff', class: "heading" }, "Upload attachment"), this.selectedFiles.length < 1 && existingFile && (h(Fragment, { key: 'c67214eb68711a97414839f06f74c2bfef1d2a5c' }, h("div", { key: '53cd97293de040c02c30e4a3ac6e19ffd2adebe4', class: "current-label" }, "Current Attachment"), h("div", { key: '74916d5a102b9115a5395d2cc58ec177947418e4', class: "attachments", style: { marginTop: '0' } }, h("div", { key: '3b72dccb1be3118f4aca2e459c578714f92f59cd', class: "attachment" }, h("div", { key: 'd820f038c505b4d6574f1fd0f3246fd4e5cb53a2', class: "icon", innerHTML: PaperclipIcon }), h("div", { key: '569c4729039bb3a4231dcff6036af2a3055135a8', class: "name" }, existingFile.name), h("div", { key: '5749bfd2aba1dbdcca5aae23858c32481759272e', class: "icon trash", innerHTML: TrashIcon, onClick: () => (this.confirmDelete = true) }))))), this.selectedFiles.length < 1 && !existingFile && (h("div", { key: 'b5f1cd3d8673f6c7b0b3fd950b87db0a615a1bbf', class: { 'drop-target': true, 'dragging-over': this.draggingOver }, onDragOver: e => this.handleDragOver(e), onDragLeave: e => this.handleDragLeave(e), onDrop: e => this.handleDrop(e) }, h("p", { key: '7f1d1ca50e3c703f689fb0b7f0ed89852033593a' }, "Drag and drop your files here"), h("p", { key: 'dd8648859f61dab02b63dabca7dde9cbafe330d7', class: "subscript" }, "Supported files: PDF, Word, JPG, PNG"), h("verdocs-button", { key: 'cad01ae7407639a48292c9a669615eb40b9ebc2f', label: !!existingFile ? 'Replace files' : 'Select files', onClick: () => this.handleSelectFile() }), h("input", { key: '53da52ab298e753c5c0063af45c793bb15efa425', type: "file", ref: el => (this.fileInput = el), style: { display: 'none' }, accept: ".pdf,application/pdf,.doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document,image/*", onChange: () => this.handleFileChange() }))), this.selectedFiles.length > 0 && (h("div", { key: '7a768cb0163861f50cb19f37ff63bf16a8b8abb9', class: "attachments" }, this.selectedFiles.map((file, index) => (h("div", { class: "attachment" }, h("div", { class: "icon", innerHTML: PaperclipIcon }), h("div", { class: "name" }, file.name), h("div", { class: "icon trash", innerHTML: TrashIcon, onClick: () => this.handleRemoveAttachment(index) })))))), !!this.errorMessage && h("div", { key: '71f96d3308c3db4987b778e60e8541e7a3083031', class: "error" }, this.errorMessage), h("div", { key: 'bb5c2efb70f4b36a533dfa96eed4ff3039660e63', class: "buttons" }, h("verdocs-button", { key: '72bb22677031d42036d6e5ccb42ca9e18ebf7d5f', label: "Cancel", variant: "outline", onClick: () => this.handleCancel() }), h("verdocs-button", { key: '9f7f801fab03b12ca426ee7beceaf39cfe266395', label: "Upload", onClick: () => this.handleDone(), disabled: !!this.errorMessage || this.selectedFiles.length < 1 })))), this.confirmDelete && (h("verdocs-ok-dialog", { key: '0d2f01c359db1c5091de761acf777b0c9b76beb4', heading: "Delete Attachment?", message: "Are you sure you wish to delete this attachment? This action cannot be undone.", showCancel: true, onExit: e => {
                 // So we don't close the upload dialog
                 e.preventDefault();
                 e.stopPropagation();

package/dist/collection/components/elements/verdocs-quick-functions/verdocs-quick-functions.js

@@ -22,7 +22,7 @@ export class VerdocsQuickFunctions {
         this.createDocument.emit();
     }
     render() {
-        return (h("div", { key: 'bf490444c127f1f497817b73ed863e816758b834', class: "container" }, h("p", { key: '1085ee695426f2c9ae52b14b914d099baf97b361', class: "title" }, "Quick Create"), h("button", { key: 'ce0e9b13f66409253cfd8912c91cabd918000967', onClick: () => this.handleCreateTemplate(), innerHTML: TemplateIcon }, "Template"), h("button", { key: '257e4cf20c3358f3c49e48d59e8d1bcd5a8e8997', onClick: () => this.handleCreateDocument(), innerHTML: DocumentIcon }, "Document")));
+        return (h("div", { key: '5d3c97738276db1ddf9828f3e2261791e751b14d', class: "container" }, h("p", { key: 'b6474f0097d65bc95a32c26e19449656d89095f5', class: "title" }, "Quick Create"), h("button", { key: '6a7e10dee4770650eaaab21f13aaa904b52af68e', onClick: () => this.handleCreateTemplate(), innerHTML: TemplateIcon }, "Template"), h("button", { key: 'ceeba0cca86c37ee8e6bc1945d9ed1d238e3f8b7', onClick: () => this.handleCreateDocument(), innerHTML: DocumentIcon }, "Document")));
     }
     static get is() { return "verdocs-quick-functions"; }
     static get originalStyleUrls() {

package/dist/collection/components/elements/verdocs-search-tabs/verdocs-search-tabs.js

@@ -4,7 +4,7 @@ export class VerdocsSearchTabs {
         this.selected = 'all';
     }
     render() {
-        return h("div", { key: '0b0ec87a485b3e7d8746e00f497f9ca636c4f3e2' }, "\u00A0");
+        return h("div", { key: 'f6609bcd02d44b1fdf45ec8a3f5590ce050b0b3d' }, "\u00A0");
     }
     static get is() { return "verdocs-search-tabs"; }
     static get originalStyleUrls() {

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

@@ -215,4 +215,94 @@ verdocs-sign .fatal-error p {
   align-items: center;
   background: rgba(0, 0, 0, 0.4980392157);
   justify-content: center;
+}
+
+.controls-toolbar {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 54px;
+  padding: 0 12px 0 24px;
+  background-color: #ffffff;
+  border-bottom: 1px solid #e0e0e0;
+  box-shadow: none;
+  font-family: "Inter", sans-serif;
+  color: #424242;
+  z-index: 1000;
+}
+.controls-toolbar .left-controls {
+  flex: 1;
+  display: flex;
+  align-items: center;
+}
+.controls-toolbar .left-controls .title {
+  font-weight: 500;
+  font-size: 16px;
+  color: #242424;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.controls-toolbar .center-controls {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  font-size: 14px;
+}
+.controls-toolbar .center-controls .label {
+  color: #000000;
+  font-weight: 300;
+}
+.controls-toolbar .center-controls .select-wrapper {
+  display: flex;
+  align-items: center;
+}
+.controls-toolbar .center-controls .select-wrapper verdocs-select-input {
+  margin: 0;
+}
+.controls-toolbar .center-controls .select-wrapper verdocs-select-input .input-label {
+  display: none;
+}
+.controls-toolbar .center-controls .select-wrapper verdocs-select-input .input-element {
+  background: transparent;
+  border: 1px solid #e0e0e0;
+  height: 32px;
+  padding: 2px 8px;
+  min-width: 60px;
+  text-align: center;
+  font-family: inherit;
+  color: #424242;
+}
+.controls-toolbar .center-controls .select-wrapper verdocs-select-input .input-element:focus {
+  border-color: #2a63f6;
+}
+.controls-toolbar .center-controls .count {
+  color: #000000;
+  font-weight: 300;
+}
+.controls-toolbar .right-controls {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+}
+.controls-toolbar .right-controls .icon-button {
+  width: 32px;
+  height: 32px;
+  display: flex;
+  color: #424242;
+  cursor: pointer;
+  align-items: center;
+  justify-content: center;
+  transition: background-color 0.2s;
+}
+.controls-toolbar .right-controls .icon-button:hover {
+  background-color: #f5f5f5;
+}
+.controls-toolbar .right-controls .icon-button svg {
+  display: block;
+  width: 20px;
+  height: 20px;
 }

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

@@ -1,14 +1,19 @@
 import { Host, Fragment, h } from "@stencil/core";
-import { askQuestion, DEFAULT_DISCLOSURES, integerSequence, isFieldFilled, isFieldValid } from "@verdocs/js-sdk";
 import { uploadEnvelopeFieldAttachment, VerdocsEndpoint } from "@verdocs/js-sdk";
+import { askQuestion, DEFAULT_DISCLOSURES, integerSequence, isFieldFilled, isFieldValid } from "@verdocs/js-sdk";
 import { verifySigner } from "@verdocs/js-sdk";
 import { fullNameToInitials, startSigningSession, deleteEnvelopeFieldAttachment, formatFullName } from "@verdocs/js-sdk";
 import { updateEnvelopeField, sortFields, delegateRecipient } from "@verdocs/js-sdk";
 import { createInitials, createSignature, envelopeRecipientAgree, envelopeRecipientDecline, envelopeRecipientSubmit } from "@verdocs/js-sdk";
 import { getFieldId, renderDocumentField, renderDocumentFlag, saveAttachment, updateDocumentFieldValue, defaultHeight } from "../../../utils/utils";
+import { DocumentPageIcon } from "../../../utils/Icons";
 import { VerdocsToast } from "../../../utils/Toast";
 import { SDKError } from "../../../utils/errors";
 import { Store } from "../../../utils/Datastore";
+const ToolbarMinusIcon = `<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M11 8C11.2761 8 11.5 8.22386 11.5 8.5C11.5 8.77614 11.2761 9 11 9H6C5.72386 9 5.5 8.77614 5.5 8.5C5.5 8.22386 5.72386 8 6 8H11ZM14 8.5C14 5.46243 11.5376 3 8.5 3C5.46243 3 3 5.46243 3 8.5C3 11.5376 5.46243 14 8.5 14C9.83879 14 11.0659 13.5217 12.0196 12.7266L16.1464 16.8536L16.2157 16.9114C16.4106 17.0464 16.68 17.0271 16.8536 16.8536C17.0488 16.6583 17.0488 16.3417 16.8536 16.1464L12.7266 12.0196C13.5217 11.0659 14 9.83879 14 8.5ZM4 8.5C4 6.01472 6.01472 4 8.5 4C10.9853 4 13 6.01472 13 8.5C13 10.9853 10.9853 13 8.5 13C6.01472 13 4 10.9853 4 8.5Z" fill="#424242" /></svg>`;
+const ToolbarPlusIcon = `<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M11.5 8.5C11.5 8.22386 11.2761 8 11 8H9V6C9 5.72386 8.77614 5.5 8.5 5.5C8.22386 5.5 8 5.72386 8 6V8H6C5.72386 8 5.5 8.22386 5.5 8.5C5.5 8.77614 5.72386 9 6 9H8V11C8 11.2761 8.22386 11.5 8.5 11.5C8.77614 11.5 9 11.2761 9 11V9H11C11.2761 9 11.5 8.77614 11.5 8.5ZM8.5 3C11.5376 3 14 5.46243 14 8.5C14 9.83879 13.5217 11.0659 12.7266 12.0196L16.8536 16.1464C17.0488 16.3417 17.0488 16.6583 16.8536 16.8536C16.68 17.0271 16.4106 17.0464 16.2157 16.9114L16.1464 16.8536L12.0196 12.7266C11.0659 13.5217 9.83879 14 8.5 14C5.46243 14 3 11.5376 3 8.5C3 5.46243 5.46243 3 8.5 3ZM8.5 4C6.01472 4 4 6.01472 4 8.5C4 10.9853 6.01472 13 8.5 13C10.9853 13 13 10.9853 13 8.5C13 6.01472 10.9853 4 8.5 4Z" fill="#424242" /></svg>`;
+const ToolbarDownloadIcon = `<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M15.5 16.9988C15.7761 16.9988 16 17.2226 16 17.4988C16 17.7442 15.8231 17.9484 15.5899 17.9907L15.5 17.9988H4.5C4.22386 17.9988 4 17.7749 4 17.4988C4 17.2533 4.17688 17.0492 4.41012 17.0068L4.5 16.9988H15.5ZM10.0001 2.00098C10.2456 2.00098 10.4497 2.17798 10.492 2.41124L10.5 2.50112L10.496 14.295L14.1414 10.6466C14.3148 10.4729 14.5842 10.4534 14.7792 10.5882L14.8485 10.646C15.0222 10.8194 15.0418 11.0888 14.907 11.2838L14.8492 11.3531L10.3574 15.8531C10.285 15.9257 10.1957 15.9714 10.1021 15.9901L9.99608 15.9999C9.83511 15.9999 9.69192 15.9237 9.60051 15.8056L5.14386 11.3537C4.94846 11.1586 4.94823 10.842 5.14336 10.6466C5.3168 10.4729 5.58621 10.4534 5.78117 10.5883L5.85046 10.6461L9.496 14.287L9.5 2.50083C9.50008 2.22469 9.724 2.00098 10.0001 2.00098Z" fill="#424242"/></svg>`;
+const ToolbarPrintIcon = `<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M5 4.5C5 3.67157 5.67157 3 6.5 3H13.5C14.3284 3 15 3.67157 15 4.5V5H15.5C16.8807 5 18 6.11929 18 7.5V12.5C18 13.3284 17.3284 14 16.5 14H15V15.5C15 16.3284 14.3284 17 13.5 17H6.5C5.67157 17 5 16.3284 5 15.5V14H3.5C2.67157 14 2 13.3284 2 12.5V7.5C2 6.11929 3.11929 5 4.5 5H5V4.5ZM6 5H14V4.5C14 4.22386 13.7761 4 13.5 4H6.5C6.22386 4 6 4.22386 6 4.5V5ZM5 13V11.5C5 10.6716 5.67157 10 6.5 10H13.5C14.3284 10 15 10.6716 15 11.5V13H16.5C16.7761 13 17 12.7761 17 12.5V7.5C17 6.67157 16.3284 6 15.5 6H4.5C3.67157 6 3 6.67157 3 7.5V12.5C3 12.7761 3.22386 13 3.5 13H5ZM6.5 11C6.22386 11 6 11.2239 6 11.5V15.5C6 15.7761 6.22386 16 6.5 16H13.5C13.7761 16 14 15.7761 14 15.5V11.5C14 11.2239 13.7761 11 13.5 11H6.5Z" fill="#424242"/></svg>`;
 /**
  * Helper to generate a human-readable label for a field.
  */
@@ -87,6 +92,10 @@ export class VerdocsSign {
          * be externally controlled, use CSS display options to hide/show it instead.
          */
         this.headerTargetId = null;
+        /**
+         * The style of the toolbar to display.
+         */
+        this.toolbarStyle = 'controls';
         this.recipient = null;
         this.hasSignature = false;
         this.nextButtonLabel = 'Start';
@@ -95,6 +104,7 @@ export class VerdocsSign {
         this.fatalErrorMessage = '';
         this.focusedField = '';
         this.disclosures = DEFAULT_DISCLOSURES;
+        this.fieldUpdateCounter = 0;
         this.submitting = false;
         this.submitted = false;
         this.isDone = false;
@@ -109,8 +119,10 @@ export class VerdocsSign {
         this.documentsSingularPlural = 'document';
         this.authStep = null;
         this.authMethodStates = {};
+        this.pageNumber = 1;
         this.kbaQuestions = null;
         this.showSpinner = false;
+        // @State() fieldUpdateCounter = 0;
         this.declining = false;
         this.delegating = false;
         this.delegated = false;
@@ -226,6 +238,21 @@ export class VerdocsSign {
             this.submitting = false;
         });
     }
+    handlePageSelect(e) {
+        const pageNumber = parseInt(e.target.value);
+        if (!isNaN(pageNumber)) {
+            this.pageNumber = pageNumber;
+            // We manually scroll the container to the top of the page element.
+            // This avoids issues where the page might be nested or scrollIntoView behaves unexpectedly.
+            const container = this.el.querySelector('.signed-document-container');
+            const pageEl = this.el.querySelector(`#page-${pageNumber}`);
+            if (container && pageEl) {
+                // 20px buffer for visual spacing
+                const top = pageEl.offsetTop - 20;
+                container.scrollTo({ top, behavior: 'smooth' });
+            }
+        }
+    }
     async handleOptionSelected(e) {
         var _a, _b, _c;
         switch (e.detail.id) {
@@ -266,6 +293,7 @@ export class VerdocsSign {
                 // TODO: Keeping this while attachments still rely on it
                 oldField.settings = updateResult.settings;
                 updateDocumentFieldValue(oldField);
+                this.fieldUpdateCounter++;
                 this.checkRecipientFields();
             }
         });
@@ -426,22 +454,6 @@ export class VerdocsSign {
                 //  NotFoundError: Failed to execute 'insertBefore' on 'Node': The node before which
                 //  the new node is to be inserted is not a child of this node.
                 window.location.reload();
-                // this.recipient.status = 'submitted';
-                // this.showDone = true;
-                // console.log('[SIGN] Reloading envelope');
-                // getEnvelope(this.endpoint, this.envelopeId)
-                //   .then(envelope => {
-                //     this.envelope = envelope;
-                //     // The show-done dialog does this
-                //     // this.isDone = true;
-                //     this.submitting = false;
-                //   })
-                //   .catch(e => {
-                //     // this.isDone = true;
-                //     console.log('[SIGN] Error reloading envelope', e);
-                //     VerdocsToast('Unable to save changes, please try again later', {style: 'error'});
-                //     this.submitting = false;
-                //   });
             }
             catch (e) {
                 console.log('[SIGN] Error submitting', e);
@@ -481,21 +493,11 @@ export class VerdocsSign {
         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 everything required is filled, try optional fields?
-        // The previous logic only looked for required fields for "Next".
-        // If we want "Fill or Skip", we should probably look for ANY unfilled field if we want to guide them to optionals too.
-        // BUT the requirement said: "just want to show a single flag for whatever the next field is the recipient needs to fill out."
-        // "Needs to fill out" strongly implies required.
-        // However, goal #4 says: "If it is optional, it should say 'Fill or Skip'".
-        // This implies we DO want to catch optional fields too.
         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.
-                // We need to decide if "Next" should jump to them.
-                // Assuming yes based on "Fill or Skip".
-                // Let's use the same logic but with the optional list.
                 return this.getNextFieldFromList(allUnfilled);
             }
             return null;
@@ -551,9 +553,8 @@ export class VerdocsSign {
             let label = 'FILL';
             let showSkip = false;
             if (!nextField.required) {
-                label = 'FILL or SKIP';
+                label = 'FILL';
                 showSkip = true; // Use the X to skip? Or just text? "Fill or Skip" implies maybe just text.
-                // But the previous implementation set `showSkip = true` if not required.
             }
             renderDocumentFlag(pageInfo, nextField.y, nextField.height || defaultHeight(nextField.type), {
                 variant,
@@ -571,99 +572,6 @@ export class VerdocsSign {
                 },
             });
         }
-        // LEGACY FLAG LOGIC - Commented out for now
-        /*
-        // Get fields for this page
-        const myFields = this.getRecipientFields().filter(f => f.document_id === pageInfo.documentId && f.page === pageNumber);
-        // Sort priority:
-        // 1. Vertical: Top to Bottom (Descending Y)
-        // 2. Horizontal: Left to Right (Ascending X) - for stability
-        myFields.sort((a, b) => {
-          if (Math.abs(b.y - a.y) > 1) {
-            return b.y - a.y;
-          }
-          return a.x - b.x;
-        });
-    
-        // console.log('[SIGN] Sorted fields for page', pageNumber, myFields.map(f => `${f.name}:${f.y}`));
-    
-        const flagGroups: IEnvelopeField[][] = [];
-        const FLAG_HEIGHT = 24;
-    
-        myFields.forEach(field => {
-          if (flagGroups.length === 0) {
-            flagGroups.push([field]);
-            return;
-          }
-    
-          const lastGroup = flagGroups[flagGroups.length - 1];
-          const lastField = lastGroup[lastGroup.length - 1];
-    
-          // Compute rendered centers (pixels)
-          // Note: We need rescale logic here. Since we don't have the import, we'll replicate the simple math: val * scale
-          // assuming standard coordinate scaling.
-          const getCenterY = (f: IEnvelopeField) => f.y * pageInfo.yScale + ((f.height || defaultHeight(f.type)) * pageInfo.yScale) / 2;
-    
-          const lastCenter = getCenterY(lastField);
-          const currCenter = getCenterY(field);
-          const dist = Math.abs(lastCenter - currCenter);
-    
-          // console.log(`[SIGN] Check overlap ${lastField.name} vs ${field.name}: dist=${dist} vs ${FLAG_HEIGHT}`, {lastCenter, currCenter});
-    
-          // If centers are closer than Flag Height, they overlap visually.
-          if (dist < FLAG_HEIGHT) {
-            lastGroup.push(field);
-          } else {
-            flagGroups.push([field]);
-          }
-        });
-    
-        // console.log('[SIGN] Flag groups', flagGroups.map(g => g.map(f => f.name).join(',')));
-    
-        flagGroups.forEach(group => {
-          // Priority: First Unfilled Required > First Unfilled Optional > First Next
-          let winner = group.find(f => f.required && !isFieldFilled(f, this.getRecipientFields()));
-          if (!winner) {
-            winner = group.find(f => !f.required && !isFieldFilled(f, this.getRecipientFields()));
-          }
-          if (!winner) {
-            // Fallback to first (Top-most) if all filled
-            winner = group[0];
-          }
-    
-          if (winner) {
-            const isFilled = isFieldFilled(winner, this.getRecipientFields());
-    
-            let variant: 'fill' | 'next' = 'fill';
-            let label = 'FILL';
-            let showSkip = false;
-    
-            if (isFilled) {
-              variant = 'next';
-              label = 'NEXT';
-            } else {
-              if (!winner.required) {
-                showSkip = true;
-              }
-            }
-    
-            renderDocumentFlag(pageInfo, winner.y, winner.height || defaultHeight(winner.type), {
-              variant,
-              label,
-              showSkip,
-              onSkip: () => {
-                this.handleNext();
-              },
-              onClick: () => {
-                const id = getFieldId(winner);
-                const el = document.getElementById(id) as any;
-                el?.scrollIntoView({behavior: 'smooth', block: 'center'});
-                el?.focusField?.();
-              },
-            });
-          }
-        });
-        */
     }
     attachFieldAttributes(pageInfo, field, el) {
         // We can get called multiple times as rendering completes and it's hard to avoid that
@@ -724,8 +632,9 @@ export class VerdocsSign {
             }
         });
         el.addEventListener('focusout', e => {
-            // These field types trigger focusout as they're used, even without a value change
-            if (field.type !== 'dropdown' && field.type !== 'attachment') {
+            // These field types trigger focusout as they're used, even without a value change.
+            // Signature/Initial fields handle their own changes via fieldChange/adopt events, so we ignore focusout to prevent double-saves.
+            if (field.type !== 'dropdown' && field.type !== 'attachment' && field.type !== 'signature' && field.type !== 'initial') {
                 this.handleFieldChange(field, e).finally(() => this.checkRecipientFields());
             }
         });
@@ -925,10 +834,35 @@ export class VerdocsSign {
         invalidFields.length > 0
             ? console.log('[SIGN] Invalid fields remaining', invalidFields.map(field => field.name))
             : console.log('[SIGN] All field valid');
-        return (h(Host, null, h("div", { id: "verdocs-sign-header" }, h("div", { class: "inner" }, h("img", { src: "https://verdocs.com/assets/white-logo.svg", alt: "Verdocs Logo", class: "logo" }), h("div", { class: "title" }, this.envelope.name), h("div", { style: { flex: '1' } }), !this.finishLater && h("verdocs-button", { size: "xsmall", label: this.nextButtonLabel, disabled: !this.agreed || this.submitting, onClick: () => this.handleNext() }), h("div", { style: { marginLeft: '10px' } }), h("verdocs-dropdown", { options: !this.isDone && !this.finishLater ? inProgressMenuOptions : doneMenuOptions, onOptionSelected: e => this.handleOptionSelected(e) }))), (() => {
+        const totalPages = this.envelope.documents.reduce((acc, doc) => acc + doc.pages, 0);
+        const pageOptions = integerSequence(1, totalPages).map(p => ({ label: p.toString(), value: p.toString() }));
+        let globalPageCounter = 0;
+        return (h(Host, null, this.toolbarStyle === 'menu' && (h("div", { id: "verdocs-sign-header" }, h("div", { class: "inner" }, h("img", { src: "https://verdocs.com/assets/white-logo.svg", alt: "Verdocs Logo", class: "logo" }), h("div", { class: "title" }, this.envelope.name), h("div", { style: { flex: '1' } }), !this.finishLater && h("verdocs-button", { size: "xsmall", label: this.nextButtonLabel, disabled: !this.agreed || this.submitting, onClick: () => this.handleNext() }), h("div", { style: { marginLeft: '10px' } }), h("verdocs-dropdown", { options: !this.isDone && !this.finishLater ? inProgressMenuOptions : doneMenuOptions, onOptionSelected: e => this.handleOptionSelected(e) })))), this.toolbarStyle === 'controls' && (h("div", { class: "controls-toolbar" }, h("div", { class: "left-controls" }, h("div", { class: "title" }, this.envelope.name)), h("div", { class: "center-controls" }, h("span", { class: "label" }, "Page"), h("div", { class: "select-wrapper" }, h("verdocs-select-input", { options: pageOptions, value: this.pageNumber.toString(), onInput: e => this.handlePageSelect(e) })), h("span", { class: "count" }, "of ", totalPages)), h("div", { class: "right-controls" }, h("div", { class: "icon-button minus", innerHTML: ToolbarMinusIcon }), h("div", { class: "icon-button plus", innerHTML: ToolbarPlusIcon }), h("div", { class: "icon-button download", innerHTML: ToolbarDownloadIcon, onClick: () => this.handleOptionSelected({ detail: { id: 'download' } }) }), h("div", { class: "icon-button print", innerHTML: ToolbarPrintIcon, onClick: () => this.handleOptionSelected({ detail: { id: 'print' } }) })))), (() => {
+            // Dependencies: focusedField, fieldUpdateCounter (to force re-calc)
+            // console.log('[SIGN] Render progress', this.focusedField, this.fieldUpdateCounter);
+            // Calculate detailed progress
+            const allFields = this.getSortedFillableFields();
+            const recipientFields = this.getRecipientFields();
+            const requiredFields = allFields.filter(f => f.required);
+            const requiredRemaining = requiredFields.filter(f => !isFieldFilled(f, recipientFields)).length;
+            const optionalFields = allFields.filter(f => !f.required);
+            const optionalRemaining = optionalFields.filter(f => !isFieldFilled(f, recipientFields)).length;
+            const progress = {
+                required: {
+                    remaining: requiredRemaining,
+                    total: requiredFields.length,
+                },
+                optional: {
+                    remaining: optionalRemaining,
+                    total: optionalFields.length,
+                },
+            };
             const focusedFieldObj = this.getSortedFillableFields().find(f => f.name === this.focusedField);
             const currentIndex = this.getSortedFillableFields().findIndex(f => f.name === this.focusedField) + 1;
             const totalFields = this.getSortedFillableFields().length;
+            const remainingFields = this.getSortedFillableFields()
+                .filter(f => f.required && !isFieldFilled(f, this.getRecipientFields()))
+                .map(f => ({ name: f.name, type: f.type, required: f.required }));
             let mode = 'start';
             if (this.nextSubmits) {
                 mode = 'completed';
@@ -936,15 +870,16 @@ export class VerdocsSign {
             else if (this.signatureId || this.initialId) {
                 mode = 'signing';
             }
-            return (h("verdocs-signing-progress", { mode: mode, current: Math.max(1, currentIndex), total: totalFields, fieldLabel: getFieldLabel(focusedFieldObj), fieldCompleted: focusedFieldObj ? !!isFieldFilled(focusedFieldObj, this.getRecipientFields()) : false, onStarted: () => {
+            return (h("verdocs-signing-progress", { mode: mode, current: Math.max(1, currentIndex), total: totalFields, remainingFields: remainingFields, progress: progress, fieldLabel: getFieldLabel(focusedFieldObj), fieldCompleted: focusedFieldObj ? !!isFieldFilled(focusedFieldObj, this.getRecipientFields()) : false, onStarted: () => {
                     this.adoptingSignature = true;
                     // this.handleNext();
                 }, onNext: () => this.handleNext(), onPrevious: () => this.handlePrev(), onExit: () => this.handleNext() }));
         })(), h("div", { class: "document signed-document-container" }, (this.envelope.documents || []).map(envelopeDocument => {
             const pageNumbers = integerSequence(1, envelopeDocument.pages);
-            return (h(Fragment, null, this.envelope.documents.length > 1 && (h("div", { class: "document-separator" }, h("svg", { width: "24", height: "24", viewBox: "0 0 24 24", fill: "none", xmlns: "http://www.w3.org/2000/svg" }, h("path", { d: "M20 2H8C6.9 2 6 2.9 6 4V16C6 17.1 6.9 18 8 18H20C21.1 18 22 17.1 22 16V4C22 2.9 21.1 2 20 2ZM20 16H8V4H20V16ZM4 6H2V20C2 21.1 2.9 22 4 22H18V20H4V6ZM16 12V9C16 8.45 15.55 8 15 8H10V14H15C15.55 14 16 13.55 16 13V12ZM14.5 9.5L14.5001 12.5H11.5V9.5H14.5Z", fill: "currentColor" })), h("span", null, envelopeDocument.name))), pageNumbers.map(pageNumber => {
+            return (h(Fragment, null, this.envelope.documents.length > 1 && (h("div", { class: "document-separator" }, h("div", { innerHTML: DocumentPageIcon }), h("span", null, envelopeDocument.name))), pageNumbers.map(pageNumber => {
                 var _a;
                 const pageSize = ((_a = envelopeDocument.page_sizes) === null || _a === void 0 ? void 0 : _a[pageNumber]) || { width: 612, height: 792 };
+                globalPageCounter++;
                 // In signing mode we show the original template page with all the recipient fields so we can show source formatting and
                 // where everything went. This is also a visual indicator when optional fields weren't filled in by previous actors, or
                 // future signers still need to act. Once we're "done" we flip to showing the envelope's documents which have the final
@@ -952,7 +887,7 @@ export class VerdocsSign {
                 // TODO: Confirm that a pure page-number match is good enough to find the matching template page. We need to make sure
                 //  we either don't reset our page numbers for additional attachments, or add match-on identifiers to work around that.
                 // console.log('tp', templatePage, page);
-                return (h("verdocs-envelope-document-page", { envelopeId: this.envelopeId, documentId: envelopeDocument.id, endpoint: this.endpoint, virtualWidth: pageSize.width, virtualHeight: pageSize.height, pageNumber: pageNumber, onPageRendered: e => this.handlePageRendered(e), type: "filled", layers: [
+                return (h("verdocs-envelope-document-page", { id: `page-${globalPageCounter}`, envelopeId: this.envelopeId, documentId: envelopeDocument.id, endpoint: this.endpoint, virtualWidth: pageSize.width, virtualHeight: pageSize.height, pageNumber: pageNumber, onPageRendered: e => this.handlePageRendered(e), type: "filled", layers: [
                         { name: 'page', type: 'canvas' },
                         { name: 'controls', type: 'div' },
                     ] }));
@@ -980,7 +915,7 @@ export class VerdocsSign {
                 // If we have a focused field, we should auto-apply the new signature/initials to it
                 if (this.focusedField) {
                     const field = this.getRecipientFields().find(f => f.name === this.focusedField);
-                    if (field && !isFieldFilled(field, this.getRecipientFields())) {
+                    if (field) {
                         console.log('[SIGN] Auto-applying adopted signature to focused field', field.name);
                         if (field.type === 'signature') {
                             const updateResult = await updateEnvelopeField(this.endpoint, this.envelopeId, this.roleId, field.name, this.signatureId, false);
@@ -1118,6 +1053,26 @@ export class VerdocsSign {
                 "reflect": false,
                 "attribute": "header-target-id",
                 "defaultValue": "null"
+            },
+            "toolbarStyle": {
+                "type": "string",
+                "mutable": false,
+                "complexType": {
+                    "original": "'controls' | 'menu'",
+                    "resolved": "\"controls\" | \"menu\"",
+                    "references": {}
+                },
+                "required": false,
+                "optional": false,
+                "docs": {
+                    "tags": [],
+                    "text": "The style of the toolbar to display."
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false,
+                "attribute": "toolbar-style",
+                "defaultValue": "'controls'"
             }
         };
     }
@@ -1131,6 +1086,7 @@ export class VerdocsSign {
             "fatalErrorMessage": {},
             "focusedField": {},
             "disclosures": {},
+            "fieldUpdateCounter": {},
             "submitting": {},
             "submitted": {},
             "isDone": {},
@@ -1145,6 +1101,7 @@ export class VerdocsSign {
             "documentsSingularPlural": {},
             "authStep": {},
             "authMethodStates": {},
+            "pageNumber": {},
             "kbaQuestions": {},
             "showSpinner": {},
             "declining": {},
@@ -1231,5 +1188,6 @@ export class VerdocsSign {
                 }
             }];
     }
+    static get elementRef() { return "el"; }
 }
 //# sourceMappingURL=verdocs-sign.js.map