@eclipse-scout/chart 22.0.39 → 22.0.41

package/dist/file-list

@@ -1,6 +1,6 @@
-eclipse-scout-chart-bc08151d11e1909eff6c.min.js
-eclipse-scout-chart-bc08151d11e1909eff6c.min.js.LICENSE.txt
-eclipse-scout-chart-bc08151d11e1909eff6c.min.js.map
+eclipse-scout-chart-8eb9461c14872058f638.min.js
+eclipse-scout-chart-8eb9461c14872058f638.min.js.LICENSE.txt
+eclipse-scout-chart-8eb9461c14872058f638.min.js.map
 eclipse-scout-chart-theme-79622289bda68b525e3e.min.css
 eclipse-scout-chart-theme-dark-1de09c03e3dc40a9529a.min.css
 eclipse-scout-chart-theme-dark.css

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/chart",
-  "version": "22.0.39",
+  "version": "22.0.41",
   "description": "Eclipse Scout chart",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://www.eclipse.org/scout",
@@ -25,13 +25,13 @@
     "src"
   ],
   "devDependencies": {
-    "@eclipse-scout/cli": "22.0.39",
+    "@eclipse-scout/cli": "22.0.41",
     "@eclipse-scout/releng": "^22.0.0",
     "jasmine-core": "3.10.1",
     "karma": "6.3.20"
   },
   "dependencies": {
-    "@eclipse-scout/core": "22.0.39",
+    "@eclipse-scout/core": "22.0.41",
     "jquery": "3.6.0",
     "chart.js": "3.7.0",
     "chartjs-plugin-datalabels": "2.0.0"

package/src/chart/Chart.js

@@ -285,6 +285,7 @@ export default class Chart extends Widget {
    */
   updateChart(opts) {
     opts = opts || {};
+    opts.onlyUpdateData = opts.onlyUpdateData && this.chartRenderer && this.chartRenderer.isDataUpdatable();
     opts.enforceRerender = !opts.onlyUpdateData && !opts.onlyRefresh;
 
     // Cancel previously scheduled update and merge opts
@@ -338,7 +339,7 @@ export default class Chart extends Widget {
           this.chartRenderer.render(opts.requestAnimation);
           this.trigger('chartRender');
         });
-      } else if (opts.onlyUpdateData && this.chartRenderer.isDataUpdatable()) {
+      } else if (opts.onlyUpdateData) {
         this.chartRenderer.updateData(opts.requestAnimation);
       } else if (opts.onlyRefresh) {
         this.chartRenderer.refresh();

package/src/chart/ChartJsRenderer.js

@@ -1021,6 +1021,11 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
     if (dataPoints.length < 1) {
       return;
     }
+    let firstDataPoint = dataPoints[0],
+      chart = firstDataPoint.chart;
+    if (!chart.getDatasetMeta(firstDataPoint.datasetIndex).data[firstDataPoint.dataIndex]) {
+      return;
+    }
     if (this._tooltip) {
       this._tooltip.destroy();
       this._tooltip = null;
@@ -1042,7 +1047,7 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
       tooltipText += arrays.ensure(tooltipItems(dataPoints, tooltipLabel, tooltipLabelValue, tooltipColor)).join('');
     }
 
-    let positionAndOffset = this._computeTooltipPositionAndOffset(dataPoints[0]),
+    let positionAndOffset = this._computeTooltipPositionAndOffset(firstDataPoint),
       origin = graphics.offsetBounds(this.$canvas);
     origin.x += tooltip.caretX + positionAndOffset.offsetX;
     origin.y += tooltip.caretY + positionAndOffset.offsetY;
@@ -1101,7 +1106,12 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
       value = dataset.data[dataIndex];
 
     if (this._isHorizontalBar(config)) {
-      tooltipDirection = value < 0 ? 'left' : 'right';
+      if (value && objects.isArray(value.x) && value.x.length === 2) {
+        let avg = (value.x[0] + value.x[1]) / 2;
+        tooltipDirection = avg < 0 ? 'left' : 'right';
+      } else {
+        tooltipDirection = value < 0 ? 'left' : 'right';
+      }
     } else if ((dataset.type || config.type) === Chart.Type.BAR) {
       tooltipPosition = value < 0 ? 'bottom' : 'top';
     } else if (scout.isOneOf(config.type, Chart.Type.PIE, Chart.Type.DOUGHNUT, Chart.Type.POLAR_AREA)) {

package/src/chart/SpeedoChartRenderer.js

@@ -1,9 +1,9 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 BSI Business Systems Integration AG.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
@@ -95,10 +95,10 @@ export default class SpeedoChartRenderer extends AbstractSvgChartRenderer {
     this.widthOfSegmentWithGap = this.segmentWidth + SpeedoChartRenderer.SEGMENT_GAP;
 
     // pointer value in range [0,1]
-    let valuePercentage = this._limitValue((value - minValue) / (maxValue - minValue), 1);
+    let valuePercentage = this._getValuePercentage(value, minValue, maxValue);
 
-    // value in the range [0,1] rounded to one segment
-    let segmentToPointAt = Math.round(valuePercentage * numTotalGaps);
+    // value in the range [0,numTotalSegments - 1] rounded to one segment
+    let segmentToPointAt = this._getSegmentToPointAt(valuePercentage, numTotalSegments);
 
     // value rounded to the closest segment so that the pointer never stays "in between" two segments but always on a segment
     let valuePercentageRounded = this._getPercentageValueOfSegment(segmentToPointAt % this.numSegmentsPerPart,
@@ -117,6 +117,14 @@ export default class SpeedoChartRenderer extends AbstractSvgChartRenderer {
     }
   }
 
+  _getValuePercentage(value, minValue, maxValue) {
+    return this._limitValue((value - minValue) / (maxValue - minValue), 1);
+  }
+
+  _getSegmentToPointAt(valuePercentage, numTotalSegments) {
+    return this._limitValue(Math.floor(valuePercentage * numTotalSegments), numTotalSegments - 1);
+  }
+
   _limitValue(value, maxValue) {
     value = Math.max(value, 0); // cannot be < 0
     value = Math.min(value, maxValue); // cannot be > maxValue