Merge pull request #777 from contactashish13/issue-771

omit left in legend position for bubble chart

Author: rodica-andronache

CHANGELOG.md

@@ -1,4 +1,8 @@
 
+ ### v3.4.8 - 2020-09-29 
+ **Changes:** 
+ * [Fix] Option to edit charts imported from JSON
+ 
  ### v3.4.7 - 2020-09-21 
  **Changes:** 
  * - [Fix] Import from JSON: Reordering columns only reorders the label, not the associated data

classes/Visualizer/Gutenberg/build/block.js

@@ -46,6 +46,12 @@ class GeneralSettings extends Component {
             positions.push({ label: __( 'Inside the chart' ), value: 'in' });
         }
 
+        if ( 'bubble' === type ) {
+            positions = positions.filter( function( obj ) {
+                return 'left' !== obj.value;
+            });
+        }
+
         let titleHelp = __( 'Text to display above the chart.' );
         if ( 0 <= [ 'tabular', 'dataTable', 'gauge', 'geo', 'timeline' ].indexOf( type ) ) {
             titleHelp = __( 'Text to display in the back-end admin area' );
@@ -200,9 +206,11 @@ class GeneralSettings extends Component {
 								if ( 'pie' !== type ) {
 									let axis = 'left' === e ? 1 : 0;
 
-									Object.keys( settings.series ).map( i => {
-										settings.series[i].targetAxisIndex = axis;
-									});
+                                    if ( settings.series ) {
+                                        Object.keys( settings.series ).map( i => {
+                                            settings.series[i].targetAxisIndex = axis;
+                                        });
+                                    }
 								}
 
 								settings.legend.position = e;

classes/Visualizer/Gutenberg/src/Components/Sidebar/GeneralSettings.js

@@ -67,10 +67,15 @@ public function __construct( $data = array() ) {
 			'none'   => esc_html__( 'Omit the legend', 'visualizer' ),
 		);
 
-		if ( ! in_array( $this->get_chart_type( false ), array( 'Pie' ), true ) ) {
+		$chart_type = $this->get_chart_type( false );
+		if ( ! in_array( $chart_type, array( 'Pie' ), true ) ) {
 			$this->_legendPositions['in']  = esc_html__( 'Inside the chart', 'visualizer' );
 		}
 
+		if ( in_array( $chart_type, array( 'Bubble' ), true ) ) {
+			unset( $this->_legendPositions['left'] );
+		}
+
 		$this->_alignments = array(
 			''       => '',
 			'start'  => esc_html__( 'Aligned to the start of the allocated area', 'visualizer' ),

classes/Visualizer/Render/Sidebar/Google.php

@@ -162,6 +162,11 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 13. Bar chart
 
 ## Changelog ##
+### 3.4.8 - 2020-09-29  ###
+
+* [Fix] Option to edit charts imported from JSON
+
+
 ### 3.4.7 - 2020-09-21  ###
 
 * - [Fix] Import from JSON: Reordering columns only reorders the label, not the associated data

readme.md

@@ -162,6 +162,11 @@ Pay attention that to turn your shortcodes into graphs, your theme has to have `
 13. Bar chart
 
 == Changelog ==
+= 3.4.8 - 2020-09-29  = 
+
+* [Fix] Option to edit charts imported from JSON
+
+
 = 3.4.7 - 2020-09-21  = 
 
 * - [Fix] Import from JSON: Reordering columns only reorders the label, not the associated data

readme.txt

@@ -1 +1 @@
-{"index.php":"a50ed270dae4dd71bc1634ba32d8e897"}
+{"index.php":"e696714581e4570da2662a4e020bbbd8"}