Merge branch 'develop' into bugfix/315-colors

material-components · Jul 12, 2022 · 1805f5e · 1805f5e
2 parents a7bd53e + 8d089a3
commit 1805f5e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
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 }
 								/>

diff --git a/plugin/assets/src/customizer/components/color-control/style.css b/plugin/assets/src/customizer/components/color-control/style.css
@@ -22,6 +22,10 @@
 	width: 40px;
 }
 
-.material-design-color__input input {
-	width: 50% !important; /* Override core */
+.material-design-color__input {
+	width: 82px;
+}
+
+.material-design-color__shuffle.material-design-color__shuffle {
+	margin-left: 15px;
 }