@websy/websy-designs 1.4.3 → 1.4.4

package/dist/websy-designs.debug.js

@@ -162,7 +162,9 @@ class ButtonGroup {
     const DEFAULTS = {
       style: 'button',
       subscribers: {},
-      activeItem: 0    
+      activeItem: -1,
+      tag: 'div',
+      allowNone: false
     }
     this.options = Object.assign({}, DEFAULTS, options)
     const el = document.getElementById(this.elementId)
@@ -175,7 +177,7 @@ class ButtonGroup {
     if (event.target.classList.contains('websy-button-group-item')) {
       const index = +event.target.getAttribute('data-index')
       if (this.options.activeItem !== index) {
-        if (this.options.onDeactivate) {
+        if (this.options.onDeactivate && this.options.activeItem !== -1) {
           this.options.onDeactivate(this.options.items[this.options.activeItem], this.options.activeItem)
         }
         this.options.activeItem = index
@@ -191,7 +193,14 @@ class ButtonGroup {
         })        
         event.target.classList.remove('inactive')
         event.target.classList.add('active')        
-      } 
+      }
+      else if (this.options.activeItem === index && this.options.allowNone === true) { 
+        if (this.options.onDeactivate) {
+          this.options.onDeactivate(this.options.items[this.options.activeItem], this.options.activeItem)
+        }
+        this.options.activeItem = -1
+        event.target.classList.remove('active')
+      }
     }    
   }
   on (event, fn) {
@@ -214,7 +223,7 @@ class ButtonGroup {
           activeClass = i === this.options.activeItem ? 'active' : 'inactive'
         }
         return `
-          <div ${(t.attributes || []).join(' ')} data-id="${t.id || t.label}" data-index="${i}" class="websy-button-group-item ${(t.classes || []).join(' ')} ${this.options.style}-style ${activeClass}">${t.label}</div>
+          <${this.options.tag} ${(t.attributes || []).join(' ')} data-id="${t.id || t.label}" data-index="${i}" class="websy-button-group-item ${(t.classes || []).join(' ')} ${this.options.style}-style ${activeClass}">${t.label}</${this.options.tag}>
         `
       }).join('')
     }
@@ -1526,7 +1535,9 @@ class WebsyDropdown {
     if (el) {
       el.style.zIndex = ''
     }
-    scrollEl.scrollTop = 0
+    if (scrollEl) {
+      scrollEl.scrollTo(0, 0)
+    }    
     maskEl.classList.remove('active')
     contentEl.classList.remove('active')
     contentEl.classList.remove('on-top')    
@@ -6075,12 +6086,16 @@ class WebsyTable3 {
         if (typeof sizingColumns[sizeIndex] === 'undefined') {
           return // need to revisit this logic
         }
-        let style = `width: ${sizingColumns[sizeIndex].width || sizingColumns[sizeIndex].actualWidth}px!important; `        
-        let divStyle = style
+        let style = ''
+        let divStyle = ''
+        if (useWidths === true && (+cell.colspan === 1 || !cell.colspan)) {
+          style = `width: ${sizingColumns[sizeIndex].width || sizingColumns[sizeIndex].actualWidth}px!important; `        
+          divStyle = style
+        }
         if (cell.style) {
           style += cell.style
         }
-        if (useWidths === true) {
+        if (useWidths === true && (+cell.colspan === 1 || !cell.colspan)) {
           style += `max-width: ${sizingColumns[sizeIndex].width || sizingColumns[sizeIndex].actualWidth}px!important;`
           divStyle += `max-width: ${sizingColumns[sizeIndex].width || sizingColumns[sizeIndex].actualWidth}px!important;`
         }        
@@ -6125,6 +6140,25 @@ class WebsyTable3 {
             class='websy-table-cell-collapse'
           >${WebsyDesigns.Icons.MinusFilled}</i>`
         }
+        if (sizingColumns[sizeIndex].showAsLink === true && cell.value.trim() !== '') {
+          cell.value = `
+            <a href='${cell.value}' target='${sizingColumns[sizeIndex].openInNewTab === true ? '_blank' : '_self'}'>${cell.displayText || sizingColumns[sizeIndex].linkText || cell.value}</a>
+          `
+        }
+        if (sizingColumns[sizeIndex].showAsRouterLink === true && cell.value.trim() !== '') {
+          cell.value = `
+            <a data-view='${(cell.link || cell.value).replace(/'/g, '\'')}' class='websy-trigger'>${cell.value}</a>
+          `
+        }
+        if (sizingColumns[sizeIndex].showAsImage === true) {
+          cell.value = `
+            <img               
+              style="width: ${sizingColumns[sizeIndex].imgWidth ? sizingColumns[sizeIndex].imgWidth : 'auto'}; height: ${sizingColumns[sizeIndex].imgHeight ? sizingColumns[sizeIndex].imgHeight : 'auto'};" 
+              src='${cell.value}'
+              ${sizingColumns[sizeIndex].errorImage ? 'onerror="this.src=\'' + sizingColumns[sizeIndex].errorImage + '\'"' : ''}
+            />
+          `
+        }
         bodyHtml += `
           ${cell.value}
         </div></td>`
@@ -6433,14 +6467,16 @@ class WebsyTable3 {
     this.mouseXStart = null
   }
   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)))
-    }
+    if (this.options.virtualScroll === true) {
+      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)))
+      }
+    }    
   }
   hideError () {
     const el = document.getElementById(`${this.elementId}_tableContainer`)

package/dist/websy-designs.js

@@ -232,7 +232,9 @@ var ButtonGroup = /*#__PURE__*/function () {
     var DEFAULTS = {
       style: 'button',
       subscribers: {},
-      activeItem: 0
+      activeItem: -1,
+      tag: 'div',
+      allowNone: false
     };
     this.options = _extends({}, DEFAULTS, options);
     var el = document.getElementById(this.elementId);
@@ -250,7 +252,7 @@ var ButtonGroup = /*#__PURE__*/function () {
         var index = +event.target.getAttribute('data-index');
 
         if (this.options.activeItem !== index) {
-          if (this.options.onDeactivate) {
+          if (this.options.onDeactivate && this.options.activeItem !== -1) {
             this.options.onDeactivate(this.options.items[this.options.activeItem], this.options.activeItem);
           }
 
@@ -269,6 +271,13 @@ var ButtonGroup = /*#__PURE__*/function () {
           });
           event.target.classList.remove('inactive');
           event.target.classList.add('active');
+        } else if (this.options.activeItem === index && this.options.allowNone === true) {
+          if (this.options.onDeactivate) {
+            this.options.onDeactivate(this.options.items[this.options.activeItem], this.options.activeItem);
+          }
+
+          this.options.activeItem = -1;
+          event.target.classList.remove('active');
         }
       }
     }
@@ -303,7 +312,7 @@ var ButtonGroup = /*#__PURE__*/function () {
             activeClass = i === _this.options.activeItem ? 'active' : 'inactive';
           }
 
-          return "\n          <div ".concat((t.attributes || []).join(' '), " data-id=\"").concat(t.id || t.label, "\" data-index=\"").concat(i, "\" class=\"websy-button-group-item ").concat((t.classes || []).join(' '), " ").concat(_this.options.style, "-style ").concat(activeClass, "\">").concat(t.label, "</div>\n        ");
+          return "\n          <".concat(_this.options.tag, " ").concat((t.attributes || []).join(' '), " data-id=\"").concat(t.id || t.label, "\" data-index=\"").concat(i, "\" class=\"websy-button-group-item ").concat((t.classes || []).join(' '), " ").concat(_this.options.style, "-style ").concat(activeClass, "\">").concat(t.label, "</").concat(_this.options.tag, ">\n        ");
         }).join('');
       }
     }
@@ -1653,7 +1662,10 @@ var WebsyDropdown = /*#__PURE__*/function () {
         el.style.zIndex = '';
       }
 
-      scrollEl.scrollTop = 0;
+      if (scrollEl) {
+        scrollEl.scrollTo(0, 0);
+      }
+
       maskEl.classList.remove('active');
       contentEl.classList.remove('active');
       contentEl.classList.remove('on-top');
@@ -6633,14 +6645,19 @@ var WebsyTable3 = /*#__PURE__*/function () {
             return; // need to revisit this logic
           }
 
-          var style = "width: ".concat(sizingColumns[sizeIndex].width || sizingColumns[sizeIndex].actualWidth, "px!important; ");
-          var divStyle = style;
+          var style = '';
+          var divStyle = '';
+
+          if (useWidths === true && (+cell.colspan === 1 || !cell.colspan)) {
+            style = "width: ".concat(sizingColumns[sizeIndex].width || sizingColumns[sizeIndex].actualWidth, "px!important; ");
+            divStyle = style;
+          }
 
           if (cell.style) {
             style += cell.style;
           }
 
-          if (useWidths === true) {
+          if (useWidths === true && (+cell.colspan === 1 || !cell.colspan)) {
             style += "max-width: ".concat(sizingColumns[sizeIndex].width || sizingColumns[sizeIndex].actualWidth, "px!important;");
             divStyle += "max-width: ".concat(sizingColumns[sizeIndex].width || sizingColumns[sizeIndex].actualWidth, "px!important;");
           }
@@ -6675,6 +6692,18 @@ var WebsyTable3 = /*#__PURE__*/function () {
             bodyHtml += "<i \n            data-row-index='".concat(rowIndex, "'\n            data-col-index='").concat(cell.level || cellIndex, "'\n            class='websy-table-cell-collapse'\n          >").concat(WebsyDesigns.Icons.MinusFilled, "</i>");
           }
 
+          if (sizingColumns[sizeIndex].showAsLink === true && cell.value.trim() !== '') {
+            cell.value = "\n            <a href='".concat(cell.value, "' target='").concat(sizingColumns[sizeIndex].openInNewTab === true ? '_blank' : '_self', "'>").concat(cell.displayText || sizingColumns[sizeIndex].linkText || cell.value, "</a>\n          ");
+          }
+
+          if (sizingColumns[sizeIndex].showAsRouterLink === true && cell.value.trim() !== '') {
+            cell.value = "\n            <a data-view='".concat((cell.link || cell.value).replace(/'/g, '\''), "' class='websy-trigger'>").concat(cell.value, "</a>\n          ");
+          }
+
+          if (sizingColumns[sizeIndex].showAsImage === true) {
+            cell.value = "\n            <img               \n              style=\"width: ".concat(sizingColumns[sizeIndex].imgWidth ? sizingColumns[sizeIndex].imgWidth : 'auto', "; height: ").concat(sizingColumns[sizeIndex].imgHeight ? sizingColumns[sizeIndex].imgHeight : 'auto', ";\" \n              src='").concat(cell.value, "'\n              ").concat(sizingColumns[sizeIndex].errorImage ? 'onerror="this.src=\'' + sizingColumns[sizeIndex].errorImage + '\'"' : '', "\n            />\n          ");
+          }
+
           bodyHtml += "\n          ".concat(cell.value, "\n        </div></td>");
         });
         bodyHtml += "</tr>";
@@ -7032,12 +7061,14 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "handleScrollWheel",
     value: function handleScrollWheel(event) {
-      event.preventDefault(); // console.log('scrollwheel', event)
+      if (this.options.virtualScroll === true) {
+        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)));
+        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)));
+        }
       }
     }
   }, {