Merge pull request #189 from 10up/no-icon-fix

Only output icon if one is set
10up · Jan 17, 2023 · 3c7551e · 3c7551e
2 parents ac20024 + 9286047
commit 3c7551e
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/components/icon-picker/icon-picker-toolbar-button.js b/components/icon-picker/icon-picker-toolbar-button.js
@@ -26,17 +26,15 @@ export const IconPickerToolbarButton = (props) => {
 		buttonLabel,
 	} = props;
 
+	const buttonIcon = name && iconSet ? <Icon name={name} iconSet={iconSet} /> : null;
+
 	return (
 		<Dropdown
 			className="component-icon-picker-toolbar-button"
 			contentClassName="component-icon-picker-toolbar-button__content"
 			position="bottom right"
 			renderToggle={({ isOpen, onToggle }) => (
-				<ToolbarButton
-					onClick={onToggle}
-					aria-expanded={isOpen}
-					icon={<Icon name={name} iconSet={iconSet} />}
-				>
+				<ToolbarButton onClick={onToggle} aria-expanded={isOpen} icon={buttonIcon}>
 					{buttonLabel ?? __('Select Icon')}
 				</ToolbarButton>
 			)}