@eclipse-scout/chart 24.2.0-beta.2 → 24.2.1

package/dist/eclipse-scout-chart.js

@@ -745,7 +745,8 @@ class Chart extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_1__.Widget {
           legend: {
             display: true,
             clickable: false,
-            position: Chart.Position.RIGHT
+            position: Chart.Position.RIGHT,
+            pointsVisible: true
           }
         }
       }
@@ -1533,6 +1534,7 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
       this._computeDatasets(this.chart.data, config);
     }
     this._adjustData(config);
+    this._adjustLegend(config);
     this._adjustTooltip(config);
     this._adjustGrid(config);
     this._adjustPlugins(config);
@@ -1727,6 +1729,23 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
       this.onlyIntegers = config.data.datasets.every(dataset => dataset.data.every(data => _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_2__.numbers.isInteger(data)));
     }
   }
+  _adjustLegend(config) {
+    if (!config || !config.type || !config.options) {
+      return;
+    }
+    config.options = jquery__WEBPACK_IMPORTED_MODULE_4___default().extend(true, {}, config.options, {
+      plugins: {
+        legend: {
+          labels: {
+            generateLabels: this._legendLabelGenerator
+          }
+        }
+      }
+    });
+    if (!config.options.plugins.legend.pointsVisible) {
+      config.options.plugins.legend.labels.boxWidth = 0;
+    }
+  }
   _adjustTooltip(config) {
     if (!config) {
       return;
@@ -2878,8 +2897,7 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
       plugins: {
         legend: {
           labels: {
-            color: this._computeLabelColor(config.type),
-            generateLabels: this._legendLabelGenerator
+            color: this._computeLabelColor(config.type)
           }
         }
       }
@@ -2923,7 +2941,7 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
         backgroundColor;
       if (dataset && _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_2__.scout.isOneOf(dataset.type || config.type, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.LINE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BAR, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.RADAR, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BUBBLE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.SCATTER)) {
         legendColor = _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_2__.arrays.ensure(dataset.legendColor)[0];
-        borderColor = this._adjustColorOpacity(dataset.borderColor, 1);
+        borderColor = this._adjustColorOpacity(_eclipse_scout_core__WEBPACK_IMPORTED_MODULE_2__.arrays.ensure(dataset.borderColor)[0], 1);
       } else if (data.datasets.length && _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_2__.scout.isOneOf(config.type, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.PIE, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.DOUGHNUT, _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.POLAR_AREA)) {
         dataset = data.datasets[0];
         legendColor = Array.isArray(dataset.legendColor) ? dataset.legendColor[idx] : dataset.legendColor;
@@ -7073,7 +7091,7 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 /*
- * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ * Copyright (c) 2010, 2024 BSI Business Systems Integration AG
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -7088,8 +7106,8 @@ class ChartFieldTile extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.Fo
     _defineProperty(this, "_chartConfigChangeHandler", void 0);
     this._chartConfigChangeHandler = this._onChartConfigChange.bind(this);
   }
-  _renderColorScheme() {
-    super._renderColorScheme();
+  _setColorScheme(colorScheme) {
+    super._setColorScheme(colorScheme);
     this._updateChartColorScheme();
   }
   _updateChartColorScheme() {
@@ -7108,6 +7126,7 @@ class ChartFieldTile extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.Fo
       this.tileWidget.chart.off('propertyChange:config', this._chartConfigChangeHandler);
     }
     super._setTileWidget(tileWidget);
+    this._updateChartColorScheme();
     this.tileWidget.chart.on('propertyChange:config', this._chartConfigChangeHandler);
   }
 }