fix #2270; improved checks for element existence before doing any cal…

…culations
apexcharts · Nov 6, 2024 · 5c3bba0 · 5c3bba0
1 parent e928398
commit 5c3bba0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/apexcharts.js b/src/apexcharts.js
@@ -50,7 +50,7 @@ export default class ApexCharts {
     // main method
     return new Promise((resolve, reject) => {
       // only draw chart, if element found
-      if (this.el !== null) {
+      if (Utils.elementExists(this.el)) {
         if (typeof Apex._chartInstances === 'undefined') {
           Apex._chartInstances = []
         }
@@ -129,18 +129,19 @@ export default class ApexCharts {
     gl.noData = false
     gl.animationEnded = false
 
+    if (!Utils.elementExists(this.el)) {
+      gl.animationEnded = true
+      this.destroy()
+      return null
+    }
+
     this.responsive.checkResponsiveConfig(opts)
 
     if (w.config.xaxis.convertedCatToNumeric) {
       const defaults = new Defaults(w.config)
       defaults.convertCatToNumericXaxis(w.config, this.ctx)
     }
 
-    if (this.el === null) {
-      gl.animationEnded = true
-      return null
-    }
-
     this.core.setupElements()
 
     if (w.config.chart.type === 'treemap') {

diff --git a/src/utils/Utils.js b/src/utils/Utils.js
@@ -161,6 +161,13 @@ class Utils {
     return str + z
   }
 
+  static elementExists(element) {
+    if (!element || !element.isConnected) {
+      return false
+    }
+    return true
+  }
+
   static getDimensions(el) {
     const computedStyle = getComputedStyle(el, null)