@websy/websy-designs 1.2.33 → 1.3.1

package/dist/websy-designs-es6.js

@@ -414,6 +414,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
       var _this2 = this;
 
       var isRange = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      console.trace();
       var maskEl = document.getElementById("".concat(this.elementId, "_mask"));
       var contentEl = document.getElementById("".concat(this.elementId, "_content"));
       var el = document.getElementById(this.elementId);
@@ -435,9 +436,9 @@ var WebsyDatePicker = /*#__PURE__*/function () {
                 hoursOut.push(this.options.hours[i]);
               }
 
-              this.options.onChange(hoursOut, true);
+              this.options.onChange(hoursOut, true, this.selectedRange);
             } else {
-              this.options.onChange(this.selectedRangeDates, true);
+              this.options.onChange(this.selectedRangeDates, true, this.selectedRange);
             }
           } else {
             if (this.options.mode === 'hour') {
@@ -445,9 +446,9 @@ var WebsyDatePicker = /*#__PURE__*/function () {
                 return _this2.options.hours[h];
               });
 
-              this.options.onChange(_hoursOut, true);
+              this.options.onChange(_hoursOut, true, this.selectedRange);
             } else {
-              this.options.onChange(this.currentselection, isRange);
+              this.options.onChange(this.currentselection, isRange, this.selectedRange);
             }
           }
         }
@@ -470,9 +471,10 @@ var WebsyDatePicker = /*#__PURE__*/function () {
     value: function floorDate(d) {
       if (typeof d === 'number') {
         d = new Date(d);
-      }
+      } // d.setTime(d.getTime() + d.getTimezoneOffset() * 60000)
+
 
-      return new Date(d.setHours(0, 0, 0, 0));
+      return new Date(d.setUTCHours(12, 0, 0, 0));
     }
   }, {
     key: "handleClick",
@@ -489,11 +491,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
         var index = event.target.getAttribute('data-index');
         this.selectRange(index);
         this.updateRange(index);
-      } else if (event.target.classList.contains('websy-dp-date')) {// if (event.target.classList.contains('websy-disabled-date')) {
-        //   return
-        // }
-        // const timestamp = event.target.id.split('_')[0]
-        // this.selectDate(+timestamp)
+      } else if (event.target.classList.contains('websy-dp-date')) {// 
       } else if (event.target.classList.contains('websy-dp-confirm')) {
         this.close(true);
       } else if (event.target.classList.contains('websy-dp-cancel')) {
@@ -527,7 +525,8 @@ var WebsyDatePicker = /*#__PURE__*/function () {
     value: function handleMouseDown(event) {
       if (this.shiftPressed === true && this.currentselection.length > 0) {
         this.mouseDownId = this.currentselection[this.currentselection.length - 1];
-        this.selectDate(+event.target.id.split('_')[1]);
+        var dateId = event.target.getAttribute('data-id');
+        this.selectDate(+dateId);
       } else {
         this.mouseDown = true;
         this.dragging = false;
@@ -542,7 +541,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
             this.customRangeSelected = false;
           }
 
-          this.mouseDownId = +event.target.id.split('_')[1];
+          this.mouseDownId = +event.target.getAttribute('data-id');
           this.selectDate(this.mouseDownId);
         }
       }
@@ -556,9 +555,11 @@ var WebsyDatePicker = /*#__PURE__*/function () {
             return;
           }
 
-          if (event.target.id.split('_')[1] !== this.mouseDownId) {
+          var dateId = +event.target.getAttribute('data-id');
+
+          if (dateId !== this.mouseDownId) {
             this.dragging = true;
-            this.selectDate(+event.target.id.split('_')[1]);
+            this.selectDate(dateId);
           }
         }
       }
@@ -614,6 +615,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
 
           if (this.options.mode === 'date') {
             d = this.floorDate(new Date(this.selectedRangeDates[0].getTime() + _i * this.oneDay));
+            d.setUTCHours(12, 0, 0, 0);
             d = d.getTime();
             rangeStart = this.selectedRangeDates[0].getTime();
             rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime();
@@ -669,9 +671,11 @@ var WebsyDatePicker = /*#__PURE__*/function () {
             dateEl = document.getElementById("".concat(_this3.elementId, "_").concat(d, "_hour"));
           }
 
-          dateEl.classList.add('selected');
-          dateEl.classList.add('first');
-          dateEl.classList.add('last');
+          if (dateEl) {
+            dateEl.classList.add('selected');
+            dateEl.classList.add('first');
+            dateEl.classList.add('last');
+          }
         });
       }
     }
@@ -906,7 +910,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
           }
 
           html += months[key].map(function (d) {
-            return "<li id='".concat(_this4.elementId, "_").concat(d.id, "_date' class='websy-dp-date ").concat(d.disabled === true ? 'websy-disabled-date' : '', "'>").concat(d.dayOfMonth, "</li>");
+            return "<li id='".concat(_this4.elementId, "_").concat(d.id, "_date' data-id='").concat(d.id, "' class='websy-dp-date ").concat(d.disabled === true ? 'websy-disabled-date' : '', "'>").concat(d.dayOfMonth, "</li>");
           }).join('');
           html += "\n            </ul>\n          </div>\n        ";
         }
@@ -919,7 +923,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
 
         html += "<div id='".concat(this.elementId, "_dateList' class='websy-dp-date-list'><ul>");
         html += yearList.map(function (d) {
-          return "<li id='".concat(_this4.elementId, "_").concat(d.id, "_year' class='websy-dp-date websy-dp-year ").concat(d.disabled === true ? 'websy-disabled-date' : '', "'>").concat(d.year, "</li>");
+          return "<li id='".concat(_this4.elementId, "_").concat(d.id, "_year' data-id='").concat(d.id, "' class='websy-dp-date websy-dp-year ").concat(d.disabled === true ? 'websy-disabled-date' : '', "'>").concat(d.year, "</li>");
         }).join('');
         html += "</ul></div>";
       } else if (this.options.mode === 'monthyear') {
@@ -939,7 +943,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
           }
 
           html += this.monthYears[year].map(function (d) {
-            return "<li id='".concat(_this4.elementId, "_").concat(d.id, "_monthyear' data-year='").concat(d.year, "' class='websy-dp-date websy-dp-monthyear'>").concat(d.month, "</li>");
+            return "<li id='".concat(_this4.elementId, "_").concat(d.id, "_monthyear' data-id='").concat(d.id, "' data-year='").concat(d.year, "' class='websy-dp-date websy-dp-monthyear'>").concat(d.month, "</li>");
           }).join('');
           html += "</ul>";
         }
@@ -1043,18 +1047,10 @@ var WebsyDatePicker = /*#__PURE__*/function () {
 
       if (this.options.ranges[this.options.mode][index]) {
         this.selectedRangeDates = _toConsumableArray(this.options.ranges[this.options.mode][index].range);
-        this.currentselection = _toConsumableArray(this.options.ranges[this.options.mode][index].range);
+        this.currentselection = this.options.ranges[this.options.mode][index].range.map(function (d) {
+          return d.getTime();
+        });
         this.selectedRange = +index;
-        var el = document.getElementById("".concat(this.elementId, "_header"));
-
-        if (el) {
-          if (this.selectedRange === 0) {
-            el.classList.remove('range-selected');
-          } else {
-            el.classList.add('range-selected');
-          }
-        }
-
         this.highlightRange();
         this.updateRange();
         this.close(confirm, true);
@@ -1066,16 +1062,17 @@ var WebsyDatePicker = /*#__PURE__*/function () {
       var _this6 = this;
 
       this.selectedRange = -1;
-      var isContinuousRange = true;
-
-      if (rangeInput.length === 1) {
-        this.selectedRangeDates = _toConsumableArray(rangeInput);
-        this.customRangeSelected = true;
-      } else if (rangeInput.length === 2) {
-        this.selectedRangeDates = _toConsumableArray(rangeInput);
-        this.customRangeSelected = true;
-      }
+      var isContinuousRange = true; // if (rangeInput.length === 1) {
+      //   this.selectedRangeDates = [...rangeInput]
+      //   this.customRangeSelected = true
+      // }
+      // else if (rangeInput.length === 2) {      
+      //   this.selectedRangeDates = [...rangeInput]
+      //   this.customRangeSelected = true
+      // }
 
+      this.selectedRangeDates = _toConsumableArray(rangeInput);
+      this.customRangeSelected = true;
       rangeInput.forEach(function (r, i) {
         if (i > 0) {
           if (_this6.options.mode === 'date' || _this6.options.mode === 'monthyear') {
@@ -1229,6 +1226,16 @@ var WebsyDatePicker = /*#__PURE__*/function () {
       if (labelEl) {
         labelEl.innerHTML = range.label;
       }
+
+      var headerEl = document.getElementById("".concat(this.elementId, "_header"));
+
+      if (headerEl) {
+        if (this.selectedRange === 0) {
+          headerEl.classList.remove('range-selected');
+        } else {
+          headerEl.classList.add('range-selected');
+        }
+      }
     }
   }]);
 
@@ -1248,7 +1255,8 @@ var WebsyDragDrop = /*#__PURE__*/function () {
     var DEFAULTS = {
       items: [],
       orientation: 'horizontal',
-      dropPlaceholder: 'Drop item here'
+      dropPlaceholder: 'Drop item here',
+      accepts: 'application/wd-item'
     };
     this.busy = false;
     this.options = _extends({}, DEFAULTS, options);
@@ -1274,8 +1282,6 @@ var WebsyDragDrop = /*#__PURE__*/function () {
     }
 
     GlobalPubSub.subscribe(this.elementId, 'requestForDDItem', this.handleRequestForItem.bind(this));
-    console.log('constructor dd');
-    console.trace();
     GlobalPubSub.subscribe(this.elementId, 'add', this.addItem.bind(this));
     this.render();
   }
@@ -1316,7 +1322,7 @@ var WebsyDragDrop = /*#__PURE__*/function () {
         item.id = WebsyDesigns.Utils.createIdentity();
       }
 
-      var html = "\n      <div id='".concat(item.id, "_item' class='websy-dragdrop-item' draggable='true' data-id='").concat(item.id, "'>        \n        <div id='").concat(item.id, "_itemInner' class='websy-dragdrop-item-inner' data-id='").concat(item.id, "'>\n    ");
+      var html = "\n      <div id='".concat(item.id, "_item' class='websy-dragdrop-item ").concat((item.classes || []).join(' '), "' draggable='true' data-id='").concat(item.id, "'>        \n        <div id='").concat(item.id, "_itemInner' class='websy-dragdrop-item-inner' data-id='").concat(item.id, "'>\n    ");
 
       if (item.component) {
         html += "<div id='".concat(item.id, "_component'></div>");
@@ -1346,35 +1352,38 @@ var WebsyDragDrop = /*#__PURE__*/function () {
     value: function handleDragStart(event) {
       this.draggedId = event.target.getAttribute('data-id');
       event.dataTransfer.effectAllowed = 'move';
-      event.dataTransfer.setData('application/wd-item', JSON.stringify({
+      event.dataTransfer.setData(this.options.accepts, JSON.stringify({
         el: event.target.id,
         id: this.elementId,
         itemId: this.draggedId
       }));
-      console.log('drag start', event);
-      event.target.style.opacity = 0.5;
+      event.target.classList.add('dragging'); // event.target.style.opacity = 0.5
+
       this.dragging = true;
     }
   }, {
     key: "handleDragOver",
     value: function handleDragOver(event) {
-      console.log('drag over', event.target.classList);
-
       if (event.preventDefault) {
         event.preventDefault();
       }
 
+      console.log('drag', event.target.classList);
+
       if (!event.target.classList.contains('droppable')) {
         return;
       }
 
+      if (event.dataTransfer.types.indexOf(this.options.accepts) === -1) {
+        return;
+      }
+
       event.target.classList.add('drag-over');
     }
   }, {
     key: "handleDragLeave",
     value: function handleDragLeave(event) {
-      console.log('drag leave', event.target.classList);
-
+      // console.log('drag leave', event.target.classList)
       if (!event.target.classList.contains('droppable')) {
         return;
       }
@@ -1387,9 +1396,9 @@ var WebsyDragDrop = /*#__PURE__*/function () {
   }, {
     key: "handleDrop",
     value: function handleDrop(event) {
-      console.log('drag drop');
-      console.log(event.dataTransfer.getData('application/wd-item'));
-      var data = JSON.parse(event.dataTransfer.getData('application/wd-item'));
+      // console.log('drag drop')
+      // console.log(event.dataTransfer.getData('application/wd-item'))    
+      var data = JSON.parse(event.dataTransfer.getData(this.options.accepts));
 
       if (event.preventDefault) {
         event.preventDefault();
@@ -1399,6 +1408,10 @@ var WebsyDragDrop = /*#__PURE__*/function () {
         return;
       }
 
+      if (event.dataTransfer.types.indexOf(this.options.accepts) === -1) {
+        return;
+      }
+
       var side = event.target.getAttribute('data-side');
       var id = event.target.getAttribute('data-id');
       var index = this.getItemIndex(id);
@@ -1410,7 +1423,7 @@ var WebsyDragDrop = /*#__PURE__*/function () {
       }
 
       if (draggedIndex === -1) {
-        console.log('requestForDDItem');
+        // console.log('requestForDDItem')
         GlobalPubSub.publish(data.id, 'requestForDDItem', {
           group: this.options.group,
           source: data.id,
@@ -1454,8 +1467,9 @@ var WebsyDragDrop = /*#__PURE__*/function () {
   }, {
     key: "handleDragEnd",
     value: function handleDragEnd(event) {
-      console.log('drag end');
+      // console.log('drag end')
       event.target.style.opacity = 1;
+      event.target.classList.remove('dragging');
       this.draggedId = null;
       this.dragging = false;
       var startEl = document.getElementById("".concat(this.elementId, "start_item"));
@@ -1913,14 +1927,17 @@ var WebsyDropdown = /*#__PURE__*/function () {
   }, {
     key: "updateHeader",
     value: function updateHeader(item) {
-      var _this11 = this;
-
       var el = document.getElementById(this.elementId);
       var headerEl = document.getElementById("".concat(this.elementId, "_header"));
       var headerLabelEl = document.getElementById("".concat(this.elementId, "_headerLabel"));
       var labelEl = document.getElementById("".concat(this.elementId, "_selectedItems"));
       var inputEl = document.getElementById("".concat(this.elementId, "_input"));
       var itemEls = el.querySelectorAll(".websy-dropdown-item");
+      var dataToUse = this._originalData;
+
+      if (this.options.onSearch) {
+        dataToUse = this.options.items;
+      }
 
       for (var i = 0; i < itemEls.length; i++) {
         itemEls[i].classList.remove('active');
@@ -1960,17 +1977,17 @@ var WebsyDropdown = /*#__PURE__*/function () {
         } else if (this.selectedItems.length > 1) {
           if (this.options.showCompleteSelectedList === true) {
             var selectedLabels = this.selectedItems.map(function (s) {
-              return _this11.options.items[s].label || _this11.options.items[s].value;
+              return dataToUse[s].label || dataToUse[s].value;
             }).join(this.options.multiValueDelimiter);
             var selectedValues = this.selectedItems.map(function (s) {
-              return _this11.options.items[s].value || _this11.options.items[s].label;
+              return dataToUse[s].value || dataToUse[s].label;
             }).join(this.options.multiValueDelimiter);
             labelEl.innerHTML = selectedLabels;
             labelEl.setAttribute('data-info', selectedLabels);
             inputEl.value = selectedValues;
           } else {
             var _selectedValues = this.selectedItems.map(function (s) {
-              return _this11.options.items[s].value || _this11.options.items[s].label;
+              return dataToUse[s].value || dataToUse[s].label;
             }).join(this.options.multiValueDelimiter);
 
             labelEl.innerHTML = "".concat(this.selectedItems.length, " selected");
@@ -1987,6 +2004,12 @@ var WebsyDropdown = /*#__PURE__*/function () {
   }, {
     key: "updateSelected",
     value: function updateSelected(index) {
+      var dataToUse = this._originalData && this._originalData.length > 0 ? this._originalData : this.options.items;
+
+      if (this.options.onSearch) {
+        dataToUse = this.options.items;
+      }
+
       if (typeof index !== 'undefined' && index !== null) {
         var pos = this.selectedItems.indexOf(index);
 
@@ -2002,11 +2025,11 @@ var WebsyDropdown = /*#__PURE__*/function () {
       } // const item = this.options.items[index]
 
 
-      var item = this._originalData[index] || this.options.items[index];
+      var item = dataToUse[index];
       this.updateHeader(item);
 
       if (item && this.options.onItemSelected) {
-        this.options.onItemSelected(item, this.selectedItems, this._originalData || this.options.items, this.options);
+        this.options.onItemSelected(item, this.selectedItems, dataToUse, this.options);
       }
 
       if (this.options.closeAfterSelection === true) {
@@ -2026,6 +2049,7 @@ var WebsyDropdown = /*#__PURE__*/function () {
           d.index = i;
         }
 
+        d.currentIndex = i;
         return d;
       });
       var headerEl = document.getElementById("".concat(this.elementId, "_header"));
@@ -2036,16 +2060,18 @@ var WebsyDropdown = /*#__PURE__*/function () {
 
       var el = document.getElementById("".concat(this.elementId, "_items"));
 
-      if (el.childElementCount === 0) {
-        this.render();
-      } else {
-        if (this.options.items.length === 0) {
-          this.options.items = [{
-            label: this.options.noItemsText || 'No Items'
-          }];
-        }
+      if (el) {
+        if (el.childElementCount === 0) {
+          this.render();
+        } else {
+          if (this.options.items.length === 0) {
+            this.options.items = [{
+              label: this.options.noItemsText || 'No Items'
+            }];
+          }
 
-        this.renderItems();
+          this.renderItems();
+        }
       }
     },
     get: function get() {
@@ -2114,16 +2140,16 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "checkRecaptcha",
     value: function checkRecaptcha() {
-      var _this12 = this;
+      var _this11 = this;
 
       return new Promise(function (resolve, reject) {
-        if (_this12.options.useRecaptcha === true) {
+        if (_this11.options.useRecaptcha === true) {
           // if (this.recaptchaValue) {                  
           grecaptcha.ready(function () {
             grecaptcha.execute(ENVIRONMENT.RECAPTCHA_KEY, {
               action: 'submit'
             }).then(function (token) {
-              _this12.apiService.add('google/checkrecaptcha', {
+              _this11.apiService.add('google/checkrecaptcha', {
                 grecaptcharesponse: token
               }).then(function (response) {
                 if (response.success && response.success === true) {
@@ -2186,14 +2212,14 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "processComponents",
     value: function processComponents(components, callbackFn) {
-      var _this13 = this;
+      var _this12 = this;
 
       if (components.length === 0) {
         callbackFn();
       } else {
         components.forEach(function (c) {
           if (typeof WebsyDesigns[c.component] !== 'undefined') {
-            c.instance = new WebsyDesigns[c.component]("".concat(_this13.elementId, "_input_").concat(c.field, "_component"), c.options);
+            c.instance = new WebsyDesigns[c.component]("".concat(_this12.elementId, "_input_").concat(c.field, "_component"), c.options);
           } else {// some user feedback here
           }
         });
@@ -2214,7 +2240,7 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(update, data) {
-      var _this14 = this;
+      var _this13 = this;
 
       var el = document.getElementById(this.elementId);
       var componentsToProcess = [];
@@ -2224,11 +2250,11 @@ var WebsyForm = /*#__PURE__*/function () {
         this.options.fields.forEach(function (f, i) {
           if (f.component) {
             componentsToProcess.push(f);
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <div id='").concat(_this14.elementId, "_input_").concat(f.field, "_component' class='form-component'></div>\n            </div><!--\n          ");
+            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <div id='").concat(_this13.elementId, "_input_").concat(f.field, "_component' class='form-component'></div>\n            </div><!--\n          ");
           } else if (f.type === 'longtext') {
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <textarea\n                id=\"").concat(_this14.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                placeholder=\"").concat(f.placeholder || '', "\"\n                name=\"").concat(f.field, "\" \n                ").concat((f.attributes || []).join(' '), "\n                class=\"websy-input websy-textarea\"\n              ></textarea>\n            </div><!--\n          ");
+            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <textarea\n                id=\"").concat(_this13.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                placeholder=\"").concat(f.placeholder || '', "\"\n                name=\"").concat(f.field, "\" \n                ").concat((f.attributes || []).join(' '), "\n                class=\"websy-input websy-textarea\"\n              ></textarea>\n            </div><!--\n          ");
           } else {
-            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <input \n                id=\"").concat(_this14.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                type=\"").concat(f.type || 'text', "\" \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            </div><!--\n          ");
+            html += "\n            ".concat(i > 0 ? '-->' : '', "<div class='").concat(f.classes || '', "'>\n              ").concat(f.label ? "<label for=\"".concat(f.field, "\">").concat(f.label, "</label>") : '', "\n              <input \n                id=\"").concat(_this13.elementId, "_input_").concat(f.field, "\"\n                ").concat(f.required === true ? 'required' : '', " \n                type=\"").concat(f.type || 'text', "\" \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            </div><!--\n          ");
           }
         });
         html += "\n        --><button class=\"websy-btn submit ".concat(this.options.submit.classes || '', "\">").concat(this.options.submit.text || 'Save', "</button>").concat(this.options.cancel ? '<!--' : '', "\n      ");
@@ -2245,7 +2271,7 @@ var WebsyForm = /*#__PURE__*/function () {
 
         el.innerHTML = html;
         this.processComponents(componentsToProcess, function () {
-          if (_this14.options.useRecaptcha === true && typeof grecaptcha !== 'undefined') {// this.recaptchaReady()
+          if (_this13.options.useRecaptcha === true && typeof grecaptcha !== 'undefined') {// this.recaptchaReady()
           }
         });
       }
@@ -2253,7 +2279,7 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "submitForm",
     value: function submitForm() {
-      var _this15 = this;
+      var _this14 = this;
 
       var formEl = document.getElementById("".concat(this.elementId, "Form"));
 
@@ -2267,32 +2293,32 @@ var WebsyForm = /*#__PURE__*/function () {
               data[key] = value;
             });
 
-            if (_this15.options.url) {
-              var _this15$apiService;
+            if (_this14.options.url) {
+              var _this14$apiService;
 
-              var params = [_this15.options.url];
+              var params = [_this14.options.url];
 
-              if (_this15.options.mode === 'update') {
-                params.push(_this15.options.id);
+              if (_this14.options.mode === 'update') {
+                params.push(_this14.options.id);
               }
 
               params.push(data);
 
-              (_this15$apiService = _this15.apiService)[_this15.options.mode].apply(_this15$apiService, params).then(function (result) {
-                if (_this15.options.clearAfterSave === true) {
+              (_this14$apiService = _this14.apiService)[_this14.options.mode].apply(_this14$apiService, params).then(function (result) {
+                if (_this14.options.clearAfterSave === true) {
                   // this.render()
                   formEl.reset();
                 }
 
-                _this15.options.onSuccess.call(_this15, result);
+                _this14.options.onSuccess.call(_this14, result);
               }, function (err) {
                 console.log('Error submitting form data:', err);
 
-                _this15.options.onError.call(_this15, err);
+                _this14.options.onError.call(_this14, err);
               });
-            } else if (_this15.options.submitFn) {
-              _this15.options.submitFn(data, function () {
-                if (_this15.options.clearAfterSave === true) {
+            } else if (_this14.options.submitFn) {
+              _this14.options.submitFn(data, function () {
+                if (_this14.options.clearAfterSave === true) {
                   // this.render()
                   formEl.reset();
                 }
@@ -2312,17 +2338,17 @@ var WebsyForm = /*#__PURE__*/function () {
   }, {
     key: "data",
     set: function set(d) {
-      var _this16 = this;
+      var _this15 = this;
 
       if (!this.options.fields) {
         this.options.fields = [];
       }
 
       var _loop = function _loop(key) {
-        _this16.options.fields.forEach(function (f) {
+        _this15.options.fields.forEach(function (f) {
           if (f.field === key) {
             f.value = d[key];
-            var el = document.getElementById("".concat(_this16.elementId, "_input_").concat(f.field));
+            var el = document.getElementById("".concat(_this15.elementId, "_input_").concat(f.field));
             el.value = f.value;
           }
         });
@@ -2634,7 +2660,7 @@ var WebsyNavigationMenu = /*#__PURE__*/function () {
 
 var Pager = /*#__PURE__*/function () {
   function Pager(elementId, options) {
-    var _this17 = this;
+    var _this16 = this;
 
     _classCallCheck(this, Pager);
 
@@ -2687,8 +2713,8 @@ var Pager = /*#__PURE__*/function () {
           allowClear: false,
           disableSearch: true,
           onItemSelected: function onItemSelected(selectedItem) {
-            if (_this17.options.onChangePageSize) {
-              _this17.options.onChangePageSize(selectedItem.value);
+            if (_this16.options.onChangePageSize) {
+              _this16.options.onChangePageSize(selectedItem.value);
             }
           }
         });
@@ -2712,13 +2738,13 @@ var Pager = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-      var _this18 = this;
+      var _this17 = 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(_this18.options.activePage === index ? 'active' : '', "\">").concat(index + 1, "</li>");
+          return "<li data-index=\"".concat(index, "\" class=\"websy-page-num ").concat(_this17.options.activePage === index ? 'active' : '', "\">").concat(index + 1, "</li>");
         });
         var startIndex = 0;
 
@@ -2786,58 +2812,58 @@ var WebsyPDFButton = /*#__PURE__*/function () {
   _createClass(WebsyPDFButton, [{
     key: "handleClick",
     value: function handleClick(event) {
-      var _this19 = this;
+      var _this18 = this;
 
       if (event.target.classList.contains('websy-pdf-button')) {
         this.loader.show();
         setTimeout(function () {
-          if (_this19.options.targetId) {
-            var el = document.getElementById(_this19.options.targetId);
+          if (_this18.options.targetId) {
+            var el = document.getElementById(_this18.options.targetId);
 
             if (el) {
               var pdfData = {
                 options: {}
               };
 
-              if (_this19.options.pdfOptions) {
-                pdfData.options = _extends({}, _this19.options.pdfOptions);
+              if (_this18.options.pdfOptions) {
+                pdfData.options = _extends({}, _this18.options.pdfOptions);
               }
 
-              if (_this19.options.header) {
-                if (_this19.options.header.elementId) {
-                  var headerEl = document.getElementById(_this19.options.header.elementId);
+              if (_this18.options.header) {
+                if (_this18.options.header.elementId) {
+                  var headerEl = document.getElementById(_this18.options.header.elementId);
 
                   if (headerEl) {
                     pdfData.header = headerEl.outerHTML;
 
-                    if (_this19.options.header.css) {
-                      pdfData.options.headerCSS = _this19.options.header.css;
+                    if (_this18.options.header.css) {
+                      pdfData.options.headerCSS = _this18.options.header.css;
                     }
                   }
-                } else if (_this19.options.header.html) {
-                  pdfData.header = _this19.options.header.html;
+                } else if (_this18.options.header.html) {
+                  pdfData.header = _this18.options.header.html;
 
-                  if (_this19.options.header.css) {
-                    pdfData.options.headerCSS = _this19.options.header.css;
+                  if (_this18.options.header.css) {
+                    pdfData.options.headerCSS = _this18.options.header.css;
                   }
                 } else {
-                  pdfData.header = _this19.options.header;
+                  pdfData.header = _this18.options.header;
                 }
               }
 
-              if (_this19.options.footer) {
-                if (_this19.options.footer.elementId) {
-                  var footerEl = document.getElementById(_this19.options.footer.elementId);
+              if (_this18.options.footer) {
+                if (_this18.options.footer.elementId) {
+                  var footerEl = document.getElementById(_this18.options.footer.elementId);
 
                   if (footerEl) {
                     pdfData.footer = footerEl.outerHTML;
 
-                    if (_this19.options.footer.css) {
-                      pdfData.options.footerCSS = _this19.options.footer.css;
+                    if (_this18.options.footer.css) {
+                      pdfData.options.footerCSS = _this18.options.footer.css;
                     }
                   }
                 } else {
-                  pdfData.footer = _this19.options.footer;
+                  pdfData.footer = _this18.options.footer;
                 }
               }
 
@@ -2846,31 +2872,31 @@ var WebsyPDFButton = /*#__PURE__*/function () {
               // document.getElementById(`${this.elementId}_pdfFooter`).value = pdfData.footer
               // document.getElementById(`${this.elementId}_form`).submit()
 
-              _this19.service.add('', pdfData, {
+              _this18.service.add('', pdfData, {
                 responseType: 'blob'
               }).then(function (response) {
-                _this19.loader.hide();
+                _this18.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 (_this19.options.directDownload === true) {
+                if (_this18.options.directDownload === true) {
                   var fileName;
 
-                  if (typeof _this19.options.fileName === 'function') {
-                    fileName = _this19.options.fileName() || 'Export';
+                  if (typeof _this18.options.fileName === 'function') {
+                    fileName = _this18.options.fileName() || 'Export';
                   } else {
-                    fileName = _this19.options.fileName || 'Export';
+                    fileName = _this18.options.fileName || 'Export';
                   }
 
                   msg += "download='".concat(fileName, ".pdf'");
                 }
 
-                msg += "\n                  >\n                    <button class='websy-btn download-pdf'>".concat(_this19.options.buttonText, "</button>\n                  </a>\n                </div>\n              ");
+                msg += "\n                  >\n                    <button class='websy-btn download-pdf'>".concat(_this18.options.buttonText, "</button>\n                  </a>\n                </div>\n              ");
 
-                _this19.popup.show({
+                _this18.popup.show({
                   message: msg,
                   mask: true
                 });
@@ -3038,9 +3064,9 @@ var WebsyPubSub = /*#__PURE__*/function () {
           this.subscriptions[id][method](data);
         }
       } else {
-        if (this.subscriptions[method]) {
-          this.subscriptions[method].forEach(function (fn) {
-            fn(data);
+        if (this.subscriptions[id]) {
+          this.subscriptions[id].forEach(function (fn) {
+            fn(method);
           });
         }
       }
@@ -3057,11 +3083,11 @@ var WebsyPubSub = /*#__PURE__*/function () {
           this.subscriptions[id][method] = fn;
         }
       } else {
-        if (!this.subscriptions[method]) {
-          this.subscriptions[method] = [];
+        if (!this.subscriptions[id]) {
+          this.subscriptions[id] = [];
         }
 
-        this.subscriptions[method].push(fn);
+        this.subscriptions[id].push(method);
       }
     }
   }]);
@@ -3071,7 +3097,7 @@ var WebsyPubSub = /*#__PURE__*/function () {
 
 var ResponsiveText = /*#__PURE__*/function () {
   function ResponsiveText(elementId, options) {
-    var _this20 = this;
+    var _this19 = this;
 
     _classCallCheck(this, ResponsiveText);
 
@@ -3084,7 +3110,7 @@ var ResponsiveText = /*#__PURE__*/function () {
     this.elementId = elementId;
     this.canvas = document.createElement('canvas');
     window.addEventListener('resize', function () {
-      return _this20.render();
+      return _this19.render();
     });
     var el = document.getElementById(this.elementId);
 
@@ -3303,7 +3329,7 @@ var ResponsiveText = /*#__PURE__*/function () {
 
 var WebsyResultList = /*#__PURE__*/function () {
   function WebsyResultList(elementId, options) {
-    var _this21 = this;
+    var _this20 = this;
 
     _classCallCheck(this, WebsyResultList);
 
@@ -3331,9 +3357,9 @@ var WebsyResultList = /*#__PURE__*/function () {
 
     if (_typeof(options.template) === 'object' && options.template.url) {
       this.templateService.get(options.template.url).then(function (templateString) {
-        _this21.options.template = templateString;
+        _this20.options.template = templateString;
 
-        _this21.render();
+        _this20.render();
       });
     } else {
       this.render();
@@ -3352,7 +3378,7 @@ var WebsyResultList = /*#__PURE__*/function () {
   }, {
     key: "buildHTML",
     value: function buildHTML(d) {
-      var _this22 = this;
+      var _this21 = this;
 
       var startIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
       var html = "";
@@ -3360,7 +3386,7 @@ var WebsyResultList = /*#__PURE__*/function () {
       if (this.options.template) {
         if (d.length > 0) {
           d.forEach(function (row, ix) {
-            var template = "".concat(ix > 0 ? '-->' : '').concat(_this22.options.template).concat(ix < d.length - 1 ? '<!--' : ''); // find conditional elements
+            var template = "".concat(ix > 0 ? '-->' : '').concat(_this21.options.template).concat(ix < d.length - 1 ? '<!--' : ''); // find conditional elements
 
             var ifMatches = _toConsumableArray(template.matchAll(/<\s*if[^>]*>([\s\S]*?)<\s*\/\s*if>/g));
 
@@ -3480,7 +3506,7 @@ var WebsyResultList = /*#__PURE__*/function () {
   }, {
     key: "handleClick",
     value: function handleClick(event) {
-      var _this23 = this;
+      var _this22 = this;
 
       if (event.target.classList.contains('clickable')) {
         var l = event.target.getAttribute('data-event');
@@ -3498,8 +3524,8 @@ var WebsyResultList = /*#__PURE__*/function () {
           l = l[0];
           params = params.map(function (p) {
             if (typeof p !== 'string' && typeof p !== 'number') {
-              if (_this23.rows[+id]) {
-                p = _this23.rows[+id][p];
+              if (_this22.rows[+id]) {
+                p = _this22.rows[+id][p];
               }
             } else if (typeof p === 'string') {
               p = p.replace(/"/g, '').replace(/'/g, '');
@@ -3521,13 +3547,13 @@ var WebsyResultList = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-      var _this24 = this;
+      var _this23 = this;
 
       if (this.options.entity) {
         this.apiService.get(this.options.entity).then(function (results) {
-          _this24.rows = results.rows;
+          _this23.rows = results.rows;
 
-          _this24.resize();
+          _this23.resize();
         });
       } else {
         this.resize();
@@ -3606,14 +3632,14 @@ var WebsyRouter = /*#__PURE__*/function () {
   _createClass(WebsyRouter, [{
     key: "addGroup",
     value: function addGroup(group) {
-      var _this25 = this;
+      var _this24 = this;
 
       if (!this.groups[group]) {
         var els = document.querySelectorAll(".websy-view[data-group=\"".concat(group, "\"]"));
 
         if (els) {
           this.getClosestParent(els[0], function (parent) {
-            _this25.groups[group] = {
+            _this24.groups[group] = {
               activeView: '',
               views: [],
               parent: parent.getAttribute('data-view')
@@ -3938,12 +3964,12 @@ var WebsyRouter = /*#__PURE__*/function () {
   }, {
     key: "showComponents",
     value: function showComponents(view) {
-      var _this26 = this;
+      var _this25 = 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') {
-            _this26.prepComponent(c.elementId, c.options);
+            _this25.prepComponent(c.elementId, c.options);
 
             c.instance = new c.Component(c.elementId, c.options);
           } else if (c.instance.render) {
@@ -4312,7 +4338,7 @@ var Switch = /*#__PURE__*/function () {
 
 var WebsyTemplate = /*#__PURE__*/function () {
   function WebsyTemplate(elementId, options) {
-    var _this27 = this;
+    var _this26 = this;
 
     _classCallCheck(this, WebsyTemplate);
 
@@ -4338,9 +4364,9 @@ var WebsyTemplate = /*#__PURE__*/function () {
 
     if (_typeof(options.template) === 'object' && options.template.url) {
       this.templateService.get(options.template.url).then(function (templateString) {
-        _this27.options.template = templateString;
+        _this26.options.template = templateString;
 
-        _this27.render();
+        _this26.render();
       });
     } else {
       this.render();
@@ -4350,7 +4376,7 @@ var WebsyTemplate = /*#__PURE__*/function () {
   _createClass(WebsyTemplate, [{
     key: "buildHTML",
     value: function buildHTML() {
-      var _this28 = this;
+      var _this27 = this;
 
       var html = "";
 
@@ -4412,14 +4438,14 @@ var WebsyTemplate = /*#__PURE__*/function () {
                 }
 
                 if (polarity === true) {
-                  if (typeof _this28.options.data[parts[0]] !== 'undefined' && _this28.options.data[parts[0]] === parts[1]) {
+                  if (typeof _this27.options.data[parts[0]] !== 'undefined' && _this27.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 _this28.options.data[parts[0]] !== 'undefined' && _this28.options.data[parts[0]] !== parts[1]) {
+                  if (typeof _this27.options.data[parts[0]] !== 'undefined' && _this27.options.data[parts[0]] !== parts[1]) {
                     // remove the <if> tags
                     removeAll = false;
                   }
@@ -4515,6 +4541,7 @@ var WebsyUtils = {
     var red = 0;
     var green = 0;
     var blue = 0;
+    var alpha = 1;
 
     if (backgroundColor.indexOf('#') !== -1) {
       // hex color
@@ -4526,14 +4553,16 @@ var WebsyUtils = {
       blue = parseInt(colorParts[4] + colorParts[5], 16);
     } else if (backgroundColor.toLowerCase().indexOf('rgb') !== -1) {
       // rgb color
-      colorParts = backgroundColor.replace(/rgb\(/gi, '').replace(/\)/gi, '');
+      colorParts = backgroundColor.replace(/rgba\(/gi, '').replace(/\)/gi, '');
+      colorParts = colorParts.replace(/rgb\(/gi, '');
       colorParts = colorParts.split(',');
       red = colorParts[0];
       green = colorParts[1];
       blue = colorParts[2];
+      alpha = colorParts[3] || 1;
     }
 
-    return red * 0.299 + green * 0.587 + blue * 0.114 > 186 ? darkColor : lightColor;
+    return (red * 0.299 + green * 0.587 + blue * 0.114) / alpha > 186 ? darkColor : lightColor;
   },
   measureText: function measureText(text) {
     var rotation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
@@ -4706,7 +4735,7 @@ var WebsyUtils = {
 
 var WebsyTable = /*#__PURE__*/function () {
   function WebsyTable(elementId, options) {
-    var _this29 = this;
+    var _this28 = this;
 
     _classCallCheck(this, WebsyTable);
 
@@ -4744,8 +4773,8 @@ var WebsyTable = /*#__PURE__*/function () {
           allowClear: false,
           disableSearch: true,
           onItemSelected: function onItemSelected(selectedItem) {
-            if (_this29.options.onChangePageSize) {
-              _this29.options.onChangePageSize(selectedItem.value);
+            if (_this28.options.onChangePageSize) {
+              _this28.options.onChangePageSize(selectedItem.value);
             }
           }
         });
@@ -4766,7 +4795,7 @@ var WebsyTable = /*#__PURE__*/function () {
   _createClass(WebsyTable, [{
     key: "appendRows",
     value: function appendRows(data) {
-      var _this30 = this;
+      var _this29 = this;
 
       this.hideError();
       var bodyHTML = '';
@@ -4774,15 +4803,15 @@ var WebsyTable = /*#__PURE__*/function () {
       if (data) {
         bodyHTML += data.map(function (r, rowIndex) {
           return '<tr>' + r.map(function (c, i) {
-            if (_this30.options.columns[i].show !== false) {
+            if (_this29.options.columns[i].show !== false) {
               var style = '';
 
               if (c.style) {
                 style += c.style;
               }
 
-              if (_this30.options.columns[i].width) {
-                style += "width: ".concat(_this30.options.columns[i].width, "; ");
+              if (_this29.options.columns[i].width) {
+                style += "width: ".concat(_this29.options.columns[i].width, "; ");
               }
 
               if (c.backgroundColor) {
@@ -4797,18 +4826,18 @@ var WebsyTable = /*#__PURE__*/function () {
                 style += "color: ".concat(c.color, "; ");
               }
 
-              if (_this30.options.columns[i].showAsLink === true && c.value.trim() !== '') {
-                return "\n                <td \n                  data-row-index='".concat(_this30.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this30.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(_this30.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this30.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
-              } else if ((_this30.options.columns[i].showAsNavigatorLink === true || _this30.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
-                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this30.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='websy-trigger trigger-item ").concat(_this30.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this30.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this30.options.columns[i].linkText || c.value, "</td>\n              ");
+              if (_this29.options.columns[i].showAsLink === true && c.value.trim() !== '') {
+                return "\n                <td \n                  data-row-index='".concat(_this29.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this29.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(_this29.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this29.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
+              } else if ((_this29.options.columns[i].showAsNavigatorLink === true || _this29.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
+                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this29.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='websy-trigger trigger-item ").concat(_this29.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this29.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this29.options.columns[i].linkText || c.value, "</td>\n              ");
               } else {
                 var info = c.value;
 
-                if (_this30.options.columns[i].showAsImage === true) {
+                if (_this29.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(_this30.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this30.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(_this29.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this29.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>';
@@ -4980,7 +5009,7 @@ var WebsyTable = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(data) {
-      var _this31 = this;
+      var _this30 = this;
 
       if (!this.options.columns) {
         return;
@@ -5005,7 +5034,17 @@ var WebsyTable = /*#__PURE__*/function () {
 
       var headHTML = '<tr>' + this.options.columns.map(function (c, i) {
         if (c.show !== false) {
-          return "\n        <th ".concat(c.width ? 'style="width: ' + (c.width || 'auto') + ';"' : '', ">\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 ? _this31.buildSearchIcon(c.qGroupFieldDefs[0]) : '', "-->\n          </div>\n        </th>\n        ");
+          var style = '';
+
+          if (c.style) {
+            style += c.style;
+          }
+
+          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 ? _this30.buildSearchIcon(c.qGroupFieldDefs[0]) : '', "-->\n          </div>\n        </th>\n        ");
         }
       }).join('') + '</tr>';
       var headEl = document.getElementById("".concat(this.elementId, "_head"));
@@ -5024,7 +5063,7 @@ var WebsyTable = /*#__PURE__*/function () {
 
         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(_this31.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
+            return "<li data-page=\"".concat(index, "\" class=\"websy-page-num ").concat(_this30.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
           });
           var startIndex = 0;
 
@@ -5092,7 +5131,7 @@ var WebsyTable = /*#__PURE__*/function () {
 
 var WebsyTable2 = /*#__PURE__*/function () {
   function WebsyTable2(elementId, options) {
-    var _this32 = this;
+    var _this31 = this;
 
     _classCallCheck(this, WebsyTable2);
 
@@ -5133,8 +5172,8 @@ var WebsyTable2 = /*#__PURE__*/function () {
           allowClear: false,
           disableSearch: true,
           onItemSelected: function onItemSelected(selectedItem) {
-            if (_this32.options.onChangePageSize) {
-              _this32.options.onChangePageSize(selectedItem.value);
+            if (_this31.options.onChangePageSize) {
+              _this31.options.onChangePageSize(selectedItem.value);
             }
           }
         });
@@ -5158,7 +5197,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
   _createClass(WebsyTable2, [{
     key: "appendRows",
     value: function appendRows(data) {
-      var _this33 = this;
+      var _this32 = this;
 
       this.hideError();
       var bodyEl = document.getElementById("".concat(this.elementId, "_body"));
@@ -5167,15 +5206,15 @@ var WebsyTable2 = /*#__PURE__*/function () {
       if (data) {
         bodyHTML += data.map(function (r, rowIndex) {
           return '<tr>' + r.map(function (c, i) {
-            if (_this33.options.columns[i].show !== false) {
-              var style = "height: ".concat(_this33.options.cellSize, "px; line-height: ").concat(_this33.options.cellSize, "px;");
+            if (_this32.options.columns[i].show !== false) {
+              var style = "height: ".concat(_this32.options.cellSize, "px; line-height: ").concat(_this32.options.cellSize, "px;");
 
               if (c.style) {
                 style += c.style;
               }
 
-              if (_this33.options.columns[i].width) {
-                style += "width: ".concat(_this33.options.columns[i].width, "; ");
+              if (_this32.options.columns[i].width) {
+                style += "width: ".concat(_this32.options.columns[i].width, "; ");
               }
 
               if (c.backgroundColor) {
@@ -5190,18 +5229,18 @@ var WebsyTable2 = /*#__PURE__*/function () {
                 style += "color: ".concat(c.color, "; ");
               }
 
-              if (_this33.options.columns[i].showAsLink === true && c.value.trim() !== '') {
-                return "\n                <td \n                  data-row-index='".concat(_this33.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this33.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(_this33.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this33.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
-              } else if ((_this33.options.columns[i].showAsNavigatorLink === true || _this33.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
-                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this33.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='websy-trigger trigger-item ").concat(_this33.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this33.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this33.options.columns[i].linkText || c.value, "</td>\n              ");
+              if (_this32.options.columns[i].showAsLink === true && c.value.trim() !== '') {
+                return "\n                <td \n                  data-row-index='".concat(_this32.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this32.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(_this32.options.columns[i].openInNewTab === true ? '_blank' : '_self', "'>").concat(c.displayText || _this32.options.columns[i].linkText || c.value, "</a>\n                </td>\n              ");
+              } else if ((_this32.options.columns[i].showAsNavigatorLink === true || _this32.options.columns[i].showAsRouterLink === true) && c.value.trim() !== '') {
+                return "\n                <td \n                  data-view='".concat(c.value, "' \n                  data-row-index='").concat(_this32.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='websy-trigger trigger-item ").concat(_this32.options.columns[i].clickable === true ? 'clickable' : '', " ").concat(_this32.options.columns[i].classes || '', "' \n                  style='").concat(style, "'\n                  colspan='").concat(c.colspan || 1, "'\n                  rowspan='").concat(c.rowspan || 1, "'\n                >").concat(c.displayText || _this32.options.columns[i].linkText || c.value, "</td>\n              ");
               } else {
                 var info = c.value;
 
-                if (_this33.options.columns[i].showAsImage === true) {
+                if (_this32.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(_this33.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this33.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(_this32.rowCount + rowIndex, "' \n                  data-col-index='").concat(i, "' \n                  class='").concat(_this32.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>';
@@ -5464,7 +5503,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(data) {
-      var _this34 = this;
+      var _this33 = this;
 
       if (!this.options.columns) {
         return;
@@ -5500,7 +5539,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
             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 ? _this34.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 ? _this33.buildSearchIcon(i) : '', "\n          </div>\n        </th>\n        ");
         }
       }).join('') + '</tr>';
       var headEl = document.getElementById("".concat(this.elementId, "_head"));
@@ -5511,7 +5550,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
         var dropdownHTML = "";
         this.options.columns.forEach(function (c, i) {
           if (c.searchable && c.searchField) {
-            dropdownHTML += "\n            <div id=\"".concat(_this34.elementId, "_columnSearch_").concat(i, "\" class=\"websy-modal-dropdown\"></div>\n          ");
+            dropdownHTML += "\n            <div id=\"".concat(_this33.elementId, "_columnSearch_").concat(i, "\" class=\"websy-modal-dropdown\"></div>\n          ");
           }
         });
         dropdownEl.innerHTML = dropdownHTML;
@@ -5533,7 +5572,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
 
         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(_this34.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
+            return "<li data-page=\"".concat(index, "\" class=\"websy-page-num ").concat(_this33.options.pageNum === index ? 'active' : '', "\">").concat(index + 1, "</li>");
           });
           var startIndex = 0;
 
@@ -5624,7 +5663,7 @@ var WebsyTable2 = /*#__PURE__*/function () {
   }, {
     key: "getColumnParameters",
     value: function getColumnParameters(values) {
-      var _this35 = this;
+      var _this34 = this;
 
       var tableEl = document.getElementById("".concat(this.elementId, "_table"));
       tableEl.style.tableLayout = 'auto';
@@ -5632,10 +5671,10 @@ var WebsyTable2 = /*#__PURE__*/function () {
       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 ? _this35.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 ? _this34.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(_this35.options.cellSize, "px; line-height: ").concat(_this35.options.cellSize, "px; padding: 10px 5px;'\n      >").concat(c.value || '&nbsp;', "</td>\n    ");
+        return "\n      <td                 \n        style='height: ".concat(_this34.options.cellSize, "px; line-height: ").concat(_this34.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");
@@ -5693,7 +5732,8 @@ var WebsyTable3 = /*#__PURE__*/function () {
       showTotalsAbove: true,
       minHandleSize: 20,
       maxColWidth: '50%',
-      allowPivoting: false
+      allowPivoting: false,
+      searchIcon: "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 512 512\"><title>ionicons-v5-f</title><path d=\"M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z\" style=\"fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px\"/><line x1=\"338.29\" y1=\"338.29\" x2=\"448\" y2=\"448\" style=\"fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px\"/></svg>"
     };
     this.options = _extends({}, DEFAULTS, options);
     this.sizes = {};
@@ -5781,7 +5821,34 @@ var WebsyTable3 = /*#__PURE__*/function () {
       data.forEach(function (row) {
         bodyHtml += "<tr class=\"websy-table-row\">";
         row.forEach(function (cell, cellIndex) {
-          bodyHtml += "<td \n          class='websy-table-cell'\n          style='".concat(cell.style, "'\n          data-info='").concat(cell.value, "'\n          colspan='").concat(cell.colspan || 1, "'\n          rowspan='").concat(cell.rowspan || 1, "'\n        "); // if (useWidths === true) {
+          if (typeof sizingColumns[cellIndex] === 'undefined') {
+            return; // need to revisit this logic
+          }
+
+          var style = '';
+
+          if (cell.style) {
+            style += cell.style;
+          }
+
+          if (useWidths === true) {
+            style += "max-width: ".concat(sizingColumns[cellIndex].width || sizingColumns[cellIndex].actualWidth, "px!important;");
+          }
+
+          if (cell.backgroundColor) {
+            style += "background-color: ".concat(cell.backgroundColor, "; ");
+
+            if (!cell.color) {
+              style += "color: ".concat(WebsyDesigns.Utils.getLightDark(cell.backgroundColor), "; ");
+            }
+          }
+
+          if (cell.color) {
+            style += "color: ".concat(cell.color, "; ");
+          }
+
+          console.log('rowspan', cell.rowspan);
+          bodyHtml += "<td \n          class='websy-table-cell ".concat((cell.classes || []).join(' '), "'\n          style='").concat(style, "'\n          data-info='").concat(cell.value, "'\n          colspan='").concat(cell.colspan || 1, "'\n          rowspan='").concat(cell.rowspan || 1, "'\n        "); // if (useWidths === true) {
           //   bodyHtml += `
           //     style='width: ${sizingColumns[cellIndex].width || sizingColumns[cellIndex].actualWidth}px!important'
           //     width='${sizingColumns[cellIndex].width || sizingColumns[cellIndex].actualWidth}'
@@ -5798,7 +5865,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "buildHeaderHtml",
     value: function buildHeaderHtml() {
-      var _this36 = this;
+      var _this35 = this;
 
       var useWidths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
       var headerHtml = '';
@@ -5813,13 +5880,13 @@ var WebsyTable3 = /*#__PURE__*/function () {
       }
 
       this.options.columns.forEach(function (row, rowIndex) {
-        if (useWidths === false && rowIndex !== _this36.options.columns.length - 1) {
+        if (useWidths === false && rowIndex !== _this35.options.columns.length - 1) {
           // if we're calculating the size we only want to render the last row of column headers
           return;
         }
 
         headerHtml += "<tr class=\"websy-table-row  websy-table-header-row\">";
-        row.forEach(function (col) {
+        row.forEach(function (col, colIndex) {
           headerHtml += "<td \n          class='websy-table-cell'  \n          style='".concat(col.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'
@@ -5827,16 +5894,34 @@ var WebsyTable3 = /*#__PURE__*/function () {
           //   `
           // }
 
-          headerHtml += "        \n          >\n          ".concat(col.name, "\n        </td>");
+          headerHtml += "        \n          >\n          <div>\n            ".concat(col.name, "\n            ").concat(col.searchable === true ? _this35.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(_this35.elementId, "_columnSearch_").concat(c.dimId || i));
+
+          if (!testEl) {
+            var newE = document.createElement('div');
+            newE.id = "".concat(_this35.elementId, "_columnSearch_").concat(c.dimId || i);
+            newE.className = 'websy-modal-dropdown';
+            dropdownEl.appendChild(newE);
+          }
+        }
+      });
       return headerHtml;
     }
+  }, {
+    key: "buildSearchIcon",
+    value: function buildSearchIcon(col, index) {
+      return "\n      <div class=\"websy-table-search-icon\" data-col-id=\"".concat(col.dimId, "\" data-col-index=\"").concat(index, "\">\n        <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"20\" height=\"20\" viewBox=\"0 0 512 512\"><title>ionicons-v5-f</title><path d=\"M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z\" style=\"fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px\"/><line x1=\"338.29\" y1=\"338.29\" x2=\"448\" y2=\"448\" style=\"fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px\"/></svg>\n      </div>\n    ");
+    }
   }, {
     key: "buildTotalHtml",
     value: function buildTotalHtml() {
-      var _this37 = this;
+      var _this36 = this;
 
       var useWidths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
 
@@ -5849,7 +5934,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
         totalHtml += "<td \n        class='websy-table-cell'\n        colspan='".concat(col.colspan || 1, "'\n        rowspan='").concat(col.rowspan || 1, "'\n      ");
 
         if (useWidths === true) {
-          totalHtml += "\n          style='width: ".concat(_this37.options.columns[_this37.options.columns.length - 1][colIndex].width || _this37.options.columns[_this37.options.columns.length - 1][colIndex].actualWidth, "px'\n          width='").concat(col.width || col.actualWidth, "'\n        ");
+          totalHtml += "\n          style='width: ".concat(_this36.options.columns[_this36.options.columns.length - 1][colIndex].width || _this36.options.columns[_this36.options.columns.length - 1][colIndex].actualWidth, "px'\n          width='").concat(col.width || col.actualWidth, "'\n        ");
         }
 
         totalHtml += "        \n        >\n        ".concat(col.value, "\n      </td>");
@@ -5860,7 +5945,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "calculateSizes",
     value: function calculateSizes() {
-      var _this38 = this;
+      var _this37 = this;
 
       var sample = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       var totalRowCount = arguments.length > 1 ? arguments[1] : undefined;
@@ -5902,30 +5987,36 @@ var WebsyTable3 = /*#__PURE__*/function () {
       rows.forEach(function (row, rowIndex) {
         Array.from(row.children).forEach(function (col, colIndex) {
           var colSize = col.getBoundingClientRect();
-          _this38.sizes.cellHeight = colSize.height;
+          _this37.sizes.cellHeight = colSize.height;
 
-          if (_this38.options.columns[_this38.options.columns.length - 1][colIndex]) {
-            if (!_this38.options.columns[_this38.options.columns.length - 1][colIndex].actualWidth) {
-              _this38.options.columns[_this38.options.columns.length - 1][colIndex].actualWidth = 0;
+          if (_this37.options.columns[_this37.options.columns.length - 1][colIndex]) {
+            if (!_this37.options.columns[_this37.options.columns.length - 1][colIndex].actualWidth) {
+              _this37.options.columns[_this37.options.columns.length - 1][colIndex].actualWidth = 0;
             }
 
-            _this38.options.columns[_this38.options.columns.length - 1][colIndex].actualWidth = Math.min(Math.max(_this38.options.columns[_this38.options.columns.length - 1][colIndex].actualWidth, colSize.width), maxWidth);
-            _this38.options.columns[_this38.options.columns.length - 1][colIndex].cellHeight = colSize.height;
+            _this37.options.columns[_this37.options.columns.length - 1][colIndex].actualWidth = Math.min(Math.max(_this37.options.columns[_this37.options.columns.length - 1][colIndex].actualWidth, colSize.width), maxWidth);
+            _this37.options.columns[_this37.options.columns.length - 1][colIndex].cellHeight = colSize.height;
           }
         });
       });
       this.options.columns[this.options.columns.length - 1].forEach(function (col, colIndex) {
-        if (colIndex < _this38.pinnedColumns) {
-          _this38.sizes.scrollableWidth -= col.actualWidth;
+        if (colIndex < _this37.pinnedColumns) {
+          _this37.sizes.scrollableWidth -= col.actualWidth;
         }
       });
       this.sizes.totalWidth = this.options.columns[this.options.columns.length - 1].reduce(function (a, b) {
         return a + (b.width || b.actualWidth);
       }, 0);
+      this.sizes.totalNonPinnedWidth = this.options.columns[this.options.columns.length - 1].filter(function (c, i) {
+        return i >= _this37.pinnedColumns;
+      }).reduce(function (a, b) {
+        return a + (b.width || b.actualWidth);
+      }, 0);
       var outerSize = outerEl.getBoundingClientRect();
 
       if (this.sizes.totalWidth < outerSize.width) {
         this.sizes.totalWidth = 0;
+        this.sizes.totalNonPinnedWidth = 0;
         var equalWidth = outerSize.width / this.options.columns[this.options.columns.length - 1].length;
         this.options.columns[this.options.columns.length - 1].forEach(function (c, i) {
           if (!c.width) {
@@ -5935,8 +6026,13 @@ var WebsyTable3 = /*#__PURE__*/function () {
             }
           }
 
-          _this38.sizes.totalWidth += c.width || c.actualWidth;
-          equalWidth = (outerSize.width - _this38.sizes.totalWidth) / (_this38.options.columns[_this38.options.columns.length - 1].length - (i + 1));
+          _this37.sizes.totalWidth += c.width || c.actualWidth;
+
+          if (i < _this37.pinnedColumns) {
+            _this37.sizes.totalNonPinnedWidth += c.width || c.actualWidth;
+          }
+
+          equalWidth = (outerSize.width - _this37.sizes.totalWidth) / (_this37.options.columns[_this37.options.columns.length - 1].length - (i + 1));
         });
       } // take the height of the last cell as the official height for data cells
       // this.sizes.dataCellHeight = this.options.columns[this.options.columns.length - 1].cellHeight
@@ -5957,10 +6053,14 @@ var WebsyTable3 = /*#__PURE__*/function () {
 
       if (this.sizes.rowsToRender < this.totalRowCount) {
         this.vScrollRequired = true;
+      } else {
+        this.vScrollRequired = false;
       }
 
       if (this.sizes.totalWidth > this.sizes.outer.width) {
         this.hScrollRequired = true;
+      } else {
+        this.hScrollRequired = false;
       }
 
       this.options.allColumns = this.options.columns.map(function (c) {
@@ -6000,7 +6100,16 @@ var WebsyTable3 = /*#__PURE__*/function () {
     }
   }, {
     key: "handleClick",
-    value: function handleClick(event) {}
+    value: function handleClick(event) {
+      if (event.target.classList.contains('websy-table-search-icon')) {
+        console.log('clicked on search icon');
+        var colIndex = +event.target.getAttribute('data-col-index');
+
+        if (this.options.columns[this.options.columns.length - 1][colIndex].onSearch) {
+          this.options.columns[this.options.columns.length - 1][colIndex].onSearch(event, this.options.columns[this.options.columns.length - 1][colIndex]);
+        }
+      }
+    }
   }, {
     key: "handleMouseDown",
     value: function handleMouseDown(event) {
@@ -6124,20 +6233,26 @@ var WebsyTable3 = /*#__PURE__*/function () {
 
       if (this.options.virtualScroll === true) {
         // set the scroll element positions
+        var vScrollEl = document.getElementById("".concat(this.elementId, "_vScrollContainer"));
+        var vHandleEl = document.getElementById("".concat(this.elementId, "_vScrollHandle"));
+
         if (this.vScrollRequired === true) {
-          var vScrollEl = document.getElementById("".concat(this.elementId, "_vScrollContainer"));
-          var vHandleEl = document.getElementById("".concat(this.elementId, "_vScrollHandle"));
           vScrollEl.style.top = "".concat(this.sizes.header.height + this.sizes.total.height, "px");
           vScrollEl.style.height = "".concat(this.sizes.bodyHeight, "px");
           vHandleEl.style.height = Math.max(this.options.minHandleSize, this.sizes.bodyHeight * (this.sizes.rowsToRenderPrecise / this.totalRowCount)) + 'px';
+        } else {
+          vHandleEl.style.height = '0px';
         }
 
+        var hScrollEl = document.getElementById("".concat(this.elementId, "_hScrollContainer"));
+        var hHandleEl = document.getElementById("".concat(this.elementId, "_hScrollHandle"));
+
         if (this.hScrollRequired === true) {
-          var hScrollEl = document.getElementById("".concat(this.elementId, "_hScrollContainer"));
-          var hHandleEl = document.getElementById("".concat(this.elementId, "_hScrollHandle"));
           hScrollEl.style.left = "".concat(this.sizes.table.width - this.sizes.scrollableWidth, "px");
           hScrollEl.style.width = "".concat(this.sizes.scrollableWidth - 20, "px");
-          hHandleEl.style.width = Math.max(this.options.minHandleSize, this.sizes.scrollableWidth * (this.sizes.scrollableWidth / this.sizes.totalWidth)) + 'px';
+          hHandleEl.style.width = Math.max(this.options.minHandleSize, this.sizes.scrollableWidth * (this.sizes.scrollableWidth / this.sizes.totalNonPinnedWidth)) + 'px';
+        } else {
+          hHandleEl.style.width = '0px';
         }
       }
     }
@@ -6178,8 +6293,6 @@ var WebsyTable3 = /*#__PURE__*/function () {
         el.classList.add('has-error');
       }
 
-      var tableEl = document.getElementById("".concat(this.elementId, "_tableInner"));
-      tableEl.classList.add('hidden');
       var containerEl = document.getElementById("".concat(this.elementId, "_errorContainer"));
 
       if (containerEl) {
@@ -6205,6 +6318,24 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "scrollX",
     value: function scrollX(diff) {
+      var el = document.getElementById("".concat(this.elementId, "_tableContainer"));
+
+      if (!el.classList.contains('scrolling')) {
+        el.classList.add('scrolling');
+      }
+
+      if (this.scrollTimeoutFn) {
+        clearTimeout(this.scrollTimeoutFn);
+      }
+
+      this.scrollTimeoutFn = setTimeout(function () {
+        el.classList.remove('scrolling');
+      }, 200);
+
+      if (this.hScrollRequired === false) {
+        return;
+      }
+
       var scrollContainerEl = document.getElementById("".concat(this.elementId, "_hScrollContainer"));
       var scrollHandleEl = document.getElementById("".concat(this.elementId, "_hScrollHandle"));
       var handlePos;
@@ -6220,14 +6351,14 @@ var WebsyTable3 = /*#__PURE__*/function () {
       scrollHandleEl.style.left = Math.min(scrollableSpace, Math.max(0, handlePos)) + 'px';
 
       if (this.options.onScroll) {
-        var actualLeft = (this.sizes.totalWidth - this.sizes.scrollableWidth) * (Math.min(scrollableSpace, Math.max(0, handlePos)) / scrollableSpace);
+        var actualLeft = (this.sizes.totalNonPinnedWidth - this.sizes.scrollableWidth) * (Math.min(scrollableSpace, Math.max(0, handlePos)) / scrollableSpace);
         var cumulativeWidth = 0;
         this.startCol = 0;
         this.endCol = 0;
 
-        for (var i = 0; i < this.options.allColumns[this.options.allColumns.length - 1].length; i++) {
+        for (var i = this.pinnedColumns; i < this.options.allColumns[this.options.allColumns.length - 1].length; i++) {
           cumulativeWidth += this.options.allColumns[this.options.allColumns.length - 1][i].actualWidth;
-          console.log(actualLeft, this.sizes.totalWidth, cumulativeWidth, cumulativeWidth + this.options.allColumns[this.options.allColumns.length - 1][i].actualWidth);
+          console.log('actualLeft', actualLeft, this.sizes.totalWidth, cumulativeWidth, cumulativeWidth + this.options.allColumns[this.options.allColumns.length - 1][i].actualWidth);
 
           if (actualLeft < cumulativeWidth) {
             this.startCol = i;
@@ -6260,6 +6391,24 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "scrollY",
     value: function scrollY(diff) {
+      var el = document.getElementById("".concat(this.elementId, "_tableContainer"));
+
+      if (!el.classList.contains('scrolling')) {
+        el.classList.add('scrolling');
+      }
+
+      if (this.scrollTimeoutFn) {
+        clearTimeout(this.scrollTimeoutFn);
+      }
+
+      this.scrollTimeoutFn = setTimeout(function () {
+        el.classList.remove('scrolling');
+      }, 200);
+
+      if (this.vScrollRequired === false) {
+        return;
+      }
+
       var scrollContainerEl = document.getElementById("".concat(this.elementId, "_vScrollContainer"));
       var scrollHandleEl = document.getElementById("".concat(this.elementId, "_vScrollHandle"));
       var handlePos;
@@ -6312,7 +6461,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
 
 var WebsyChart = /*#__PURE__*/function () {
   function WebsyChart(elementId, options) {
-    var _this39 = this;
+    var _this38 = this;
 
     _classCallCheck(this, WebsyChart);
 
@@ -6361,22 +6510,22 @@ var WebsyChart = /*#__PURE__*/function () {
     this.invertOverride = function (input, input2) {
       var xAxis = 'bottomAxis';
 
-      if (_this39.options.orientation === 'horizontal') {
+      if (_this38.options.orientation === 'horizontal') {
         xAxis = 'leftAxis';
       }
 
-      var width = _this39[xAxis].step();
+      var width = _this38[xAxis].step();
 
       var output;
 
-      var domain = _toConsumableArray(_this39[xAxis].domain());
+      var domain = _toConsumableArray(_this38[xAxis].domain());
 
-      if (_this39.options.orientation === 'horizontal') {
+      if (_this38.options.orientation === 'horizontal') {
         domain = domain.reverse();
       }
 
       for (var j = 0; j < domain.length; j++) {
-        var breakA = _this39[xAxis](domain[j]) - width / 2;
+        var breakA = _this38[xAxis](domain[j]) - width / 2;
         var breakB = breakA + width;
 
         if (input > breakA && input <= breakB) {
@@ -6476,10 +6625,10 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "handleEventMouseMove",
     value: function handleEventMouseMove(event, d) {
-      var _this40 = this;
+      var _this39 = this;
 
       var bisectDate = d3.bisector(function (d) {
-        return _this40.parseX(d.x.value);
+        return _this39.parseX(d.x.value);
       }).left;
 
       if (this.options.showTrackingLine === true && d3.pointer(event)) {
@@ -6518,8 +6667,8 @@ var WebsyChart = /*#__PURE__*/function () {
         }
 
         this.options.data.series.forEach(function (s) {
-          if (_this40.options.data[xData].scale !== 'Time') {
-            xPoint = _this40[xAxis](_this40.parseX(xLabel));
+          if (_this39.options.data[xData].scale !== 'Time') {
+            xPoint = _this39[xAxis](_this39.parseX(xLabel));
             s.data.forEach(function (d) {
               if (d.x.value === xLabel) {
                 if (!tooltipTitle) {
@@ -6538,13 +6687,13 @@ var WebsyChart = /*#__PURE__*/function () {
             var pointA = s.data[index - 1];
             var pointB = s.data[index];
 
-            if (_this40.options.orientation === 'horizontal') {
+            if (_this39.options.orientation === 'horizontal') {
               pointA = _toConsumableArray(s.data).reverse()[index - 1];
               pointB = _toConsumableArray(s.data).reverse()[index];
             }
 
             if (pointA && !pointB) {
-              xPoint = _this40[xAxis](_this40.parseX(pointA.x.value));
+              xPoint = _this39[xAxis](_this39.parseX(pointA.x.value));
               tooltipTitle = pointA.x.value;
 
               if (!pointA.y.color) {
@@ -6554,12 +6703,12 @@ var WebsyChart = /*#__PURE__*/function () {
               tooltipData.push(pointA.y);
 
               if (typeof pointA.x.value.getTime !== 'undefined') {
-                tooltipTitle = d3.timeFormat(_this40.options.dateFormat || _this40.options.calculatedTimeFormatPattern)(pointA.x.value);
+                tooltipTitle = d3.timeFormat(_this39.options.dateFormat || _this39.options.calculatedTimeFormatPattern)(pointA.x.value);
               }
             }
 
             if (pointB && !pointA) {
-              xPoint = _this40[xAxis](_this40.parseX(pointB.x.value));
+              xPoint = _this39[xAxis](_this39.parseX(pointB.x.value));
               tooltipTitle = pointB.x.value;
 
               if (!pointB.y.color) {
@@ -6569,14 +6718,14 @@ var WebsyChart = /*#__PURE__*/function () {
               tooltipData.push(pointB.y);
 
               if (typeof pointB.x.value.getTime !== 'undefined') {
-                tooltipTitle = d3.timeFormat(_this40.options.dateFormat || _this40.options.calculatedTimeFormatPattern)(pointB.x.value);
+                tooltipTitle = d3.timeFormat(_this39.options.dateFormat || _this39.options.calculatedTimeFormatPattern)(pointB.x.value);
               }
             }
 
             if (pointA && pointB) {
-              var d0 = _this40[xAxis](_this40.parseX(pointA.x.value));
+              var d0 = _this39[xAxis](_this39.parseX(pointA.x.value));
 
-              var d1 = _this40[xAxis](_this40.parseX(pointB.x.value));
+              var d1 = _this39[xAxis](_this39.parseX(pointB.x.value));
 
               var mid = Math.abs(d0 - d1) / 2;
 
@@ -6585,7 +6734,7 @@ var WebsyChart = /*#__PURE__*/function () {
                 tooltipTitle = pointB.x.value;
 
                 if (typeof pointB.x.value.getTime !== 'undefined') {
-                  tooltipTitle = d3.timeFormat(_this40.options.dateFormat || _this40.options.calculatedTimeFormatPattern)(pointB.x.value);
+                  tooltipTitle = d3.timeFormat(_this39.options.dateFormat || _this39.options.calculatedTimeFormatPattern)(pointB.x.value);
                 }
 
                 if (!pointB.y.color) {
@@ -6598,7 +6747,7 @@ var WebsyChart = /*#__PURE__*/function () {
                 tooltipTitle = pointA.x.value;
 
                 if (typeof pointB.x.value.getTime !== 'undefined') {
-                  tooltipTitle = d3.timeFormat(_this40.options.dateFormat || _this40.options.calculatedTimeFormatPattern)(pointB.x.value);
+                  tooltipTitle = d3.timeFormat(_this39.options.dateFormat || _this39.options.calculatedTimeFormatPattern)(pointB.x.value);
                 }
 
                 if (!pointA.y.color) {
@@ -6703,7 +6852,7 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(options) {
-      var _this41 = this;
+      var _this40 = this;
 
       /* global d3 options WebsyUtils */
       if (typeof options !== 'undefined') {
@@ -6772,7 +6921,7 @@ var WebsyChart = /*#__PURE__*/function () {
             var legendData = this.options.data.series.map(function (s, i) {
               return {
                 value: s.label || s.key,
-                color: s.color || _this41.options.colors[i % _this41.options.colors.length]
+                color: s.color || _this40.options.colors[i % _this40.options.colors.length]
               };
             });
 
@@ -7024,7 +7173,7 @@ var WebsyChart = /*#__PURE__*/function () {
 
             if (this.options.data.bottom.formatter) {
               bAxisFunc.tickFormat(function (d) {
-                return _this41.options.data.bottom.formatter(d);
+                return _this40.options.data.bottom.formatter(d);
               });
             }
 
@@ -7050,8 +7199,8 @@ 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 (_this41.options.data.left.formatter) {
-                d = _this41.options.data.left.formatter(d);
+              if (_this40.options.data.left.formatter) {
+                d = _this40.options.data.left.formatter(d);
               }
 
               return d;
@@ -7088,8 +7237,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.left.ticks || 5).tickFormat(function (d) {
-                if (_this41.options.data.right.formatter) {
-                  d = _this41.options.data.right.formatter(d);
+                if (_this40.options.data.right.formatter) {
+                  d = _this40.options.data.right.formatter(d);
                 }
 
                 return d;
@@ -7115,16 +7264,16 @@ var WebsyChart = /*#__PURE__*/function () {
 
           this.options.data.series.forEach(function (series, index) {
             if (!series.key) {
-              series.key = _this41.createIdentity();
+              series.key = _this40.createIdentity();
             }
 
             if (!series.color) {
-              series.color = _this41.options.colors[index % _this41.options.colors.length];
+              series.color = _this40.options.colors[index % _this40.options.colors.length];
             }
 
-            _this41["render".concat(series.type || 'bar')](series, index);
+            _this40["render".concat(series.type || 'bar')](series, index);
 
-            _this41.renderLabels(series, index);
+            _this40.renderLabels(series, index);
           });
         }
       }
@@ -7132,17 +7281,17 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "renderarea",
     value: function renderarea(series, index) {
-      var _this42 = this;
+      var _this41 = this;
 
       /* global d3 series index */
       var drawArea = function drawArea(xAxis, yAxis, curveStyle) {
         return d3.area().x(function (d) {
-          return _this42[xAxis](_this42.parseX(d.x.value));
+          return _this41[xAxis](_this41.parseX(d.x.value));
         }).y0(function (d) {
-          return _this42[yAxis](0);
+          return _this41[yAxis](0);
         }).y1(function (d) {
-          return _this42[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
-        }).curve(d3[curveStyle || _this42.options.curveStyle]);
+          return _this41[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
+        }).curve(d3[curveStyle || _this41.options.curveStyle]);
       };
 
       var xAxis = 'bottomAxis';
@@ -7246,11 +7395,11 @@ var WebsyChart = /*#__PURE__*/function () {
 
       bars.exit().transition(this.transition).style('stroke-opacity', 1e-6).remove();
       bars.attr('width', getBarWidth.bind(this)).attr('height', getBarHeight.bind(this)).attr('x', getBarX.bind(this)).attr('y', getBarY.bind(this)).transition(this.transition).attr('fill', function (d) {
-        return d.color || series.color;
+        return d.y.color || d.color || series.color;
       });
       bars.enter().append('rect').attr('width', getBarWidth.bind(this)).attr('height', getBarHeight.bind(this)).attr('x', getBarX.bind(this)).attr('y', getBarY.bind(this)) // .transition(this.transition)
       .attr('fill', function (d) {
-        return d.color || series.color;
+        return d.y.color || d.color || series.color;
       }).attr('class', function (d) {
         return "bar bar_".concat(series.key);
       });
@@ -7258,7 +7407,7 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "renderLabels",
     value: function renderLabels(series, index) {
-      var _this43 = this;
+      var _this42 = this;
 
       /* global series index d3 WebsyDesigns */
       var xAxis = 'bottomAxis';
@@ -7270,20 +7419,36 @@ var WebsyChart = /*#__PURE__*/function () {
         yAxis = 'bottomAxis';
       }
 
-      if (this.options.showLabels) {
+      if (this.options.showLabels === true || series.showLabels === true) {
         // need to add logic to handle positioning options
         // e.g. Inside, Outide, Auto (this will also affect the available plot space)
         // We currently only support 'Auto'  
         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', getLabelX.bind(this)).attr('y', getLabelY.bind(this)).attr('class', "label_".concat(series.key)).style('font-size', "".concat(this.options.labelSize || this.options.fontSize, "px")).style('fill', function (d) {
-          return _this43.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.color || series.color);
-        }).transition(this.transition).text(function (d) {
+        labels.attr('x', getLabelX.bind(this)).attr('y', getLabelY.bind(this)).attr('class', "label_".concat(series.key)).attr('fill', function (d) {
+          return _this42.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) {
+          if (that.options.orientation === 'horizontal') {
+            if (that.options.grouping === 'stacked') {
+              this.setAttribute('text-anchor', 'middle');
+            } else if (that.plotWidth - getLabelX.call(that, d) < this.getComputedTextLength()) {
+              this.setAttribute('text-anchor', 'end');
+              this.setAttribute('x', +this.getAttribute('x') - 8);
+              this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color));
+            } else {
+              this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'));
+            }
+          } else {
+            if (that.plotheight - getLabelX.call(that, d) < (that.options.labelSize || that.options.fontSize)) {
+              this.setAttribute('y', +this.getAttribute('y') + 8);
+            }
+          }
         });
-        labels.enter().append('text').attr('class', "label_".concat(series.key)).attr('x', getLabelX.bind(this)).attr('y', getLabelY.bind(this)).attr('alignment-baseline', 'central').attr('text-anchor', this.options.orientation === 'horizontal' ? 'left' : 'middle').style('font-size', "".concat(this.options.labelSize || this.options.fontSize, "px")).style('fill', function (d) {
-          return _this43.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.color || series.color);
-        }).text(function (d) {
+        labels.enter().append('text').attr('class', "label_".concat(series.key)).attr('x', getLabelX.bind(this)).attr('y', getLabelY.bind(this)).attr('alignment-baseline', 'central').attr('text-anchor', this.options.orientation === 'horizontal' ? 'left' : 'middle').attr('fill', function (d) {
+          return _this42.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) {
           if (that.options.orientation === 'horizontal') {
@@ -7292,6 +7457,9 @@ var WebsyChart = /*#__PURE__*/function () {
             } else if (that.plotWidth - getLabelX.call(that, d) < this.getComputedTextLength()) {
               this.setAttribute('text-anchor', 'end');
               this.setAttribute('x', +this.getAttribute('x') - 8);
+              this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color));
+            } else {
+              this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'));
             }
           } else {
             if (that.plotheight - getLabelX.call(that, d) < (that.options.labelSize || that.options.fontSize)) {
@@ -7327,15 +7495,15 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "renderline",
     value: function renderline(series, index) {
-      var _this44 = this;
+      var _this43 = this;
 
       /* global series index d3 */
       var drawLine = function drawLine(xAxis, yAxis, curveStyle) {
         return d3.line().x(function (d) {
-          return _this44[xAxis](_this44.parseX(d.x.value));
+          return _this43[xAxis](_this43.parseX(d.x.value));
         }).y(function (d) {
-          return _this44[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
-        }).curve(d3[curveStyle || _this44.options.curveStyle]);
+          return _this43[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
+        }).curve(d3[curveStyle || _this43.options.curveStyle]);
       };
 
       var xAxis = 'bottomAxis';
@@ -7373,14 +7541,14 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "rendersymbol",
     value: function rendersymbol(series, index) {
-      var _this45 = this;
+      var _this44 = this;
 
       /* global d3 series index series.key */
       var drawSymbol = function drawSymbol(size) {
         return d3.symbol() // .type(d => {
         //   return d3.symbols[0]
         // })
-        .size(size || _this45.options.symbolSize);
+        .size(size || _this44.options.symbolSize);
       };
 
       var xAxis = 'bottomAxis';
@@ -7398,7 +7566,7 @@ var WebsyChart = /*#__PURE__*/function () {
       symbols.attr('d', function (d) {
         return drawSymbol(d.y.size || series.symbolSize)(d);
       }).transition(this.transition).attr('fill', 'white').attr('stroke', series.color).attr('transform', function (d) {
-        return "translate(".concat(_this45[xAxis](_this45.parseX(d.x.value)), ", ").concat(_this45[yAxis](isNaN(d.y.value) ? 0 : d.y.value), ")");
+        return "translate(".concat(_this44[xAxis](_this44.parseX(d.x.value)), ", ").concat(_this44[yAxis](isNaN(d.y.value) ? 0 : d.y.value), ")");
       }); // Enter
 
       symbols.enter().append('path').attr('d', function (d) {
@@ -7407,7 +7575,7 @@ var WebsyChart = /*#__PURE__*/function () {
       .attr('fill', 'white').attr('stroke', series.color).attr('class', function (d) {
         return "symbol symbol_".concat(series.key);
       }).attr('transform', function (d) {
-        return "translate(".concat(_this45[xAxis](_this45.parseX(d.x.value)), ", ").concat(_this45[yAxis](isNaN(d.y.value) ? 0 : d.y.value), ")");
+        return "translate(".concat(_this44[xAxis](_this44.parseX(d.x.value)), ", ").concat(_this44[yAxis](isNaN(d.y.value) ? 0 : d.y.value), ")");
       });
     }
   }, {
@@ -7562,7 +7730,7 @@ var WebsyLegend = /*#__PURE__*/function () {
   }, {
     key: "resize",
     value: function resize() {
-      var _this46 = this;
+      var _this45 = this;
 
       var el = document.getElementById(this.elementId);
 
@@ -7575,7 +7743,7 @@ var WebsyLegend = /*#__PURE__*/function () {
         // }
         var html = "\n        <div class='text-".concat(this.options.align, "'>\n      ");
         html += this._data.map(function (d, i) {
-          return _this46.getLegendItemHTML(d);
+          return _this45.getLegendItemHTML(d);
         }).join('');
         html += "\n        <div>\n      ";
         el.innerHTML = html;
@@ -7747,7 +7915,7 @@ var WebsyMap = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-      var _this47 = this;
+      var _this46 = this;
 
       var mapEl = document.getElementById("".concat(this.elementId, "_map"));
       var legendEl = document.getElementById("".concat(this.elementId, "_map"));
@@ -7756,7 +7924,7 @@ var WebsyMap = /*#__PURE__*/function () {
         var legendData = this.options.data.polygons.map(function (s, i) {
           return {
             value: s.label || s.key,
-            color: s.color || _this47.options.colors[i % _this47.options.colors.length]
+            color: s.color || _this46.options.colors[i % _this46.options.colors.length]
           };
         });
         var longestValue = legendData.map(function (s) {
@@ -7820,7 +7988,7 @@ var WebsyMap = /*#__PURE__*/function () {
 
       if (this.polygons) {
         this.polygons.forEach(function (p) {
-          return _this47.map.removeLayer(p);
+          return _this46.map.removeLayer(p);
         });
       }
 
@@ -7878,18 +8046,18 @@ var WebsyMap = /*#__PURE__*/function () {
           }
 
           if (!p.options.color) {
-            p.options.color = _this47.options.colors[i % _this47.options.colors.length];
+            p.options.color = _this46.options.colors[i % _this46.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(_this47.map);
+          }), p.options).addTo(_this46.map);
 
-          _this47.polygons.push(pol);
+          _this46.polygons.push(pol);
 
-          _this47.map.fitBounds(pol.getBounds());
+          _this46.map.fitBounds(pol.getBounds());
         });
       } // if (this.data.markers.length > 0) {            
       //   el.classList.remove('hidden')