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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/chart",
-  "version": "22.0.0-beta.1",
+  "version": "22.0.0",
   "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.0-beta.1",
+    "@eclipse-scout/cli": "22.0.0",
     "@eclipse-scout/releng": "^22.0.0",
     "jasmine-core": "3.10.1",
     "karma": "6.3.9"
   },
   "dependencies": {
-    "@eclipse-scout/core": "22.0.0-beta.1",
+    "@eclipse-scout/core": "22.0.0",
     "jquery": "3.6.0",
     "chart.js": "3.7.0",
     "chartjs-plugin-datalabels": "2.0.0"

package/src/chart/AbstractChartRenderer.js

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -96,13 +96,6 @@ export default class AbstractChartRenderer {
     // Override in subclasses
   }
 
-  checkCompletlyRendered() {
-    if (this.rendered || !this.chart.data) {
-      return;
-    }
-    this.render();
-  }
-
   renderCheckedItems() {
     if (this.rendered) {
       this._renderCheckedItems();

package/src/chart/Chart.js

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -45,6 +45,7 @@ export default class Chart extends Widget {
 
     this._updateChartTimeoutId = null;
     this._updateChartOpts = null;
+    this._updateChartOptsWhileNotAttached = [];
     this.updatedOnce = false;
   }
 
@@ -103,6 +104,11 @@ export default class Chart extends 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);
@@ -278,6 +284,7 @@ export default class Chart extends Widget {
    */
   updateChart(opts) {
     opts = opts || {};
+    opts.enforceRerender = !opts.onlyUpdateData && !opts.onlyRefresh;
 
     // Cancel previously scheduled update and merge opts
     if (this._updateChartTimeoutId) {
@@ -285,6 +292,9 @@ export default class Chart extends 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;
       this._updateChartOpts = null;
@@ -308,11 +318,17 @@ export default class Chart extends Widget {
     function updateChartImpl() {
       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
@@ -321,8 +337,11 @@ export default class Chart extends 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;
     }
   }
 

package/src/chart/ChartJsRenderer.js

@@ -916,6 +916,9 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
   }
 
   _renderTooltipLater(context) {
+    if (!this.rendered || this.removing) {
+      return;
+    }
     let tooltip = context.tooltip,
       tooltipItems = tooltip._tooltipItems;
     if (tooltipItems.length < 1) {
@@ -1888,7 +1891,7 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
     }
     let defaultGenerateLabels = defaultTypeGenerateLabels || ChartJs.defaults.plugins.legend.labels.generateLabels;
     let labels = defaultGenerateLabels.call(chart, chart);
-    if (!this.rendered || this.removing) {
+    if (this.removing) {
       return labels;
     }
     let data = config.data,
@@ -2694,10 +2697,10 @@ export default class ChartJsRenderer extends AbstractChartRenderer {
   _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);
     this.removing = false;

package/src/chart/VennChartRenderer.js

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -112,14 +112,6 @@ export default class VennChartRenderer extends AbstractSvgChartRenderer {
     }
   }
 
-  checkCompletlyRendered() {
-    if (this.readyToDraw) {
-      this._draw(false, true);
-    } else {
-      super.checkCompletlyRendered();
-    }
-  }
-
   remove(requestAnimation, afterRemoveFunc) {
     this._cancelAsync3Calculator();
     super.remove(requestAnimation, afterRemoveFunc);

package/src/form/fields/chartfield/ChartField.js

@@ -1,5 +1,5 @@
 /*
- * 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
@@ -36,11 +36,4 @@ export default class ChartField extends FormField {
     this.chart.remove();
     this._removeField();
   }
-
-  _renderOnAttach() {
-    super._renderOnAttach();
-    if (this.chart && this.chart.chartRenderer) {
-      this.chart.chartRenderer.checkCompletlyRendered();
-    }
-  }
 }