From 645069271a53ba77100c82916202a6070323df0a Mon Sep 17 00:00:00 2001 From: Vignesh Joglekar Date: Mon, 14 Jun 2021 08:44:46 -0500 Subject: [PATCH] Fixes React errors+crash when system theme changes on loaded dashboard (#1123) * Fixes crash on theme change * Changelog --- CHANGELOG.md | 1 + assets/js/dashboard/stats/countries.js | 4 ++-- assets/js/dashboard/stats/visitor-graph.js | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9bb9a9cc..dd770b4f5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file. - Fix weekly report time range plausible/analytics#951 - Make sure embedded dashboards can run when user has blocked third-party cookies plausible/analytics#971 - Sites listing page will paginate if the user has a lot of sites plausible/analytics#994 +- Crash when changing theme on a loaded dashboard plausible/analytics#1123 ### Removed - Removes AppSignal monitoring package diff --git a/assets/js/dashboard/stats/countries.js b/assets/js/dashboard/stats/countries.js index 20dd363d0..b5f247686 100644 --- a/assets/js/dashboard/stats/countries.js +++ b/assets/js/dashboard/stats/countries.js @@ -34,7 +34,7 @@ class Countries extends React.Component { componentDidUpdate(prevProps) { if (this.props.query !== prevProps.query) { this.setState({loading: true, countries: null}) - this.fetchCountries().then(this.drawMap.bind(this)) + this.fetchCountries().then(this.drawMap) } if (this.props.darkTheme !== prevProps.darkTheme) { @@ -42,7 +42,7 @@ class Countries extends React.Component { document.getElementById('map-container').removeChild(document.querySelector('.datamaps-hoverover')); document.getElementById('map-container').removeChild(document.querySelector('.datamap')); } - this.drawMap(); + this.fetchCountries().then(this.drawMap) } } diff --git a/assets/js/dashboard/stats/visitor-graph.js b/assets/js/dashboard/stats/visitor-graph.js index 48f0a6863..40ae56550 100644 --- a/assets/js/dashboard/stats/visitor-graph.js +++ b/assets/js/dashboard/stats/visitor-graph.js @@ -202,6 +202,7 @@ class LineGraph extends React.Component { } if (prevProps.darkTheme !== this.props.darkTheme) { + this.chart.destroy(); this.chart = this.regenerateChart(); this.chart.update(); }