@banyan_cloud/roots 1.0.345 → 1.0.347

package/dist/index.js

@@ -4975,11 +4975,15 @@ var generateColors = function generateColors(_ref4) {
     excludedColors = _ref4$excludedColors === void 0 ? [] : _ref4$excludedColors,
     _ref4$exclusionThresh = _ref4.exclusionThreshold,
     exclusionThreshold = _ref4$exclusionThresh === void 0 ? 30 : _ref4$exclusionThresh,
-    _ref4$minPerceptualDi = _ref4.minPerceptualDistance,
-    minPerceptualDistance = _ref4$minPerceptualDi === void 0 ? 25 : _ref4$minPerceptualDi;
+    _ref4$distinctionThre = _ref4.distinctionThreshold,
+    distinctionThreshold = _ref4$distinctionThre === void 0 ? 40 : _ref4$distinctionThre,
+    _ref4$excludedHueRang = _ref4.excludedHueRanges,
+    excludedHueRanges = _ref4$excludedHueRang === void 0 ? [] : _ref4$excludedHueRang;
   var colors = [];
-  var minLightness = 25;
-  var maxLightness = 75;
+  var minLightness = 30;
+  var maxLightness = 70;
+  var minSaturation = 65;
+  var maxSaturation = 100;
   var normalizedExcludedColors = excludedColors.map(function (color) {
     return color.startsWith('#') ? color : "#".concat(color);
   });
@@ -4989,16 +4993,49 @@ var generateColors = function generateColors(_ref4) {
     var b = parseInt(hex.slice(5, 7), 16);
     return [r, g, b];
   };
+  var hexToHSL = function hexToHSL(hex) {
+    var r = parseInt(hex.slice(1, 3), 16) / 255;
+    var g = parseInt(hex.slice(3, 5), 16) / 255;
+    var b = parseInt(hex.slice(5, 7), 16) / 255;
+    var cmin = Math.min(r, g, b);
+    var cmax = Math.max(r, g, b);
+    var delta = cmax - cmin;
+    var h = 0;
+    var s = 0;
+    var l = 0;
+    if (delta === 0) {
+      h = 0;
+    } else if (cmax === r) {
+      h = (g - b) / delta % 6;
+    } else if (cmax === g) {
+      h = (b - r) / delta + 2;
+    } else {
+      h = (r - g) / delta + 4;
+    }
+    h = Math.round(h * 60);
+    if (h < 0) h += 360;
+    l = (cmax + cmin) / 2;
+    s = delta === 0 ? 0 : delta / (1 - Math.abs(2 * l - 1));
+    s = Math.round(s * 100);
+    l = Math.round(l * 100);
+    return [h, s, l];
+  };
   var colorDistance = function colorDistance(hex1, hex2) {
     var rgb1 = hexToRGB(hex1);
     var rgb2 = hexToRGB(hex2);
-    var rDiff = rgb1[0] - rgb2[0];
-    var gDiff = rgb1[1] - rgb2[1];
-    var bDiff = rgb1[2] - rgb2[2];
-    return Math.sqrt(rDiff * rDiff * 0.299 + gDiff * gDiff * 0.587 + bDiff * bDiff * 0.114);
+    var rMean = (rgb1[0] + rgb2[0]) / 2;
+    var r = rgb1[0] - rgb2[0];
+    var g = rgb1[1] - rgb2[1];
+    var b = rgb1[2] - rgb2[2];
+    var weightR = 2 + rMean / 256;
+    var weightG = 4.0;
+    var weightB = 2 + (255 - rMean) / 256;
+    return Math.sqrt(weightR * r * r + weightG * g * g + weightB * b * b);
   };
   function hslToHex(h, s, l) {
-    // eslint-disable-next-line no-param-reassign
+    h = (h % 360 + 360) % 360;
+    s = Math.max(0, Math.min(100, s));
+    l = Math.max(0, Math.min(100, l));
     l /= 100;
     var a = s * Math.min(l, 1 - l) / 100;
     var f = function f(n) {
@@ -5008,7 +5045,21 @@ var generateColors = function generateColors(_ref4) {
     };
     return "#".concat(f(0)).concat(f(8)).concat(f(4));
   }
+  var isHueExcluded = function isHueExcluded(hue) {
+    return excludedHueRanges.some(function (range) {
+      if (range.min > range.max) {
+        return hue >= range.min || hue <= range.max;
+      }
+      return hue >= range.min && hue <= range.max;
+    });
+  };
   var isTooSimilarToExcluded = function isTooSimilarToExcluded(hexColor) {
+    var _hexToHSL = hexToHSL(hexColor),
+      _hexToHSL2 = _slicedToArray(_hexToHSL, 1),
+      hue = _hexToHSL2[0];
+    if (isHueExcluded(hue)) {
+      return true;
+    }
     var _iterator = _createForOfIteratorHelper(normalizedExcludedColors),
       _step;
     try {
@@ -5027,21 +5078,24 @@ var generateColors = function generateColors(_ref4) {
   };
   var generateDistinctColor = function generateDistinctColor() {
     var attempts = 0;
-    var maxAttempts = 150;
+    var maxAttempts = 300;
     while (attempts < maxAttempts) {
-      var _h = Math.floor(Math.random() * 360);
-      var _s = Math.floor(Math.random() * 40) + 60;
-      var _l = Math.floor(Math.random() * (maxLightness - minLightness)) + minLightness;
-      var hexColor = hslToHex(_h, _s, _l);
+      var h = Math.floor(Math.random() * 360);
+      var s = Math.floor(Math.random() * (maxSaturation - minSaturation)) + minSaturation;
+      var l = Math.floor(Math.random() * (maxLightness - minLightness)) + minLightness;
+      if (isHueExcluded(h)) {
+        attempts++;
+        continue;
+      }
+      var hexColor = hslToHex(h, s, l);
       if (isTooSimilarToExcluded(hexColor)) {
         attempts++;
-        // eslint-disable-next-line no-continue
         continue;
       }
       var isDistinct = true;
       for (var _i2 = 0, _colors = colors; _i2 < _colors.length; _i2++) {
         var existingColor = _colors[_i2];
-        if (colorDistance(hexColor, existingColor) < minPerceptualDistance) {
+        if (colorDistance(hexColor, existingColor) < distinctionThreshold) {
           isDistinct = false;
           break;
         }
@@ -5051,13 +5105,36 @@ var generateColors = function generateColors(_ref4) {
       }
       attempts++;
     }
-    var h = Math.floor(Math.random() * 360);
-    var s = Math.floor(Math.random() * 40) + 60;
-    var l = Math.floor(Math.random() * (maxLightness - minLightness)) + minLightness;
-    return hslToHex(h, s, l);
+    for (var adjustedAttempts = 0; adjustedAttempts < 50; adjustedAttempts++) {
+      var _h = Math.floor(Math.random() * 360);
+      if (isHueExcluded(_h)) {
+        continue;
+      }
+      var _s = 90;
+      var _l = 50;
+      var _hexColor = hslToHex(_h, _s, _l);
+      if (!isTooSimilarToExcluded(_hexColor)) {
+        var mostDistinct = true;
+        for (var _i3 = 0, _colors2 = colors; _i3 < _colors2.length; _i3++) {
+          var _existingColor = _colors2[_i3];
+          var distance = colorDistance(_hexColor, _existingColor);
+          if (distance < distinctionThreshold * 0.7) {
+            mostDistinct = false;
+          }
+        }
+        if (mostDistinct || adjustedAttempts >= 49) {
+          return _hexColor;
+        }
+      }
+    }
+    return hslToHex(Math.floor(Math.random() * 360), 80, 50);
   };
-  for (var i = 0; i < count; i++) {
-    colors.push(generateDistinctColor());
+  var failsafeCounter = 0;
+  var maxFailsafe = count * 3;
+  while (colors.length < count && failsafeCounter < maxFailsafe) {
+    var newColor = generateDistinctColor();
+    colors.push(newColor);
+    failsafeCounter++;
   }
   return colors;
 };
@@ -25798,8 +25875,13 @@ var BaseVerticalBarChart = function BaseVerticalBarChart(_ref) {
     barColor2 = _ref.barColor2,
     xAxisTitle = _ref.xAxisTitle,
     yAxisTitle = _ref.yAxisTitle,
-    dataLabels = _ref.dataLabels,
-    tooltip = _ref.tooltip;
+    tooltip = _ref.tooltip,
+    legends = _ref.legends,
+    chartOptions = _ref.chartOptions,
+    chartDatasets = _ref.chartDatasets,
+    xAxis = _ref.xAxis,
+    yAxis = _ref.yAxis,
+    styles = _ref.styles;
   if (loading) {
     return /*#__PURE__*/jsx(ChartSkeleton$1, {});
   }
@@ -25812,22 +25894,21 @@ var BaseVerticalBarChart = function BaseVerticalBarChart(_ref) {
       return seriesData.chartData[label][key] !== undefined;
     });
   }).map(function (key) {
-    return {
+    return _objectSpread2({
       label: seriesData.metaData.keyData[key],
       backgroundColor: key === 'x1' ? barColor1 !== null && barColor1 !== void 0 ? barColor1 : COLORS.success : key === 'x2' ? barColor2 !== null && barColor2 !== void 0 ? barColor2 : COLORS.error : COLORS.warning,
       data: labels.map(function (label) {
-        // Only include data if it's defined
         return seriesData.chartData[label][key] !== undefined ? seriesData.chartData[label][key] : null;
       }),
       borderRadius: borderRadius,
       barThickness: barThickness
-    };
+    }, chartDatasets);
   });
   var options = {
     responsive: true,
     maintainAspectRatio: false,
     // To allow custom height and width
-    plugins: {
+    plugins: _objectSpread2({
       title: {
         display: true,
         font: {
@@ -25839,7 +25920,7 @@ var BaseVerticalBarChart = function BaseVerticalBarChart(_ref) {
           left: (title === null || title === void 0 ? void 0 : title.left) || 0
         }
       },
-      tooltip: _objectSpread2(_objectSpread2({}, tooltip), {}, {
+      tooltip: _objectSpread2({
         borderWidth: (_tooltip$borderWidth = tooltip === null || tooltip === void 0 ? void 0 : tooltip.borderWidth) !== null && _tooltip$borderWidth !== void 0 ? _tooltip$borderWidth : 1,
         borderColor: (_tooltip$borderColor = tooltip === null || tooltip === void 0 ? void 0 : tooltip.borderColor) !== null && _tooltip$borderColor !== void 0 ? _tooltip$borderColor : COLORS.success,
         backgroundColor: 'rgba(255, 255, 255, 1)',
@@ -25858,7 +25939,7 @@ var BaseVerticalBarChart = function BaseVerticalBarChart(_ref) {
           label: function label(tooltipItem) {
             var _seriesData$metaData$;
             var label = (_seriesData$metaData$ = seriesData.metaData.controlsApplied[tooltipItem.label]) === null || _seriesData$metaData$ === void 0 ? void 0 : _seriesData$metaData$.x1;
-            return "".concat(tooltipItem.dataset.label, ": ").concat(label);
+            return "".concat(tooltipItem.label, ": ").concat(label);
           },
           title: tooltip.displayTitle ? function (tooltipItems) {
             var _tooltipItems$;
@@ -25867,12 +25948,12 @@ var BaseVerticalBarChart = function BaseVerticalBarChart(_ref) {
             return '';
           }
         }
-      }),
-      legend: {
+      }, tooltip),
+      legend: _objectSpread2({
         display: false
-      },
+      }, legends),
       // Enable the datalabels plugin
-      datalabels: _objectSpread2(_objectSpread2({}, dataLabels), {}, {
+      datalabels: {
         anchor: 'end',
         align: 'top',
         // Align the labels above the bars
@@ -25887,10 +25968,10 @@ var BaseVerticalBarChart = function BaseVerticalBarChart(_ref) {
         formatter: function formatter(value, context) {
           return context.chart.data.labels[context.dataIndex];
         }
-      })
-    },
+      }
+    }, chartOptions),
     scales: {
-      x: {
+      x: _objectSpread2({
         grid: {
           display: (gridOptions === null || gridOptions === void 0 ? void 0 : gridOptions.gridContainLabel) || true,
           color: 'rgba(255, 255, 255, 0.2)'
@@ -25913,8 +25994,8 @@ var BaseVerticalBarChart = function BaseVerticalBarChart(_ref) {
             family: 'Poppins'
           }
         }
-      },
-      y: {
+      }, xAxis),
+      y: _objectSpread2({
         grid: {
           display: true,
           color: 'rgba(255, 255, 255, 0.2)'
@@ -25934,15 +26015,15 @@ var BaseVerticalBarChart = function BaseVerticalBarChart(_ref) {
             family: 'Poppins'
           }
         }
-      }
+      }, yAxis)
     }
   };
   return /*#__PURE__*/jsx("div", {
-    style: {
+    style: _objectSpread2({
       width: width || '100%',
       // Default to full width if not provided
-      height: height || '100%' // Default to full height if not provided
-    },
+      height: height || '100%'
+    }, styles),
     children: /*#__PURE__*/jsx(Bar, {
       data: {
         labels: labels,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@banyan_cloud/roots",
-	"version": "1.0.345",
+	"version": "1.0.347",
 	"description": "Design System Library which drives the Banyan Cloud products",
 	"main": "dist/cjs/index.js",
 	"module": "dist/esm/index.js",