Skip to content

Commit

Permalink
Button: always render the Tooltip component even when a tooltip shoul…
Browse files Browse the repository at this point in the history
…d not be shown (#56490)

* Force `shouldShowTooltip` to always be a boolean

* Button: always render the `Tooltip` component even when a tooltip should not be shown

* Restore Button in post save button

* Remove unnecessary useMemo

* Remove unused import

* CHANGELOG

* Add unit test

* Remove unncessary assertions
  • Loading branch information
ciampo authored Jan 24, 2024
1 parent f1f7afc commit c87e338
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 80 deletions.
1 change: 1 addition & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- `ToggleGroupControl`: Improve controlled value detection ([#57770](https://github.com/WordPress/gutenberg/pull/57770)).
- `Tooltip`: Improve props forwarding to children of nested `Tooltip` components ([#57878](https://github.com/WordPress/gutenberg/pull/57878)).
- `Tooltip`: revert prop types to only accept component-specific props ([#58125](https://github.com/WordPress/gutenberg/pull/58125)).
- `Button`: prevent the component from trashing and re-creating the HTML element ([#56490](https://github.com/WordPress/gutenberg/pull/56490)).

### Experimental

Expand Down
54 changes: 21 additions & 33 deletions packages/components/src/button/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,9 @@ export function UnforwardedButton(
const shouldShowTooltip =
! trulyDisabled &&
// An explicit tooltip is passed or...
( ( showTooltip && label ) ||
( ( showTooltip && !! label ) ||
// There's a shortcut or...
shortcut ||
!! shortcut ||
// There's a label and...
( !! label &&
// The children are empty and...
Expand Down Expand Up @@ -249,40 +249,28 @@ export function UnforwardedButton(
</button>
);

// Convert legacy `position` values to be used with the new `placement` prop
let computedPlacement;
// if `tooltipPosition` is defined, compute value to `placement`
if ( tooltipPosition !== undefined ) {
computedPlacement = positionToPlacement( tooltipPosition );
}

if ( ! shouldShowTooltip ) {
return (
<>
{ element }
{ describedBy && (
<VisuallyHidden>
<span id={ descriptionId }>{ describedBy }</span>
</VisuallyHidden>
) }
</>
);
}

return (
<>
<Tooltip
text={
// In order to avoid some React reconciliation issues, we are always rendering
// the `Tooltip` component even when `shouldShowTooltip` is `false`.
// In order to make sure that the tooltip doesn't show when it shouldn't,
// we don't pass the props to the `Tooltip` component.
const tooltipProps = shouldShowTooltip
? {
text:
( children as string | ReactElement[] )?.length &&
describedBy
? describedBy
: label
}
shortcut={ shortcut }
placement={ computedPlacement }
>
{ element }
</Tooltip>
: label,
shortcut,
placement:
tooltipPosition &&
// Convert legacy `position` values to be used with the new `placement` prop
positionToPlacement( tooltipPosition ),
}
: {};

return (
<>
<Tooltip { ...tooltipProps }>{ element }</Tooltip>
{ describedBy && (
<VisuallyHidden>
<span id={ descriptionId }>{ describedBy }</span>
Expand Down
37 changes: 37 additions & 0 deletions packages/components/src/button/test/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,43 @@ describe( 'Button', () => {
).not.toBeInTheDocument();
} );

it( 'should not trash the rendered HTML elements when toggling between showing and not showing a tooltip', async () => {
const user = userEvent.setup();

const { rerender } = render(
<Button label="Button label">Test button</Button>
);

const button = screen.getByRole( 'button', {
name: 'Button label',
} );

expect( button ).toBeVisible();

await user.tab();

expect( button ).toHaveFocus();

// Re-render the button, but this time change the settings so that it
// shows a tooltip.
rerender(
<Button label="Button label" showTooltip>
Test button
</Button>
);

// The same button element that we referenced before should still be
// in the document and have focus.
expect( button ).toHaveFocus();

// Re-render the button, but stop showing a tooltip.
rerender( <Button label="Button label">Test button</Button> );

// The same button element that we referenced before should still be
// in the document and have focus.
expect( button ).toHaveFocus();
} );

it( 'should add a disabled prop to the button', () => {
render( <Button disabled /> );

Expand Down
77 changes: 30 additions & 47 deletions packages/editor/src/components/post-saved-state/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import classnames from 'classnames';
import {
__unstableGetAnimateClassName as getAnimateClassName,
Button,
Tooltip,
} from '@wordpress/components';
import { usePrevious, useViewportMatch } from '@wordpress/compose';
import { useDispatch, useSelect } from '@wordpress/data';
Expand Down Expand Up @@ -129,54 +128,38 @@ export default function PostSavedState( { forceIsDirty } ) {
text = shortLabel;
}

const buttonAccessibleLabel = text || label;

/**
* The tooltip needs to be enabled only if the button is not disabled. When
* relying on the internal Button tooltip functionality, this causes the
* resulting `button` element to be always removed and re-added to the DOM,
* causing focus loss. An alternative approach to circumvent the issue
* is not to use the `label` and `shortcut` props on `Button` (which would
* trigger the tooltip), and instead manually wrap the `Button` in a separate
* `Tooltip` component.
*/
const tooltipProps = isDisabled
? undefined
: {
text: buttonAccessibleLabel,
shortcut: displayShortcut.primary( 's' ),
};

// Use common Button instance for all saved states so that focus is not
// lost.
return (
<Tooltip { ...tooltipProps }>
<Button
className={
isSaveable || isSaving
? classnames( {
'editor-post-save-draft': ! isSavedState,
'editor-post-saved-state': isSavedState,
'is-saving': isSaving,
'is-autosaving': isAutosaving,
'is-saved': isSaved,
[ getAnimateClassName( {
type: 'loading',
} ) ]: isSaving,
} )
: undefined
}
onClick={ isDisabled ? undefined : () => savePost() }
variant="tertiary"
size="compact"
icon={ isLargeViewport ? undefined : cloudUpload }
// Make sure the aria-label has always a value, as the default `text` is undefined on small screens.
aria-label={ buttonAccessibleLabel }
aria-disabled={ isDisabled }
>
{ isSavedState && <Icon icon={ isSaved ? check : cloud } /> }
{ text }
</Button>
</Tooltip>
<Button
className={
isSaveable || isSaving
? classnames( {
'editor-post-save-draft': ! isSavedState,
'editor-post-saved-state': isSavedState,
'is-saving': isSaving,
'is-autosaving': isAutosaving,
'is-saved': isSaved,
[ getAnimateClassName( {
type: 'loading',
} ) ]: isSaving,
} )
: undefined
}
onClick={ isDisabled ? undefined : () => savePost() }
/*
* We want the tooltip to show the keyboard shortcut only when the
* button does something, i.e. when it's not disabled.
*/
shortcut={ isDisabled ? undefined : displayShortcut.primary( 's' ) }
variant="tertiary"
size="compact"
icon={ isLargeViewport ? undefined : cloudUpload }
label={ text || label }
aria-disabled={ isDisabled }
>
{ isSavedState && <Icon icon={ isSaved ? check : cloud } /> }
{ text }
</Button>
);
}

1 comment on commit c87e338

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flaky tests detected in c87e338.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/7641252330
📝 Reported issues:

Please sign in to comment.