Merge branch 'issue-440' of https://github.com/contactashish13/visualizer; branch '3.3.0' of https://github.com/codeinwp/visualizer into issue-440

Author: contactashish13

classes/Visualizer/Gutenberg/Block.php

@@ -194,6 +194,8 @@ public function get_visualizer_data( $post ) {
 
 		$data['visualizer-chart-type'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_TYPE, true );
 
+		$data['visualizer-chart-library'] = get_post_meta( $post_id, Visualizer_Plugin::CF_CHART_LIBRARY, true );
+
 		$data['visualizer-source'] = get_post_meta( $post_id, Visualizer_Plugin::CF_SOURCE, true );
 
 		$data['visualizer-default-data'] = get_post_meta( $post_id, Visualizer_Plugin::CF_DEFAULT_DATA, true );

classes/Visualizer/Gutenberg/build/block.css

@@ -101,6 +101,12 @@ class Charts extends Component {
 											chart = `${ startCase( data['visualizer-chart-type']) }Chart`;
 										}
 
+										if ( data['visualizer-chart-library']) {
+											if ( 'ChartJS' === data['visualizer-chart-library']) {
+												return;
+											}
+										}
+
 										if ( 'dataTable' === chart ) {
 											return;
 										}

classes/Visualizer/Gutenberg/build/block.js

@@ -118,8 +118,7 @@ private static function get_random_color() {
 	}
 
 	/**
-	 * Sets some defaults (colors etc.) in the chart.
-	 * Currently only for ChartJS.
+	 * Sets some defaults in the chart.
 	 *
 	 * @since 3.3.0
 	 *
@@ -129,20 +128,69 @@ public static function set_defaults( $chart, $post_status = 'auto-draft' ) {
 		$type           = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
 		$library        = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_LIBRARY, true );
 
-		if ( ( ! is_null( $post_status ) && $chart->post_status !== $post_status ) || $library !== 'ChartJS' ) {
+		// if post_status is null, operate on the chart irrespective of the post_status
+		if ( ( ! is_null( $post_status ) && $chart->post_status !== $post_status ) ) {
 			return;
 		}
 
-		$series = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true );
-		$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
+		$series         = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true );
 		if ( ! $series || ! is_array( $series ) ) {
 			return;
 		}
 
+		switch ( $library ) {
+			case 'ChartJS':
+				self::set_defaults_chartjs( $chart, $post_status );
+				break;
+			case 'GoogleCharts':
+				self::set_defaults_google( $chart, $post_status );
+				break;
+		}
+	}
+
+	/**
+	 * Sets some defaults in the chart for Google charts.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @access private
+	 */
+	private static function set_defaults_google( $chart, $post_status ) {
+		$type           = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
+
+		$attributes     = array();
+		if ( $post_status === 'auto-draft' ) {
+			switch ( $type ) {
+				case 'combo':
+					// chart type 'bars' and first series 'line'.
+					$attributes['seriesType'] = 'bars';
+					$attributes['series'][0]['type'] = 'line';
+					break;
+			}
+		}
+
+		if ( $attributes ) {
+			$settings       = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
+			update_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, array_merge( $settings, $attributes ) );
+		}
+	}
+
+	/**
+	 * Sets some defaults in the chart for ChartJS charts.
+	 *
+	 * @since 3.3.0
+	 *
+	 * @access private
+	 */
+	private static function set_defaults_chartjs( $chart, $post_status ) {
+		$type = get_post_meta( $chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
+		$series = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SERIES, true );
+		$settings = get_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, true );
+
+		$attributes = array();
 		$name   = 'series';
 		$count  = count( $series );
 		$max    = $count - 1;
-		$attributes = array();
 		switch ( $type ) {
 			case 'polarArea':
 				// fall through.
@@ -170,10 +218,10 @@ public static function set_defaults( $chart, $post_status = 'auto-draft' ) {
 				}
 				break;
 		}
+
 		if ( $attributes ) {
 			$settings[ $name ] = $attributes;
 			update_post_meta( $chart->ID, Visualizer_Plugin::CF_SETTINGS, $settings );
 		}
 	}
-
 }

classes/Visualizer/Gutenberg/build/handsontable.css

@@ -1,4 +1,4 @@
-Date,GBP/USD,,,
+Date,GBP/USD,GBP/USD,GBP/USD,GBP/USD
 date,number,number,number,number
 2013-07-10,20,28,38,45
 2013-07-11,31,38,55,66