@websy/websy-designs 1.9.13 → 1.10.0

package/dist/websy-designs-es6.js

@@ -84,6 +84,12 @@ var APIService = /*#__PURE__*/function () {
       var url = this.buildUrl(entity, id);
       return this.run('DELETE', url);
     }
+  }, {
+    key: "deleteMany",
+    value: function deleteMany(entity, query) {
+      var url = this.buildUrl(entity, null, query);
+      return this.run('DELETE', url);
+    }
   }, {
     key: "get",
     value: function get(entity, id, query, offset, limit) {
@@ -95,11 +101,11 @@ var APIService = /*#__PURE__*/function () {
           url += "?offset=".concat(offset);
         }
       }
-      if (limit) {
+      if (limit || this.options.rowLimit) {
         if (url.indexOf('?') !== -1) {
-          url += "&limit=".concat(limit);
+          url += "&limit=".concat(limit || this.options.rowLimit);
         } else {
-          url += "?limit=".concat(limit);
+          url += "?limit=".concat(limit || this.options.rowLimit);
         }
       }
       return this.run('GET', url);
@@ -232,16 +238,52 @@ var ButtonGroup = /*#__PURE__*/function () {
     }
   }
   _createClass(ButtonGroup, [{
+    key: "value",
+    get: function get() {
+      if (this.options.activeItem > -1) {
+        return [this.options.items[this.options.activeItem]];
+      } else if (this.options.multiSelect === true) {
+        return this.options.items.filter(function (d) {
+          return d.selected;
+        });
+      }
+      return [];
+    },
+    set: function set(value) {
+      var activeIndex = -1;
+      if (this.options.multiSelect === true) {
+        if (Array.isArray(value)) {
+          this.options.items.forEach(function (d) {
+            if (value.indexOf(d.value) !== -1) {
+              d.selected = true;
+            } else {
+              d.selected = false;
+            }
+          });
+        }
+      } else {
+        for (var i = 0; i < this.options.items.length; i++) {
+          if ((this.options.items[i].value || this.options.items[i].label) === value) {
+            activeIndex = i;
+          }
+        }
+        this.options.activeItem = activeIndex;
+      }
+      this.render();
+    }
+  }, {
     key: "handleClick",
     value: function handleClick(event) {
       if (event.target.classList.contains('websy-button-group-item')) {
         var index = +event.target.getAttribute('data-index');
         if (this.options.multiSelect === true) {
           if (event.target.classList.contains('active')) {
+            this.options.items[index].selected = false;
             this.options.onDeactivate(this.options.items[index], index, event);
             event.target.classList.remove('active');
             event.target.classList.add('inactive');
           } else {
+            this.options.items[index].selected = true;
             this.options.onActivate(this.options.items[index], index, event);
             event.target.classList.add('active');
             event.target.classList.remove('inactive');
@@ -297,6 +339,8 @@ var ButtonGroup = /*#__PURE__*/function () {
           var activeClass = '';
           if (_this.options.activeItem !== -1) {
             activeClass = i === _this.options.activeItem ? 'active' : 'inactive';
+          } else if (_this.options.multiSelect === true) {
+            activeClass = t.selected === true ? 'active' : 'inactive';
           }
           return "\n          <".concat(_this.options.tag, " ").concat((t.attributes || []).join(' '), " data-id=\"").concat(t.id || t.label, "\" data-index=\"").concat(i, "\" class=\"websy-button-group-item ").concat((t.classes || []).join(' '), " ").concat(_this.options.style, "-style ").concat(activeClass, "\">").concat(t.label, "</").concat(_this.options.tag, ">\n        ");
         }).join('');
@@ -1667,6 +1711,18 @@ var WebsyDropdown = /*#__PURE__*/function () {
       var contentEl = document.getElementById("".concat(this.elementId, "_content"));
       var scrollEl = document.getElementById("".concat(this.elementId, "_itemsContainer"));
       var actionEl = document.getElementById("".concat(this.elementId, "_actionContainer"));
+      var headerEl = document.getElementById("".concat(this.elementId, "_header"));
+      var headerPos = WebsyUtils.getElementPos(headerEl);
+      var contentPos = WebsyUtils.getElementPos(contentEl);
+      if (this.options.style === 'plain' && headerPos.width > 0 && headerPos.height > 0) {
+        contentEl.style.right = 'unset';
+        if (headerPos.bottom + contentPos.height > window.innerHeight) {
+          // contentEl.classList.add('on-top')
+          contentEl.style.bottom = 'unset';
+        } else {
+          contentEl.style.top = 'unset';
+        }
+      }
       if (actionEl) {
         actionEl.classList.remove('active');
       }
@@ -1692,7 +1748,7 @@ var WebsyDropdown = /*#__PURE__*/function () {
         return;
       }
       if (event.target.classList.contains('websy-dropdown-header')) {
-        this.open();
+        this.open(event);
       } else if (event.target.classList.contains('websy-dropdown-mask')) {
         this.close();
       } else if (event.target.classList.contains('websy-dropdown-item')) {
@@ -1806,18 +1862,28 @@ var WebsyDropdown = /*#__PURE__*/function () {
     }
   }, {
     key: "open",
-    value: function open(options) {
+    value: function open(event) {
       var override = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var maskEl = document.getElementById("".concat(this.elementId, "_mask"));
       var contentEl = document.getElementById("".concat(this.elementId, "_content"));
-      var el = document.getElementById(this.elementId);
-      if (el) {
-        el.style.zIndex = 999;
-      }
+      var headerEl = document.getElementById("".concat(this.elementId, "_header"));
       maskEl.classList.add('active');
       contentEl.classList.add('active');
-      if (WebsyUtils.getElementPos(contentEl).bottom > window.innerHeight) {
-        contentEl.classList.add('on-top');
+      var headerPos = WebsyUtils.getElementPos(headerEl);
+      var contentPos = WebsyUtils.getElementPos(contentEl);
+      if (this.options.style === 'plain' && headerPos.width > 0 && headerPos.height > 0) {
+        contentEl.style.right = "calc(100vw - ".concat(headerPos.right, "px)");
+        contentEl.style.width = "".concat(headerEl.clientWidth, "px");
+        if (headerPos.bottom + contentPos.height > window.innerHeight) {
+          // contentEl.classList.add('on-top')
+          contentEl.style.bottom = "calc(100vh - ".concat(headerPos.top, "px)");
+        } else {
+          contentEl.style.top = headerPos.bottom + 'px';
+        }
+      } else if (this.options.style === 'plain' && headerPos.width === 0 && headerPos.height === 0) {
+        var targetPos = WebsyUtils.getElementPos(event.target);
+        contentEl.style.right = "calc(100vw - ".concat(targetPos.right, "px)");
+        contentEl.style.width = "".concat(targetPos.width, "px");
       }
       if (this.options.disableSearch !== true) {
         var searchEl = document.getElementById("".concat(this.elementId, "_search"));
@@ -1829,6 +1895,21 @@ var WebsyDropdown = /*#__PURE__*/function () {
         this.options.onOpen(this.elementId);
       }
     }
+  }, {
+    key: "items",
+    set: function set(items) {
+      this.options.items = _toConsumableArray(items);
+      if (this.options.items.length > 0) {
+        this.options.items = this.options.items.map(function (d, i) {
+          if (typeof d.index === 'undefined') {
+            d.index = i;
+          }
+          return d;
+        });
+      }
+      this._originalData = _toConsumableArray(this.options.items);
+      this.render();
+    }
   }, {
     key: "render",
     value: function render() {
@@ -2047,9 +2128,7 @@ var WebsyForm = /*#__PURE__*/function () {
     };
     GlobalPubSub.subscribe('recaptchaready', this.recaptchaReady.bind(this));
     this.recaptchaResult = null;
-    this.options = _extends(defaults, {}, {
-      // defaults go here
-    }, options);
+    this.options = _extends({}, defaults, options);
     if (!elementId) {
       console.log('No element Id provided');
       return;
@@ -2123,23 +2202,41 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "data",
     get: function get() {
+      var _this14 = this;
       var formEl = document.getElementById("".concat(this.elementId, "Form"));
       var data = {};
       var temp = new FormData(formEl);
       temp.forEach(function (value, key) {
-        data[key] = value;
+        if (_this14.fieldMap[key] && _this14.fieldMap[key].type === 'checkbox') {
+          data[key] = true;
+        }
+        if (_this14.fieldMap[key] && _this14.fieldMap[key].instance && _this14.fieldMap[key].instance.value) {
+          data[key] = _this14.fieldMap[key].instance.value;
+        } else {
+          data[key] = value;
+        }
       });
+      var keys = Object.keys(data);
+      for (var key in this.fieldMap) {
+        if (keys.indexOf(key) === -1) {
+          if (this.fieldMap[key] && this.fieldMap[key].type === 'checkbox') {
+            data[key] = false;
+          } else if (this.fieldMap[key] && this.fieldMap[key].instance && this.fieldMap[key].instance.value) {
+            data[key] = this.fieldMap[key].instance.value;
+          }
+        }
+      }
       return data;
     },
     set: function set(d) {
-      var _this14 = this;
+      var _this15 = this;
       if (!this.options.fields) {
         this.options.fields = [];
       }
       var _loop = function _loop(key) {
-        _this14.options.fields.forEach(function (f) {
+        _this15.options.fields.forEach(function (f) {
           if (f.field === key) {
-            _this14.setValue(key, d[key]);
+            _this15.setValue(key, d[key]);
             //   f.value = d[key]
             //   const el = document.getElementById(`${this.elementId}_input_${f.field}`)
             //   if (el) {
@@ -2198,6 +2295,7 @@ var WebsyForm = /*#__PURE__*/function () {
     value: function handleClick(event) {
       if (event.target.classList.contains('submit')) {
         event.preventDefault();
+        event.stopPropagation();
         this.submitForm();
       } else if (event.target.classList.contains('cancel')) {
         event.preventDefault();
@@ -2339,7 +2437,7 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "processComponents",
     value: function processComponents(components, callbackFn) {
-      var _this15 = this;
+      var _this16 = this;
       if (components.length === 0) {
         callbackFn();
       } else {
@@ -2348,11 +2446,11 @@ var WebsyForm = /*#__PURE__*/function () {
             if (!c.options.onChange) {
               c.options.onChange = function () {
                 if (c.required || c.validate) {
-                  _this15.validateField(c, c.instance.value);
+                  _this16.validateField(c, c.instance.value);
                 }
               };
             }
-            c.instance = new WebsyDesigns[c.component]("".concat(_this15.elementId, "_input_").concat(c.field, "_component"), c.options);
+            c.instance = new WebsyDesigns[c.component]("".concat(_this16.elementId, "_input_").concat(c.field, "_component"), c.options);
           } else {
             // some user feedback here
           }
@@ -2362,13 +2460,13 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "recaptchaReady",
     value: function recaptchaReady() {
-      var _this16 = this;
+      var _this17 = this;
       var el = document.getElementById("".concat(this.elementId, "_recaptcha"));
       if (el) {
         grecaptcha.ready(function () {
-          grecaptcha.render("".concat(_this16.elementId, "_recaptcha"), {
+          grecaptcha.render("".concat(_this17.elementId, "_recaptcha"), {
             sitekey: ENVIRONMENT.RECAPTCHA_KEY,
-            callback: _this16.validateRecaptcha.bind(_this16)
+            callback: _this17.validateRecaptcha.bind(_this17)
           });
         });
       }
@@ -2376,20 +2474,21 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(update, data) {
-      var _this17 = this;
+      var _this18 = this;
       var el = document.getElementById(this.elementId);
       var componentsToProcess = [];
       if (el) {
         var html = "\n        <form id=\"".concat(this.elementId, "Form\" class=\"websy-form ").concat((this.options.classes || []).join(' '), "\">\n      ");
         this.options.fields.forEach(function (f, i) {
-          _this17.fieldMap[f.field] = f;
+          _this18.fieldMap[f.field] = f;
+          f.owningElement = _this18.elementId;
           if (f.component) {
             componentsToProcess.push(f);
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div id='").concat(_this17.elementId, "_").concat(f.field, "_inputContainer' style='").concat(f.style || '', "' class='websy-input-container ").concat(f.classes ? f.classes.join(' ') : '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '').concat(f.required === true ? '<span class="websy-form-required-value">*</span>' : '', "\n              <div id='").concat(_this17.elementId, "_input_").concat(f.field, "_component' class='form-component'></div>\n              <span id='").concat(_this17.elementId, "_").concat(f.field, "_error' class='websy-form-validation-error'></span>\n            </div><!--\n          ");
+            html += "\n            ".concat(i > 0 ? '-->' : '', "<div id='").concat(_this18.elementId, "_").concat(f.field, "_inputContainer' style='").concat(f.style || '', "' class='websy-input-container ").concat(f.classes ? f.classes.join(' ') : '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '').concat(f.required === true ? '<span class="websy-form-required-value">*</span>' : '', "\n              <div id='").concat(_this18.elementId, "_input_").concat(f.field, "_component' class='form-component'></div>\n              <span id='").concat(_this18.elementId, "_").concat(f.field, "_error' class='websy-form-validation-error'></span>\n            </div><!--\n          ");
           } else if (f.type === 'longtext') {
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div id='").concat(_this17.elementId, "_").concat(f.field, "_inputContainer' style='").concat(f.style || '', "' class='websy-input-container ").concat(f.classes ? f.classes.join(' ') : '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '').concat(f.required === true ? '<span class="websy-form-required-value">*</span>' : '', "\n              <textarea\n                id=\"").concat(_this17.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                placeholder=\"").concat(f.placeholder || '', "\"\n                data-user-type=\"").concat(f.type, "\"\n                data-index=\"").concat(i, "\"\n                name=\"").concat(f.field, "\" \n                ").concat((f.attributes || []).join(' '), "\n                class=\"websy-input websy-textarea\"\n              ></textarea>\n              <span id='").concat(_this17.elementId, "_").concat(f.field, "_error' class='websy-form-validation-error'></span>\n            </div><!--\n          ");
+            html += "\n            ".concat(i > 0 ? '-->' : '', "<div id='").concat(_this18.elementId, "_").concat(f.field, "_inputContainer' style='").concat(f.style || '', "' class='websy-input-container ").concat(f.classes ? f.classes.join(' ') : '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '').concat(f.required === true ? '<span class="websy-form-required-value">*</span>' : '', "\n              <textarea\n                id=\"").concat(_this18.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                placeholder=\"").concat(f.placeholder || '', "\"\n                data-user-type=\"").concat(f.type, "\"\n                data-index=\"").concat(i, "\"\n                name=\"").concat(f.field, "\" \n                ").concat((f.attributes || []).join(' '), "\n                class=\"websy-input websy-textarea\"\n              ></textarea>\n              <span id='").concat(_this18.elementId, "_").concat(f.field, "_error' class='websy-form-validation-error'></span>\n            </div><!--\n          ");
           } else {
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div id='").concat(_this17.elementId, "_").concat(f.field, "_inputContainer' style='").concat(f.style || '', "' class='websy-input-container ").concat(f.classes ? f.classes.join(' ') : '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '').concat(f.required === true ? '<span class="websy-form-required-value">*</span>' : '', "\n              <input \n                id=\"").concat(_this17.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                type=\"").concat((f.type === 'expiry' ? 'text' : f.type === 'cvv' ? 'number' : f.type) || 'text', "\" \n                data-user-type=\"").concat(f.type, "\"\n                data-index=\"").concat(i, "\"\n                class=\"websy-input\" \n                ").concat((f.attributes || []).join(' '), "\n                name=\"").concat(f.field, "\" \n                placeholder=\"").concat(f.placeholder || '', "\"\n                value=\"").concat(f.value || '', "\"\n                valueAsDate=\"").concat(f.type === 'date' ? f.value : '', "\"\n                oninvalidx=\"this.setCustomValidity('").concat(f.invalidMessage || 'Please fill in this field.', "')\"\n              />\n              <span id='").concat(_this17.elementId, "_").concat(f.field, "_error' class='websy-form-validation-error'></span>\n            </div><!--\n          ");
+            html += "\n            ".concat(i > 0 ? '-->' : '', "<div id='").concat(_this18.elementId, "_").concat(f.field, "_inputContainer' style='").concat(f.style || '', "' class='websy-input-container ").concat(f.classes ? f.classes.join(' ') : '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '').concat(f.required === true ? '<span class="websy-form-required-value">*</span>' : '', "\n              <input \n                id=\"").concat(_this18.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                type=\"").concat((f.type === 'expiry' ? 'text' : f.type === 'cvv' ? 'number' : f.type) || 'text', "\" \n                data-user-type=\"").concat(f.type, "\"\n                data-index=\"").concat(i, "\"\n                class=\"websy-input\" \n                ").concat((f.attributes || []).join(' '), "\n                name=\"").concat(f.field, "\" \n                placeholder=\"").concat(f.placeholder || '', "\"\n                value=\"").concat(f.value || '', "\"\n                valueAsDate=\"").concat(f.type === 'date' ? f.value : '', "\"\n                oninvalidx=\"this.setCustomValidity('").concat(f.invalidMessage || 'Please fill in this field.', "')\"\n              />\n              <span id='").concat(_this18.elementId, "_").concat(f.field, "_error' class='websy-form-validation-error'></span>\n            </div><!--\n          ");
           }
         });
         if (this.options.useRecaptcha === true) {
@@ -2402,8 +2501,8 @@ var WebsyForm = /*#__PURE__*/function () {
         html += "          \n        </form>\n        <div id=\"".concat(this.elementId, "_validationFail\" class=\"websy-validation-failure\"></div>\n      ");
         el.innerHTML = html;
         this.processComponents(componentsToProcess, function () {
-          if (_this17.options.useRecaptcha === true && typeof grecaptcha !== 'undefined') {
-            _this17.recaptchaReady();
+          if (_this18.options.useRecaptcha === true && typeof grecaptcha !== 'undefined') {
+            _this18.recaptchaReady();
           }
         });
       }
@@ -2418,6 +2517,10 @@ var WebsyForm = /*#__PURE__*/function () {
           var el = document.getElementById("".concat(this.elementId, "_input_").concat(field));
           if (el) {
             el.value = value;
+            el.setAttribute('value', value);
+            if (this.fieldMap[field].type === 'checkbox') {
+              el.checked = value;
+            }
           } else {
             console.error("Input for ".concat(field, " does not exist in form."));
           }
@@ -2429,7 +2532,7 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "submitForm",
     value: function submitForm() {
-      var _this18 = this;
+      var _this19 = this;
       var formEl = document.getElementById("".concat(this.elementId, "Form"));
       var buttonEl = formEl.querySelector('button.websy-btn.submit');
       var recaptchErrEl = document.getElementById("".concat(this.elementId, "_recaptchaError"));
@@ -2454,27 +2557,27 @@ var WebsyForm = /*#__PURE__*/function () {
             temp.forEach(function (value, key) {
               data[key] = value;
             });
-            if (_this18.options.url) {
-              var _this18$apiService;
-              var params = [_this18.options.url];
-              if (_this18.options.mode === 'update') {
-                params.push(_this18.options.id);
+            if (_this19.options.url) {
+              var _this19$apiService;
+              var params = [_this19.options.url];
+              if (_this19.options.mode === 'update') {
+                params.push(_this19.options.id);
               }
               params.push(data);
-              (_this18$apiService = _this18.apiService)[_this18.options.mode].apply(_this18$apiService, params).then(function (result) {
-                if (_this18.options.clearAfterSave === true) {
+              (_this19$apiService = _this19.apiService)[_this19.options.mode].apply(_this19$apiService, params).then(function (result) {
+                if (_this19.options.clearAfterSave === true) {
                   // this.render()
                   formEl.reset();
                 }
                 buttonEl.removeAttribute('disabled');
-                _this18.options.onSuccess.call(_this18, result);
+                _this19.options.onSuccess.call(_this19, result);
               }, function (err) {
                 console.log('Error submitting form data:', err);
-                _this18.options.onError.call(_this18, err);
+                _this19.options.onError.call(_this19, err);
               });
-            } else if (_this18.options.submitFn) {
-              _this18.options.submitFn(data, function () {
-                if (_this18.options.clearAfterSave === true) {
+            } else if (_this19.options.submitFn) {
+              _this19.options.submitFn(data, function () {
+                if (_this19.options.clearAfterSave === true) {
                   // this.render()
                   formEl.reset();
                 }
@@ -2581,6 +2684,12 @@ var MultiForm = /*#__PURE__*/function () {
     this.render();
   }
   _createClass(MultiForm, [{
+    key: "addData",
+    value: function addData(data) {
+      this.formData = this.formData.concat(data);
+      this.render();
+    }
+  }, {
     key: "addEntry",
     value: function addEntry() {
       var el = document.getElementById("".concat(this.elementId, "_container"));
@@ -2590,7 +2699,11 @@ var MultiForm = /*#__PURE__*/function () {
       newFormEl.classList.add('websy-multi-form-form-container');
       newFormEl.innerHTML = "\n      <div id='".concat(this.elementId, "_").concat(newId, "_form' class='websy-multi-form-form'>\n      </div>\n      <button id='").concat(this.elementId, "_").concat(newId, "_deleteButton' data-formid='").concat(newId, "' class='hidden websy-multi-form-delete'>\n        ").concat(this.options.deleteButton, "\n      </button>          \n      <button id='").concat(this.elementId, "_").concat(newId, "_addButton' data-formid='").concat(newId, "' class='websy-multi-form-add'>\n        ").concat(this.options.addButton, "\n      </button>   \n    ");
       el.appendChild(newFormEl);
-      var formOptions = _extends({}, this.options);
+      var formOptions = _extends({}, this.options, {
+        fields: _toConsumableArray(this.options.fields.map(function (f) {
+          return _extends({}, f);
+        }))
+      });
       this.forms.push(new WebsyDesigns.Form("".concat(this.elementId, "_").concat(newId, "_form"), formOptions));
     }
   }, {
@@ -2610,14 +2723,25 @@ var MultiForm = /*#__PURE__*/function () {
       var d = this.forms.map(function (f) {
         return f.data;
       });
-      // we don't return the last form
-      d.pop();
+      console.log('forms data', d);
+      if (this.options.allowAdd !== false) {
+        // we don't return the last form
+        d.pop();
+      }
       return d;
     },
     set: function set(d) {
       this.formData = d;
       this.render();
     }
+  }, {
+    key: "deleted",
+    get: function get() {
+      var _this20 = this;
+      return this.formData.filter(function (d) {
+        return _this20.recordsToDelete.includes("".concat(d.id));
+      });
+    }
   }, {
     key: "handleClick",
     value: function handleClick(event) {
@@ -2662,7 +2786,7 @@ var MultiForm = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-      var _this19 = this;
+      var _this21 = this;
       this.forms = [];
       this.recordsToDelete = [];
       var el = document.getElementById("".concat(this.elementId, "_container"));
@@ -2670,9 +2794,9 @@ var MultiForm = /*#__PURE__*/function () {
         var html = '';
         this.formData.forEach(function (d) {
           d.formId = WebsyDesigns.Utils.createIdentity();
-          html += "\n          <div id='".concat(_this19.elementId, "_").concat(d.formId, "_formContainer' class='websy-multi-form-form-container'>\n            <div id='").concat(_this19.elementId, "_").concat(d.formId, "_form' class='websy-multi-form-form'>\n            </div>\n        ");
-          if (_this19.options.allowDelete === true) {
-            html += "\n            <button id='".concat(_this19.elementId, "_").concat(d.formId, "_deleteButton' data-formid='").concat(d.formId, "' data-rowid='").concat(d.id, "' class='websy-multi-form-delete'>\n              ").concat(_this19.options.deleteButton, "\n            </button>\n          ");
+          html += "\n          <div id='".concat(_this21.elementId, "_").concat(d.formId, "_formContainer' class='websy-multi-form-form-container'>\n            <div id='").concat(_this21.elementId, "_").concat(d.formId, "_form' class='websy-multi-form-form'>\n            </div>\n        ");
+          if (_this21.options.allowDelete === true) {
+            html += "\n            <button id='".concat(_this21.elementId, "_").concat(d.formId, "_deleteButton' data-formid='").concat(d.formId, "' data-rowid='").concat(d.id, "' class='websy-multi-form-delete'>\n              ").concat(_this21.options.deleteButton, "\n            </button>\n          ");
           }
           html += "\n          </div>\n        ";
         });
@@ -2681,15 +2805,25 @@ var MultiForm = /*#__PURE__*/function () {
           html += "\n          <div id='".concat(this.elementId, "_").concat(id, "_formContainer' class='websy-multi-form-form-container'>\n            <div id='").concat(this.elementId, "_").concat(id, "_form' class='websy-multi-form-form'>\n            </div>\n            <button id='").concat(this.elementId, "_").concat(id, "_deleteButton' data-formid='").concat(id, "' class='hidden websy-multi-form-delete'>\n              ").concat(this.options.deleteButton, "\n            </button>          \n            <button id='").concat(this.elementId, "_").concat(id, "_addButton' data-formid='").concat(id, "' class='websy-multi-form-add'>\n              ").concat(this.options.addButton, "\n            </button>                    \n          </div>\n        ");
         }
         el.innerHTML = html;
-        this.formData.forEach(function (d) {
-          var formOptions = _extends({}, _this19.options);
-          var formObject = new WebsyDesigns.Form("".concat(_this19.elementId, "_").concat(d.formId, "_form"), formOptions);
+        this.forms = new Array(this.formData.length);
+        this.formData.forEach(function (d, i) {
+          var formOptions = _extends({}, _this21.options, {
+            fields: _toConsumableArray(_this21.options.fields.map(function (f) {
+              return _extends({}, f);
+            }))
+          });
+          var formObject = new WebsyDesigns.Form("".concat(_this21.elementId, "_").concat(d.formId, "_form"), formOptions);
           formObject.data = d;
-          _this19.forms.push(formObject);
+          _this21.forms[i] = formObject;
         });
         if (this.options.allowAdd === true) {
-          var formOptions = _extends({}, this.options);
-          this.forms.push(new WebsyDesigns.Form("".concat(this.elementId, "_").concat(id, "_form"), formOptions));
+          var formOptions = _extends({}, this.options, {
+            fields: _toConsumableArray(this.options.fields.map(function (f) {
+              return _extends({}, f);
+            }))
+          });
+          var formObject = new WebsyDesigns.Form("".concat(this.elementId, "_").concat(id, "_form"), formOptions);
+          this.forms.push(formObject);
         }
       }
     }
@@ -2914,7 +3048,7 @@ var WebsyNavigationMenu = /*#__PURE__*/function () {
   }, {
     key: "handleSearch",
     value: function handleSearch(searchText) {
-      var _this20 = this;
+      var _this22 = this;
       var el = document.getElementById(this.elementId);
       // let lowestItems = this.flatItems.filter(d => d.level === this.maxLevel)
       var lowestItems = this.flatItems.filter(function (d) {
@@ -2925,7 +3059,7 @@ var WebsyNavigationMenu = /*#__PURE__*/function () {
       if (searchText && searchText.length > 1) {
         defaultMethod = 'add';
         visibleItems = lowestItems.filter(function (d) {
-          return d[_this20.options.searchProp].toLowerCase().indexOf(searchText.toLowerCase()) !== -1;
+          return d[_this22.options.searchProp].toLowerCase().indexOf(searchText.toLowerCase()) !== -1;
         });
       }
       // hide everything
@@ -3107,7 +3241,7 @@ var WebsyNavigationMenu = /*#__PURE__*/function () {
 /* global WebsyDesigns */
 var Pager = /*#__PURE__*/function () {
   function Pager(elementId, options) {
-    var _this21 = this;
+    var _this23 = this;
     _classCallCheck(this, Pager);
     this.elementId = elementId;
     var DEFAULTS = {
@@ -3154,8 +3288,8 @@ var Pager = /*#__PURE__*/function () {
           allowClear: false,
           disableSearch: true,
           onItemSelected: function onItemSelected(selectedItem) {
-            if (_this21.options.onChangePageSize) {
-              _this21.options.onChangePageSize(selectedItem.value);
+            if (_this23.options.onChangePageSize) {
+              _this23.options.onChangePageSize(selectedItem.value);
             }
           }
         });
@@ -3176,11 +3310,11 @@ var Pager = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-      var _this22 = this;
+      var _this24 = this;
       var el = document.getElementById("".concat(this.elementId, "_pageList"));
       if (el) {
         var pages = this.options.pages.map(function (item, index) {
-          return "<li data-index=\"".concat(index, "\" class=\"websy-page-num ").concat(_this22.options.activePage === index ? 'active' : '', "\">").concat(index + 1, "</li>");
+          return "<li data-index=\"".concat(index, "\" class=\"websy-page-num ").concat(_this24.options.activePage === index ? 'active' : '', "\">").concat(index + 1, "</li>");
         });
         var startIndex = 0;
         if (this.options.pages.length > 8) {
@@ -3238,48 +3372,48 @@ var WebsyPDFButton = /*#__PURE__*/function () {
   _createClass(WebsyPDFButton, [{
     key: "handleClick",
     value: function handleClick(event) {
-      var _this23 = this;
+      var _this25 = this;
       if (event.target.classList.contains('websy-pdf-button')) {
         this.loader.show();
         setTimeout(function () {
-          if (_this23.options.targetId) {
-            var el = document.getElementById(_this23.options.targetId);
+          if (_this25.options.targetId) {
+            var el = document.getElementById(_this25.options.targetId);
             if (el) {
               var pdfData = {
                 options: {}
               };
-              if (_this23.options.pdfOptions) {
-                pdfData.options = _extends({}, _this23.options.pdfOptions);
+              if (_this25.options.pdfOptions) {
+                pdfData.options = _extends({}, _this25.options.pdfOptions);
               }
-              if (_this23.options.header) {
-                if (_this23.options.header.elementId) {
-                  var headerEl = document.getElementById(_this23.options.header.elementId);
+              if (_this25.options.header) {
+                if (_this25.options.header.elementId) {
+                  var headerEl = document.getElementById(_this25.options.header.elementId);
                   if (headerEl) {
                     pdfData.header = headerEl.outerHTML;
-                    if (_this23.options.header.css) {
-                      pdfData.options.headerCSS = _this23.options.header.css;
+                    if (_this25.options.header.css) {
+                      pdfData.options.headerCSS = _this25.options.header.css;
                     }
                   }
-                } else if (_this23.options.header.html) {
-                  pdfData.header = _this23.options.header.html;
-                  if (_this23.options.header.css) {
-                    pdfData.options.headerCSS = _this23.options.header.css;
+                } else if (_this25.options.header.html) {
+                  pdfData.header = _this25.options.header.html;
+                  if (_this25.options.header.css) {
+                    pdfData.options.headerCSS = _this25.options.header.css;
                   }
                 } else {
-                  pdfData.header = _this23.options.header;
+                  pdfData.header = _this25.options.header;
                 }
               }
-              if (_this23.options.footer) {
-                if (_this23.options.footer.elementId) {
-                  var footerEl = document.getElementById(_this23.options.footer.elementId);
+              if (_this25.options.footer) {
+                if (_this25.options.footer.elementId) {
+                  var footerEl = document.getElementById(_this25.options.footer.elementId);
                   if (footerEl) {
                     pdfData.footer = footerEl.outerHTML;
-                    if (_this23.options.footer.css) {
-                      pdfData.options.footerCSS = _this23.options.footer.css;
+                    if (_this25.options.footer.css) {
+                      pdfData.options.footerCSS = _this25.options.footer.css;
                     }
                   }
                 } else {
-                  pdfData.footer = _this23.options.footer;
+                  pdfData.footer = _this25.options.footer;
                 }
               }
               pdfData.html = el.outerHTML;
@@ -3287,25 +3421,25 @@ var WebsyPDFButton = /*#__PURE__*/function () {
               // document.getElementById(`${this.elementId}_pdfHTML`).value = pdfData.html
               // document.getElementById(`${this.elementId}_pdfFooter`).value = pdfData.footer
               // document.getElementById(`${this.elementId}_form`).submit()
-              _this23.service.add('', pdfData, {
+              _this25.service.add('', pdfData, {
                 responseType: 'blob'
               }).then(function (response) {
-                _this23.loader.hide();
+                _this25.loader.hide();
                 var blob = new Blob([response], {
                   type: 'application/pdf'
                 });
                 var msg = "\n                <div class='text-center websy-pdf-download'>\n                  <div>Your file is ready to download</div>\n                  <a href='".concat(URL.createObjectURL(blob), "' target='_blank'\n              ");
-                if (_this23.options.directDownload === true) {
+                if (_this25.options.directDownload === true) {
                   var fileName;
-                  if (typeof _this23.options.fileName === 'function') {
-                    fileName = _this23.options.fileName() || 'Export';
+                  if (typeof _this25.options.fileName === 'function') {
+                    fileName = _this25.options.fileName() || 'Export';
                   } else {
-                    fileName = _this23.options.fileName || 'Export';
+                    fileName = _this25.options.fileName || 'Export';
                   }
                   msg += "download='".concat(fileName, ".pdf'");
                 }
-                msg += "\n                  >\n                    <button class='websy-btn download-pdf'>".concat(_this23.options.buttonText, "</button>\n                  </a>\n                </div>\n              ");
-                _this23.popup.show({
+                msg += "\n                  >\n                    <button class='websy-btn download-pdf'>".concat(_this25.options.buttonText, "</button>\n                  </a>\n                </div>\n              ");
+                _this25.popup.show({
                   message: msg,
                   mask: true
                 });
@@ -3454,6 +3588,9 @@ var WebsyPubSub = /*#__PURE__*/function () {
   }, {
     key: "subscribe",
     value: function subscribe(id, method, fn) {
+      if (!this.subscriptions) {
+        this.subscriptions = {};
+      }
       if (arguments.length === 3) {
         if (!this.subscriptions[id]) {
           this.subscriptions[id] = {};
@@ -3473,7 +3610,7 @@ var WebsyPubSub = /*#__PURE__*/function () {
 }();
 var ResponsiveText = /*#__PURE__*/function () {
   function ResponsiveText(elementId, options) {
-    var _this24 = this;
+    var _this26 = this;
     _classCallCheck(this, ResponsiveText);
     var DEFAULTS = {
       textAlign: 'center',
@@ -3484,7 +3621,7 @@ var ResponsiveText = /*#__PURE__*/function () {
     this.elementId = elementId;
     this.canvas = document.createElement('canvas');
     window.addEventListener('resize', function () {
-      return _this24.render();
+      return _this26.render();
     });
     var el = document.getElementById(this.elementId);
     if (el) {
@@ -3674,7 +3811,7 @@ var ResponsiveText = /*#__PURE__*/function () {
 /* global WebsyDesigns */
 var WebsyResultList = /*#__PURE__*/function () {
   function WebsyResultList(elementId, options) {
-    var _this25 = this;
+    var _this27 = this;
     _classCallCheck(this, WebsyResultList);
     var DEFAULTS = {
       listeners: {
@@ -3700,8 +3837,8 @@ var WebsyResultList = /*#__PURE__*/function () {
     }
     if (_typeof(options.template) === 'object' && options.template.url) {
       this.templateService.get(options.template.url).then(function (templateString) {
-        _this25.options.template = templateString;
-        _this25.render();
+        _this27.options.template = templateString;
+        _this27.render();
       });
     } else {
       this.render();
@@ -3720,7 +3857,7 @@ var WebsyResultList = /*#__PURE__*/function () {
   }, {
     key: "buildHTML",
     value: function buildHTML(d) {
-      var _this26 = this;
+      var _this28 = this;
       var startIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
       var inputTemplate = arguments.length > 2 ? arguments[2] : undefined;
       var locator = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
@@ -3728,7 +3865,7 @@ var WebsyResultList = /*#__PURE__*/function () {
       if (this.options.template) {
         if (d.length > 0) {
           d.forEach(function (row, ix) {
-            var template = "".concat(ix > 0 ? '-->' : '').concat(inputTemplate || _this26.options.template).concat(ix < d.length - 1 ? '<!--' : '');
+            var template = "".concat(ix > 0 ? '-->' : '').concat(inputTemplate || _this28.options.template).concat(ix < d.length - 1 ? '<!--' : '');
             // find conditional elements
             var ifMatches = _toConsumableArray(template.matchAll(/<\s*if[^>]*>([\s\S]*?)<\s*\/\s*if>/g));
             ifMatches.forEach(function (m) {
@@ -3816,7 +3953,7 @@ var WebsyResultList = /*#__PURE__*/function () {
                 parts.forEach(function (p) {
                   items = items[p];
                 });
-                template = template.replace(m[0], _this26.buildHTML(items, 0, withoutFor, [].concat(_toConsumableArray(locator), ["".concat(startIndex + ix, ":").concat(c)])));
+                template = template.replace(m[0], _this28.buildHTML(items, 0, withoutFor, [].concat(_toConsumableArray(locator), ["".concat(startIndex + ix, ":").concat(c)])));
               }
             });
             var tagMatches = _toConsumableArray(template.matchAll(/(\sdata-event=["|']\w.+)["|']/g));
@@ -3825,7 +3962,7 @@ var WebsyResultList = /*#__PURE__*/function () {
                 template = template.replace(m[0], "".concat(m[0], " data-id=").concat(startIndex + ix, " data-locator='").concat(locator.join(';'), "'"));
               }
             });
-            var flatRow = _this26.flattenObject(row);
+            var flatRow = _this28.flattenObject(row);
             for (var key in flatRow) {
               var rg = new RegExp("{".concat(key, "}"), 'gm');
               template = template.replace(rg, flatRow[key] || '');
@@ -3950,15 +4087,15 @@ var WebsyResultList = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-      var _this27 = this;
+      var _this29 = this;
       if (this.options.entity) {
         var url = this.options.entity;
         if (this.options.sortField) {
           url += (url.indexOf('?') === -1 ? '?' : '&') + "by=".concat(this.options.sortField, "&order=").concat(this.options.sortOrder || 'ASC');
         }
         this.apiService.get(url).then(function (results) {
-          _this27.rows = results.rows;
-          _this27.resize();
+          _this29.rows = results.rows;
+          _this29.resize();
         });
       } else {
         this.resize();
@@ -4028,12 +4165,12 @@ var WebsyRouter = /*#__PURE__*/function () {
   _createClass(WebsyRouter, [{
     key: "addGroup",
     value: function addGroup(group) {
-      var _this28 = this;
+      var _this30 = this;
       if (!this.groups[group]) {
         var els = document.querySelectorAll(".websy-view[data-group=\"".concat(group, "\"]"));
         if (els) {
           this.getClosestParent(els[0], function (parent) {
-            _this28.groups[group] = {
+            _this30.groups[group] = {
               activeView: '',
               views: [],
               parent: parent.getAttribute('data-view')
@@ -4097,7 +4234,7 @@ var WebsyRouter = /*#__PURE__*/function () {
   }, {
     key: "removeUrlParams",
     value: function removeUrlParams() {
-      var _this29 = this;
+      var _this31 = this;
       var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       var reloadView = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var noHistory = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
@@ -4105,7 +4242,7 @@ var WebsyRouter = /*#__PURE__*/function () {
       var path = '';
       if (this.currentParams && this.currentParams.items) {
         params.forEach(function (p) {
-          delete _this29.currentParams.items[p];
+          delete _this31.currentParams.items[p];
         });
         path = this.buildUrlPath(this.currentParams.items);
       }
@@ -4436,11 +4573,11 @@ var WebsyRouter = /*#__PURE__*/function () {
   }, {
     key: "showComponents",
     value: function showComponents(view) {
-      var _this30 = this;
+      var _this32 = this;
       if (this.options.views && this.options.views[view] && this.options.views[view].components) {
         this.options.views[view].components.forEach(function (c) {
           if (typeof c.instance === 'undefined') {
-            _this30.prepComponent(c.elementId, c.options);
+            _this32.prepComponent(c.elementId, c.options);
             c.instance = new c.Component(c.elementId, c.options);
           } else if (c.instance.render) {
             c.instance.render();
@@ -4784,7 +4921,7 @@ var Switch = /*#__PURE__*/function () {
 /* global WebsyDesigns */
 var WebsyTemplate = /*#__PURE__*/function () {
   function WebsyTemplate(elementId, options) {
-    var _this31 = this;
+    var _this33 = this;
     _classCallCheck(this, WebsyTemplate);
     var DEFAULTS = {
       listeners: {
@@ -4804,8 +4941,8 @@ var WebsyTemplate = /*#__PURE__*/function () {
     }
     if (_typeof(options.template) === 'object' && options.template.url) {
       this.templateService.get(options.template.url).then(function (templateString) {
-        _this31.options.template = templateString;
-        _this31.render();
+        _this33.options.template = templateString;
+        _this33.render();
       });
     } else {
       this.render();
@@ -4814,7 +4951,7 @@ var WebsyTemplate = /*#__PURE__*/function () {
   _createClass(WebsyTemplate, [{
     key: "buildHTML",
     value: function buildHTML() {
-      var _this32 = this;
+      var _this34 = this;
       var html = "";
       if (this.options.template) {
         var template = this.options.template;
@@ -4863,14 +5000,14 @@ var WebsyTemplate = /*#__PURE__*/function () {
                   }
                 }
                 if (polarity === true) {
-                  if (typeof _this32.options.data[parts[0]] !== 'undefined' && _this32.options.data[parts[0]] === parts[1]) {
+                  if (typeof _this34.options.data[parts[0]] !== 'undefined' && _this34.options.data[parts[0]] === parts[1]) {
                     // remove the <if> tags
                     removeAll = false;
                   } else if (parts[0] === parts[1]) {
                     removeAll = false;
                   }
                 } else if (polarity === false) {
-                  if (typeof _this32.options.data[parts[0]] !== 'undefined' && _this32.options.data[parts[0]] !== parts[1]) {
+                  if (typeof _this34.options.data[parts[0]] !== 'undefined' && _this34.options.data[parts[0]] !== parts[1]) {
                     // remove the <if> tags
                     removeAll = false;
                   }
@@ -4907,7 +5044,55 @@ var WebsyTemplate = /*#__PURE__*/function () {
   }, {
     key: "handleClick",
     value: function handleClick(event) {
-      // 
+      if (event.target.classList.contains('clickable')) {
+        this.handleEvent(event, 'clickable', 'click');
+      }
+    }
+  }, {
+    key: "handleEvent",
+    value: function handleEvent(event, eventType, action) {
+      var l = event.target.getAttribute('data-event');
+      if (l) {
+        l = l.split('(');
+        var params = [];
+        var id = event.target.getAttribute('data-id');
+        // const locator = event.target.getAttribute('data-locator')
+        // if (l[1]) {
+        //   l[1] = l[1].replace(')', '')
+        //   params = l[1].split(',')      
+        // }
+        // l = l[0]
+        var data = this.options.data;
+        // if (locator !== '') {
+        //   let locatorItems = locator.split(';')
+        //   locatorItems.forEach(loc => {
+        //     let locatorParts = loc.split(':')
+        //     if (data[locatorParts[0]]) {
+        //       data = data[locatorParts[0]]
+        //       let parts = locatorParts[1].split('.')
+        //       parts.forEach(p => {
+        //         data = data[p]
+        //       })              
+        //     }
+        //   })
+        // }
+        // params = params.map(p => {
+        //   if (typeof p !== 'string' && typeof p !== 'number') {
+        //     if (data[+id]) {
+        //       p = data[+id][p]
+        //     }
+        //   }
+        //   else if (typeof p === 'string') {
+        //     p = p.replace(/"/g, '').replace(/'/g, '')
+        //   }
+        //   return p
+        // })
+        if (event.target.classList.contains(eventType) && this.options.listeners[action] && this.options.listeners[action][l]) {
+          var _this$options$listene2;
+          event.stopPropagation();
+          (_this$options$listene2 = this.options.listeners[action][l]).call.apply(_this$options$listene2, [this, event, data[+id]].concat(params));
+        }
+      }
     }
   }, {
     key: "render",
@@ -4945,7 +5130,9 @@ var WebsyUtils = {
       top: rect.top + scrollTop,
       left: rect.left + scrollLeft,
       bottom: rect.top + scrollTop + el.clientHeight,
-      right: rect.left + scrollLeft + el.clientWidth
+      right: rect.left + scrollLeft + el.clientWidth,
+      width: rect.width,
+      height: rect.height
     };
   },
   getLightDark: function getLightDark(backgroundColor) {
@@ -5129,7 +5316,7 @@ var WebsyUtils = {
 /* global WebsyDesigns */
 var WebsyTable = /*#__PURE__*/function () {
   function WebsyTable(elementId, options) {
-    var _this33 = this;
+    var _this35 = this;
     _classCallCheck(this, WebsyTable);
     var DEFAULTS = {
       pageSize: 20,
@@ -5161,8 +5348,8 @@ var WebsyTable = /*#__PURE__*/function () {
           allowClear: false,
           disableSearch: true,
           onItemSelected: function onItemSelected(selectedItem) {
-            if (_this33.options.onChangePageSize) {
-              _this33.options.onChangePageSize(selectedItem.value);
+            if (_this35.options.onChangePageSize) {
+              _this35.options.onChangePageSize(selectedItem.value);
             }
           }
         });
@@ -5181,19 +5368,19 @@ var WebsyTable = /*#__PURE__*/function () {
   _createClass(WebsyTable, [{
     key: "appendRows",
     value: function appendRows(data) {
-      var _this34 = this;
+      var _this36 = this;
       this.hideError();
       var bodyHTML = '';
       if (data) {
         bodyHTML += data.map(function (r, rowIndex) {
           return '<tr>' + r.map(function (c, i) {
-            if (_this34.options.columns[i].show !== false) {
+            if (_this36.options.columns[i].show !== false) {
               var style = '';
               if (c.style) {
                 style += c.style;
               }
-              if (_this34.options.columns[i].width) {
-                style += "width: ".concat(_this34.options.columns[i].width, "; ");
+              if (_this36.options.columns[i].width) {
+                style += "width: ".concat(_this36.options.columns[i].width, "; ");
               }
               if (c.backgroundColor) {
                 style += "background-color: ".concat(c.backgroundColor, "; ");
@@ -5204,16 +5391,16 @@ var WebsyTable = /*#__PURE__*/function () {
               if (c.color) {
                 style += "color: ".concat(c.color, "; ");
               }
-              if (_this34.options.columns[i].showAsLink === true && c.value.trim() !== '') {
-                return "\n                <td \n                  data-row-index='".concat(_this34.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this34.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >\n                  <a href='").concat(c.value, "' target='").concat(_this34.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this34.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
-              } else if ((_this34.options.columns[i].showAsNavigatorLink === true || _this34.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
-                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this34.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='websy-trigger trigger-item ").concat(_this34.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this34.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this34.options.columns[i].linkText || c.value, "</td>\n              ");
+              if (_this36.options.columns[i].showAsLink === true && c.value.trim() !== '') {
+                return "\n                <td \n                  data-row-index='".concat(_this36.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this36.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >\n                  <a href='").concat(c.value, "' target='").concat(_this36.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this36.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
+              } else if ((_this36.options.columns[i].showAsNavigatorLink === true || _this36.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
+                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this36.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='websy-trigger trigger-item ").concat(_this36.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this36.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this36.options.columns[i].linkText || c.value, "</td>\n              ");
               } else {
                 var info = c.value;
-                if (_this34.options.columns[i].showAsImage === true) {
+                if (_this36.options.columns[i].showAsImage === true) {
                   c.value = "\n                  <img src='".concat(c.value, "'>\n                ");
                 }
-                return "\n                <td \n                  data-info='".concat(info, "' \n                  data-row-index='").concat(_this34.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this34.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.value, "</td>\n              ");
+                return "\n                <td \n                  data-info='".concat(info, "' \n                  data-row-index='").concat(_this36.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this36.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.value, "</td>\n              ");
               }
             }
           }).join('') + '</tr>';
@@ -5372,7 +5559,7 @@ var WebsyTable = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(data) {
-      var _this35 = this;
+      var _this37 = this;
       if (!this.options.columns) {
         return;
       }
@@ -5399,7 +5586,7 @@ var WebsyTable = /*#__PURE__*/function () {
           if (c.width) {
             style += "width: ".concat(c.width || 'auto', ";");
           }
-          return "\n        <th style=\"".concat(style, "\">\n          <div class =\"tableHeader\">\n            <div class=\"leftSection\">\n              <div\n                class=\"tableHeaderField ").concat(['asc', 'desc'].indexOf(c.sort) !== -1 ? 'sortable-column' : '', "\"\n                data-index=\"").concat(i, "\"                \n                data-sort=\"").concat(c.sort, "\"                \n              >\n                ").concat(c.name, "\n              </div>\n            </div>\n            <div class=\"").concat(c.activeSort ? c.sort + ' sortOrder' : '', "\"></div>\n            <!--").concat(c.searchable === true ? _this35.buildSearchIcon(c.qGroupFieldDefs[0]) : '', "-->\n          </div>\n        </th>\n        ");
+          return "\n        <th style=\"".concat(style, "\">\n          <div class =\"tableHeader\">\n            <div class=\"leftSection\">\n              <div\n                class=\"tableHeaderField ").concat(['asc', 'desc'].indexOf(c.sort) !== -1 ? 'sortable-column' : '', "\"\n                data-index=\"").concat(i, "\"                \n                data-sort=\"").concat(c.sort, "\"                \n              >\n                ").concat(c.name, "\n              </div>\n            </div>\n            <div class=\"").concat(c.activeSort ? c.sort + ' sortOrder' : '', "\"></div>\n            <!--").concat(c.searchable === true ? _this37.buildSearchIcon(c.qGroupFieldDefs[0]) : '', "-->\n          </div>\n        </th>\n        ");
         }
       }).join('') + '</tr>';
       var headEl = document.getElementById("".concat(this.elementId, "_head"));
@@ -5417,7 +5604,7 @@ var WebsyTable = /*#__PURE__*/function () {
         var pagingEl = document.getElementById("".concat(this.elementId, "_pageList"));
         if (pagingEl) {
           var pages = new Array(this.options.pageCount).fill('').map(function (item, index) {
-            return "<li data-page=\"".concat(index, "\" class=\"websy-page-num ").concat(_this35.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
+            return "<li data-page=\"".concat(index, "\" class=\"websy-page-num ").concat(_this37.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
           });
           var startIndex = 0;
           if (this.options.pageCount > 8) {
@@ -5472,7 +5659,7 @@ var WebsyTable = /*#__PURE__*/function () {
 /* global WebsyDesigns */
 var WebsyTable2 = /*#__PURE__*/function () {
   function WebsyTable2(elementId, options) {
-    var _this36 = this;
+    var _this38 = this;
     _classCallCheck(this, WebsyTable2);
     var DEFAULTS = {
       pageSize: 20,
@@ -5507,8 +5694,8 @@ var WebsyTable2 = /*#__PURE__*/function () {
           allowClear: false,
           disableSearch: true,
           onItemSelected: function onItemSelected(selectedItem) {
-            if (_this36.options.onChangePageSize) {
-              _this36.options.onChangePageSize(selectedItem.value);
+            if (_this38.options.onChangePageSize) {
+              _this38.options.onChangePageSize(selectedItem.value);
             }
           }
         });
@@ -5530,20 +5717,20 @@ var WebsyTable2 = /*#__PURE__*/function () {
   _createClass(WebsyTable2, [{
     key: "appendRows",
     value: function appendRows(data) {
-      var _this37 = this;
+      var _this39 = this;
       this.hideError();
       var bodyEl = document.getElementById("".concat(this.elementId, "_body"));
       var bodyHTML = '';
       if (data) {
         bodyHTML += data.map(function (r, rowIndex) {
           return '<tr>' + r.map(function (c, i) {
-            if (_this37.options.columns[i].show !== false) {
-              var style = "height: ".concat(_this37.options.cellSize, "px; line-height: ").concat(_this37.options.cellSize, "px;");
+            if (_this39.options.columns[i].show !== false) {
+              var style = "height: ".concat(_this39.options.cellSize, "px; line-height: ").concat(_this39.options.cellSize, "px;");
               if (c.style) {
                 style += c.style;
               }
-              if (_this37.options.columns[i].width) {
-                style += "width: ".concat(_this37.options.columns[i].width, "; ");
+              if (_this39.options.columns[i].width) {
+                style += "width: ".concat(_this39.options.columns[i].width, "; ");
               }
               if (c.backgroundColor) {
                 style += "background-color: ".concat(c.backgroundColor, "; ");
@@ -5554,16 +5741,16 @@ var WebsyTable2 = /*#__PURE__*/function () {
               if (c.color) {
                 style += "color: ".concat(c.color, "; ");
               }
-              if (_this37.options.columns[i].showAsLink === true && c.value.trim() !== '') {
-                return "\n                <td \n                  data-row-index='".concat(_this37.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this37.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >\n                  <a href='").concat(c.value, "' target='").concat(_this37.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this37.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
-              } else if ((_this37.options.columns[i].showAsNavigatorLink === true || _this37.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
-                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this37.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='websy-trigger trigger-item ").concat(_this37.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this37.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this37.options.columns[i].linkText || c.value, "</td>\n              ");
+              if (_this39.options.columns[i].showAsLink === true && c.value.trim() !== '') {
+                return "\n                <td \n                  data-row-index='".concat(_this39.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this39.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >\n                  <a href='").concat(c.value, "' target='").concat(_this39.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this39.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
+              } else if ((_this39.options.columns[i].showAsNavigatorLink === true || _this39.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
+                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this39.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='websy-trigger trigger-item ").concat(_this39.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this39.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this39.options.columns[i].linkText || c.value, "</td>\n              ");
               } else {
                 var info = c.value;
-                if (_this37.options.columns[i].showAsImage === true) {
+                if (_this39.options.columns[i].showAsImage === true) {
                   c.value = "\n                  <img src='".concat(c.value, "'>\n                ");
                 }
-                return "\n                <td \n                  data-info='".concat(info, "' \n                  data-row-index='").concat(_this37.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this37.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.value, "</td>\n              ");
+                return "\n                <td \n                  data-info='".concat(info, "' \n                  data-row-index='").concat(_this39.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this39.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.value, "</td>\n              ");
               }
             }
           }).join('') + '</tr>';
@@ -5797,7 +5984,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(data) {
-      var _this38 = this;
+      var _this40 = this;
       if (!this.options.columns) {
         return;
       }
@@ -5825,7 +6012,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
           if (c.width) {
             style += "width: ".concat(c.width || 'auto', "; ");
           }
-          return "\n        <th style=\"".concat(style, "\">\n          <div class =\"tableHeader\">\n            <div class=\"leftSection\">\n              <div\n                class=\"tableHeaderField ").concat(['asc', 'desc'].indexOf(c.sort) !== -1 ? 'sortable-column' : '', "\"\n                data-sort-index=\"").concat(c.sortIndex || i, "\"\n                data-index=\"").concat(i, "\"\n                data-sort=\"").concat(c.sort, "\"\n                style=\"").concat(c.style || '', "\"                \n              >\n                ").concat(c.name, "\n              </div>\n            </div>\n            <div class=\"").concat(c.activeSort ? c.sort + ' sortOrder' : '', "\"></div>\n            ").concat(c.searchable === true ? _this38.buildSearchIcon(i) : '', "\n          </div>\n        </th>\n        ");
+          return "\n        <th style=\"".concat(style, "\">\n          <div class =\"tableHeader\">\n            <div class=\"leftSection\">\n              <div\n                class=\"tableHeaderField ").concat(['asc', 'desc'].indexOf(c.sort) !== -1 ? 'sortable-column' : '', "\"\n                data-sort-index=\"").concat(c.sortIndex || i, "\"\n                data-index=\"").concat(i, "\"\n                data-sort=\"").concat(c.sort, "\"\n                style=\"").concat(c.style || '', "\"                \n              >\n                ").concat(c.name, "\n              </div>\n            </div>\n            <div class=\"").concat(c.activeSort ? c.sort + ' sortOrder' : '', "\"></div>\n            ").concat(c.searchable === true ? _this40.buildSearchIcon(i) : '', "\n          </div>\n        </th>\n        ");
         }
       }).join('') + '</tr>';
       var headEl = document.getElementById("".concat(this.elementId, "_head"));
@@ -5835,7 +6022,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
         var dropdownHTML = "";
         this.options.columns.forEach(function (c, i) {
           if (c.searchable && c.searchField) {
-            dropdownHTML += "\n            <div id=\"".concat(_this38.elementId, "_columnSearch_").concat(i, "\" class=\"websy-modal-dropdown\"></div>\n          ");
+            dropdownHTML += "\n            <div id=\"".concat(_this40.elementId, "_columnSearch_").concat(i, "\" class=\"websy-modal-dropdown\"></div>\n          ");
           }
         });
         dropdownEl.innerHTML = dropdownHTML;
@@ -5855,7 +6042,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
         var pagingEl = document.getElementById("".concat(this.elementId, "_pageList"));
         if (pagingEl) {
           var pages = new Array(this.options.pageCount).fill('').map(function (item, index) {
-            return "<li data-page=\"".concat(index, "\" class=\"websy-page-num ").concat(_this38.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
+            return "<li data-page=\"".concat(index, "\" class=\"websy-page-num ").concat(_this40.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
           });
           var startIndex = 0;
           if (this.options.pageCount > 8) {
@@ -5932,17 +6119,17 @@ var WebsyTable2 = /*#__PURE__*/function () {
   }, {
     key: "getColumnParameters",
     value: function getColumnParameters(values) {
-      var _this39 = this;
+      var _this41 = this;
       var tableEl = document.getElementById("".concat(this.elementId, "_table"));
       tableEl.style.tableLayout = 'auto';
       tableEl.style.width = 'auto';
       var headEl = document.getElementById("".concat(this.elementId, "_head"));
       var bodyEl = document.getElementById("".concat(this.elementId, "_body"));
       headEl.innerHTML = '<tr style="visibility: hidden;">' + values.map(function (c, i) {
-        return "\n      <th>\n        <div class =\"tableHeader\">\n          <div class=\"leftSection\">\n            <div\n              class=\"tableHeaderField\"              \n            >\n              ".concat(c.value || 'nbsp;', "\n            </div>\n          </div>          \n          ").concat(c.searchable === true ? _this39.buildSearchIcon(i) : '', "\n        </div>\n      </th>\n    ");
+        return "\n      <th>\n        <div class =\"tableHeader\">\n          <div class=\"leftSection\">\n            <div\n              class=\"tableHeaderField\"              \n            >\n              ".concat(c.value || 'nbsp;', "\n            </div>\n          </div>          \n          ").concat(c.searchable === true ? _this41.buildSearchIcon(i) : '', "\n        </div>\n      </th>\n    ");
       }).join('') + '</tr>';
       bodyEl.innerHTML = '<tr style="visibility: hidden;">' + values.map(function (c) {
-        return "\n      <td                 \n        style='height: ".concat(_this39.options.cellSize, "px; line-height: ").concat(_this39.options.cellSize, "px; padding: 10px 5px;'\n      >").concat(c.value || '&nbsp;', "</td>\n    ");
+        return "\n      <td                 \n        style='height: ".concat(_this41.options.cellSize, "px; line-height: ").concat(_this41.options.cellSize, "px; padding: 10px 5px;'\n      >").concat(c.value || '&nbsp;', "</td>\n    ");
       }).join('') + '</tr>';
       // get height of the first data cell
       var cells = bodyEl.querySelectorAll("tr:first-of-type td");
@@ -6098,7 +6285,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "buildBodyHtml",
     value: function buildBodyHtml() {
-      var _this40 = this;
+      var _this42 = this;
       var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       var useWidths = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       if (!this.options.columns) {
@@ -6123,7 +6310,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
         row.forEach(function (cell, cellIndex) {
           var sizeIndex = cell.level || cellIndex;
           var colIndex = cell.index || cellIndex;
-          if (typeof sizingColumns[sizeIndex] === 'undefined' || sizingColumns[sizeIndex].show === false) {
+          if (typeof sizingColumns[sizeIndex] === 'undefined' || _this42.options.columns[_this42.options.columns.length - 1][colIndex].show === false) {
             return; // need to revisit this logic
           }
 
@@ -6150,7 +6337,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
             style += "color: ".concat(cell.color, "; ");
           }
           // console.log('rowspan', cell.rowspan)
-          bodyHtml += "<td \n          class='websy-table-cell ".concat(sizeIndex < _this40.pinnedColumns ? 'pinned' : 'unpinned', " ").concat((cell.classes || []).join(' '), " ").concat((sizingColumns[sizeIndex].classes || []).join(' '), "'\n          style='").concat(style, "'\n          data-info='").concat(cell.value.replace ? cell.value.replace(/'/g, '`') : cell.value, "'\n          colspan='").concat(cell.colspan || 1, "'\n          rowspan='").concat(cell.rowspan || 1, "'\n          data-row-index='").concat(rowIndex, "'\n          data-cell-index='").concat(cellIndex, "'\n          data-col-index='").concat(colIndex, "'\n        ");
+          bodyHtml += "<td \n          class='websy-table-cell ".concat(sizeIndex < _this42.pinnedColumns ? 'pinned' : 'unpinned', " ").concat((cell.classes || []).join(' '), " ").concat((sizingColumns[sizeIndex].classes || []).join(' '), "'\n          style='").concat(style, "'\n          data-info='").concat(cell.value.replace ? cell.value.replace(/'/g, '`') : cell.value, "'\n          colspan='").concat(cell.colspan || 1, "'\n          rowspan='").concat(cell.rowspan || 1, "'\n          data-row-index='").concat(rowIndex, "'\n          data-cell-index='").concat(cellIndex, "'\n          data-col-index='").concat(colIndex, "'\n        ");
           // if (useWidths === true) {
           //   bodyHtml += `
           //     style='width: ${sizingColumns[cellIndex].width || sizingColumns[cellIndex].actualWidth}px!important'
@@ -6159,10 +6346,10 @@ var WebsyTable3 = /*#__PURE__*/function () {
           // }
           bodyHtml += "\n        ><div \n          style='".concat(divStyle, "' \n          class='websy-table-cell-content'\n          data-row-index='").concat(rowIndex, "'\n          data-cell-index='").concat(cellIndex, "'\n          data-col-index='").concat(colIndex, "'\n        >");
           if (cell.expandable === true) {
-            bodyHtml += "<i \n            data-row-index='".concat(rowIndex, "'\n            data-col-index='").concat(cell.level || cellIndex, "'\n            class='websy-table-cell-expand'\n          >").concat(_this40.options.plusIcon, "</i>");
+            bodyHtml += "<i \n            data-row-index='".concat(rowIndex, "'\n            data-col-index='").concat(cell.level || cellIndex, "'\n            class='websy-table-cell-expand'\n          >").concat(_this42.options.plusIcon, "</i>");
           }
           if (cell.collapsable === true) {
-            bodyHtml += "<i \n            data-row-index='".concat(rowIndex, "'\n            data-col-index='").concat(cell.level || cellIndex, "'\n            class='websy-table-cell-collapse'\n          >").concat(_this40.options.minusIcon, "</i>");
+            bodyHtml += "<i \n            data-row-index='".concat(rowIndex, "'\n            data-col-index='").concat(cell.level || cellIndex, "'\n            class='websy-table-cell-collapse'\n          >").concat(_this42.options.minusIcon, "</i>");
           }
           if (sizingColumns[sizeIndex].showAsLink === true && cell.value.trim() !== '') {
             cell.value = "\n            <a href=\"".concat(encodeURI(cell.value), "\" target='").concat(sizingColumns[sizeIndex].openInNewTab === true ? '_blank' : '_self', "'>").concat(cell.displayText || sizingColumns[sizeIndex].linkText || cell.value, "</a>\n          ");
@@ -6183,7 +6370,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "buildHeaderHtml",
     value: function buildHeaderHtml() {
-      var _this41 = this;
+      var _this43 = this;
       var useWidths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       if (!this.options.columns) {
         return '';
@@ -6200,7 +6387,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
         headerHtml += '</colgroup>';
       }
       this.options.columns.forEach(function (row, rowIndex) {
-        if (useWidths === false && rowIndex !== _this41.options.columns.length - 1) {
+        if (useWidths === false && rowIndex !== _this43.options.columns.length - 1) {
           // if we're calculating the size we only want to render the last row of column headers
           return;
         }
@@ -6224,24 +6411,24 @@ var WebsyTable3 = /*#__PURE__*/function () {
           if (col.style) {
             style += col.style;
           }
-          headerHtml += "<td \n          class='websy-table-cell ".concat(colIndex < _this41.pinnedColumns ? 'pinned' : 'unpinned', " ").concat((col.classes || []).join(' '), "'  \n          style='").concat(style, "'       \n          colspan='").concat(col.colspan || 1, "'\n          rowspan='").concat(col.rowspan || 1, "'\n        ");
+          headerHtml += "<td \n          class='websy-table-cell ".concat(colIndex < _this43.pinnedColumns ? 'pinned' : 'unpinned', " ").concat((col.classes || []).join(' '), "'  \n          style='").concat(style, "'       \n          colspan='").concat(col.colspan || 1, "'\n          rowspan='").concat(col.rowspan || 1, "'\n        ");
           // if (useWidths === true && rowIndex === this.options.columns.length - 1) {
           //   headerHtml += `
           //     style='width: ${col.width || col.actualWidth}px'
           //     width='${col.width || col.actualWidth}'
           //   `
           // }
-          headerHtml += ">\n          <div \n            style='".concat(divStyle, "'\n            data-col-index=\"").concat(colIndex, "\"\n            class='").concat(['asc', 'desc'].indexOf(col.sort) !== -1 ? 'sortable-column' : '', "'\n          >\n            ").concat(col.name).concat(col.activeSort ? _this41.buildSortIcon(col.sort, colIndex) : '').concat(col.searchable === true ? _this41.buildSearchIcon(col, colIndex) : '', "\n          </div>\n        </td>");
+          headerHtml += ">\n          <div \n            style='".concat(divStyle, "'\n            data-col-index=\"").concat(colIndex, "\"\n            class='").concat(['asc', 'desc'].indexOf(col.sort) !== -1 ? 'sortable-column' : '', "'\n          >\n            ").concat(col.name).concat(col.activeSort ? _this43.buildSortIcon(col.sort, colIndex) : '').concat(col.searchable === true ? _this43.buildSearchIcon(col, colIndex) : '', "\n          </div>\n        </td>");
         });
         headerHtml += "</tr>";
       });
       var dropdownEl = document.getElementById("".concat(this.elementId, "_dropdownContainer"));
       this.options.columns[this.options.columns.length - 1].forEach(function (c, i) {
         if (c.searchable && c.isExternalSearch === true) {
-          var testEl = document.getElementById("".concat(_this41.elementId, "_columnSearch_").concat(c.dimId || i));
+          var testEl = document.getElementById("".concat(_this43.elementId, "_columnSearch_").concat(c.dimId || i));
           if (!testEl) {
             var newE = document.createElement('div');
-            newE.id = "".concat(_this41.elementId, "_columnSearch_").concat(c.dimId || i);
+            newE.id = "".concat(_this43.elementId, "_columnSearch_").concat(c.dimId || i);
             newE.className = 'websy-modal-dropdown';
             dropdownEl.appendChild(newE);
           }
@@ -6264,7 +6451,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "buildTotalHtml",
     value: function buildTotalHtml() {
-      var _this42 = this;
+      var _this44 = this;
       var useWidths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       if (!this.options.totals) {
         return '';
@@ -6280,7 +6467,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
 
         totalHtml += "<td \n        class='websy-table-cell ".concat((col.classes || []).join(' '), "'\n        colspan='").concat(col.colspan || 1, "'\n        rowspan='").concat(col.rowspan || 1, "'\n      ");
         if (useWidths === true) {
-          totalHtml += "\n          style='width: ".concat(_this42.options.columns[_this42.options.columns.length - 1][colIndex].width || _this42.options.columns[_this42.options.columns.length - 1][colIndex].actualWidth, "px'\n          width='").concat(col.width || col.actualWidth, "'\n        ");
+          totalHtml += "\n          style='width: ".concat(_this44.options.columns[_this44.options.columns.length - 1][colIndex].width || _this44.options.columns[_this44.options.columns.length - 1][colIndex].actualWidth, "px'\n          width='").concat(col.width || col.actualWidth, "'\n        ");
         }
         totalHtml += "        \n        >\n        ".concat(col.value, "\n      </td>");
       });
@@ -6290,7 +6477,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "calculateSizes",
     value: function calculateSizes() {
-      var _this43 = this;
+      var _this45 = this;
       var sample = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       var totalRowCount = arguments.length > 1 ? arguments[1] : undefined;
       var totalColumnCount = arguments.length > 2 ? arguments[2] : undefined;
@@ -6334,7 +6521,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
       rows.forEach(function (row, rowIndex) {
         Array.from(row.children).forEach(function (col, colIndex) {
           var colSize = col.getBoundingClientRect();
-          _this43.sizes.cellHeight = colSize.height;
+          _this45.sizes.cellHeight = colSize.height;
           if (columnsForSizing[colIndex]) {
             if (!columnsForSizing[colIndex].actualWidth) {
               columnsForSizing[colIndex].potentialWidth = 0;
@@ -6346,7 +6533,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
             //   columnsForSizing[colIndex].actualWidth = columnsForSizing[colIndex].width
             // }
             columnsForSizing[colIndex].cellHeight = colSize.height;
-            if (colIndex >= _this43.pinnedColumns) {
+            if (colIndex >= _this45.pinnedColumns) {
               firstNonPinnedColumnWidth = columnsForSizing[colIndex].actualWidth;
             }
           }
@@ -6361,7 +6548,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
         return a + (b.width || b.actualWidth);
       }, 0);
       this.sizes.totalNonPinnedWidth = columnsForSizing.filter(function (c, i) {
-        return i >= _this43.pinnedColumns;
+        return i >= _this45.pinnedColumns;
       }).reduce(function (a, b) {
         return a + (b.width || b.actualWidth);
       }, 0);
@@ -6372,7 +6559,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
         var availableSpace = this.sizes.table.width - this.sizes.totalWidth;
         columnsForSizing.forEach(function (c) {
           c.shouldGrow = true;
-          if (_this43.options.autoFitColumns === false) {
+          if (_this45.options.autoFitColumns === false) {
             c.shouldGrow = false;
             if (c.potentialWidth > c.actualWidth) {
               c.shouldGrow = true;
@@ -6391,7 +6578,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
           // if (!c.width) {
           // if (c.actualWidth < equalWidth) {
           // adjust the width
-          if (_this43.options.autoFitColumns === true) {
+          if (_this45.options.autoFitColumns === true) {
             if (c.width) {
               c.width += equalWidth;
             }
@@ -6415,9 +6602,9 @@ var WebsyTable3 = /*#__PURE__*/function () {
           }
           //   }
           // }
-          _this43.sizes.totalWidth += c.width || c.actualWidth;
-          if (i > _this43.pinnedColumns) {
-            _this43.sizes.totalNonPinnedWidth += c.width || c.actualWidth;
+          _this45.sizes.totalWidth += c.width || c.actualWidth;
+          if (i > _this45.pinnedColumns) {
+            _this45.sizes.totalNonPinnedWidth += c.width || c.actualWidth;
           }
           // equalWidth = (outerSize.width - this.sizes.totalWidth) / (this.options.columns[this.options.columns.length - 1].length - (i + 1))
         });
@@ -6476,7 +6663,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "createSample",
     value: function createSample(data) {
-      var _this44 = this;
+      var _this46 = this;
       var output = [];
       this.options.columns[this.options.columns.length - 1].forEach(function (col, colIndex) {
         if (col.maxLength) {
@@ -6486,7 +6673,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
         } else if (data) {
           var longest = '';
           for (var i = 0; i < Math.min(data.length, 1000); i++) {
-            if (data[i].length === _this44.options.columns[_this44.options.columns.length - 1].length) {
+            if (data[i].length === _this46.options.columns[_this46.options.columns.length - 1].length) {
               if (longest.length < data[i][colIndex].value.length) {
                 longest = data[i][colIndex].value;
               }
@@ -6758,7 +6945,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "perpetualScroll",
     value: function perpetualScroll() {
-      var _this45 = this;
+      var _this47 = this;
       // if the currentTouchtime and touchEndTime are more than 300ms apart then we abort the perpetual scroll
       if (this.touchEndTime - this.currentTouchtime > 300) {
         return;
@@ -6777,17 +6964,17 @@ var WebsyTable3 = /*#__PURE__*/function () {
       var direction = touchDistance > 0 ? -1 : 1;
       var _loop2 = function _loop2(i) {
         setTimeout(function () {
-          var delta = _this45.mouseYStart - _this45.currentClientY + _this45.sizes.cellHeight * (i + 1) * direction;
+          var delta = _this47.mouseYStart - _this47.currentClientY + _this47.sizes.cellHeight * (i + 1) * direction;
           delta = Math.min(10, delta);
           delta = Math.max(-10, delta);
           // only run this if isPerpetual === true
           // this value is reset to false on touchStart
-          if (_this45.isPerpetual === true) {
+          if (_this47.isPerpetual === true) {
             // this.$scope.scrollTop += (delta / (this.$scope.layout.qHyperCube.qSize.qcy / this.$scope.rowsToLoad / (this.$scope.totalSpaceAvailable / 250)))
             // this.$scope.scrollTop += (delta / (this.$scope.layout.qHyperCube.qSize.qcy / this.$scope.rowsToLoad / (this.$scope.totalSpaceAvailable / 200)))
-            _this45.scrollY(Math.max(-5, Math.min(5, delta)));
-            if (_this45.scrollTimeout) {
-              clearTimeout(_this45.scrollTimeout);
+            _this47.scrollY(Math.max(-5, Math.min(5, delta)));
+            if (_this47.scrollTimeout) {
+              clearTimeout(_this47.scrollTimeout);
             }
           }
         }, 1000 / fps * i);
@@ -7055,7 +7242,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
 /* global d3 include WebsyDesigns */
 var WebsyChart = /*#__PURE__*/function () {
   function WebsyChart(elementId, options) {
-    var _this46 = this;
+    var _this48 = this;
     _classCallCheck(this, WebsyChart);
     var DEFAULTS = {
       margin: {
@@ -7112,7 +7299,7 @@ var WebsyChart = /*#__PURE__*/function () {
     this.invertOverride = function (input, input2) {
       var forBrush = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var xAxis = 'bottom';
-      if (_this46.options.orientation === 'horizontal') {
+      if (_this48.options.orientation === 'horizontal') {
         xAxis = 'left';
       }
       if (forBrush === true) {
@@ -7120,12 +7307,12 @@ var WebsyChart = /*#__PURE__*/function () {
       }
       xAxis += 'Axis';
       var output;
-      var width = _this46.options.data[xAxis.replace('Brush', '').replace('Axis', '')].bandWidth;
+      var width = _this48.options.data[xAxis.replace('Brush', '').replace('Axis', '')].bandWidth;
       // if (this.customBottomRange) {
-      for (var index = 0; index < _this46.customBottomRange.length; index++) {
-        if (input > _this46.customBottomRange[index]) {
-          if (_this46.customBottomRange[index + 1]) {
-            if (input < _this46.customBottomRange[index + 1]) {
+      for (var index = 0; index < _this48.customBottomRange.length; index++) {
+        if (input > _this48.customBottomRange[index]) {
+          if (_this48.customBottomRange[index + 1]) {
+            if (input < _this48.customBottomRange[index + 1]) {
               output = index;
               break;
             }
@@ -7300,9 +7487,9 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "handleEventMouseMove",
     value: function handleEventMouseMove(event, d) {
-      var _this47 = this;
+      var _this49 = this;
       var bisectDate = d3.bisector(function (d) {
-        return _this47.parseX(d.x.value);
+        return _this49.parseX(d.x.value);
       }).left;
       if (this.options.showTrackingLine === true && d3.pointer(event)) {
         var xAxis = 'bottomAxis';
@@ -7335,9 +7522,9 @@ var WebsyChart = /*#__PURE__*/function () {
           xLabel = _toConsumableArray(this[xAxis].domain().reverse())[x0];
         }
         this.options.data.series.forEach(function (s) {
-          if (_this47.options.data[xData].scale !== 'Time') {
+          if (_this49.options.data[xData].scale !== 'Time') {
             // if (this.customBottomRange && this.customBottomRange.length > 0) {
-            xPoint = _this47.customBottomRange[x0] + (_this47.customBottomRange[x0 + 1] - _this47.customBottomRange[x0]) / 2;
+            xPoint = _this49.customBottomRange[x0] + (_this49.customBottomRange[x0 + 1] - _this49.customBottomRange[x0]) / 2;
             // }
             // else {
             //   xPoint = this[xAxis](this.parseX(xLabel))
@@ -7357,41 +7544,41 @@ var WebsyChart = /*#__PURE__*/function () {
             var index = bisectDate(s.data, x0, 1);
             var pointA = s.data[index - 1];
             var pointB = s.data[index];
-            if (_this47.options.orientation === 'horizontal') {
+            if (_this49.options.orientation === 'horizontal') {
               pointA = _toConsumableArray(s.data).reverse()[index - 1];
               pointB = _toConsumableArray(s.data).reverse()[index];
             }
             if (pointA && !pointB) {
-              xPoint = _this47[xAxis](_this47.parseX(pointA.x.value));
+              xPoint = _this49[xAxis](_this49.parseX(pointA.x.value));
               tooltipTitle = pointA.x.value;
               if (!pointA.y.color) {
                 pointA.y.color = s.color;
               }
               tooltipData.push(pointA);
               if (typeof pointA.x.value.getTime !== 'undefined') {
-                tooltipTitle = d3.timeFormat(_this47.options.dateFormat || _this47.options.calculatedTimeFormatPattern)(pointA.x.value);
+                tooltipTitle = d3.timeFormat(_this49.options.dateFormat || _this49.options.calculatedTimeFormatPattern)(pointA.x.value);
               }
             }
             if (pointB && !pointA) {
-              xPoint = _this47[xAxis](_this47.parseX(pointB.x.value));
+              xPoint = _this49[xAxis](_this49.parseX(pointB.x.value));
               tooltipTitle = pointB.x.value;
               if (!pointB.y.color) {
                 pointB.y.color = s.color;
               }
               tooltipData.push(pointB);
               if (typeof pointB.x.value.getTime !== 'undefined') {
-                tooltipTitle = d3.timeFormat(_this47.options.dateFormat || _this47.options.calculatedTimeFormatPattern)(pointB.x.value);
+                tooltipTitle = d3.timeFormat(_this49.options.dateFormat || _this49.options.calculatedTimeFormatPattern)(pointB.x.value);
               }
             }
             if (pointA && pointB) {
-              var d0 = _this47[xAxis](_this47.parseX(pointA.x.value));
-              var d1 = _this47[xAxis](_this47.parseX(pointB.x.value));
+              var d0 = _this49[xAxis](_this49.parseX(pointA.x.value));
+              var d1 = _this49[xAxis](_this49.parseX(pointB.x.value));
               var mid = Math.abs(d0 - d1) / 2;
               if (d3.pointer(event)[0] - d0 >= mid) {
                 xPoint = d1;
                 tooltipTitle = pointB.x.value;
                 if (typeof pointB.x.value.getTime !== 'undefined') {
-                  tooltipTitle = d3.timeFormat(_this47.options.dateFormat || _this47.options.calculatedTimeFormatPattern)(pointB.x.value);
+                  tooltipTitle = d3.timeFormat(_this49.options.dateFormat || _this49.options.calculatedTimeFormatPattern)(pointB.x.value);
                 }
                 if (!pointB.y.color) {
                   pointB.y.color = s.color;
@@ -7401,7 +7588,7 @@ var WebsyChart = /*#__PURE__*/function () {
                 xPoint = d0;
                 tooltipTitle = pointA.x.value;
                 if (typeof pointB.x.value.getTime !== 'undefined') {
-                  tooltipTitle = d3.timeFormat(_this47.options.dateFormat || _this47.options.calculatedTimeFormatPattern)(pointB.x.value);
+                  tooltipTitle = d3.timeFormat(_this49.options.dateFormat || _this49.options.calculatedTimeFormatPattern)(pointB.x.value);
                 }
                 if (!pointA.y.color) {
                   pointA.y.color = s.color;
@@ -7527,7 +7714,7 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(options) {
-      var _this48 = this;
+      var _this50 = this;
       /* global d3 options WebsyUtils */
       if (typeof options !== 'undefined') {
         this.options = _extends({}, this.options, options);
@@ -7595,7 +7782,7 @@ var WebsyChart = /*#__PURE__*/function () {
               this.options.data.series.map(function (s, i) {
                 return {
                   value: s.label || s.key,
-                  color: s.color || _this48.options.colors[i % _this48.options.colors.length]
+                  color: s.color || _this50.options.colors[i % _this50.options.colors.length]
                 };
               });
             }
@@ -7952,25 +8139,25 @@ var WebsyChart = /*#__PURE__*/function () {
           if (this.options.data[customRangeSideLC].data && this.options.data[customRangeSideLC].data[0] && (this.options.data[customRangeSideLC].data[0].valueCount || 1) && this.options.data[customRangeSideLC].scale === 'Ordinal') {
             var acc = 0;
             this["custom".concat(customRangeSide, "Range")] = [0].concat(_toConsumableArray(this.options.data[customRangeSideLC].data.map(function (d, index, arr) {
-              var adjustment = _this48.bandPadding * index + _this48.bandPadding;
+              var adjustment = _this50.bandPadding * index + _this50.bandPadding;
               // if (this.options.data.bottom.padding) {
               // adjustment = (this.widthForCalc * this.options.data.bottom.padding) / (arr.length * 2)
               // }
-              var start = _this48.widthForCalc / noOfPoints * acc;
+              var start = _this50.widthForCalc / noOfPoints * acc;
               for (var i = 0; i < (d.valueCount || 1); i++) {
                 var pos = i * proposedBandWidth;
-                _this48["custom".concat(customRangeSide, "DetailRange")].push(start + adjustment + pos);
+                _this50["custom".concat(customRangeSide, "DetailRange")].push(start + adjustment + pos);
               }
-              acc += _this48.options.grouping !== 'stacked' && _this48.options.allowUnevenBands === true ? d.valueCount || 1 : 1;
-              var end = _this48.widthForCalc / noOfPoints * acc;
+              acc += _this50.options.grouping !== 'stacked' && _this50.options.allowUnevenBands === true ? d.valueCount || 1 : 1;
+              var end = _this50.widthForCalc / noOfPoints * acc;
               // this.customBottomBrushRange.push((end + adjustment) * (this.plotWidth / this.widthForCalc))
               return end + adjustment;
             })));
             acc = 0;
             this["custom".concat(customRangeSide, "BrushRange")] = [0].concat(_toConsumableArray(this.options.data[customRangeSideLC].data.map(function (d, index, arr) {
-              var adjustment = _this48.brushBandPadding * index + _this48.brushBandPadding;
-              acc += _this48.options.grouping !== 'stacked' && _this48.options.allowUnevenBands === true ? d.valueCount || 1 : 1;
-              return (_this48.options.orientation === 'vertical' ? _this48.plotWidth : _this48.plotHeight) / noOfPoints * acc;
+              var adjustment = _this50.brushBandPadding * index + _this50.brushBandPadding;
+              acc += _this50.options.grouping !== 'stacked' && _this50.options.allowUnevenBands === true ? d.valueCount || 1 : 1;
+              return (_this50.options.orientation === 'vertical' ? _this50.plotWidth : _this50.plotHeight) / noOfPoints * acc;
             })));
           }
           // }
@@ -8143,7 +8330,7 @@ var WebsyChart = /*#__PURE__*/function () {
             this.bAxisFunc = d3.axisBottom(this.bottomAxis).ticks(tickDefinition);
             if (this.options.data.bottom.formatter) {
               this.bAxisFunc.tickFormat(function (d) {
-                return _this48.options.data.bottom.formatter(d);
+                return _this50.options.data.bottom.formatter(d);
               });
             }
             this.bottomAxisLayer.call(this.bAxisFunc);
@@ -8153,7 +8340,7 @@ var WebsyChart = /*#__PURE__*/function () {
             }
             if (this.customBottomRange.length > 0) {
               this.bottomAxisLayer.selectAll('g').attr('transform', function (d, i) {
-                return "translate(".concat(_this48.customBottomRange[i] + (_this48.customBottomRange[i + 1] - _this48.customBottomRange[i]) / 2, ", 0)");
+                return "translate(".concat(_this50.customBottomRange[i] + (_this50.customBottomRange[i + 1] - _this50.customBottomRange[i]) / 2, ", 0)");
               });
             }
           }
@@ -8172,14 +8359,14 @@ var WebsyChart = /*#__PURE__*/function () {
           }
           if (this.options.margin.axisLeft > 0) {
             this.leftAxisLayer.call(d3.axisLeft(this.leftAxis).ticks(this.options.data.left.ticks || 5).tickFormat(function (d) {
-              if (_this48.options.data.left.formatter) {
-                d = _this48.options.data.left.formatter(d);
+              if (_this50.options.data.left.formatter) {
+                d = _this50.options.data.left.formatter(d);
               }
               return d;
             }));
             if (this.customLeftRange.length > 0) {
               this.leftAxisLayer.selectAll('g').attr('transform', function (d, i) {
-                return "translate(0, ".concat(_this48.customLeftRange[i] + (_this48.customLeftRange[i + 1] - _this48.customLeftRange[i]) / 2, ")");
+                return "translate(0, ".concat(_this50.customLeftRange[i] + (_this50.customLeftRange[i + 1] - _this50.customLeftRange[i]) / 2, ")");
               });
             }
           }
@@ -8207,8 +8394,8 @@ var WebsyChart = /*#__PURE__*/function () {
             }
             if (this.options.margin.axisRight > 0 && (this.options.data.right.min !== 0 || this.options.data.right.max !== 0)) {
               this.rightAxisLayer.call(d3.axisRight(this.rightAxis).ticks(this.options.data.right.ticks || 5).tickFormat(function (d) {
-                if (_this48.options.data.right.formatter) {
-                  d = _this48.options.data.right.formatter(d);
+                if (_this50.options.data.right.formatter) {
+                  d = _this50.options.data.right.formatter(d);
                 }
                 return d;
               }));
@@ -8248,50 +8435,50 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "renderComponents",
     value: function renderComponents() {
-      var _this49 = this;
+      var _this51 = this;
       // Draw the series data
       this.renderedKeys = {};
       this.options.data.series.forEach(function (series, index) {
         if (!series.key) {
-          series.key = _this49.createIdentity();
+          series.key = _this51.createIdentity();
         }
         if (!series.color) {
-          series.color = _this49.options.colors[index % _this49.options.colors.length];
+          series.color = _this51.options.colors[index % _this51.options.colors.length];
         }
-        _this49["render".concat(series.type || 'bar')](series, index);
-        _this49.renderLabels(series, index);
-        _this49.renderedKeys[series.key] = series.type;
+        _this51["render".concat(series.type || 'bar')](series, index);
+        _this51.renderLabels(series, index);
+        _this51.renderedKeys[series.key] = series.type;
       });
       this.refLineLayer.selectAll('.reference-line').remove();
       this.refLineLayer.selectAll('.reference-line-label').remove();
       if (this.options.refLines && this.options.refLines.length > 0) {
         this.options.refLines.forEach(function (l) {
-          return _this49.renderRefLine(l);
+          return _this51.renderRefLine(l);
         });
       }
     }
   }, {
     key: "renderarea",
     value: function renderarea(series, index) {
-      var _this50 = this;
+      var _this52 = this;
       /* global d3 series index */
       var drawArea = function drawArea(xAxis, yAxis, curveStyle) {
         return d3.area().x(function (d) {
-          if (_this50.options.data[xAxis].scale === 'Time') {
-            return _this50["".concat(xAxis, "Axis")](_this50.parseX(d.x.value));
+          if (_this52.options.data[xAxis].scale === 'Time') {
+            return _this52["".concat(xAxis, "Axis")](_this52.parseX(d.x.value));
           } else {
-            var xIndex = _this50[xAxis + 'Axis'].domain().indexOf(d.x.value);
-            var xPos = _this50["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex];
-            if (_this50["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1]) {
-              xPos = xPos + (_this50["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1] - xPos) / 2;
+            var xIndex = _this52[xAxis + 'Axis'].domain().indexOf(d.x.value);
+            var xPos = _this52["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex];
+            if (_this52["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1]) {
+              xPos = xPos + (_this52["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1] - xPos) / 2;
             }
             return xPos;
           }
         }).y0(function (d) {
-          return _this50["".concat(yAxis, "Axis")](0);
+          return _this52["".concat(yAxis, "Axis")](0);
         }).y1(function (d) {
-          return _this50["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value);
-        }).curve(d3[curveStyle || _this50.options.curveStyle]);
+          return _this52["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value);
+        }).curve(d3[curveStyle || _this52.options.curveStyle]);
       };
       var xAxis = 'bottom';
       var yAxis = series.axis === 'secondary' ? 'right' : 'left';
@@ -8331,7 +8518,7 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "renderbar",
     value: function renderbar(series, index) {
-      var _this51 = this;
+      var _this53 = this;
       /* global series index d3 */
       var xAxis = 'bottom';
       var yAxis = 'left';
@@ -8498,26 +8685,26 @@ var WebsyChart = /*#__PURE__*/function () {
       }
       bars.exit().transition(this.transition).style('fill-opacity', 1e-6).remove();
       bars.attr('width', function (d, i) {
-        return Math.abs(getBarWidth.call(_this51, d, i, yAxis, xAxis));
+        return Math.abs(getBarWidth.call(_this53, d, i, yAxis, xAxis));
       }).attr('height', function (d, i) {
-        return getBarHeight.call(_this51, d, i, yAxis, xAxis);
+        return getBarHeight.call(_this53, d, i, yAxis, xAxis);
       }).attr('x', function (d, i) {
-        return getBarX.call(_this51, d, i, yAxis, xAxis);
+        return getBarX.call(_this53, d, i, yAxis, xAxis);
       }).attr('y', function (d, i) {
-        return getBarY.call(_this51, d, i, yAxis, xAxis);
+        return getBarY.call(_this53, d, i, yAxis, xAxis);
       })
       // .transition(this.transition)  
       .attr('fill', function (d) {
         return d.y.color || d.color || series.color;
       });
       bars.enter().append('rect').attr('width', function (d, i) {
-        return Math.abs(getBarWidth.call(_this51, d, i, yAxis, xAxis));
+        return Math.abs(getBarWidth.call(_this53, d, i, yAxis, xAxis));
       }).attr('height', function (d, i) {
-        return getBarHeight.call(_this51, d, i, yAxis, xAxis);
+        return getBarHeight.call(_this53, d, i, yAxis, xAxis);
       }).attr('x', function (d, i) {
-        return getBarX.call(_this51, d, i, yAxis, xAxis);
+        return getBarX.call(_this53, d, i, yAxis, xAxis);
       }).attr('y', function (d, i) {
-        return getBarY.call(_this51, d, i, yAxis, xAxis);
+        return getBarY.call(_this53, d, i, yAxis, xAxis);
       })
       // .transition(this.transition)
       .attr('fill', function (d) {
@@ -8529,26 +8716,26 @@ var WebsyChart = /*#__PURE__*/function () {
         this.brushBarsInitialized[series.key] = true;
         brushBars.exit().transition(this.transition).style('fill-opacity', 1e-6).remove();
         brushBars.attr('width', function (d, i) {
-          return Math.abs(getBarWidth.call(_this51, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush")));
+          return Math.abs(getBarWidth.call(_this53, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush")));
         }).attr('height', function (d, i) {
-          return getBarHeight.call(_this51, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
+          return getBarHeight.call(_this53, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
         }).attr('x', function (d, i) {
-          return getBarX.call(_this51, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
+          return getBarX.call(_this53, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
         }).attr('y', function (d, i) {
-          return getBarY.call(_this51, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
+          return getBarY.call(_this53, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
         })
         // .transition(this.transition)  
         .attr('fill', function (d) {
           return d.y.color || d.color || series.color;
         });
         brushBars.enter().append('rect').attr('width', function (d, i) {
-          return Math.abs(getBarWidth.call(_this51, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush")));
+          return Math.abs(getBarWidth.call(_this53, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush")));
         }).attr('height', function (d, i) {
-          return getBarHeight.call(_this51, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
+          return getBarHeight.call(_this53, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
         }).attr('x', function (d, i) {
-          return getBarX.call(_this51, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
+          return getBarX.call(_this53, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
         }).attr('y', function (d, i) {
-          return getBarY.call(_this51, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
+          return getBarY.call(_this53, d, i, "".concat(yAxis, "Brush"), "".concat(xAxis, "Brush"));
         })
         // .transition(this.transition)
         .attr('fill', function (d) {
@@ -8569,7 +8756,7 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "renderLabels",
     value: function renderLabels(series, index) {
-      var _this52 = this;
+      var _this54 = this;
       /* global series index d3 WebsyDesigns */
       var xAxis = 'bottom';
       var yAxis = 'left';
@@ -8585,14 +8772,14 @@ var WebsyChart = /*#__PURE__*/function () {
         var labels = this.labelLayer.selectAll(".label_".concat(series.key)).data(series.data);
         labels.exit().transition(this.transition).style('stroke-opacity', 1e-6).remove();
         labels.attr('x', function (d) {
-          return getLabelX.call(_this52, d, series.labelPosition);
+          return getLabelX.call(_this54, d, series.labelPosition);
         }).attr('y', function (d) {
-          return getLabelY.call(_this52, d, series.labelPosition);
+          return getLabelY.call(_this54, d, series.labelPosition);
         }).attr('class', "label_".concat(series.key)).attr('fill', function (d) {
-          if (_this52.options.grouping === 'stacked' && d.y.value === 0) {
+          if (_this54.options.grouping === 'stacked' && d.y.value === 0) {
             return 'transparent';
           }
-          return _this52.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color);
+          return _this54.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color);
         }).style('font-size', "".concat(this.options.labelSize || this.options.fontSize, "px")).transition(this.transition).text(function (d) {
           return d.y.label || d.y.value;
         }).each(function (d, i) {
@@ -8626,14 +8813,14 @@ var WebsyChart = /*#__PURE__*/function () {
           }
         });
         labels.enter().append('text').attr('class', "label_".concat(series.key)).attr('x', function (d) {
-          return getLabelX.call(_this52, d, series.labelPosition);
+          return getLabelX.call(_this54, d, series.labelPosition);
         }).attr('y', function (d) {
-          return getLabelY.call(_this52, d, series.labelPosition);
+          return getLabelY.call(_this54, d, series.labelPosition);
         }).attr('alignment-baseline', 'central').attr('text-anchor', this.options.orientation === 'horizontal' ? 'left' : 'middle').attr('fill', function (d) {
-          if (_this52.options.grouping === 'stacked' && d.y.value === 0) {
+          if (_this54.options.grouping === 'stacked' && d.y.value === 0) {
             return 'transparent';
           }
-          return _this52.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color);
+          return _this54.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color);
         }).style('font-size', "".concat(this.options.labelSize || this.options.fontSize, "px")).text(function (d) {
           return d.y.label || d.y.value;
         }).each(function (d, i) {
@@ -8711,32 +8898,32 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "renderline",
     value: function renderline(series, index) {
-      var _this53 = this;
+      var _this55 = this;
       /* global series index d3 */
       var drawLine = function drawLine(xAxis, yAxis, curveStyle) {
         return d3.line().x(function (d) {
-          if (_this53.options.orientation === 'horizontal') {
-            return _this53["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value);
+          if (_this55.options.orientation === 'horizontal') {
+            return _this55["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value);
           } else {
-            if (_this53.options.data[xAxis].scale === 'Time') {
-              return _this53["".concat(xAxis, "Axis")](_this53.parseX(d.x.value));
+            if (_this55.options.data[xAxis].scale === 'Time') {
+              return _this55["".concat(xAxis, "Axis")](_this55.parseX(d.x.value));
             } else {
-              var xIndex = _this53[xAxis + 'Axis'].domain().indexOf(d.x.value);
-              var xPos = _this53["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex];
-              if (_this53["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1]) {
-                xPos = xPos + (_this53["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1] - xPos) / 2;
+              var xIndex = _this55[xAxis + 'Axis'].domain().indexOf(d.x.value);
+              var xPos = _this55["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex];
+              if (_this55["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1]) {
+                xPos = xPos + (_this55["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1] - xPos) / 2;
               }
               return xPos;
             }
           }
         }).y(function (d) {
-          if (_this53.options.orientation === 'horizontal') {
-            var adjustment = _this53.options.data[xAxis.replace('Brush', '')].scale === 'Time' ? 0 : _this53.options.data[xAxis].bandWidth / 2;
-            return _this53["".concat(xAxis, "Axis")](_this53.parseX(d.x.value)) + adjustment;
+          if (_this55.options.orientation === 'horizontal') {
+            var adjustment = _this55.options.data[xAxis.replace('Brush', '')].scale === 'Time' ? 0 : _this55.options.data[xAxis].bandWidth / 2;
+            return _this55["".concat(xAxis, "Axis")](_this55.parseX(d.x.value)) + adjustment;
           } else {
-            return _this53["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value);
+            return _this55["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value);
           }
-        }).curve(d3[curveStyle || _this53.options.curveStyle]);
+        }).curve(d3[curveStyle || _this55.options.curveStyle]);
       };
       var xAxis = 'bottom';
       var yAxis = series.axis === 'secondary' ? 'right' : 'left';
@@ -8845,14 +9032,14 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "rendersymbol",
     value: function rendersymbol(series, index) {
-      var _this54 = this;
+      var _this56 = this;
       /* global d3 series index series.key */
       var drawSymbol = function drawSymbol(size) {
         return d3.symbol()
         // .type(d => {
         //   return d3.symbols[0]
         // })
-        .size(size || _this54.options.symbolSize);
+        .size(size || _this56.options.symbolSize);
       };
       var xAxis = 'bottom';
       var yAxis = series.axis === 'secondary' ? 'right' : 'left';
@@ -8878,20 +9065,27 @@ var WebsyChart = /*#__PURE__*/function () {
         // else {
         //   return `translate(${this[`${xAxis}Axis`](this.parseX(d.x.value)) + adjustment}, ${this[`${yAxis}Axis`](isNaN(d.y.value) ? 0 : d.y.value)})` 
         // }
-        var xIndex = _this54[xAxis + 'Axis'].domain().indexOf(d.x.value);
-        var xPos = _this54["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex];
-        if (_this54["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1]) {
-          xPos = xPos + (_this54["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1] - xPos) / 2;
-        }
-        var adjustment = _this54.options.data[xAxis].scale === 'Time' || _this54.options.data[xAxis].scale === 'Linear' ? 0 : _this54.options.data[xAxis].bandWidth / 2;
-        if (_this54.options.orientation === 'horizontal') {
-          return "translate(".concat(_this54["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value), ", ").concat(xPos, ")");
+        var xIndex = _this56[xAxis + 'Axis'].domain().indexOf(d.x.value);
+        var xPos = _this56["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex];
+        if (_this56["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1]) {
+          xPos = xPos + (_this56["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1] - xPos) / 2;
+        }
+        var adjustment = _this56.options.data[xAxis].scale === 'Time' || _this56.options.data[xAxis].scale === 'Linear' ? 0 : _this56.options.data[xAxis].bandWidth / 2;
+        if (_this56.options.orientation === 'horizontal') {
+          return "translate(".concat(_this56["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value), ", ").concat(xPos, ")");
         } else {
-          if (_this54.options.data[xAxis].scale === 'Time') {
-            xPos = _this54["".concat(xAxis, "Axis")](_this54.parseX(d.x.value));
+          if (_this56.options.data[xAxis].scale === 'Time') {
+            xPos = _this56["".concat(xAxis, "Axis")](_this56.parseX(d.x.value));
+          } else {
+            var _xIndex = _this56[xAxis + 'Axis'].domain().indexOf(d.x.value);
+            var _xPos = _this56["custom".concat(xAxis.toInitialCaps(), "Range")][_xIndex];
+            if (_this56["custom".concat(xAxis.toInitialCaps(), "Range")][_xIndex + 1]) {
+              _xPos = _xPos + (_this56["custom".concat(xAxis.toInitialCaps(), "Range")][_xIndex + 1] - _xPos) / 2;
+            }
+            // return xPos
           }
           // return `translate(${this[`${xAxis}Axis`](this.parseX(d.x.value)) + adjustment}, ${this[`${yAxis}Axis`](isNaN(d.y.value) ? 0 : d.y.value)})` 
-          return "translate(".concat(xPos, ", ").concat(_this54["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value), ")");
+          return "translate(".concat(xPos, ", ").concat(_this56["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value), ")");
         }
       });
       // Enter
@@ -8906,20 +9100,27 @@ var WebsyChart = /*#__PURE__*/function () {
       }).attr('class', function (d) {
         return "symbol symbol_".concat(series.key);
       }).attr('transform', function (d) {
-        var xIndex = _this54[xAxis + 'Axis'].domain().indexOf(d.x.value);
-        var xPos = _this54["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex];
-        if (_this54["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1]) {
-          xPos = xPos + (_this54["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1] - xPos) / 2;
-        }
-        var adjustment = _this54.options.data[xAxis].scale === 'Time' || _this54.options.data[xAxis].scale === 'Linear' ? 0 : _this54.options.data[xAxis].bandWidth / 2;
-        if (_this54.options.orientation === 'horizontal') {
-          return "translate(".concat(_this54["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value), ", ").concat(xPos, ")");
+        var xIndex = _this56[xAxis + 'Axis'].domain().indexOf(d.x.value);
+        var xPos = _this56["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex];
+        if (_this56["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1]) {
+          xPos = xPos + (_this56["custom".concat(xAxis.toInitialCaps(), "Range")][xIndex + 1] - xPos) / 2;
+        }
+        var adjustment = _this56.options.data[xAxis].scale === 'Time' || _this56.options.data[xAxis].scale === 'Linear' ? 0 : _this56.options.data[xAxis].bandWidth / 2;
+        if (_this56.options.orientation === 'horizontal') {
+          return "translate(".concat(_this56["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value), ", ").concat(xPos, ")");
         } else {
-          if (_this54.options.data[xAxis].scale === 'Time') {
-            xPos = _this54["".concat(xAxis, "Axis")](_this54.parseX(d.x.value));
+          if (_this56.options.data[xAxis].scale === 'Time') {
+            xPos = _this56["".concat(xAxis, "Axis")](_this56.parseX(d.x.value));
+          } else {
+            var _xIndex2 = _this56[xAxis + 'Axis'].domain().indexOf(d.x.value);
+            var _xPos2 = _this56["custom".concat(xAxis.toInitialCaps(), "Range")][_xIndex2];
+            if (_this56["custom".concat(xAxis.toInitialCaps(), "Range")][_xIndex2 + 1]) {
+              _xPos2 = _xPos2 + (_this56["custom".concat(xAxis.toInitialCaps(), "Range")][_xIndex2 + 1] - _xPos2) / 2;
+            }
+            // return xPos
           }
           // return `translate(${this[`${xAxis}Axis`](this.parseX(d.x.value)) + adjustment}, ${this[`${yAxis}Axis`](isNaN(d.y.value) ? 0 : d.y.value)})` 
-          return "translate(".concat(xPos, ", ").concat(_this54["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value), ")");
+          return "translate(".concat(xPos, ", ").concat(_this56["".concat(yAxis, "Axis")](isNaN(d.y.value) ? 0 : d.y.value), ")");
         }
       });
     }
@@ -9115,7 +9316,7 @@ var WebsyLegend = /*#__PURE__*/function () {
   }, {
     key: "resize",
     value: function resize() {
-      var _this55 = this;
+      var _this57 = this;
       var el = document.getElementById(this.elementId);
       if (el) {
         // if (this.options.width) {
@@ -9126,7 +9327,7 @@ var WebsyLegend = /*#__PURE__*/function () {
         // }
         var html = "\n        <div class='text-".concat(this.options.align, "'>\n      ");
         html += this._data.map(function (d, i) {
-          return _this55.getLegendItemHTML(d);
+          return _this57.getLegendItemHTML(d);
         }).join('');
         html += "\n        <div>\n      ";
         el.innerHTML = html;
@@ -9162,8 +9363,12 @@ var WebsyKPI = /*#__PURE__*/function () {
     _classCallCheck(this, WebsyKPI);
     var DEFAULTS = {
       tooltip: {},
-      label: {},
-      value: {}
+      label: {
+        value: ''
+      },
+      value: {
+        value: ''
+      }
     };
     this.elementId = elementId;
     this.options = _extends({}, DEFAULTS, options);
@@ -9196,7 +9401,7 @@ var WebsyKPI = /*#__PURE__*/function () {
         if (this.options.icon) {
           html += "\n          <div class=\"websy-kpi-icon\"><img src=\"".concat(this.options.icon, "\"></div>   \n        ");
         }
-        html += "   \n          <div class=\"websy-kpi-info\">\n            <div class=\"websy-kpi-label ".concat(this.options.label.classes.join(' ') || '', "\">\n              ").concat(this.options.label.value || '', "\n      ");
+        html += "   \n          <div class=\"websy-kpi-info\">\n            <div class=\"websy-kpi-label ".concat(this.options.label.classes.join(' ') || '', "\">\n              ").concat((this.options.label || {}).value || '', "\n      ");
         if (this.options.tooltip && this.options.tooltip.value) {
           html += "\n          <div class=\"websy-info ".concat(this.options.tooltip.classes.join(' ') || '', "\" data-info=\"").concat(this.options.tooltip.value, "\">\n            <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 512 512\"><title>ionicons-v5-e</title><path d=\"M256,56C145.72,56,56,145.72,56,256s89.72,200,200,200,200-89.72,200-200S366.28,56,256,56Zm0,82a26,26,0,1,1-26,26A26,26,0,0,1,256,138Zm48,226H216a16,16,0,0,1,0-32h28V244H228a16,16,0,0,1,0-32h32a16,16,0,0,1,16,16V332h28a16,16,0,0,1,0,32Z\"/></svg>\n          </div>   \n        ");
         }
@@ -9266,14 +9471,14 @@ var WebsyMap = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-      var _this56 = this;
+      var _this58 = this;
       var mapEl = document.getElementById("".concat(this.elementId, "_map"));
       var legendEl = document.getElementById("".concat(this.elementId, "_map"));
       if (this.options.showLegend === true && this.options.data.polygons) {
         var legendData = this.options.data.polygons.map(function (s, i) {
           return {
             value: s.label || s.key,
-            color: s.color || _this56.options.colors[i % _this56.options.colors.length]
+            color: s.color || _this58.options.colors[i % _this58.options.colors.length]
           };
         });
         var longestValue = legendData.map(function (s) {
@@ -9327,7 +9532,7 @@ var WebsyMap = /*#__PURE__*/function () {
       }
       if (this.polygons) {
         this.polygons.forEach(function (p) {
-          return _this56.map.removeLayer(p);
+          return _this58.map.removeLayer(p);
         });
       }
       this.polygons = [];
@@ -9381,15 +9586,15 @@ var WebsyMap = /*#__PURE__*/function () {
             p.options = {};
           }
           if (!p.options.color) {
-            p.options.color = _this56.options.colors[i % _this56.options.colors.length];
+            p.options.color = _this58.options.colors[i % _this58.options.colors.length];
           }
           var pol = L.polygon(p.data.map(function (c) {
             return c.map(function (d) {
               return [d.Latitude, d.Longitude];
             });
-          }), p.options).addTo(_this56.map);
-          _this56.polygons.push(pol);
-          _this56.map.fitBounds(pol.getBounds());
+          }), p.options).addTo(_this58.map);
+          _this58.polygons.push(pol);
+          _this58.map.fitBounds(pol.getBounds());
         });
       }
       // if (this.data.markers.length > 0) {