@websy/websy-designs 1.9.6 → 1.9.8

package/dist/websy-designs.debug.js

@@ -6764,11 +6764,14 @@ class WebsyTable3 {
           return // need to revisit this logic
         }
         let style = `width: ${sizingColumns[colIndex].width || sizingColumns[colIndex].actualWidth}px!important; `        
-        let divStyle = style
+        let divStyle = `width: ${sizingColumns[colIndex].width || sizingColumns[colIndex].actualWidth}px!important; `
         if (useWidths === true) {
           style += `max-width: ${sizingColumns[colIndex].width || sizingColumns[colIndex].actualWidth}px!important;`        
           divStyle += `max-width: ${sizingColumns[colIndex].width || sizingColumns[colIndex].actualWidth}px!important;`        
         }
+        if (col.colspan > 1) {
+          divStyle = `width: 100%;`
+        }
         if (col.style) {
           style += col.style
         }
@@ -7560,6 +7563,7 @@ class WebsyChart {
       minBandWidth: 30,
       maxBandWidth: 100,
       allowUnevenBands: true,
+      allowBrushing: true,
       balancedMinMax: false
     }
     this.elementId = elementId
@@ -8321,7 +8325,7 @@ else {
         maxBandWidthFits = true
         proposedBandWidth = this.options.maxBandWidth
       }
-      if (!maxBandWidthFits) {
+      if (!maxBandWidthFits && this.options.allowBrushing === true) {
         // Check to see if all bars at the min allowed width will fit
         if (plotable / noOfPoints < this.options.minBandWidth) {
           this.brushNeeded = true
@@ -8524,6 +8528,9 @@ else {
     else {       
       leftRange = [(this.widthForCalc + this.totalBandPadding), 0]
     }
+    if (this.options.allowBrushing !== true) {
+      bottomRange = bottomBrushRange
+    }
     this.bottomAxis = d3[`scale${this.options.data.bottom.scale || 'Ordinal'}`]()
       .domain(bottomDomain)
       .range(bottomRange)

package/dist/websy-designs.js

@@ -6422,11 +6422,14 @@ var WebsyTable3 = /*#__PURE__*/function () {
           }
 
           var style = "width: ".concat(sizingColumns[colIndex].width || sizingColumns[colIndex].actualWidth, "px!important; ");
-          var divStyle = style;
+          var divStyle = "width: ".concat(sizingColumns[colIndex].width || sizingColumns[colIndex].actualWidth, "px!important; ");
           if (useWidths === true) {
             style += "max-width: ".concat(sizingColumns[colIndex].width || sizingColumns[colIndex].actualWidth, "px!important;");
             divStyle += "max-width: ".concat(sizingColumns[colIndex].width || sizingColumns[colIndex].actualWidth, "px!important;");
           }
+          if (col.colspan > 1) {
+            divStyle = "width: 100%;";
+          }
           if (col.style) {
             style += col.style;
           }
@@ -7248,6 +7251,7 @@ var WebsyChart = /*#__PURE__*/function () {
       minBandWidth: 30,
       maxBandWidth: 100,
       allowUnevenBands: true,
+      allowBrushing: true,
       balancedMinMax: false
     };
     this.elementId = elementId;
@@ -7993,7 +7997,7 @@ var WebsyChart = /*#__PURE__*/function () {
               maxBandWidthFits = true;
               proposedBandWidth = this.options.maxBandWidth;
             }
-            if (!maxBandWidthFits) {
+            if (!maxBandWidthFits && this.options.allowBrushing === true) {
               // Check to see if all bars at the min allowed width will fit
               if (plotable / noOfPoints < this.options.minBandWidth) {
                 this.brushNeeded = true;
@@ -8145,6 +8149,9 @@ var WebsyChart = /*#__PURE__*/function () {
           } else {
             leftRange = [this.widthForCalc + this.totalBandPadding, 0];
           }
+          if (this.options.allowBrushing !== true) {
+            bottomRange = bottomBrushRange;
+          }
           this.bottomAxis = d3["scale".concat(this.options.data.bottom.scale || 'Ordinal')]().domain(bottomDomain).range(bottomRange);
           if (!this.brushInitialized) {
             this.bottomBrushAxis = d3["scale".concat(this.options.data.bottom.scale || 'Ordinal')]().domain(bottomBrushDomain).range(bottomBrushRange);