@websy/websy-designs 1.2.32 → 1.3.0

package/dist/websy-designs-es6.js

@@ -470,7 +470,8 @@ 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));
     }
@@ -489,11 +490,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 +524,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 +540,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 +554,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 +614,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
 
           if (this.options.mode === 'date') {
             d = this.floorDate(new Date(this.selectedRangeDates[0].getTime() + _i * this.oneDay));
+            d.setHours(0, 0, 0, 0);
             d = d.getTime();
             rangeStart = this.selectedRangeDates[0].getTime();
             rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime();
@@ -906,7 +907,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        ";
         }
@@ -1043,7 +1044,9 @@ 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"));
 
@@ -1238,12 +1241,322 @@ var WebsyDatePicker = /*#__PURE__*/function () {
 Date.prototype.floor = function () {
   return new Date("".concat(this.getMonth() + 1, "/").concat(this.getDate(), "/").concat(this.getFullYear()));
 };
+/* global WebsyDesigns GlobalPubSub */
+
+
+var WebsyDragDrop = /*#__PURE__*/function () {
+  function WebsyDragDrop(elementId, options) {
+    _classCallCheck(this, WebsyDragDrop);
+
+    var DEFAULTS = {
+      items: [],
+      orientation: 'horizontal',
+      dropPlaceholder: 'Drop item here'
+    };
+    this.busy = false;
+    this.options = _extends({}, DEFAULTS, options);
+    this.elementId = elementId;
+
+    if (!elementId) {
+      console.log('No element Id provided for Websy DragDrop');
+      return;
+    }
+
+    var el = document.getElementById(elementId);
+
+    if (el) {
+      el.innerHTML = "\n        <div id='".concat(this.elementId, "_container' class='websy-drag-drop-container ").concat(this.options.orientation, "'>\n          <div>\n        </div>\n      ");
+      el.addEventListener('click', this.handleClick.bind(this));
+      el.addEventListener('dragstart', this.handleDragStart.bind(this));
+      el.addEventListener('dragover', this.handleDragOver.bind(this));
+      el.addEventListener('dragleave', this.handleDragLeave.bind(this));
+      el.addEventListener('drop', this.handleDrop.bind(this));
+      window.addEventListener('dragend', this.handleDragEnd.bind(this));
+    } else {
+      console.error("No element found with ID ".concat(this.elementId));
+    }
+
+    GlobalPubSub.subscribe(this.elementId, 'requestForDDItem', this.handleRequestForItem.bind(this));
+    GlobalPubSub.subscribe(this.elementId, 'add', this.addItem.bind(this));
+    this.render();
+  }
+
+  _createClass(WebsyDragDrop, [{
+    key: "addItem",
+    value: function addItem(data) {
+      if (data.target === this.elementId && this.busy === false) {
+        this.busy = true;
+        console.log('adding item to dd'); // check that an item with the same id doesn't already exist
+
+        var index = this.getItemIndex(data.item.id);
+
+        if (index === -1) {
+          this.options.items.splice(data.index, 0, data.item);
+          var startEl = document.getElementById("".concat(this.elementId, "start_item"));
+
+          if (startEl) {
+            if (this.options.items.length === 0) {
+              startEl.classList.add('empty');
+            } else {
+              startEl.classList.remove('empty');
+            }
+          }
+
+          if (this.options.onItemAdded) {
+            this.options.onItemAdded();
+          }
+        }
+
+        this.busy = false;
+      }
+    }
+  }, {
+    key: "createItemHtml",
+    value: function createItemHtml(elementId, index, item) {
+      if (!item.id) {
+        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    ");
+
+      if (item.component) {
+        html += "<div id='".concat(item.id, "_component'></div>");
+      } else {
+        html += "".concat(item.html || item.label || '');
+      }
+
+      html += "\n        </div>\n        <div id='".concat(item.id, "_dropZone' class='websy-drop-zone droppable' data-index='").concat(item.id, "' data-side='right' data-id='").concat(item.id, "' data-placeholder='").concat(this.options.dropPlaceholder, "'></div>    \n      </div>\n    ");
+      return html;
+    }
+  }, {
+    key: "getItemIndex",
+    value: function getItemIndex(id) {
+      for (var i = 0; i < this.options.items.length; i++) {
+        if (this.options.items[i].id === id) {
+          return i;
+        }
+      }
+
+      return -1;
+    }
+  }, {
+    key: "handleClick",
+    value: function handleClick(event) {}
+  }, {
+    key: "handleDragStart",
+    value: function handleDragStart(event) {
+      this.draggedId = event.target.getAttribute('data-id');
+      event.dataTransfer.effectAllowed = 'move';
+      event.dataTransfer.setData('application/wd-item', JSON.stringify({
+        el: event.target.id,
+        id: this.elementId,
+        itemId: this.draggedId
+      })); // console.log('drag start', event)
+
+      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();
+      }
+
+      if (!event.target.classList.contains('droppable')) {
+        return;
+      }
+
+      event.target.classList.add('drag-over');
+    }
+  }, {
+    key: "handleDragLeave",
+    value: function handleDragLeave(event) {
+      // console.log('drag leave', event.target.classList)
+      if (!event.target.classList.contains('droppable')) {
+        return;
+      }
+
+      event.target.classList.remove('drag-over'); // let side = event.target.getAttribute('data-side')
+      // let id = event.target.getAttribute('data-id')    
+      // let droppedItem = this.options.items[id]
+      // this.removeExpandedDrop(side, id, droppedItem)  
+    }
+  }, {
+    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'));
+
+      if (event.preventDefault) {
+        event.preventDefault();
+      }
+
+      if (!event.target.classList.contains('droppable')) {
+        return;
+      }
+
+      var side = event.target.getAttribute('data-side');
+      var id = event.target.getAttribute('data-id');
+      var index = this.getItemIndex(id);
+      var draggedIndex = this.getItemIndex(data.id);
+      var droppedItem = this.options.items[index];
+
+      if (side === 'right') {
+        index += 1;
+      }
+
+      if (draggedIndex === -1) {
+        // console.log('requestForDDItem')
+        GlobalPubSub.publish(data.id, 'requestForDDItem', {
+          group: this.options.group,
+          source: data.id,
+          target: this.elementId,
+          index: index,
+          id: data.itemId
+        });
+      } else if (index > draggedIndex) {
+        // insert and then remove     
+        this.options.items.splice(index, 0, droppedItem);
+        this.options.items.splice(draggedIndex, 1);
+
+        if (this.options.onOrderUpdated) {
+          this.options.onOrderUpdated();
+        }
+      } else {
+        // remove and then insert
+        this.options.items.splice(draggedIndex, 1);
+        this.options.items.splice(index, 0, droppedItem);
+
+        if (this.options.onOrderUpdated) {
+          this.options.onOrderUpdated();
+        }
+      } // this.removeExpandedDrop(side, id, droppedItem)
+      // const draggedEl = document.getElementById(`${this.elementId}_${this.draggedId}_item`)
+
+
+      var draggedEl = document.getElementById(data.el);
+      var droppedEl = document.getElementById("".concat(id, "_item"));
+
+      if (draggedEl) {
+        droppedEl.insertAdjacentElement('afterend', draggedEl);
+      }
+
+      var dragOverEl = droppedEl.querySelector('.drag-over');
+
+      if (dragOverEl) {
+        dragOverEl.classList.remove('drag-over');
+      }
+    }
+  }, {
+    key: "handleDragEnd",
+    value: function handleDragEnd(event) {
+      // console.log('drag end')
+      event.target.style.opacity = 1;
+      this.draggedId = null;
+      this.dragging = false;
+      var startEl = document.getElementById("".concat(this.elementId, "start_item"));
+
+      if (startEl) {
+        if (this.options.items.length === 0) {
+          startEl.classList.add('empty');
+        } else {
+          startEl.classList.remove('empty');
+        }
+      }
+    }
+  }, {
+    key: "handleRequestForItem",
+    value: function handleRequestForItem(data) {
+      if (data.group === this.options.group) {
+        var index = this.getItemIndex(data.id);
+
+        if (index !== -1) {
+          var itemToAdd = this.options.items.splice(index, 1);
+          GlobalPubSub.publish(data.target, 'add', {
+            target: data.target,
+            index: data.index,
+            item: itemToAdd[0]
+          });
+        }
+      }
+    }
+  }, {
+    key: "measureItems",
+    value: function measureItems() {
+      var el = document.getElementById("".concat(this.elementId, "_container"));
+      this.options.items.forEach(function (d) {});
+    } // removeExpandedDrop (side, id, droppedItem) {
+    //   let dropEl
+    //   const dropImageEl = document.getElementById(`${id}_itemInner`)
+    //   // const placeholderEl = document.getElementById(`${this.elementId}_${id}_dropZonePlaceholder`)
+    //   if (side === 'left') {
+    //     dropEl = document.getElementById(`${this.elementId}_${id}_dropZoneLeft`) 
+    //     dropImageEl.style.left = `0px`
+    //   }
+    //   else if (side === 'right') {
+    //     dropEl = document.getElementById(`${this.elementId}_${id}_dropZoneRight`)      
+    //   }
+    //   else {
+    //     dropEl = document.getElementById(`${this.elementId}_${id}_dropZoneEnd`)  
+    //   }
+    //   if (dropEl) {
+    //     const dropElSize = dropEl.getBoundingClientRect()      
+    //     dropEl.style.width = `${(dropElSize.width / 2)}px`
+    //     dropEl.style.marginLeft = null
+    //     dropEl.style.border = null
+    //   }
+    //   if (placeholderEl) {
+    //     placeholderEl.classList.remove('active')
+    //     placeholderEl.style.left = null
+    //     placeholderEl.style.right = null
+    //     placeholderEl.style.width = null
+    //     placeholderEl.style.height = null
+    //   }
+    // }
+
+  }, {
+    key: "removeItem",
+    value: function removeItem(id) {}
+  }, {
+    key: "render",
+    value: function render() {
+      var _this8 = this;
+
+      var el = document.getElementById("".concat(this.elementId, "_container"));
+
+      if (el) {
+        this.measureItems();
+        var html = "\n        <div id='".concat(this.elementId, "start_item' class='websy-dragdrop-item ").concat(this.options.items.length === 0 ? 'empty' : '', "' data-id='").concat(this.elementId, "start'>\n          <div id='").concat(this.elementId, "start_dropZone' class='websy-drop-zone droppable' data-index='start' data-side='start' data-id='").concat(this.elementId, "start' data-placeholder='").concat(this.options.dropPlaceholder, "'></div>\n        </div>\n      ");
+        html += this.options.items.map(function (d, i) {
+          return _this8.createItemHtml(_this8.elementId, i, d);
+        }).join('');
+        el.innerHTML = html;
+        this.options.items.forEach(function (item, i) {
+          if (item.component) {
+            if (item.isQlikPlugin && WebsyDesigns.QlikPlugin[item.component]) {
+              item.instance = new WebsyDesigns.QlikPlugin[item.component]("".concat(item.id, "_component"), item.options);
+            } else if (WebsyDesigns[item.component]) {
+              item.instance = new WebsyDesigns[item.component]("".concat(item.id, "_component"), item.options);
+            } else {
+              console.error("Component ".concat(item.component, " not found."));
+            }
+          }
+        });
+      }
+    }
+  }]);
+
+  return WebsyDragDrop;
+}();
 /* global WebsyUtils */
 
 
 var WebsyDropdown = /*#__PURE__*/function () {
   function WebsyDropdown(elementId, options) {
-    var _this8 = this;
+    var _this9 = this;
 
     _classCallCheck(this, WebsyDropdown);
 
@@ -1291,10 +1604,10 @@ var WebsyDropdown = /*#__PURE__*/function () {
       el.addEventListener('mouseout', this.handleMouseOut.bind(this));
       el.addEventListener('mousemove', this.handleMouseMove.bind(this));
       var headerLabel = this.selectedItems.map(function (s) {
-        return _this8.options.items[s].label || _this8.options.items[s].value;
+        return _this9.options.items[s].label || _this9.options.items[s].value;
       }).join(this.options.multiValueDelimiter);
       var headerValue = this.selectedItems.map(function (s) {
-        return _this8.options.items[s].value || _this8.options.items[s].label;
+        return _this9.options.items[s].value || _this9.options.items[s].label;
       }).join(this.options.multiValueDelimiter);
       var html = "\n        <div id='".concat(this.elementId, "_container' class='websy-dropdown-container ").concat(this.options.disabled ? 'disabled' : '', " ").concat(this.options.disableSearch !== true ? 'with-search' : '', " ").concat(this.options.style, " ").concat(this.options.customActions.length > 0 ? 'with-actions' : '', "'>\n          <div id='").concat(this.elementId, "_header' class='websy-dropdown-header ").concat(this.selectedItems.length === 1 ? 'one-selected' : '', " ").concat(this.options.allowClear === true ? 'allow-clear' : '', "'>\n            ").concat(this.options.searchIcon, "\n            <span>\n              <span class='websy-dropdown-header-value' data-info='").concat(headerLabel, "' id='").concat(this.elementId, "_selectedItems'>").concat(headerLabel, "</span> \n              <span class='websy-dropdown-header-label' id='").concat(this.elementId, "_headerLabel'>").concat(this.options.label, "</span>\n            </span>\n            <input class='dropdown-input' id='").concat(this.elementId, "_input' name='").concat(this.options.field || this.options.label, "' value='").concat(headerValue, "'>\n            ").concat(this.options.arrowIcon, "\n      ");
 
@@ -1577,10 +1890,10 @@ var WebsyDropdown = /*#__PURE__*/function () {
   }, {
     key: "renderItems",
     value: function renderItems() {
-      var _this9 = this;
+      var _this10 = this;
 
       var html = this.options.items.map(function (r, i) {
-        return "\n      <li data-index='".concat(r.index, "' class='websy-dropdown-item ").concat((r.classes || []).join(' '), " ").concat(_this9.selectedItems.indexOf(r.index) !== -1 ? 'active' : '', "'>").concat(r.label, "</li>\n    ");
+        return "\n      <li data-index='".concat(r.index, "' class='websy-dropdown-item ").concat((r.classes || []).join(' '), " ").concat(_this10.selectedItems.indexOf(r.index) !== -1 ? 'active' : '', "'>").concat(r.label, "</li>\n    ");
       }).join('');
       var el = document.getElementById("".concat(this.elementId, "_items"));
 
@@ -1599,14 +1912,17 @@ var WebsyDropdown = /*#__PURE__*/function () {
   }, {
     key: "updateHeader",
     value: function updateHeader(item) {
-      var _this10 = 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');
@@ -1646,17 +1962,17 @@ var WebsyDropdown = /*#__PURE__*/function () {
         } else if (this.selectedItems.length > 1) {
           if (this.options.showCompleteSelectedList === true) {
             var selectedLabels = this.selectedItems.map(function (s) {
-              return _this10.options.items[s].label || _this10.options.items[s].value;
+              return dataToUse[s].label || dataToUse[s].value;
             }).join(this.options.multiValueDelimiter);
             var selectedValues = this.selectedItems.map(function (s) {
-              return _this10.options.items[s].value || _this10.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 _this10.options.items[s].value || _this10.options.items[s].label;
+              return dataToUse[s].value || dataToUse[s].label;
             }).join(this.options.multiValueDelimiter);
 
             labelEl.innerHTML = "".concat(this.selectedItems.length, " selected");
@@ -1673,6 +1989,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);
 
@@ -1685,13 +2007,14 @@ var WebsyDropdown = /*#__PURE__*/function () {
             this.selectedItems.push(index);
           }
         }
-      }
+      } // const item = this.options.items[index]
 
-      var item = this.options.items[index];
+
+      var item = dataToUse[index];
       this.updateHeader(item);
 
       if (item && this.options.onItemSelected) {
-        this.options.onItemSelected(item, this.selectedItems, this.options.items, this.options);
+        this.options.onItemSelected(item, this.selectedItems, dataToUse, this.options);
       }
 
       if (this.options.closeAfterSelection === true) {
@@ -1711,20 +2034,29 @@ var WebsyDropdown = /*#__PURE__*/function () {
           d.index = i;
         }
 
+        d.currentIndex = i;
         return d;
       });
+      var headerEl = document.getElementById("".concat(this.elementId, "_header"));
+
+      if (headerEl) {
+        headerEl.classList["".concat(this.options.allowClear === true ? 'add' : 'remove')]('allow-clear');
+      }
+
       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() {
@@ -2711,21 +3043,37 @@ var WebsyPubSub = /*#__PURE__*/function () {
 
   _createClass(WebsyPubSub, [{
     key: "publish",
-    value: function publish(method, data) {
-      if (this.subscriptions[method]) {
-        this.subscriptions[method].forEach(function (fn) {
-          fn(data);
-        });
+    value: function publish(id, method, data) {
+      if (arguments.length === 3) {
+        if (this.subscriptions[id] && this.subscriptions[id][method]) {
+          this.subscriptions[id][method](data);
+        }
+      } else {
+        if (this.subscriptions[id]) {
+          this.subscriptions[id].forEach(function (fn) {
+            fn(method);
+          });
+        }
       }
     }
   }, {
     key: "subscribe",
-    value: function subscribe(method, fn) {
-      if (!this.subscriptions[method]) {
-        this.subscriptions[method] = [];
-      }
+    value: function subscribe(id, method, fn) {
+      if (arguments.length === 3) {
+        if (!this.subscriptions[id]) {
+          this.subscriptions[id] = {};
+        }
+
+        if (!this.subscriptions[id][method]) {
+          this.subscriptions[id][method] = fn;
+        }
+      } else {
+        if (!this.subscriptions[id]) {
+          this.subscriptions[id] = [];
+        }
 
-      this.subscriptions[method].push(fn);
+        this.subscriptions[id].push(method);
+      }
     }
   }]);
 
@@ -4178,6 +4526,7 @@ var WebsyUtils = {
     var red = 0;
     var green = 0;
     var blue = 0;
+    var alpha = 1;
 
     if (backgroundColor.indexOf('#') !== -1) {
       // hex color
@@ -4189,14 +4538,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;
@@ -4668,7 +5019,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 ? _this30.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"));
@@ -5077,7 +5438,11 @@ var WebsyTable2 = /*#__PURE__*/function () {
   }, {
     key: "hideLoading",
     value: function hideLoading() {
-      this.loadingDialog.hide();
+      if (this.options.onLoading) {
+        this.options.onLoading(false);
+      } else {
+        this.loadingDialog.hide();
+      }
     }
   }, {
     key: "internalSort",
@@ -5159,7 +5524,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              >\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        ");
+          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"));
@@ -5274,7 +5639,11 @@ var WebsyTable2 = /*#__PURE__*/function () {
   }, {
     key: "showLoading",
     value: function showLoading(options) {
-      this.loadingDialog.show(options);
+      if (this.options.onLoading) {
+        this.options.onLoading(true);
+      } else {
+        this.loadingDialog.show(options);
+      }
     }
   }, {
     key: "getColumnParameters",
@@ -5335,85 +5704,764 @@ var WebsyTable2 = /*#__PURE__*/function () {
 
   return WebsyTable2;
 }();
-/* global d3 include WebsyDesigns */
-
+/* global WebsyDesigns */
 
-var WebsyChart = /*#__PURE__*/function () {
-  function WebsyChart(elementId, options) {
-    var _this35 = this;
 
-    _classCallCheck(this, WebsyChart);
+var WebsyTable3 = /*#__PURE__*/function () {
+  function WebsyTable3(elementId, options) {
+    _classCallCheck(this, WebsyTable3);
 
+    this.elementId = elementId;
     var DEFAULTS = {
-      margin: {
-        top: 10,
-        left: 3,
-        bottom: 3,
-        right: 3,
-        axisBottom: 0,
-        axisLeft: 0,
-        axisRight: 0,
-        axisTop: 0,
-        legendBottom: 0,
-        legendLeft: 0,
-        legendRight: 0,
-        legendTop: 0
-      },
-      axis: {},
-      orientation: 'vertical',
-      colors: ['#5e4fa2', '#3288bd', '#66c2a5', '#abdda4', '#e6f598', '#fee08b', '#fdae61', '#f46d43', '#d53e4f', '#9e0142'],
-      transitionDuration: 650,
-      curveStyle: 'curveLinear',
-      lineWidth: 2,
-      forceZero: true,
-      fontSize: 14,
-      symbolSize: 20,
-      showTrackingLine: true,
-      showTooltip: true,
-      showLegend: false,
-      legendPosition: 'bottom',
-      tooltipWidth: 200
+      virtualScroll: false,
+      showTotalsAbove: true,
+      minHandleSize: 20,
+      maxColWidth: '50%',
+      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.elementId = elementId;
     this.options = _extends({}, DEFAULTS, options);
-    this.leftAxis = null;
-    this.rightAxis = null;
-    this.topAxis = null;
-    this.bottomAxis = null;
+    this.sizes = {};
+    this.scrollDragging = false;
+    this.cellDragging = false;
+    this.vScrollRequired = false;
+    this.hScrollRequired = false;
+    this.pinnedColumns = 0;
+    this.startRow = 0;
+    this.endRow = 0;
+    this.startCol = 0;
+    this.endCol = 0;
+    this.mouseYStart = 0;
+    this.mouseYStart = 0;
 
     if (!elementId) {
-      console.log('No element Id provided for Websy Chart');
+      console.log('No element Id provided for Websy Table');
       return;
     }
 
-    this.invertOverride = function (input, input2) {
-      var xAxis = 'bottomAxis';
-
-      if (_this35.options.orientation === 'horizontal') {
-        xAxis = 'leftAxis';
-      }
-
-      var width = _this35[xAxis].step();
-
-      var output;
+    var el = document.getElementById(this.elementId);
 
-      var domain = _toConsumableArray(_this35[xAxis].domain());
+    if (el) {
+      var html = "\n        <div id='".concat(this.elementId, "_tableContainer' class='websy-vis-table-3 ").concat(this.options.paging === 'pages' ? 'with-paging' : '', " ").concat(this.options.virtualScroll === true ? 'with-virtual-scroll' : '', "'>\n          <!--<div class=\"download-button\">\n            <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\"><path d=\"M16 11h5l-9 10-9-10h5v-11h8v11zm1 11h-10v2h10v-2z\"/></svg>\n          </div>-->\n          <div id=\"").concat(this.elementId, "_tableInner\" class=\"websy-table-inner-container\">\n            <table id=\"").concat(this.elementId, "_tableHeader\" class=\"websy-table-header\"></table>\n            <table id=\"").concat(this.elementId, "_tableBody\" class=\"websy-table-body\"></table>\n            <table id=\"").concat(this.elementId, "_tableFooter\" class=\"websy-table-footer\"></table>\n            <div id=\"").concat(this.elementId, "_vScrollContainer\" class=\"websy-v-scroll-container\">\n              <div id=\"").concat(this.elementId, "_vScrollHandle\" class=\"websy-scroll-handle websy-scroll-handle-y\"></div>\n            </div>\n            <div id=\"").concat(this.elementId, "_hScrollContainer\" class=\"websy-h-scroll-container\">\n              <div id=\"").concat(this.elementId, "_hScrollHandle\" class=\"websy-scroll-handle websy-scroll-handle-x\"></div>\n            </div>\n          </div>     \n          <div id=\"").concat(this.elementId, "_errorContainer\" class='websy-vis-error-container'>\n            <div>\n              <div id=\"").concat(this.elementId, "_errorTitle\"></div>\n              <div id=\"").concat(this.elementId, "_errorMessage\"></div>\n            </div>            \n          </div>\n          <div id=\"").concat(this.elementId, "_dropdownContainer\"></div>\n          <div id=\"").concat(this.elementId, "_loadingContainer\"></div>\n        </div>\n      ");
 
-      if (_this35.options.orientation === 'horizontal') {
-        domain = domain.reverse();
+      if (this.options.paging === 'pages') {
+        html += "\n          <div class=\"websy-table-paging-container\">\n            Show <div id=\"".concat(this.elementId, "_pageSizeSelector\" class=\"websy-vis-page-selector\"></div> rows\n            <ul id=\"").concat(this.elementId, "_pageList\" class=\"websy-vis-page-list\"></ul>\n          </div>\n        ");
       }
 
-      for (var j = 0; j < domain.length; j++) {
-        var breakA = _this35[xAxis](domain[j]) - width / 2;
-        var breakB = breakA + width;
+      el.innerHTML = html;
+      el.addEventListener('click', this.handleClick.bind(this));
+      el.addEventListener('mousedown', this.handleMouseDown.bind(this));
+      window.addEventListener('mousemove', this.handleMouseMove.bind(this));
+      window.addEventListener('mouseup', this.handleMouseUp.bind(this));
+      var scrollEl = document.getElementById("".concat(this.elementId, "_tableBody"));
 
-        if (input > breakA && input <= breakB) {
-          output = j;
-          break;
-        }
+      if (scrollEl) {
+        scrollEl.addEventListener('wheel', this.handleScrollWheel.bind(this));
       }
 
-      return output;
+      this.loadingDialog = new WebsyDesigns.LoadingDialog("".concat(this.elementId, "_loadingContainer"));
+      this.render(this.options.data);
+    } else {
+      console.error("No element found with ID ".concat(this.elementId));
+    }
+  }
+
+  _createClass(WebsyTable3, [{
+    key: "appendRows",
+    value: function appendRows(data) {
+      this.hideError();
+      var bodyEl = document.getElementById("".concat(this.elementId, "_tableBody"));
+
+      if (bodyEl) {
+        if (this.options.virtualScroll === true) {
+          bodyEl.innerHTML = this.buildBodyHtml(data, true);
+        } else {
+          bodyEl.innerHTML += this.buildBodyHtml(data, true);
+        }
+      } // this.data = this.data.concat(data)
+      // this.rowCount = this.data.length   
+
+    }
+  }, {
+    key: "buildBodyHtml",
+    value: function buildBodyHtml() {
+      var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      var useWidths = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+      if (data.length === 0) {
+        return '';
+      }
+
+      var bodyHtml = "";
+      var sizingColumns = this.options.columns[this.options.columns.length - 1];
+
+      if (useWidths === true) {
+        bodyHtml += '<colgroup>';
+        bodyHtml += sizingColumns.map(function (c) {
+          return "\n        <col\n          style='width: ".concat(c.width || c.actualWidth, "px!important'\n        ></col>\n      ");
+        }).join('');
+        bodyHtml += '</colgroup>';
+      }
+
+      data.forEach(function (row) {
+        bodyHtml += "<tr class=\"websy-table-row\">";
+        row.forEach(function (cell, cellIndex) {
+          var style = '';
+
+          if (cell.style) {
+            style += cell.style;
+          }
+
+          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, "; ");
+          }
+
+          bodyHtml += "<td \n          class='websy-table-cell'\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}'
+          //   `
+          // }
+
+          bodyHtml += "\n        >\n          ".concat(cell.value, "\n        </td>");
+        });
+        bodyHtml += "</tr>";
+      }); // bodyHtml += `</div>`    
+
+      return bodyHtml;
+    }
+  }, {
+    key: "buildHeaderHtml",
+    value: function buildHeaderHtml() {
+      var _this35 = this;
+
+      var useWidths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+      var headerHtml = '';
+      var sizingColumns = this.options.columns[this.options.columns.length - 1];
+
+      if (useWidths === true) {
+        headerHtml += '<colgroup>';
+        headerHtml += sizingColumns.map(function (c) {
+          return "\n        <col\n          style='width: ".concat(c.width || c.actualWidth, "px!important'\n        ></col>\n      ");
+        }).join('');
+        headerHtml += '</colgroup>';
+      }
+
+      this.options.columns.forEach(function (row, rowIndex) {
+        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, 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'
+          //     width='${col.width || col.actualWidth}'
+          //   `
+          // }
+
+          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 _this36 = this;
+
+      var useWidths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
+      if (!this.options.totals) {
+        return '';
+      }
+
+      var totalHtml = "<tr class=\"websy-table-row  websy-table-total-row\">";
+      this.options.totals.forEach(function (col, colIndex) {
+        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(_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>");
+      });
+      totalHtml += "</tr>";
+      return totalHtml;
+    }
+  }, {
+    key: "calculateSizes",
+    value: function calculateSizes() {
+      var _this37 = this;
+
+      var sample = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      var totalRowCount = arguments.length > 1 ? arguments[1] : undefined;
+      var totalColumnCount = arguments.length > 2 ? arguments[2] : undefined;
+      var pinnedColumns = arguments.length > 3 ? arguments[3] : undefined;
+      this.totalRowCount = totalRowCount; // probably need some error handling here if no value is passed in
+
+      this.totalColumnCount = totalColumnCount; // probably need some error handling here if no value is passed in
+
+      this.pinnedColumns = pinnedColumns; // probably need some error handling here if no value is passed in    
+
+      var outerEl = document.getElementById(this.elementId);
+      var tableEl = document.getElementById("".concat(this.elementId, "_tableContainer"));
+      var headEl = document.getElementById("".concat(this.elementId, "_tableHeader"));
+      headEl.style.width = 'auto';
+      headEl.innerHTML = this.buildHeaderHtml();
+      this.sizes.outer = outerEl.getBoundingClientRect();
+      this.sizes.table = tableEl.getBoundingClientRect();
+      this.sizes.header = headEl.getBoundingClientRect();
+      var maxWidth;
+
+      if (typeof this.options.maxColWidth === 'number') {
+        maxWidth = this.options.maxColWidth;
+      } else if (this.options.maxColWidth.indexOf('%') !== -1) {
+        maxWidth = this.sizes.outer.width * (+this.options.maxColWidth.replace('%', '') / 100);
+      } else if (this.options.maxColWidth.indexOf('px') !== -1) {
+        maxWidth = +this.options.maxColWidth.replace('px', '');
+      }
+
+      var bodyEl = document.getElementById("".concat(this.elementId, "_tableBody"));
+      bodyEl.style.width = 'auto';
+      bodyEl.innerHTML = this.buildBodyHtml([sample]);
+      var footerEl = document.getElementById("".concat(this.elementId, "_tableFooter"));
+      footerEl.innerHTML = this.buildTotalHtml();
+      this.sizes.total = footerEl.getBoundingClientRect();
+      var rows = Array.from(tableEl.querySelectorAll('.websy-table-row'));
+      var totalWidth = 0;
+      this.sizes.scrollableWidth = this.sizes.outer.width;
+      rows.forEach(function (row, rowIndex) {
+        Array.from(row.children).forEach(function (col, colIndex) {
+          var colSize = col.getBoundingClientRect();
+          _this37.sizes.cellHeight = colSize.height;
+
+          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;
+            }
+
+            _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 < _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);
+      var outerSize = outerEl.getBoundingClientRect();
+
+      if (this.sizes.totalWidth < outerSize.width) {
+        this.sizes.totalWidth = 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) {
+            if (c.actualWidth < equalWidth) {
+              // adjust the width
+              c.actualWidth = equalWidth;
+            }
+          }
+
+          _this37.sizes.totalWidth += 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
+
+
+      headEl.innerHTML = '';
+      bodyEl.innerHTML = '';
+      footerEl.innerHTML = '';
+      headEl.style.width = 'initial';
+      bodyEl.style.width = 'initial';
+      this.sizes.bodyHeight = this.sizes.table.height - (this.sizes.header.height + this.sizes.total.height);
+      this.sizes.rowsToRender = Math.ceil(this.sizes.bodyHeight / this.sizes.cellHeight);
+      this.sizes.rowsToRenderPrecise = this.sizes.bodyHeight / this.sizes.cellHeight;
+      this.startRow = 0;
+      this.endRow = this.sizes.rowsToRender;
+      this.startCol = 0;
+      this.endCol = this.options.columns[this.options.columns.length - 1].length;
+
+      if (this.sizes.rowsToRender < this.totalRowCount) {
+        this.vScrollRequired = true;
+      }
+
+      if (this.sizes.totalWidth > this.sizes.outer.width) {
+        this.hScrollRequired = true;
+      }
+
+      this.options.allColumns = this.options.columns.map(function (c) {
+        return c;
+      });
+      console.log('sizes', this.sizes);
+      return this.sizes;
+    }
+  }, {
+    key: "createSample",
+    value: function createSample(data) {
+      var output = [];
+      this.options.columns[this.options.columns.length - 1].forEach(function (col, colIndex) {
+        if (col.maxLength) {
+          output.push({
+            value: new Array(col.maxLength).fill('W').join('')
+          });
+        } else if (data) {
+          var longest = '';
+
+          for (var i = 0; i < Math.min(data.length, 1000); i++) {
+            if (longest.length < data[i][colIndex].value.length) {
+              longest = data[i][colIndex].value;
+            }
+          }
+
+          output.push({
+            value: longest
+          });
+        } else {
+          output.push({
+            value: ''
+          });
+        }
+      });
+      return output;
+    }
+  }, {
+    key: "handleClick",
+    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) {
+      if (event.target.classList.contains('websy-scroll-handle-y')) {
+        // set up the scroll start values
+        this.scrollDragging = true;
+        this.scrollDirection = 'y';
+        var scrollHandleEl = document.getElementById("".concat(this.elementId, "_vScrollHandle"));
+        this.handleYStart = scrollHandleEl.offsetTop;
+        this.mouseYStart = event.pageY;
+        console.log('mouse down', this.handleYStart, this.mouseYStart);
+        console.log(scrollHandleEl.offsetTop);
+      } else if (event.target.classList.contains('websy-scroll-handle-x')) {
+        this.scrollDragging = true;
+        this.scrollDirection = 'x';
+
+        var _scrollHandleEl = document.getElementById("".concat(this.elementId, "_hScrollHandle"));
+
+        this.handleXStart = _scrollHandleEl.offsetLeft;
+        this.mouseXStart = event.pageX;
+      }
+    }
+  }, {
+    key: "handleMouseMove",
+    value: function handleMouseMove(event) {
+      // event.preventDefault()
+      if (this.scrollDragging === true) {
+        if (this.scrollDirection === 'y') {
+          var diff = event.pageY - this.mouseYStart;
+          this.scrollY(diff);
+        } else if (this.scrollDirection === 'x') {
+          var _diff = event.pageX - this.mouseXStart;
+
+          this.scrollX(_diff);
+        }
+      }
+    }
+  }, {
+    key: "handleMouseUp",
+    value: function handleMouseUp(event) {
+      this.scrollDragging = false;
+      this.cellDragging = false;
+      this.handleYStart = null;
+      this.mouseYStart = null;
+      this.handleXStart = null;
+      this.mouseXStart = null;
+    }
+  }, {
+    key: "handleScrollWheel",
+    value: function handleScrollWheel(event) {
+      event.preventDefault();
+      console.log('scrollwheel', event);
+
+      if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
+        this.scrollX(Math.max(-5, Math.min(5, event.deltaX)));
+      } else {
+        this.scrollY(Math.max(-5, Math.min(5, event.deltaY)));
+      }
+    }
+  }, {
+    key: "hideError",
+    value: function hideError() {
+      var el = document.getElementById("".concat(this.elementId, "_tableContainer"));
+
+      if (el) {
+        el.classList.remove('has-error');
+      }
+
+      var tableEl = document.getElementById("".concat(this.elementId, "_tableInner"));
+      tableEl.classList.remove('hidden');
+      var containerEl = document.getElementById("".concat(this.elementId, "_errorContainer"));
+
+      if (containerEl) {
+        containerEl.classList.remove('active');
+      }
+    }
+  }, {
+    key: "hideLoading",
+    value: function hideLoading() {
+      this.loadingDialog.hide();
+    }
+  }, {
+    key: "render",
+    value: function render(data) {
+      var calcSizes = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+
+      if (!this.options.columns) {
+        console.log("No columns provided for table with ID ".concat(this.elementId));
+        return;
+      }
+
+      if (this.options.columns.length === 0) {
+        console.log("No columns provided for table with ID ".concat(this.elementId));
+        return;
+      } // this.data = []
+      // Adjust the sizing of the header/body/footer
+
+
+      if (calcSizes === true) {
+        var sample = this.createSample(data);
+        this.calculateSizes(sample, data.length, (data[0] || []).length, 0);
+      }
+
+      console.log(this.options.columns);
+      var tableInnerEl = document.getElementById("".concat(this.elementId, "_tableInner"));
+
+      if (tableInnerEl) {
+        tableInnerEl.style.width = "".concat(this.sizes.totalWidth, "px");
+      }
+
+      this.renderColumnHeaders();
+      this.renderTotals();
+
+      if (data) {
+        this.appendRows(data);
+      }
+
+      var bodyEl = document.getElementById("".concat(this.elementId, "_tableBody")); // bodyEl.innerHTML = this.buildBodyHtml(data, true)
+
+      bodyEl.style.height = "calc(100% - ".concat(this.sizes.header.height, "px - ").concat(this.sizes.total.height, "px)");
+
+      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) {
+          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) {
+          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';
+        } else {
+          hHandleEl.style.height = '0px';
+        }
+      }
+    }
+  }, {
+    key: "renderColumnHeaders",
+    value: function renderColumnHeaders() {
+      var headEl = document.getElementById("".concat(this.elementId, "_tableHeader"));
+
+      if (headEl) {
+        headEl.innerHTML = this.buildHeaderHtml(true);
+      }
+    }
+  }, {
+    key: "renderTotals",
+    value: function renderTotals() {
+      var headEl = document.getElementById("".concat(this.elementId, "_tableHeader"));
+      var totalHtml = this.buildTotalHtml(true);
+
+      if (this.options.showTotalsAbove === true) {
+        headEl.innerHTML += totalHtml;
+      } else {
+        var footerEl = document.getElementById("".concat(this.elementId, "_tableFooter"));
+
+        if (footerEl) {
+          footerEl.innerHTML = totalHtml;
+        }
+      }
+    }
+  }, {
+    key: "resize",
+    value: function resize() {}
+  }, {
+    key: "showError",
+    value: function showError(options) {
+      var el = document.getElementById("".concat(this.elementId, "_tableContainer"));
+
+      if (el) {
+        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) {
+        containerEl.classList.add('active');
+      }
+
+      if (options.title) {
+        var titleEl = document.getElementById("".concat(this.elementId, "_errorTitle"));
+
+        if (titleEl) {
+          titleEl.innerHTML = options.title;
+        }
+      }
+
+      if (options.message) {
+        var messageEl = document.getElementById("".concat(this.elementId, "_errorMessage"));
+
+        if (messageEl) {
+          messageEl.innerHTML = options.message;
+        }
+      }
+    }
+  }, {
+    key: "scrollX",
+    value: function scrollX(diff) {
+      var scrollContainerEl = document.getElementById("".concat(this.elementId, "_hScrollContainer"));
+      var scrollHandleEl = document.getElementById("".concat(this.elementId, "_hScrollHandle"));
+      var handlePos;
+
+      if (typeof this.handleXStart !== 'undefined' && this.handleXStart !== null) {
+        handlePos = this.handleXStart + diff;
+      } else {
+        handlePos = scrollHandleEl.offsetLeft + diff;
+      }
+
+      var scrollableSpace = scrollContainerEl.getBoundingClientRect().width - scrollHandleEl.getBoundingClientRect().width;
+      console.log('dragging x', diff, scrollContainerEl.getBoundingClientRect().width - scrollHandleEl.getBoundingClientRect().width);
+      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 cumulativeWidth = 0;
+        this.startCol = 0;
+        this.endCol = 0;
+
+        for (var i = 0; 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', actualLeft, this.sizes.totalWidth, cumulativeWidth, cumulativeWidth + this.options.allColumns[this.options.allColumns.length - 1][i].actualWidth);
+
+          if (actualLeft < cumulativeWidth) {
+            this.startCol = i;
+            break;
+          }
+        }
+
+        cumulativeWidth = 0;
+
+        for (var _i10 = this.startCol; _i10 < this.options.allColumns[this.options.allColumns.length - 1].length; _i10++) {
+          cumulativeWidth += this.options.allColumns[this.options.allColumns.length - 1][_i10].actualWidth;
+
+          if (cumulativeWidth < this.sizes.scrollableWidth) {
+            this.endCol = _i10;
+          }
+        }
+
+        if (this.endCol < this.options.allColumns[this.options.allColumns.length - 1].length - 1) {
+          this.endCol += 1;
+        }
+
+        if (this.endCol === this.options.allColumns[this.options.allColumns.length - 1].length - 1 && cumulativeWidth > this.sizes.totalWidth) {
+          this.startCol += 1;
+        }
+
+        this.endCol = Math.max(this.startCol, this.endCol);
+        this.options.onScroll('y', this.startRow, this.endRow, this.startCol, this.endCol);
+      }
+    }
+  }, {
+    key: "scrollY",
+    value: function scrollY(diff) {
+      var scrollContainerEl = document.getElementById("".concat(this.elementId, "_vScrollContainer"));
+      var scrollHandleEl = document.getElementById("".concat(this.elementId, "_vScrollHandle"));
+      var handlePos;
+
+      if (typeof this.handleYStart !== 'undefined' && this.handleYStart !== null) {
+        handlePos = this.handleYStart + diff;
+      } else {
+        console.log('appending not resetting');
+        handlePos = scrollHandleEl.offsetTop + diff;
+      }
+
+      var scrollableSpace = scrollContainerEl.getBoundingClientRect().height - scrollHandleEl.getBoundingClientRect().height;
+      console.log('dragging y', diff, scrollContainerEl.getBoundingClientRect().height - scrollHandleEl.getBoundingClientRect().height);
+      scrollHandleEl.style.top = Math.min(scrollableSpace, Math.max(0, handlePos)) + 'px';
+
+      if (this.options.onScroll) {
+        this.startRow = Math.min(this.totalRowCount - this.sizes.rowsToRender, Math.max(0, Math.round((this.totalRowCount - this.sizes.rowsToRender) * (handlePos / scrollableSpace))));
+        this.endRow = this.startRow + this.sizes.rowsToRender;
+
+        if (this.endRow === this.totalRowCount) {
+          this.startRow += 1;
+        }
+
+        this.options.onScroll('y', this.startRow, this.endRow, this.startCol, this.endCol);
+      }
+    }
+  }, {
+    key: "showLoading",
+    value: function showLoading(options) {
+      this.loadingDialog.show(options);
+    }
+  }, {
+    key: "columns",
+    set: function set(columns) {
+      this.options.columns = columns;
+      this.renderColumnHeaders();
+    }
+  }, {
+    key: "totals",
+    set: function set(totals) {
+      this.options.totals = totals;
+      this.renderTotals();
+    }
+  }]);
+
+  return WebsyTable3;
+}();
+/* global d3 include WebsyDesigns */
+
+
+var WebsyChart = /*#__PURE__*/function () {
+  function WebsyChart(elementId, options) {
+    var _this38 = this;
+
+    _classCallCheck(this, WebsyChart);
+
+    var DEFAULTS = {
+      margin: {
+        top: 10,
+        left: 3,
+        bottom: 3,
+        right: 3,
+        axisBottom: 0,
+        axisLeft: 0,
+        axisRight: 0,
+        axisTop: 0,
+        legendBottom: 0,
+        legendLeft: 0,
+        legendRight: 0,
+        legendTop: 0
+      },
+      axis: {},
+      orientation: 'vertical',
+      colors: ['#5e4fa2', '#3288bd', '#66c2a5', '#abdda4', '#e6f598', '#fee08b', '#fdae61', '#f46d43', '#d53e4f', '#9e0142'],
+      transitionDuration: 650,
+      curveStyle: 'curveLinear',
+      lineWidth: 2,
+      forceZero: true,
+      fontSize: 14,
+      symbolSize: 20,
+      showTrackingLine: true,
+      showTooltip: true,
+      showLegend: false,
+      legendPosition: 'bottom',
+      tooltipWidth: 200
+    };
+    this.elementId = elementId;
+    this.options = _extends({}, DEFAULTS, options);
+    this.leftAxis = null;
+    this.rightAxis = null;
+    this.topAxis = null;
+    this.bottomAxis = null;
+
+    if (!elementId) {
+      console.log('No element Id provided for Websy Chart');
+      return;
+    }
+
+    this.invertOverride = function (input, input2) {
+      var xAxis = 'bottomAxis';
+
+      if (_this38.options.orientation === 'horizontal') {
+        xAxis = 'leftAxis';
+      }
+
+      var width = _this38[xAxis].step();
+
+      var output;
+
+      var domain = _toConsumableArray(_this38[xAxis].domain());
+
+      if (_this38.options.orientation === 'horizontal') {
+        domain = domain.reverse();
+      }
+
+      for (var j = 0; j < domain.length; j++) {
+        var breakA = _this38[xAxis](domain[j]) - width / 2;
+        var breakB = breakA + width;
+
+        if (input > breakA && input <= breakB) {
+          output = j;
+          break;
+        }
+      }
+
+      return output;
     };
 
     var el = document.getElementById(this.elementId);
@@ -5504,10 +6552,10 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "handleEventMouseMove",
     value: function handleEventMouseMove(event, d) {
-      var _this36 = this;
+      var _this39 = this;
 
       var bisectDate = d3.bisector(function (d) {
-        return _this36.parseX(d.x.value);
+        return _this39.parseX(d.x.value);
       }).left;
 
       if (this.options.showTrackingLine === true && d3.pointer(event)) {
@@ -5546,8 +6594,8 @@ var WebsyChart = /*#__PURE__*/function () {
         }
 
         this.options.data.series.forEach(function (s) {
-          if (_this36.options.data[xData].scale !== 'Time') {
-            xPoint = _this36[xAxis](_this36.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) {
@@ -5566,13 +6614,13 @@ var WebsyChart = /*#__PURE__*/function () {
             var pointA = s.data[index - 1];
             var pointB = s.data[index];
 
-            if (_this36.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 = _this36[xAxis](_this36.parseX(pointA.x.value));
+              xPoint = _this39[xAxis](_this39.parseX(pointA.x.value));
               tooltipTitle = pointA.x.value;
 
               if (!pointA.y.color) {
@@ -5582,12 +6630,12 @@ var WebsyChart = /*#__PURE__*/function () {
               tooltipData.push(pointA.y);
 
               if (typeof pointA.x.value.getTime !== 'undefined') {
-                tooltipTitle = d3.timeFormat(_this36.options.dateFormat || _this36.options.calculatedTimeFormatPattern)(pointA.x.value);
+                tooltipTitle = d3.timeFormat(_this39.options.dateFormat || _this39.options.calculatedTimeFormatPattern)(pointA.x.value);
               }
             }
 
             if (pointB && !pointA) {
-              xPoint = _this36[xAxis](_this36.parseX(pointB.x.value));
+              xPoint = _this39[xAxis](_this39.parseX(pointB.x.value));
               tooltipTitle = pointB.x.value;
 
               if (!pointB.y.color) {
@@ -5597,14 +6645,14 @@ var WebsyChart = /*#__PURE__*/function () {
               tooltipData.push(pointB.y);
 
               if (typeof pointB.x.value.getTime !== 'undefined') {
-                tooltipTitle = d3.timeFormat(_this36.options.dateFormat || _this36.options.calculatedTimeFormatPattern)(pointB.x.value);
+                tooltipTitle = d3.timeFormat(_this39.options.dateFormat || _this39.options.calculatedTimeFormatPattern)(pointB.x.value);
               }
             }
 
             if (pointA && pointB) {
-              var d0 = _this36[xAxis](_this36.parseX(pointA.x.value));
+              var d0 = _this39[xAxis](_this39.parseX(pointA.x.value));
 
-              var d1 = _this36[xAxis](_this36.parseX(pointB.x.value));
+              var d1 = _this39[xAxis](_this39.parseX(pointB.x.value));
 
               var mid = Math.abs(d0 - d1) / 2;
 
@@ -5613,7 +6661,7 @@ var WebsyChart = /*#__PURE__*/function () {
                 tooltipTitle = pointB.x.value;
 
                 if (typeof pointB.x.value.getTime !== 'undefined') {
-                  tooltipTitle = d3.timeFormat(_this36.options.dateFormat || _this36.options.calculatedTimeFormatPattern)(pointB.x.value);
+                  tooltipTitle = d3.timeFormat(_this39.options.dateFormat || _this39.options.calculatedTimeFormatPattern)(pointB.x.value);
                 }
 
                 if (!pointB.y.color) {
@@ -5626,7 +6674,7 @@ var WebsyChart = /*#__PURE__*/function () {
                 tooltipTitle = pointA.x.value;
 
                 if (typeof pointB.x.value.getTime !== 'undefined') {
-                  tooltipTitle = d3.timeFormat(_this36.options.dateFormat || _this36.options.calculatedTimeFormatPattern)(pointB.x.value);
+                  tooltipTitle = d3.timeFormat(_this39.options.dateFormat || _this39.options.calculatedTimeFormatPattern)(pointB.x.value);
                 }
 
                 if (!pointA.y.color) {
@@ -5731,7 +6779,7 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render(options) {
-      var _this37 = this;
+      var _this40 = this;
 
       /* global d3 options WebsyUtils */
       if (typeof options !== 'undefined') {
@@ -5800,7 +6848,7 @@ var WebsyChart = /*#__PURE__*/function () {
             var legendData = this.options.data.series.map(function (s, i) {
               return {
                 value: s.label || s.key,
-                color: s.color || _this37.options.colors[i % _this37.options.colors.length]
+                color: s.color || _this40.options.colors[i % _this40.options.colors.length]
               };
             });
 
@@ -6052,7 +7100,7 @@ var WebsyChart = /*#__PURE__*/function () {
 
             if (this.options.data.bottom.formatter) {
               bAxisFunc.tickFormat(function (d) {
-                return _this37.options.data.bottom.formatter(d);
+                return _this40.options.data.bottom.formatter(d);
               });
             }
 
@@ -6078,8 +7126,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 (_this37.options.data.left.formatter) {
-                d = _this37.options.data.left.formatter(d);
+              if (_this40.options.data.left.formatter) {
+                d = _this40.options.data.left.formatter(d);
               }
 
               return d;
@@ -6116,8 +7164,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 (_this37.options.data.right.formatter) {
-                  d = _this37.options.data.right.formatter(d);
+                if (_this40.options.data.right.formatter) {
+                  d = _this40.options.data.right.formatter(d);
                 }
 
                 return d;
@@ -6143,16 +7191,16 @@ var WebsyChart = /*#__PURE__*/function () {
 
           this.options.data.series.forEach(function (series, index) {
             if (!series.key) {
-              series.key = _this37.createIdentity();
+              series.key = _this40.createIdentity();
             }
 
             if (!series.color) {
-              series.color = _this37.options.colors[index % _this37.options.colors.length];
+              series.color = _this40.options.colors[index % _this40.options.colors.length];
             }
 
-            _this37["render".concat(series.type || 'bar')](series, index);
+            _this40["render".concat(series.type || 'bar')](series, index);
 
-            _this37.renderLabels(series, index);
+            _this40.renderLabels(series, index);
           });
         }
       }
@@ -6160,17 +7208,17 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "renderarea",
     value: function renderarea(series, index) {
-      var _this38 = this;
+      var _this41 = this;
 
       /* global d3 series index */
       var drawArea = function drawArea(xAxis, yAxis, curveStyle) {
         return d3.area().x(function (d) {
-          return _this38[xAxis](_this38.parseX(d.x.value));
+          return _this41[xAxis](_this41.parseX(d.x.value));
         }).y0(function (d) {
-          return _this38[yAxis](0);
+          return _this41[yAxis](0);
         }).y1(function (d) {
-          return _this38[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
-        }).curve(d3[curveStyle || _this38.options.curveStyle]);
+          return _this41[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
+        }).curve(d3[curveStyle || _this41.options.curveStyle]);
       };
 
       var xAxis = 'bottomAxis';
@@ -6273,15 +7321,21 @@ 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', series.color);
+      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;
+      });
       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', series.color).attr('class', function (d) {
+      .attr('fill', function (d) {
+        return d.color || series.color;
+      }).attr('class', function (d) {
         return "bar bar_".concat(series.key);
       });
     }
   }, {
     key: "renderLabels",
     value: function renderLabels(series, index) {
+      var _this42 = this;
+
       /* global series index d3 WebsyDesigns */
       var xAxis = 'bottomAxis';
       var yAxis = 'leftAxis';
@@ -6298,10 +7352,14 @@ var WebsyChart = /*#__PURE__*/function () {
         // 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', this.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(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)).style('font-size', "".concat(this.options.labelSize || this.options.fontSize, "px")).style('fill', function (d) {
+          return _this42.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.color || series.color);
+        }).transition(this.transition).text(function (d) {
           return d.y.label || d.y.value;
         });
-        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', this.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(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').style('font-size', "".concat(this.options.labelSize || this.options.fontSize, "px")).style('fill', function (d) {
+          return _this42.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.color || series.color);
+        }).text(function (d) {
           return d.y.label || d.y.value;
         }).each(function (d, i) {
           if (that.options.orientation === 'horizontal') {
@@ -6345,15 +7403,15 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "renderline",
     value: function renderline(series, index) {
-      var _this39 = this;
+      var _this43 = this;
 
       /* global series index d3 */
       var drawLine = function drawLine(xAxis, yAxis, curveStyle) {
         return d3.line().x(function (d) {
-          return _this39[xAxis](_this39.parseX(d.x.value));
+          return _this43[xAxis](_this43.parseX(d.x.value));
         }).y(function (d) {
-          return _this39[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
-        }).curve(d3[curveStyle || _this39.options.curveStyle]);
+          return _this43[yAxis](isNaN(d.y.value) ? 0 : d.y.value);
+        }).curve(d3[curveStyle || _this43.options.curveStyle]);
       };
 
       var xAxis = 'bottomAxis';
@@ -6391,14 +7449,14 @@ var WebsyChart = /*#__PURE__*/function () {
   }, {
     key: "rendersymbol",
     value: function rendersymbol(series, index) {
-      var _this40 = 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 || _this40.options.symbolSize);
+        .size(size || _this44.options.symbolSize);
       };
 
       var xAxis = 'bottomAxis';
@@ -6416,7 +7474,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(_this40[xAxis](_this40.parseX(d.x.value)), ", ").concat(_this40[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) {
@@ -6425,7 +7483,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(_this40[xAxis](_this40.parseX(d.x.value)), ", ").concat(_this40[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), ")");
       });
     }
   }, {
@@ -6580,7 +7638,7 @@ var WebsyLegend = /*#__PURE__*/function () {
   }, {
     key: "resize",
     value: function resize() {
-      var _this41 = this;
+      var _this45 = this;
 
       var el = document.getElementById(this.elementId);
 
@@ -6593,7 +7651,7 @@ var WebsyLegend = /*#__PURE__*/function () {
         // }
         var html = "\n        <div class='text-".concat(this.options.align, "'>\n      ");
         html += this._data.map(function (d, i) {
-          return _this41.getLegendItemHTML(d);
+          return _this45.getLegendItemHTML(d);
         }).join('');
         html += "\n        <div>\n      ";
         el.innerHTML = html;
@@ -6765,7 +7823,7 @@ var WebsyMap = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-      var _this42 = this;
+      var _this46 = this;
 
       var mapEl = document.getElementById("".concat(this.elementId, "_map"));
       var legendEl = document.getElementById("".concat(this.elementId, "_map"));
@@ -6774,7 +7832,7 @@ var WebsyMap = /*#__PURE__*/function () {
         var legendData = this.options.data.polygons.map(function (s, i) {
           return {
             value: s.label || s.key,
-            color: s.color || _this42.options.colors[i % _this42.options.colors.length]
+            color: s.color || _this46.options.colors[i % _this46.options.colors.length]
           };
         });
         var longestValue = legendData.map(function (s) {
@@ -6838,7 +7896,7 @@ var WebsyMap = /*#__PURE__*/function () {
 
       if (this.polygons) {
         this.polygons.forEach(function (p) {
-          return _this42.map.removeLayer(p);
+          return _this46.map.removeLayer(p);
         });
       }
 
@@ -6896,18 +7954,18 @@ var WebsyMap = /*#__PURE__*/function () {
           }
 
           if (!p.options.color) {
-            p.options.color = _this42.options.colors[i % _this42.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(_this42.map);
+          }), p.options).addTo(_this46.map);
 
-          _this42.polygons.push(pol);
+          _this46.polygons.push(pol);
 
-          _this42.map.fitBounds(pol.getBounds());
+          _this46.map.fitBounds(pol.getBounds());
         });
       } // if (this.data.markers.length > 0) {            
       //   el.classList.remove('hidden')
@@ -7028,6 +8086,8 @@ var WebsyDesigns = {
   Form: WebsyForm,
   WebsyDatePicker: WebsyDatePicker,
   DatePicker: WebsyDatePicker,
+  WebsyDragDrop: WebsyDragDrop,
+  DragDrop: WebsyDragDrop,
   WebsyDropdown: WebsyDropdown,
   Dropdown: WebsyDropdown,
   WebsyResultList: WebsyResultList,
@@ -7040,8 +8100,10 @@ var WebsyDesigns = {
   Router: WebsyRouter,
   WebsyTable: WebsyTable,
   WebsyTable2: WebsyTable2,
+  WebsyTable3: WebsyTable3,
   Table: WebsyTable,
   Table2: WebsyTable2,
+  Table3: WebsyTable3,
   WebsyChart: WebsyChart,
   Chart: WebsyChart,
   WebsyChartTooltip: WebsyChartTooltip,
@@ -7067,5 +8129,6 @@ var WebsyDesigns = {
   WebsyIcons: WebsyIcons
 };
 WebsyDesigns.service = new WebsyDesigns.APIService('');
+window.GlobalPubSub = new WebsyPubSub('empty', {});
 var _default = WebsyDesigns;
 exports["default"] = _default;