@eclipse-scout/chart 22.0.33 → 22.0.34

package/dist/file-list

@@ -1,6 +1,6 @@
-eclipse-scout-chart-0677e5a0d5ac4456cdf5.min.js
-eclipse-scout-chart-0677e5a0d5ac4456cdf5.min.js.LICENSE.txt
-eclipse-scout-chart-0677e5a0d5ac4456cdf5.min.js.map
+eclipse-scout-chart-bc08151d11e1909eff6c.min.js
+eclipse-scout-chart-bc08151d11e1909eff6c.min.js.LICENSE.txt
+eclipse-scout-chart-bc08151d11e1909eff6c.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.33",
+  "version": "22.0.34",
   "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.33",
+    "@eclipse-scout/cli": "22.0.34",
     "@eclipse-scout/releng": "^22.0.0",
     "jasmine-core": "3.10.1",
     "karma": "6.3.20"
   },
   "dependencies": {
-    "@eclipse-scout/core": "22.0.33",
+    "@eclipse-scout/core": "22.0.34",
     "jquery": "3.6.0",
     "chart.js": "3.7.0",
     "chartjs-plugin-datalabels": "2.0.0"

package/src/chart/ChartJsRenderer.js

@@ -1046,8 +1046,7 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
       origin = graphics.offsetBounds(this.$canvas);
     origin.x += tooltip.caretX + positionAndOffset.offsetX;
     origin.y += tooltip.caretY + positionAndOffset.offsetY;
-    // Tooltip adds origin.height to origin.y in 'bottom' mode, but origin.y is already the correct value for 'top' and 'bottom' mode
-    origin.height = 0;
+    origin.height = positionAndOffset.height;
 
     this._tooltip = scout.create({
       objectType: 'Tooltip',
@@ -1090,7 +1089,8 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
     let tooltipPosition = 'top',
       tooltipDirection = 'right',
       offsetX = 0,
-      offsetY = 0;
+      offsetY = 0,
+      height = 0;
 
     let chart = tooltipItem.chart,
       datasetIndex = tooltipItem.datasetIndex,
@@ -1137,8 +1137,8 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
        * @type BarElement
        */
       let element = chart.getDatasetMeta(datasetIndex).data[dataIndex];
-      let height = element.height,
-        width = element.width,
+      height = element.height;
+      let width = element.width,
         // golden ratio: (a + b) / a = a / b = PHI
         // and a + b = width
         // -> b = width / (PHI + 1)
@@ -1158,7 +1158,8 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
         offset += value.r;
       }
 
-      offsetY = tooltipPosition === 'top' ? -offset : offset;
+      height = 2 * offset;
+      offsetY = -offset;
     } else if (scout.isOneOf(config.type, Chart.Type.PIE, Chart.Type.DOUGHNUT, Chart.Type.POLAR_AREA)) {
       // noinspection JSValidateTypes
       /**
@@ -1175,12 +1176,7 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
       offsetY = offset * Math.sin(angle);
     }
 
-    return {
-      tooltipPosition: tooltipPosition,
-      tooltipDirection: tooltipDirection,
-      offsetX: offsetX,
-      offsetY: offsetY
-    };
+    return {tooltipPosition, tooltipDirection, offsetX, offsetY, height};
   }
 
   _adjustGrid(config) {

package/src/chart/SalesfunnelChartRenderer.js

@@ -1,14 +1,14 @@
 /*
- * 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
  */
-import {strings} from '@eclipse-scout/core';
+import {objects, strings} from '@eclipse-scout/core';
 import {AbstractSvgChartRenderer} from '../index';
 import $ from 'jquery';
 
@@ -344,13 +344,10 @@ export default class SalesfunnelChartRenderer extends AbstractSvgChartRenderer {
   }
 
   _calcConversionRate(valueBefore, value) {
-    let returnValue = 0;
-    if (valueBefore === 0) {
-      returnValue = undefined;
-    } else if (value !== valueBefore) {
-      returnValue = Math.round(value / valueBefore * 100);
+    if (objects.isNullOrUndefined(valueBefore) || objects.isNullOrUndefined(value) || valueBefore === 0) {
+      return undefined;
     }
-    return returnValue;
+    return Math.round(value / valueBefore * 100);
   }
 
   _analyzeData(valueGroups) {