Replace tooltip prop with showTooltip

WordPress · Dec 18, 2019 · 2ca5ed5 · 2ca5ed5
1 parent b9d72e4
commit 2ca5ed5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/packages/components/src/button/index.js b/packages/components/src/button/index.js
@@ -34,7 +34,7 @@ export function Button( props, ref ) {
 		disabled,
 		icon,
 		iconSize,
-		tooltip,
+		showTooltip,
 		tooltipPosition,
 		shortcut,
 		label,
@@ -69,9 +69,9 @@ export function Button( props, ref ) {
 		{ type: 'button', disabled, 'aria-pressed': isPressed };
 
 	// Should show the tooltip if...
-	const showTooltip = ! disabled && (
+	const shouldShowTooltip = ! disabled && (
 		// an explicit tooltip is passed or...
-		tooltip ||
+		( showTooltip && label ) ||
 		// there's a shortcut or...
 		shortcut ||
 		(
@@ -80,7 +80,7 @@ export function Button( props, ref ) {
 			// the children are empty and...
 			( ! children || ( isArray( children ) && ! children.length ) ) &&
 			// the tooltip is not explicitly disabled.
-			false !== tooltip
+			false !== showTooltip
 		)
 	);
 
@@ -97,14 +97,12 @@ export function Button( props, ref ) {
 		</Tag>
 	);
 
-	if ( ! showTooltip ) {
+	if ( ! shouldShowTooltip ) {
 		return element;
 	}
 
-	const tooltipText = tooltip || label;
-
 	return (
-		<Tooltip text={ tooltipText } shortcut={ shortcut } position={ tooltipPosition }>
+		<Tooltip text={ label } shortcut={ shortcut } position={ tooltipPosition }>
 			{ element }
 		</Tooltip>
 	);

diff --git a/packages/components/src/icon-button/index.js b/packages/components/src/icon-button/index.js
@@ -11,6 +11,8 @@ import Button from '../button';
 function IconButton( {
 	labelPosition,
 	size,
+	tooltip,
+	label,
 	...props
 }, ref ) {
 	return (
@@ -19,6 +21,8 @@ function IconButton( {
 			ref={ ref }
 			tooltipPosition={ labelPosition }
 			iconSize={ size }
+			showTooltip={ tooltip !== undefined ? !! tooltip : undefined }
+			label={ tooltip || label }
 		/>
 	);
 }

diff --git a/packages/components/src/icon-button/test/index.js b/packages/components/src/icon-button/test/index.js
@@ -63,10 +63,10 @@ describe( 'IconButton', () => {
 		} );
 
 		it( 'should allow custom tooltip text', () => {
-			const iconButton = shallow( <IconButton label="WordPress" tooltip="Custom" /> );
+			const iconButton = shallow( <IconButton tooltip="Custom" /> );
 			expect( iconButton.name() ).toBe( 'Tooltip' );
 			expect( iconButton.prop( 'text' ) ).toBe( 'Custom' );
-			expect( iconButton.find( 'ForwardRef(Button)' ).prop( 'aria-label' ) ).toBe( 'WordPress' );
+			expect( iconButton.find( 'ForwardRef(Button)' ).prop( 'aria-label' ) ).toBe( 'Custom' );
 		} );
 
 		it( 'should allow tooltip disable', () => {