@eclipse-scout/chart 25.2.0-beta.2 → 25.2.1

package/dist/eclipse-scout-chart.js

@@ -84,7 +84,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @eclipse-scout/core */ "@eclipse-scout/core");
 /* harmony import */ var _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__);
 /*
- * Copyright (c) 2010, 2024 BSI Business Systems Integration AG
+ * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -210,6 +210,9 @@ class AbstractChartRenderer extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE
     return true;
   }
   refresh() {
+    if (this.rendering) {
+      return;
+    }
     if (this.rendered) {
       this.remove(false);
     }
@@ -3353,12 +3356,12 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
     });
   }
   _adjustSize(config, chartArea, options) {
-    this._adjustBubbleSizes(config, chartArea, options);
+    chartArea = this._adjustBubbleSizes(config, chartArea, options);
     this._adjustGridMaxMin(config, chartArea, options);
   }
   _adjustBubbleSizes(config, chartArea, options) {
     if (config.type !== _index__WEBPACK_IMPORTED_MODULE_0__.Chart.Type.BUBBLE) {
-      return;
+      return chartArea;
     }
     let datasets = config.data.datasets;
     // Scale all bubbles so that the largest radius is equal to sizeOfLargestBubble and the smallest greater than or equal to minBubbleSize.
@@ -3421,6 +3424,13 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
         data.r = data.r * bubbleScalingFactor + bubbleRadiusOffset;
       }
     }));
+    if (!this.chartJs) {
+      return chartArea;
+    }
+    // chartJs sets the chartArea depending on the bubble sizes and subtracts the max radius from the height / width.
+    // this results in a different grid layout, and we need to refresh before the next calculations.
+    this.refresh();
+    return this.chartJs.chartArea;
   }
   _computeMaxMinValue(config, datasets, options) {
     if (!datasets) {
@@ -3431,7 +3441,8 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
       exact,
       boundRange,
       padding,
-      space
+      space,
+      offset
     } = options || {};
     const isDatasetVisible = options?.isDatasetVisible || (i => true);
     // do not use 0 as default as the max-min-range might not include 0, e.g. all values are greater than 10.000
@@ -3506,6 +3517,11 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
     if (padding && space && space > 2 * padding) {
       let valuePerPixel = (maxValue - minValue) / (space - 2 * padding),
         paddingValue = valuePerPixel * padding;
+      // When there are only integers and an offset, the offset will cover at least a span of 0.5 (half the space between two ticks, stepSize = 1).
+      // Therefore, a paddingValue between 0 and 0.5 can be eliminated.
+      if (offset && this.onlyIntegers && 0 < paddingValue && paddingValue <= 0.5) {
+        paddingValue = 0;
+      }
       maxBoundary = Math.max(maxBoundary, maxValue - adjust + paddingValue);
       minBoundary = Math.min(minBoundary, minValue - adjust - paddingValue);
     }
@@ -3624,22 +3640,21 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
     if (config.options.elements && config.options.elements.point && config.options.elements.point.hoverRadius) {
       padding = padding + config.options.elements.point.hoverRadius;
     }
-    if (offset) {
-      boundary = this._computeMaxMinValue(config, datasets, {
-        ...options,
-        exact: !!labelMap,
-        boundRange: true,
-        space: null
-      });
-    } else {
-      boundary = this._computeMaxMinValue(config, datasets, {
-        ...options,
-        exact: !!labelMap,
-        boundRange: true,
-        padding
-      });
-    }
+    boundary = this._computeMaxMinValue(config, datasets, {
+      ...options,
+      exact: !!labelMap,
+      boundRange: true,
+      padding,
+      offset
+    });
     if (labelMap) {
+      // if we have a labelMap compare the min and max key of the labelMap and the boundary.
+      // in order to show all data and labels we have to take lowest and highest value.
+      const keys = Object.keys(labelMap).map(Number).filter(isFinite);
+      if (keys.length) {
+        boundary.minValue = Math.min(boundary.minValue, Math.min(...keys));
+        boundary.maxValue = Math.max(boundary.maxValue, Math.max(...keys));
+      }
       boundary.maxValue = Math.ceil(boundary.maxValue);
       boundary.minValue = Math.floor(boundary.minValue);
     }
@@ -4421,6 +4436,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @eclipse-scout/core */ "@eclipse-scout/core");
 /* harmony import */ var _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../index */ "./src/index.ts");
+var _staticBlock;
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 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); }
@@ -4471,11 +4487,10 @@ class SpeedoChartRenderer extends _index__WEBPACK_IMPORTED_MODULE_1__.AbstractSv
   static TEN_THOUSAND = 10000;
   static ONE_MILLION = 1000000;
   static ARC_MIN = (() => -0.25)();
-  static ARC_MAX = 0.25;
-  static #_ = (() => {
+  static ARC_MAX = (() => (_staticBlock = () => {
     _defineProperty(this, "ARC_RANGE", SpeedoChartRenderer.ARC_MAX - SpeedoChartRenderer.ARC_MIN);
     _defineProperty(this, "SEGMENT_GAP", 0.0103);
-  })();
+  }, 0.25))();
   // space between two segments (lines)
   _validate() {
     let chartData = this.chart.data;
@@ -4787,6 +4802,7 @@ class SpeedoChartRenderer extends _index__WEBPACK_IMPORTED_MODULE_1__.AbstractSv
     });
   }
 }
+_staticBlock();
 
 /***/ }),