fix custom text color at editor #1937

vektor-inc · Mar 28, 2024 · 5e10613 · 5e10613
1 parent 4e98043
commit 5e10613
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/blocks/button/component.js b/src/blocks/button/component.js
@@ -18,6 +18,7 @@ export class VKBButton extends Component {
 		const iconSizeAfter = this.props.lbIconSizeAfter;
 		const richText = this.props.lbRichtext;
 		const subCaption = this.props.lbsubCaption;
+		const isSelected = this.props.isSelected;
 		let aClass = '';
 		let aStyle = {};
 		let iconBefore = '';
@@ -76,6 +77,18 @@ export class VKBButton extends Component {
 			}
 		}
 
+		// 文字色がカスタムカラーの場合
+		if (
+			buttonTextColorCustom !== undefined &&
+			isHexColor(buttonTextColorCustom) &&
+			isSelected
+		) {
+			aStyle = {
+				// 編集画面対策
+				color: `${buttonTextColorCustom}`,
+			};
+		}
+
 		aClass = `${aClass} btn-${buttonSize}`;
 
 		if (buttonAlign === 'block') {

diff --git a/src/blocks/button/edit.js b/src/blocks/button/edit.js
@@ -810,6 +810,7 @@ export default function ButtonEdit(props) {
 					lbIconSizeBefore={iconSizeBefore}
 					lbIconSizeAfter={iconSizeAfter}
 					lbsubCaption={subCaption}
+					isSelected={true}
 					lbRichtext={
 						<RichText
 							tagName={'span'}