fix add function, fix frontend if default is empty

Author: kaeizen

src/plugins/global-settings/color-schemes/color-scheme-picker.js

@@ -98,7 +98,7 @@ const ColorSchemePicker = props => {
 	const customColorSchemes = applyFilters( 'stackable.global-settings.global-color-schemes.custom-color-schemes', [] )
 
 	// Add a custom color scheme
-	const handleAddItem = ( scheme = null ) => {
+	const handleAddItem = ( event, scheme = null ) => {
 		doAction( 'stackable.global-settings.global-color-schemes.custom-color-schemes.add-color-scheme', scheme, setItemInEdit, saveTimeout )
 	}
 
@@ -210,7 +210,7 @@ const ColorSchemePicker = props => {
 		const confirmDuplicate = window.confirm( __( 'Do you want to duplicate this color scheme?', i18n ) )
 
 		if ( confirmDuplicate ) {
-			handleAddItem( item )
+			handleAddItem( null, item )
 		}
 	}
 

src/plugins/global-settings/color-schemes/index.php

@@ -169,14 +169,21 @@ public static function get_color_scheme_properties( $values = null ) {
 		 * @return String
 		 */
 		public function add_global_color_schemes_styles( $current_css ) {
-			$schemes_array = get_option( 'stackable_global_color_schemes' );
-			$base_default = get_option( 'stackable_global_base_color_scheme' ) != '' ? get_option( 'stackable_global_base_color_scheme' ) : 'scheme-default-1';
-			$background_default = get_option( 'stackable_global_background_mode_color_scheme' ) != '' ? get_option( 'stackable_global_background_mode_color_scheme' ) : 'scheme-default-2';
-			$container_default = get_option( 'stackable_global_container_mode_color_scheme' ) != '' ? get_option( 'stackable_global_container_mode_color_scheme' ) : 'scheme-default-1';
+			$schemes_array = is_array( get_option( 'stackable_global_color_schemes' ) ) ? get_option( 'stackable_global_color_schemes' ) : [];
 
 			// Get all color schemes, including custom color schemes if any
 			$all_color_schemes = apply_filters( 'stackable_global_color_schemes.get_color_schemes', $schemes_array );
+
+			if ( ! is_array( $all_color_schemes ) ) {
+				return $current_css;
+			}
+
 			$this->color_schemes = $this->convert_to_assoc_array( $all_color_schemes );
+
+			$base_default = isset( $this->color_schemes[ get_option( 'stackable_global_base_color_scheme' ) ] ) ? get_option( 'stackable_global_base_color_scheme' ) : 'scheme-default-1';
+			$background_default = isset( $this->color_schemes[ get_option( 'stackable_global_background_mode_color_scheme' ) ] )  ? get_option( 'stackable_global_background_mode_color_scheme' ) : 'scheme-default-2';
+			$container_default = isset( $this->color_schemes[ get_option( 'stackable_global_container_mode_color_scheme' ) ] )  ? get_option( 'stackable_global_container_mode_color_scheme' ) : 'scheme-default-1';
+
 			$styles = array();
 
 			if ( isset( $this->color_schemes[$base_default] ) ) {