@verdocs/web-sdk 2.3.25 → 2.3.27

package/dist/esm/verdocs-field-textarea.entry.js

@@ -5,7 +5,7 @@ import { V as VerdocsEndpoint } from './VerdocsEndpoint-56fa3371.js';
 import { u as updateField } from './Fields-c82e6df3.js';
 import { g as getRGBA } from './Colors-1b298092.js';
 import { g as getFieldSettings } from './utils-f76f3448.js';
-import { g as getTemplateFieldStore } from './TemplateFieldStore-295f240e.js';
+import { g as getTemplateFieldStore } from './TemplateFieldStore-0516a7ec.js';
 import './_commonjsHelpers-8a9f3b18.js';
 import './Envelopes-627c5239.js';
 import './Files-70a192df.js';
@@ -84,7 +84,7 @@ const VerdocsFieldTextarea = class {
     Object.assign(e.target.dataset, { x, y, h });
   }
   handleResizeEnd(e) {
-    const field = this.fieldStore.get(this.fieldname);
+    const field = this.fieldStore.get('fields').find(field => field.name === this.fieldname);
     const newSettings = { ...getFieldSettings(field) };
     const [translateX, translateY] = e.target.style.transform.split('(')[1].split(')')[0].split(',').map(parseFloat);
     newSettings.width = Math.round(parseFloat(e.target.style.width) / this.xscale);
@@ -101,7 +101,7 @@ const VerdocsFieldTextarea = class {
   }
   render() {
     var _a, _b;
-    const field = this.fieldStore.get(this.fieldname);
+    const field = this.fieldStore.get('fields').find(field => field.name === this.fieldname);
     if (!field) {
       return h(Fragment, null);
     }

package/dist/esm/verdocs-field-textbox.entry.js

@@ -4,7 +4,7 @@ import './Types-5f31149e.js';
 import { V as VerdocsEndpoint } from './VerdocsEndpoint-56fa3371.js';
 import { u as updateField } from './Fields-c82e6df3.js';
 import { g as getRGBA } from './Colors-1b298092.js';
-import { g as getTemplateFieldStore } from './TemplateFieldStore-295f240e.js';
+import { g as getTemplateFieldStore } from './TemplateFieldStore-0516a7ec.js';
 import { g as getFieldSettings } from './utils-f76f3448.js';
 import './_commonjsHelpers-8a9f3b18.js';
 import './index-4439b0d1.js';
@@ -84,7 +84,7 @@ const VerdocsFieldTextbox = class {
     Object.assign(e.target.dataset, { x, y, h });
   }
   handleResizeEnd(e) {
-    const field = this.fieldStore.get(this.fieldname);
+    const field = this.fieldStore.get('fields').find(field => field.name === this.fieldname);
     const newSettings = { ...getFieldSettings(field) };
     const [translateX, translateY] = e.target.style.transform.split('(')[1].split(')')[0].split(',').map(parseFloat);
     newSettings.width = Math.round(parseFloat(e.target.style.width) / this.xscale);
@@ -102,7 +102,7 @@ const VerdocsFieldTextbox = class {
   }
   render() {
     var _a, _b;
-    const field = this.fieldStore.get(this.fieldname);
+    const field = this.fieldStore.get('fields').find(field => field.name === this.fieldname);
     if (!field) {
       return h(Fragment, null);
     }

package/dist/esm/verdocs-field-timestamp.entry.js

@@ -2,7 +2,7 @@ import { r as registerInstance, c as createEvent, h, F as Fragment, H as Host }
 import { g as getRGBA } from './Colors-1b298092.js';
 import { g as getFieldSettings } from './utils-f76f3448.js';
 import { F as FORMAT_TIMESTAMP } from './Types-1628dc71.js';
-import { g as getTemplateFieldStore } from './TemplateFieldStore-295f240e.js';
+import { g as getTemplateFieldStore } from './TemplateFieldStore-0516a7ec.js';
 import { f as format } from './index-914ed6f7.js';
 import './_commonjsHelpers-8a9f3b18.js';
 import './Envelopes-627c5239.js';
@@ -51,7 +51,7 @@ const VerdocsFieldTimestamp = class {
   }
   render() {
     var _a, _b;
-    const field = this.fieldStore.get(this.fieldname);
+    const field = this.fieldStore.get('fields').find(field => field.name === this.fieldname);
     if (!field) {
       return h(Fragment, null);
     }

package/dist/esm/verdocs-portal_2.entry.js

@@ -3,8 +3,8 @@ import { a as commonjsGlobal } from './_commonjsHelpers-8a9f3b18.js';
 import './Types-5f31149e.js';
 import { V as VerdocsEndpoint } from './VerdocsEndpoint-56fa3371.js';
 import { u as updateField, d as deleteField } from './Fields-c82e6df3.js';
-import { c as createTemplateFieldStore } from './TemplateFieldStore-295f240e.js';
-import { g as getTemplateStore } from './TemplateStore-f188c963.js';
+import { g as getTemplateFieldStore, u as updateStoreField } from './TemplateFieldStore-0516a7ec.js';
+import { g as getTemplateStore, b as getTemplateRoleStore } from './TemplateStore-618fb47f.js';
 import { S as SDKError } from './errors-9b5498c8.js';
 import './index-4439b0d1.js';
 
@@ -282,7 +282,7 @@ const VerdocsTemplateFieldProperties = class {
     this.sdkError = createEvent(this, "sdkError", 7);
     this.templateStore = null;
     this.fieldStore = null;
-    this.watcher = null;
+    this.roleStore = null;
     this.endpoint = VerdocsEndpoint.getDefault();
     this.templateId = '';
     this.fieldName = '';
@@ -320,10 +320,10 @@ const VerdocsTemplateFieldProperties = class {
         return;
       }
       this.templateStore = await getTemplateStore(this.endpoint, this.templateId);
-      createTemplateFieldStore(this.templateStore.state);
-      this.fieldStore = await createTemplateFieldStore(this.templateStore.state);
+      this.fieldStore = await getTemplateFieldStore(this.templateId);
+      this.roleStore = await getTemplateRoleStore(this.templateId);
       // console.log('tfs', this.fieldStore?.state);
-      const field = this.fieldStore.get(this.fieldName);
+      const field = this.fieldStore.get('fields').find(field => field.name === this.fieldName);
       // console.log('gf', field);
       if (!field) {
         console.log(`[FIELD PROPERTIES] Unable to find field "${this.fieldName}" in fields`);
@@ -331,25 +331,6 @@ const VerdocsTemplateFieldProperties = class {
       else {
         console.log('props', field);
       }
-      this.watcher = this.fieldStore.onChange(this.fieldName, (field) => {
-        console.log('Field changed', field);
-        // this.type = field.type;
-        // this.name = field.name;
-        // this.label = field.label;
-        // this.group = field.name;
-        // this.roleName = field.role_name;
-        // this.required = field.required;
-        // this.fieldType = field.type;
-        // // TODO: Talk about how we want to handle labels/placeholders
-        // this.placeholder = field.setting?.placeholder || '';
-        // this.value = field.setting?.result || '';
-        // this.leading = field.setting?.leading || 0;
-        // this.setting = field.setting || {};
-        // this.options = field.setting?.options || [];
-        // this.dirty = false;
-        // this.loading = false;
-      });
-      console.log('watcher', this.watcher);
       this.type = field.type;
       this.name = field.name;
       this.label = field.label;
@@ -376,7 +357,7 @@ const VerdocsTemplateFieldProperties = class {
   handleCancel(e) {
     var _a, _b, _c, _d;
     e.stopPropagation();
-    const field = this.fieldStore.get(this.fieldName);
+    const field = this.fieldStore.get('fields').find(field => field.name === this.fieldName);
     if (field) {
       this.name = field.name;
       this.label = field.label;
@@ -416,11 +397,19 @@ const VerdocsTemplateFieldProperties = class {
     }
     console.log('FP: Will update', this.fieldName, newProperties);
     updateField(this.endpoint, this.templateId, this.fieldName, newProperties)
-      .then(field => {
+      .then(updated => {
       var _a, _b;
       this.dirty = false;
-      this.updateField(field);
-      (_a = this.settingsChanged) === null || _a === void 0 ? void 0 : _a.emit({ fieldName: this.fieldName, settings: newProperties, field });
+      const newFields = [
+        ...this.fieldStore.get('fields').map(field => {
+          if (field.name !== this.fieldName) {
+            return field;
+          }
+          return { ...field, ...updated };
+        }),
+      ];
+      this.fieldStore.set('fields', newFields);
+      (_a = this.settingsChanged) === null || _a === void 0 ? void 0 : _a.emit({ fieldName: this.fieldName, settings: newProperties, field: updated });
       (_b = this.close) === null || _b === void 0 ? void 0 : _b.emit();
     })
       .catch(() => {
@@ -454,29 +443,25 @@ const VerdocsTemplateFieldProperties = class {
     delete newProperties.setting.result;
     newProperties.setting.options = [...this.options];
     updateField(this.endpoint, this.templateId, this.fieldName, newProperties)
-      .then(field => {
+      .then(updated => {
       var _a, _b;
       this.dirty = false;
-      this.updateField(field);
-      (_a = this.settingsChanged) === null || _a === void 0 ? void 0 : _a.emit({ fieldName: this.fieldName, settings: newProperties, field });
+      updateStoreField(this.fieldStore, this.fieldName, updated);
+      this.fieldName = updated.name;
+      (_a = this.settingsChanged) === null || _a === void 0 ? void 0 : _a.emit({ fieldName: this.fieldName, settings: newProperties, field: updated });
       (_b = this.close) === null || _b === void 0 ? void 0 : _b.emit();
     })
       .catch(() => {
       console.log('Field update failed', e);
     });
   }
-  updateField(newField) {
-    const oldField = this.fieldStore.get(this.fieldName) || {};
-    console.log('Updating field', this.fieldName, newField);
-    Object.assign(oldField, newField);
-  }
   async handleDelete(e) {
     e.stopPropagation();
     if (window.confirm('Are you sure you wish to remove this field? This action cannot be undone.')) {
       deleteField(this.endpoint, this.templateId, this.fieldName)
         .then(() => {
         var _a;
-        this.fieldStore.set(this.fieldName, undefined);
+        this.fieldStore.set('fields', this.fieldStore.get('fields').filter(field => field.name !== this.fieldName));
         (_a = this.delete) === null || _a === void 0 ? void 0 : _a.emit({ templateId: this.templateId, roleName: this.roleName });
       })
         .catch(e => {
@@ -491,7 +476,7 @@ const VerdocsTemplateFieldProperties = class {
       return (h(Host, null, h("verdocs-component-error", { message: "You must be authenticated to use this module." })));
     }
     // This is meant to be a companion for larger visual experiences so we just go blank on errors for now.
-    if (!this.endpoint.session || !this.fieldStore.get(this.fieldName)) {
+    if (!this.endpoint.session || !this.fieldStore.get('fields').some(field => field.name === this.fieldName)) {
       return h(Host, { class: "empty" });
     }
     if (this.helpText && this.showingHelp) {
@@ -508,7 +493,7 @@ const VerdocsTemplateFieldProperties = class {
       placeholder: "Optional Label...", onInput: (e) => {
         this.label = e.target.value;
         this.dirty = true;
-      } })), h("div", { class: "row" }, h("div", { class: "input-label" }, "Role:"), h("verdocs-select-input", { value: this.roleName, options: (_a = this.templateStore.state) === null || _a === void 0 ? void 0 : _a.roles.map(role => ({ label: role.name, value: role.name })), onInput: (e) => {
+      } })), h("div", { class: "row" }, h("div", { class: "input-label" }, "Role:"), h("verdocs-select-input", { value: this.roleName, options: (_a = this.roleStore.state) === null || _a === void 0 ? void 0 : _a.roles.map(role => ({ label: role.name, value: role.name })), onInput: (e) => {
         this.roleName = e.target.value;
         this.dirty = true;
       } })), ['textbox', 'textarea'].includes(this.type) && (h("div", { class: "row", style: { marginTop: '10px', marginBottom: '10px' } }, h("verdocs-text-input", { id: "verdocs-field-value", label: "Value", value: this.value, autocomplete: "off", placeholder: "Pre-defined value...", onInput: (e) => {

package/dist/esm/verdocs-preview_8.entry.js

@@ -2,7 +2,7 @@ import { r as registerInstance, c as createEvent, h, H as Host } from './index-1
 import './Types-5f31149e.js';
 import { V as VerdocsEndpoint, b as createTemplatev2, u as updateTemplate } from './VerdocsEndpoint-56fa3371.js';
 import { r as renderDocumentField, b as getRoleIndex } from './utils-f76f3448.js';
-import { g as getTemplateStore, a as getRoleNames } from './TemplateStore-f188c963.js';
+import { g as getTemplateStore, a as getRoleNames } from './TemplateStore-618fb47f.js';
 import { S as SDKError } from './errors-9b5498c8.js';
 import { j as createEnvelope } from './Envelopes-627c5239.js';
 import { a as isValidEmail, i as isValidPhone } from './Validators-16a2a43b.js';
@@ -15,7 +15,7 @@ import './Files-70a192df.js';
 import './Types-1628dc71.js';
 import './index-914ed6f7.js';
 import './index-4439b0d1.js';
-import './TemplateFieldStore-295f240e.js';
+import './TemplateFieldStore-0516a7ec.js';
 
 /**
  * Enable automatic reminders. setup_time is the number of days after the envelope is sent that the first reminder

package/dist/esm/verdocs-sign.entry.js

@@ -6,7 +6,7 @@ import { V as VerdocsEndpoint } from './VerdocsEndpoint-56fa3371.js';
 import { i as isValidPhone, a as isValidEmail } from './Validators-16a2a43b.js';
 import { f as fullNameToInitials, i as integerSequence } from './Primitives-8fe93caf.js';
 import { a as saveAttachment, u as updateDocumentFieldValue, b as getRoleIndex, r as renderDocumentField, c as getFieldId } from './utils-f76f3448.js';
-import { a as createTemplateFieldStoreFromEnvelope } from './TemplateFieldStore-295f240e.js';
+import { a as createTemplateFieldStoreFromEnvelope } from './TemplateFieldStore-0516a7ec.js';
 import { a as FORMAT_DATE } from './Types-1628dc71.js';
 import { V as VerdocsToast } from './Toast-f3b8fd46.js';
 import { S as SDKError } from './errors-9b5498c8.js';

package/dist/esm/verdocs-template-fields_4.entry.js

@@ -5,8 +5,8 @@ import { V as VerdocsEndpoint, T as TemplateSenderTypes, u as updateTemplate } f
 import { u as updateField, c as createField } from './Fields-c82e6df3.js';
 import { i as integerSequence } from './Primitives-8fe93caf.js';
 import { b as getRoleIndex, r as renderDocumentField, f as updateCssTransform, h as defaultWidth, i as defaultHeight } from './utils-f76f3448.js';
-import { g as getTemplateStore, b as getTemplateRoleStore, a as getRoleNames, c as createTemplateRoleStore } from './TemplateStore-f188c963.js';
-import { g as getTemplateFieldStore } from './TemplateFieldStore-295f240e.js';
+import { g as getTemplateStore, b as getTemplateRoleStore, a as getRoleNames, c as createTemplateRoleStore, u as updateStoreRole, d as deleteStoreRole } from './TemplateStore-618fb47f.js';
+import { g as getTemplateFieldStore, u as updateStoreField } from './TemplateFieldStore-0516a7ec.js';
 import { S as SDKError } from './errors-9b5498c8.js';
 import { g as getRGBA } from './Colors-1b298092.js';
 import './_commonjsHelpers-8a9f3b18.js';
@@ -133,33 +133,12 @@ const VerdocsTemplateFields = class {
   async handleFieldChange(field, e, optionId) {
     console.log('[FIELDS] handleFieldChange', field, e, optionId);
   }
-  handleFieldSettingsChange(pageInfo, field, el, newFieldData, oldName) {
-    var _a, _b;
-    // handleFieldSettingsChange(pageInfo: any, field: any, roleIndex: number, el: any, newFieldData: any) {
-    console.log('[FIELDS] Field settings changed', oldName, field.name, newFieldData);
-    Object.assign(field, newFieldData);
-    el.field = newFieldData;
-    this.selectedRoleName = field.role_name;
-    el.setAttribute('roleindex', getRoleIndex(getRoleNames(this.templateStore), field.role_name));
-    el.field = this.fieldStore.get(field.name);
-    (_a = this.templateUpdated) === null || _a === void 0 ? void 0 : _a.emit({ endpoint: this.endpoint, template: (_b = this.templateStore) === null || _b === void 0 ? void 0 : _b.state, event: 'updated-field' });
-    // We do this to avoid dupes if the field gets renamed.
-    if (field.name !== oldName) {
-      console.log('[FIELDS] Renaming field', oldName, field.name);
-      el.remove();
-      delete this.fieldStore.state[oldName];
-    }
-    else {
-      console.log('[FIELDS] Updating existing field', field.name);
-    }
-    // REMINDER: Do not access el past this point! It may have been removed from the DOM.
-    console.log('[FIELDS] Re-rendering field', field.name, pageInfo.pageNumber, field);
-    this.fieldStore.set(field.name, field);
-    this.reRenderField(field, pageInfo.pageNumber);
-  }
   attachFieldAttributes(pageInfo, field, roleIndex, el) {
     el.addEventListener('input', e => this.handleFieldChange(field, e));
-    el.addEventListener('settingsChanged', e => this.handleFieldSettingsChange(pageInfo, field, el, e.detail.field, e.detail.fieldName));
+    el.addEventListener('settingsChanged', () => {
+      var _a, _b;
+      (_a = this.templateUpdated) === null || _a === void 0 ? void 0 : _a.emit({ endpoint: this.endpoint, template: (_b = this.templateStore) === null || _b === void 0 ? void 0 : _b.state, event: 'added-field' });
+    });
     el.addEventListener('deleted', () => {
       var _a, _b;
       console.log('[FIELDS] Deleted', this, field);
@@ -179,9 +158,7 @@ const VerdocsTemplateFields = class {
     // console.log('[FIELDS] Page rendered', pageInfo.pageNumber, pageInfo);
     this.cachedPageInfo[pageInfo.pageNumber] = pageInfo;
     this.pageHeights[pageInfo.pageNumber] = pageInfo.naturalHeight;
-    // Entries can be undefined when deleted because Stencil has no remove() operator yet for stores.
-    // See https://github.com/ionic-team/stencil-store/issues/23
-    const fields = Object.values(this.fieldStore.state).filter((field) => field && field.page_sequence === pageInfo.pageNumber);
+    const fields = this.fieldStore.get('fields').filter(field => field && field.page_sequence === pageInfo.pageNumber);
     console.log('[FIELDS] Page rendered', pageInfo, fields);
     fields.forEach((field) => this.reRenderField(field, pageInfo.pageNumber));
   }
@@ -223,9 +200,10 @@ const VerdocsTemplateFields = class {
     updateCssTransform(event.target, 'translate', `${newX}px, ${newY}px`);
   }
   async handleMoveEnd(event) {
+    var _a, _b;
     const name = event.target.getAttribute('name');
     const option = +(event.target.getAttribute('option') || '0');
-    const field = this.fieldStore.get(name);
+    const field = this.fieldStore.get('fields').find(field => field.name === name);
     if (!field) {
       console.log('[FIELDS] Unable to find field', name);
       return;
@@ -268,10 +246,10 @@ const VerdocsTemplateFields = class {
     }
     console.log('[FIELDS] Will update', name, y, option, field);
     const newFieldData = await updateField(this.endpoint, this.templateId, name, field);
-    const pageInfo = this.cachedPageInfo[pageNumber];
-    this.handleFieldSettingsChange(pageInfo, field, event.target, newFieldData, name);
+    updateStoreField(this.fieldStore, name, newFieldData);
     event.target.removeAttribute('posX');
     event.target.removeAttribute('posY');
+    (_a = this.templateUpdated) === null || _a === void 0 ? void 0 : _a.emit({ endpoint: this.endpoint, template: (_b = this.templateStore) === null || _b === void 0 ? void 0 : _b.state, event: 'updated-field' });
   }
   generateFieldName(type, pageNumber) {
     let i = 1;
@@ -279,7 +257,7 @@ const VerdocsTemplateFields = class {
     do {
       fieldName = `${type}P${pageNumber}-${i}`;
       i++;
-    } while (Object.values(this.fieldStore.state).some(field => field && field.name === fieldName));
+    } while (this.fieldStore.get('fields').some(field => field && field.name === fieldName));
     return fieldName;
   }
   // Scale the X,Y clicks to the virtual page dimensions. Also ensure the field doesn't go off the page.
@@ -384,10 +362,9 @@ const VerdocsTemplateFields = class {
       }
       const saved = await createField(this.endpoint, this.templateId, field);
       console.log('[FIELDS] Saved field', saved);
-      this.fieldStore.set(saved.name, saved);
+      this.fieldStore.set('fields', [...this.fieldStore.state.fields, saved]);
       this.placing = null;
       (_a = this.templateUpdated) === null || _a === void 0 ? void 0 : _a.emit({ endpoint: this.endpoint, template: (_b = this.templateStore) === null || _b === void 0 ? void 0 : _b.state, event: 'added-field' });
-      this.reRenderField(saved, pageNumber);
     }
   }
   render() {
@@ -464,7 +441,7 @@ const VerdocsTemplateRoleProperties = class {
       this.templateStore = await getTemplateStore(this.endpoint, this.templateId, false);
       this.fieldStore = getTemplateFieldStore(this.templateId);
       this.roleStore = createTemplateRoleStore(this.templateStore.state);
-      const editingRole = this.roleStore.get(this.roleName);
+      const editingRole = this.roleStore.state.roles.find(role => role.name === this.roleName);
       if (editingRole) {
         this.name = editingRole.name;
         this.type = editingRole.type;
@@ -483,7 +460,7 @@ const VerdocsTemplateRoleProperties = class {
   handleCancel(e) {
     var _a;
     e.stopPropagation();
-    const editingRole = this.roleStore.get(this.roleName);
+    const editingRole = this.roleStore.state.roles.find(role => role.name === this.roleName);
     if (editingRole) {
       this.name = editingRole.name;
       this.type = editingRole.type;
@@ -511,10 +488,7 @@ const VerdocsTemplateRoleProperties = class {
       console.log('[ROLE_PROPERTIES] Update result', r);
       this.saving = false;
       this.dirty = false;
-      this.roleStore.set(r.name, r);
-      if (this.roleName !== r.name) {
-        this.roleStore.set(this.roleName, undefined);
-      }
+      updateStoreRole(this.roleStore, this.roleName, r);
       (_a = this.close) === null || _a === void 0 ? void 0 : _a.emit();
     })
       .catch(e => {
@@ -526,9 +500,9 @@ const VerdocsTemplateRoleProperties = class {
     e.stopPropagation();
     if (window.confirm('Are you sure you wish to remove this role? All associated fields will be removed as well. This action cannot be undone.')) {
       deleteRole(this.endpoint, this.templateId, this.roleName)
-        .then(r => {
+        .then(() => {
         var _a;
-        delete this.roleStore.state[r.name];
+        deleteStoreRole(this.roleStore, this.roleName);
         (_a = this.delete) === null || _a === void 0 ? void 0 : _a.emit({ templateId: this.templateId, roleName: this.roleName });
       })
         .catch(e => {
@@ -537,7 +511,7 @@ const VerdocsTemplateRoleProperties = class {
     }
   }
   render() {
-    const hasFields = Object.values(this.fieldStore).findIndex(field => field.role_name === this.roleName) !== -1;
+    const hasFields = this.fieldStore.get('fields').some(field => field.role_name === this.roleName);
     return (h(Host, null, h("div", { class: "background-overlay", onClick: e => this.handleCancel(e) }, h("div", { class: "dialog" }, h("form", { onSubmit: e => e.preventDefault(), onClick: e => e.stopPropagation(), autocomplete: "off" }, h("verdocs-text-input", { id: "verdocs-role-name", label: "Role Name", value: this.name, autocomplete: "off", disabled: hasFields, helpText: hasFields
         ? 'This role has fields assigned and can no longer be renamed.'
         : 'A unique name to identify the role in the workflow. Submitted data will also be tagged with this value.', placeholder: "Role Name...", onInput: (e) => {
@@ -631,6 +605,7 @@ const VerdocsTemplateRoles = class {
           const oldX = +(e.target.getAttribute('dX') || 0);
           const oldY = +(e.target.getAttribute('dY') || 0);
           const sequence = +(e.target.dataset['sequence'] || 0);
+          const order = +(e.target.dataset['order'] || 0);
           const newX = e.dx + oldX;
           const newY = e.dy + oldY;
           e.target.setAttribute('dX', newX);
@@ -638,7 +613,8 @@ const VerdocsTemplateRoles = class {
           const rect = e.target.getBoundingClientRect();
           // Note: I never did figure out exactly why this is, but if we don't offset the transform
           // the dragged item is offset from the mouse cursor quite a bit.
-          e.target.style.transform = `translate(${newX + 80}px, ${newY - rect.height * sequence}px)`;
+          console.log('w', rect.width);
+          e.target.style.transform = `translate(${newX + rect.width - (order + 1)}px, ${newY - rect.height * sequence}px)`;
         }.bind(this),
         end: function handleEnd(e) {
           e.target.classList.remove('dragging');
@@ -652,22 +628,17 @@ const VerdocsTemplateRoles = class {
     });
     interact_min('.dropzone').dropzone({
       overlap: 0.05,
-      ondrop: async function handleDrop(event) {
+      ondrop: async function onDrop(event) {
         var _a;
+        console.log('dropped', event.target.classList);
         event.target.classList.remove('active');
         const roleName = event.relatedTarget.dataset.rolename;
         const targetSequence = +event.target.dataset.sequence;
         const targetOrder = +event.target.dataset.order;
-        const changingRole = this.roleStore.get(roleName);
-        if (changingRole) {
-          // To handle the renumbering, we update the role being moved to the new values, which will be some half-interval e.g.
-          // sequence 1.5 order 1. Then we sort/renumber the roles at each level to determine their final ordering values.
-          const newRole = { ...changingRole, sequence: targetSequence, order: targetOrder };
-          this.roleStore.set(changingRole.name, newRole);
-          await this.renumberTemplateRoles();
-          (_a = this.rolesUpdated) === null || _a === void 0 ? void 0 : _a.emit({ event: 'updated', endpoint: this.endpoint, templateId: this.templateId, roles: this.getSortedRoles() });
-          console.log('[ROLES] Updated roles', this.getSortedRoles());
-        }
+        updateStoreRole(this.roleStore, roleName, { sequence: targetSequence, order: targetOrder });
+        await this.renumberTemplateRoles();
+        console.log('[ROLES] Updated roles', this.getSortedRoles());
+        (_a = this.rolesUpdated) === null || _a === void 0 ? void 0 : _a.emit({ event: 'updated', endpoint: this.endpoint, templateId: this.templateId, roles: this.getSortedRoles() });
       }.bind(this),
       ondropactivate: e => {
         e.target.classList.add('visible');
@@ -692,9 +663,7 @@ const VerdocsTemplateRoles = class {
     (_a = this.next) === null || _a === void 0 ? void 0 : _a.emit();
   }
   getSortedRoles() {
-    return Object.values(this.roleStore.state)
-      .filter(role => role !== undefined)
-      .sort((a, b) => {
+    return this.roleStore.state.roles.sort((a, b) => {
       return a.sequence === b.sequence ? a.order - b.order : a.sequence - b.sequence;
     });
   }
@@ -714,12 +683,13 @@ const VerdocsTemplateRoles = class {
   getRolesAtSequence(sequence) {
     // Entries can be undefined when deleted because Stencil has no remove() operator yet for stores.
     // See https://github.com/ionic-team/stencil-store/issues/23
-    return Object.values(this.roleStore.state).filter(role => role && role.sequence === sequence);
+    return this.roleStore.state.roles.filter(role => role && role.sequence === sequence);
   }
   // When the user drags a role around, we handle placement "between" items by assigning it a half-order number
   // e.g. 1.5 to place it between items 1 and 2, 0.5 to place it at the beginning, or last+0.5 to place it at the end.
   // Then we re-sort the list of roles and renumber them.
   renumberTemplateRoles() {
+    console.log('Renumbering roles', this.getSequenceNumbers(), JSON.stringify(this.roleStore.state));
     // Avoid dupe renumber attempts
     const renumbered = [];
     // If the user dragged an entry from below a row to above it, we end up here like [1,0]. Make sure it's [0,1] for the next operation.
@@ -738,13 +708,13 @@ const VerdocsTemplateRoles = class {
   }
   // Look for name conflicts, because they're UGC and can be anything, regardless of order.
   getNextRoleName() {
-    var _a;
+    console.log('Getting next role name', JSON.stringify(this.roleStore.state));
     let name = '';
-    let nextNumber = Object.keys(this.roleStore).length;
+    let nextNumber = Object.keys(this.roleStore.state).length - 1;
     do {
       nextNumber++;
       name = `Recipient ${nextNumber}`;
-    } while (!name || Object.values((_a = this.roleStore) === null || _a === void 0 ? void 0 : _a.state).some(role => role && role.name === name));
+    } while (!name || this.roleStore.state.roles.some(role => role && role.name === name));
     return name;
   }
   callCreateRole(name, sequence, order) {
@@ -763,7 +733,7 @@ const VerdocsTemplateRoles = class {
       .then(async (r) => {
       var _a;
       console.log('[ROLES] Created role', r);
-      this.roleStore.set(r.name, r);
+      this.roleStore.set('roles', [...this.roleStore.state.roles, r]);
       await this.renumberTemplateRoles();
       (_a = this.rolesUpdated) === null || _a === void 0 ? void 0 : _a.emit({ event: 'added', endpoint: this.endpoint, templateId: this.templateId, roles: this.getSortedRoles() });
     })
@@ -791,11 +761,13 @@ const VerdocsTemplateRoles = class {
     if (!((_a = this.templateStore) === null || _a === void 0 ? void 0 : _a.state.isLoaded)) {
       return (h(Host, { class: "loading" }, h("verdocs-loader", null)));
     }
+    console.log('Rendering roles', this.roleStore.get('roles'));
     const roleNames = this.getRoleNames();
     const sequences = this.getSequenceNumbers();
+    console.log('Rendering', roleNames, sequences);
     return (h(Host, null, h("form", { onSubmit: e => e.preventDefault(), onClick: e => e.stopPropagation(), autocomplete: "off" }, h("h5", null, "Roles and Workflow"), h("div", { class: "participants" }, h("div", { class: "left-line" }), h("div", { class: "row" }, h("div", { class: "icon", innerHTML: startIcon }), h("div", { class: "row-roles" }, h("div", { class: "sender" }, h("span", { class: "label" }, "Sender:"), " ", senderLabels[(_c = (_b = this.templateStore) === null || _b === void 0 ? void 0 : _b.state) === null || _c === void 0 ? void 0 : _c.sender], ' ', h("div", { class: "settings-button", innerHTML: settingsIcon, onClick: () => (this.showingSenderDialog = true), "aria-role": "button" })))), h("div", { class: "row add-sequence", "data-sequence": 0 }, h("div", { class: "icon", innerHTML: plusIcon }), h("div", { class: "row-roles" }, h("div", { class: "dropzone", "data-sequence": 0, "data-order": 1 }, "Add Step"))), sequences.map(sequence => (h(Fragment, null, h("div", { class: "row" }, h("div", { class: "icon", innerHTML: stepIcon }), h("div", { class: "row-roles" }, h("div", { class: "dropzone", "data-order": 0.5, "data-sequence": sequence }), this.getRolesAtSequence(sequence).map(role => {
       const unknown = !role.email;
-      return unknown ? (h(Fragment, null, h("div", { class: "recipient", style: { backgroundColor: getRGBA(getRoleIndex(roleNames, role.name)) }, "data-rolename": role.name, "data-sequence": sequence }, h("span", { class: "type-icon", innerHTML: role.type === 'signer' ? iconSigner : role.type === 'cc' ? iconCC : iconApprover }), role.name, " ", h("div", { class: "settings-button", innerHTML: settingsIcon, onClick: () => (this.showingRoleDialog = role.name), "aria-role": "button" })), h("div", { class: "dropzone", "data-order": role.order + 0.5, "data-sequence": sequence }))) : (h(Fragment, null, h("div", { class: "recipient", style: { borderColor: getRGBA(getRoleIndex(roleNames, role.name)) }, "data-rolename": role.name, "data-sequence": sequence }, h("span", { class: "type-icon", innerHTML: role.type === 'signer' ? iconSigner : role.type === 'cc' ? iconCC : iconApprover }), role.full_name, " ", h("div", { class: "settings-button", innerHTML: settingsIcon, onClick: () => (this.showingRoleDialog = role.name), "aria-role": "button" })), h("div", { class: "dropzone", "data-order": role.order + 0.5, "data-sequence": sequence })));
+      return unknown ? (h(Fragment, null, h("div", { class: "recipient", style: { backgroundColor: getRGBA(getRoleIndex(roleNames, role.name)) }, "data-rolename": role.name, "data-sequence": sequence, "data-order": role.order }, h("span", { class: "type-icon", innerHTML: role.type === 'signer' ? iconSigner : role.type === 'cc' ? iconCC : iconApprover }), role.name, " ", h("div", { class: "settings-button", innerHTML: settingsIcon, onClick: () => (this.showingRoleDialog = role.name), "aria-role": "button" })), h("div", { class: "dropzone", "data-order": role.order + 0.5, "data-sequence": sequence }))) : (h(Fragment, null, h("div", { class: "recipient", style: { borderColor: getRGBA(getRoleIndex(roleNames, role.name)) }, "data-rolename": role.name, "data-sequence": sequence, "data-order": role.order }, h("span", { class: "type-icon", innerHTML: role.type === 'signer' ? iconSigner : role.type === 'cc' ? iconCC : iconApprover }), role.full_name, " ", h("div", { class: "settings-button", innerHTML: settingsIcon, onClick: () => (this.showingRoleDialog = role.name), "aria-role": "button" })), h("div", { class: "dropzone", "data-order": role.order + 0.5, "data-sequence": sequence })));
     }), h("button", { class: "add-role", innerHTML: plusIcon, onClick: e => this.handleAddRole(e, sequence) }))), sequences.length > 0 && (h("div", { class: "row add-sequence", "data-sequence": sequence }, h("div", { class: "row-roles" }, h("div", { class: "icon", innerHTML: plusIcon }), h("div", { class: "dropzone", "data-sequence": sequence + 1, "data-order": 1 }, "Add Step"))))))), h("div", { class: "row", "data-sequence": sequences.length + 1 }, h("div", { class: "row-roles" }, h("div", { class: "icon", innerHTML: plusIcon }), h("button", { class: "add-step", innerHTML: plusIcon, onClick: e => this.handleAddStep(e, sequences.length + 1) }))), h("div", { class: "row" }, h("div", { class: "icon", innerHTML: doneIcon }), h("div", { class: "row-roles" }, h("div", { class: "complete" }, "Document Complete")))), roleNames.length < 1 && (h("div", { class: "empty" }, "You must add at least one Role before proceeding.", h("br", null), " Click the ", h("span", { innerHTML: plusIcon }), " Add button above to get started.")), h("div", { class: "buttons" }, h("div", { class: "flex-fill" }), h("verdocs-button", { variant: "outline", label: "Cancel", size: "small", onClick: () => this.handleCancel() }), h("verdocs-button", { label: "OK", size: "small", onClick: () => this.handleSubmit(), disabled: roleNames.length < 1 }))), this.showingRoleDialog && (h("verdocs-template-role-properties", { endpoint: this.endpoint, templateId: this.templateId, roleName: this.showingRoleDialog, onClose: () => {
         this.showingRoleDialog = null;
       }, onDelete: async () => {