Merge pull request #1375 from vektor-inc/fix/button/background-clear

[ ボタン ]背景色をクリアしたとき、primary に変換

readme.txt

@@ -66,6 +66,7 @@ e.g.
 
 [ Improvement ][ Page list from ancestor ] Fix behavior site editor.
 [ Bug Fix ][ highlighter ] cope with color palette with alpha.
+[ Bug Fix ][ button ] buttonColorCustom clear convert to primary.
 
 = 1.41.1 =
 [ Bug Fix ] Fix don't display Admin screen in case of spacific option value

src/blocks/button/edit.js

@@ -147,6 +147,9 @@ export default function ButtonEdit(props) {
 	useEffect(() => {
 		if (buttonColorCustom !== undefined) {
 			updateBlockAttributes(clientId, { buttonColor: 'custom' });
+		} else if (buttonColor === 'custom') {
+			// 背景色クリアされたらデフォルトに戻す
+			updateBlockAttributes(clientId, { buttonColor: 'primary' });
 		}
 	}, [buttonColorCustom]);
 

src/blocks/button/style.scss

@@ -20,7 +20,8 @@ $xxl-min: 1400px;
 
 :root,
 :root .editor-styles-wrapper {
-	.has-vk-color-primary-background-color {
+	.has-vk-color-primary-background-color,
+	.has-undefined-background-color {
 		background-color: var(--vk-color-primary);
 	}
 	.has-vk-color-secondary-background-color {
@@ -367,6 +368,8 @@ $xxl-min: 1400px;
 			user-select: text;
 			text-decoration: none;
 			font-size: calc( var(--vk-size-text) * 1 );
+
+
 		}
 		&.btn-lg{
 			font-size:calc( var(--vk-size-text) * 1.25 );
@@ -403,4 +406,4 @@ $xxl-min: 1400px;
 		// Font Awesomeアイコンが管理画面側で改行されないために inline-block を指定
 		display: inline-block;
 	}
-}
+}