Merge cc3545e into aef276c

material-components · Jul 12, 2022 · 7ad786c · 7ad786c
2 parents aef276c + cc3545e
commit 7ad786c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/plugin/assets/src/customizer/components/color-control/index.js b/plugin/assets/src/customizer/components/color-control/index.js
@@ -73,6 +73,10 @@ const ColorControl = ( { defaultValue, params, onColorChange, mode } ) => {
 	};
 
 	useEffect( () => {
+		if ( ! color ) {
+			return;
+		}
+
 		let hexColor = color.substring( 1 );
 
 		if ( hexColor.length === 3 ) {
@@ -179,7 +183,7 @@ const ColorControl = ( { defaultValue, params, onColorChange, mode } ) => {
 								<MaterialColorPalette
 									value={ color }
 									onChange={ value => {
-										onChange( value );
+										onChange( value ?? defaultValue );
 									} }
 									materialColorsOnly={ true }
 								/>