Fix logic of has-text class addition in Button

WordPress · Dec 14, 2023 · 9c5f676 · 9c5f676
1 parent 4cc9ec4
commit 9c5f676
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/packages/components/src/button/index.tsx b/packages/components/src/button/index.tsx
@@ -156,7 +156,7 @@ export function UnforwardedButton(
 		'is-busy': isBusy,
 		'is-link': variant === 'link',
 		'is-destructive': isDestructive,
-		'has-text': !! icon && hasChildren,
+		'has-text': !! icon && ( hasChildren || text ),
 		'has-icon': !! icon,
 	} );
 

diff --git a/packages/components/src/button/style.scss b/packages/components/src/button/style.scss
@@ -270,6 +270,7 @@
 
 		&.has-icon:not(.has-text) {
 			padding: 0;
+			width: $button-size-compact;
 			min-width: $button-size-compact;
 		}
 	}
@@ -282,6 +283,7 @@
 
 		&.has-icon:not(.has-text) {
 			padding: 0;
+			width: $button-size-small;
 			min-width: $button-size-small;
 		}
 	}