@eclipse-scout/chart 22.0.0-beta.1 → 22.0.0

package/dist/eclipse-scout-chart.js

@@ -13,7 +13,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "default": () => (/* binding */ AbstractChartRenderer)
 /* harmony export */ });
 /*
- * Copyright (c) 2010-2020 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
@@ -119,14 +119,6 @@ class AbstractChartRenderer {
   _render() {// Override in subclasses
   }
 
-  checkCompletlyRendered() {
-    if (this.rendered || !this.chart.data) {
-      return;
-    }
-
-    this.render();
-  }
-
   renderCheckedItems() {
     if (this.rendered) {
       this._renderCheckedItems();
@@ -669,7 +661,7 @@ __webpack_require__.r(__webpack_exports__);
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 /*
- * 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
@@ -712,6 +704,7 @@ class Chart extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_1__.Widget {
     this.checkedItems = [];
     this._updateChartTimeoutId = null;
     this._updateChartOpts = null;
+    this._updateChartOptsWhileNotAttached = [];
     this.updatedOnce = false;
   }
 
@@ -747,6 +740,14 @@ class Chart extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_1__.Widget {
     });
   }
 
+  _renderOnAttach() {
+    super._renderOnAttach();
+
+    this._updateChartOptsWhileNotAttached.splice(0).forEach(opts => this.updateChart($.extend(true, {}, opts, {
+      debounce: true
+    })));
+  }
+
   _remove() {
     if (this.chartRenderer) {
       this.chartRenderer.remove(false);
@@ -945,7 +946,8 @@ class Chart extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_1__.Widget {
 
 
   updateChart(opts) {
-    opts = opts || {}; // Cancel previously scheduled update and merge opts
+    opts = opts || {};
+    opts.enforceRerender = !opts.onlyUpdateData && !opts.onlyRefresh; // Cancel previously scheduled update and merge opts
 
     if (this._updateChartTimeoutId) {
       clearTimeout(this._updateChartTimeoutId);
@@ -953,6 +955,9 @@ class Chart extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_1__.Widget {
       if (this._updateChartOpts) {
         // Inherit 'true' values from previously scheduled updates
         opts.requestAnimation = opts.requestAnimation || this._updateChartOpts.requestAnimation;
+        opts.onlyUpdateData = opts.onlyUpdateData || this._updateChartOpts.onlyUpdateData;
+        opts.onlyRefresh = opts.onlyRefresh || this._updateChartOpts.onlyRefresh;
+        opts.enforceRerender = opts.enforceRerender || this._updateChartOpts.enforceRerender;
       }
 
       this._updateChartTimeoutId = null;
@@ -979,11 +984,19 @@ class Chart extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_1__.Widget {
       this._updateChartTimeoutId = null;
       this._updateChartOpts = null;
 
-      if (opts.onlyUpdateData && this.chartRenderer && this.chartRenderer.isDataUpdatable()) {
-        this.chartRenderer.updateData(opts.requestAnimation);
-      } else if (opts.onlyRefresh && this.chartRenderer) {
-        this.chartRenderer.refresh();
-      } else if (this.chartRenderer) {
+      if (!this.$container || !this.$container.isAttached()) {
+        this._updateChartOptsWhileNotAttached.push(opts);
+
+        return;
+      }
+
+      this.updatedOnce = true;
+
+      if (!this.chartRenderer) {
+        return; // nothing to render when there is no renderer.
+      }
+
+      if (opts.enforceRerender) {
         this.chartRenderer.remove(this.chartRenderer.shouldAnimateRemoveOnUpdate(opts), chartAnimationStopping => {
           if (this.removing || chartAnimationStopping) {
             // prevent exceptions trying to render after navigated away, and do not update/render while a running animation is being stopped
@@ -993,9 +1006,11 @@ class Chart extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_1__.Widget {
           this.chartRenderer.render(opts.requestAnimation);
           this.trigger('chartRender');
         });
+      } else if (opts.onlyUpdateData && this.chartRenderer.isDataUpdatable()) {
+        this.chartRenderer.updateData(opts.requestAnimation);
+      } else if (opts.onlyRefresh) {
+        this.chartRenderer.refresh();
       }
-
-      this.updatedOnce = true;
     }
   }
 
@@ -2108,6 +2123,10 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
   }
 
   _renderTooltipLater(context) {
+    if (!this.rendered || this.removing) {
+      return;
+    }
+
     let tooltip = context.tooltip,
         tooltipItems = tooltip._tooltipItems;
 
@@ -3136,7 +3155,7 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
     let defaultGenerateLabels = defaultTypeGenerateLabels || chart_js_auto__WEBPACK_IMPORTED_MODULE_1__["default"].defaults.plugins.legend.labels.generateLabels;
     let labels = defaultGenerateLabels.call(chart, chart);
 
-    if (!this.rendered || this.removing) {
+    if (this.removing) {
       return labels;
     }
 
@@ -4017,10 +4036,10 @@ class ChartJsRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractChartR
   _remove(afterRemoveFunc) {
     if (this.rendered && !this.removing) {
       this.removing = true;
-      this.$canvas.remove();
-      this.$canvas = null;
       this.chartJs.destroy();
       this.chartJs = null;
+      this.$canvas.remove();
+      this.$canvas = null;
     }
 
     super._remove(afterRemoveFunc);
@@ -5430,7 +5449,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! jquery */ "jquery");
 /* harmony import */ var jquery__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(jquery__WEBPACK_IMPORTED_MODULE_1__);
 /*
- * 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
@@ -5542,14 +5561,6 @@ class VennChartRenderer extends _index__WEBPACK_IMPORTED_MODULE_0__.AbstractSvgC
     }
   }
 
-  checkCompletlyRendered() {
-    if (this.readyToDraw) {
-      this._draw(false, true);
-    } else {
-      super.checkCompletlyRendered();
-    }
-  }
-
   remove(requestAnimation, afterRemoveFunc) {
     this._cancelAsync3Calculator();
 
@@ -6000,7 +6011,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-2020 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
@@ -6039,14 +6050,6 @@ class ChartField extends _eclipse_scout_core__WEBPACK_IMPORTED_MODULE_0__.FormFi
     this._removeField();
   }
 
-  _renderOnAttach() {
-    super._renderOnAttach();
-
-    if (this.chart && this.chart.chartRenderer) {
-      this.chart.chartRenderer.checkCompletlyRendered();
-    }
-  }
-
 }
 
 /***/ }),