Merge pull request #812 from Codeinwp/bugfix/811

Fix gutenberg chart broken issue when active google sitekit plugin

Author: selul

classes/Visualizer/Gutenberg/build/block.js

@@ -36,6 +36,9 @@ class ChartRender extends Component {
 	}
 
 	render() {
+
+		let chartVersion = google.visualization.Version || 'current';
+
 		let chart, footer;
 
 		let data = formatDate( JSON.parse( JSON.stringify( this.props.chart ) ) );
@@ -88,6 +91,7 @@ class ChartRender extends Component {
 							/>
 						) : ( '' !== data['visualizer-data-exploded'] ? (
 							<Chart
+								chartVersion={ chartVersion }
 								chartType={ chart }
 								rows={ data['visualizer-data'] }
 								columns={ data['visualizer-series'] }
@@ -101,6 +105,7 @@ class ChartRender extends Component {
 							/>
                         ) : (
 							<Chart
+								chartVersion={ chartVersion }
 								chartType={ chart }
 								rows={ data['visualizer-data'] }
 								columns={ data['visualizer-series'] }

classes/Visualizer/Gutenberg/src/Components/ChartRender.js

@@ -57,6 +57,8 @@ class ChartSelect extends Component {
 
 	render() {
 
+		let chartVersion = google.visualization.Version || 'current';
+
 		let chart, footer;
 
 		let data = formatDate( JSON.parse( JSON.stringify( this.props.chart ) ) );
@@ -160,6 +162,7 @@ class ChartSelect extends Component {
 							/>
 						) : ( '' !== data['visualizer-data-exploded'] ? (
 							<Chart
+								chartVersion={ chartVersion }
 								chartType={ chart }
 								rows={ data['visualizer-data'] }
 								columns={ data['visualizer-series'] }
@@ -173,6 +176,7 @@ class ChartSelect extends Component {
 							/>
                         ) : (
 							<Chart
+								chartVersion={ chartVersion }
 								chartType={ chart }
 								rows={ data['visualizer-data'] }
 								columns={ data['visualizer-series'] }

classes/Visualizer/Gutenberg/src/Components/ChartSelect.js

@@ -74,6 +74,8 @@ class Charts extends Component {
 
 	render() {
 
+		let chartVersion = google.visualization.Version || 'current';
+
 		const { charts, isBusy, chartsLoaded, perPage } = this.state;
 
 		return (
@@ -148,6 +150,7 @@ class Charts extends Component {
 													/>
 												) : ( '' !== data['visualizer-data-exploded'] ? (
 													<Chart
+														chartVersion={ chartVersion }
 														chartType={ chart }
 														rows={ data['visualizer-data'] }
 														columns={ data['visualizer-series'] }
@@ -156,6 +159,7 @@ class Charts extends Component {
 													/>
 												) : (
 													<Chart
+														chartVersion={ chartVersion }
 														chartType={ chart }
 														rows={ data['visualizer-data'] }
 														columns={ data['visualizer-series'] }