Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelogs/upcoming/7740.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**Accessibility**

- Updated `EuiCollapsedNavButton` with improved context for screen reader navigation
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exports[`KibanaCollapsibleNavSolution renders docked icons 1`] = `
class="euiToolTipAnchor emotion-euiToolTipAnchor-block"
>
<button
aria-label="Some solution"
aria-label="Some solution, quick navigation menu"
class="euiButtonIcon euiCollapsedNavButton emotion-euiButtonIcon-s-empty-text-euiCollapsedNavButton"
data-test-subj="euiCollapsedNavButton"
type="button"
Expand All @@ -33,7 +33,7 @@ exports[`KibanaCollapsibleNavSolution renders docked icons 1`] = `
class="euiToolTipAnchor emotion-euiToolTipAnchor-block"
>
<button
aria-label="Solution view"
aria-label="Solution view, quick navigation menu"
class="euiButtonIcon euiCollapsedNavButton emotion-euiButtonIcon-s-empty-text-euiCollapsedNavButton"
data-test-subj="euiCollapsedNavButton"
type="button"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('KibanaCollapsibleNavSolution', () => {
);
expect(container.firstChild).toMatchSnapshot();

fireEvent.click(getByLabelText('Solution view'));
fireEvent.click(getByLabelText('Solution view, quick navigation menu'));
await waitForEuiPopoverOpen();
expect(getByText('Some other solution')).toBeInTheDocument();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ exports[`EuiCollapsibleNavItem renders a collapsed button icon when in a collaps
data-test-subj="test subject string"
>
<button
aria-label="Item"
aria-label="Item, quick navigation menu"
class="euiButtonIcon euiCollapsedNavButton emotion-euiButtonIcon-s-empty-text-euiCollapsedNavButton"
data-test-subj="euiCollapsedNavButton"
type="button"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ exports[`EuiCollapsedNavButton renders a tooltip around the icon button 1`] = `
>
<button
aria-describedby="generated-id"
aria-label="Nav item"
aria-label="Nav item, quick navigation menu"
class="euiButtonIcon euiCollapsedNavButton emotion-euiButtonIcon-s-empty-text-euiCollapsedNavButton"
data-test-subj="euiCollapsedNavButton"
type="button"
Expand Down Expand Up @@ -55,7 +55,7 @@ exports[`EuiCollapsedNavButton renders isSelected 1`] = `
class="euiToolTipAnchor emotion-euiToolTipAnchor-block"
>
<a
aria-label="Nav item"
aria-label="Nav item, quick navigation menu"
class="euiButtonIcon euiCollapsedNavButton emotion-euiButtonIcon-s-empty-text-euiCollapsedNavButton-isSelected"
data-test-subj="euiCollapsedNavButton"
href="#"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ exports[`EuiCollapsedNavItem renders a popover if items are passed 1`] = `
class="euiToolTipAnchor emotion-euiToolTipAnchor-block"
>
<button
aria-label="Item"
aria-label="Item, quick navigation menu"
class="euiButtonIcon euiCollapsedNavButton emotion-euiButtonIcon-s-empty-text-euiCollapsedNavButton"
data-test-subj="euiCollapsedNavButton"
type="button"
Expand All @@ -32,7 +32,7 @@ exports[`EuiCollapsedNavItem renders an icon button/link if href is passed 1`] =
data-test-subj="test subject string"
>
<a
aria-label="Item"
aria-label="Item, quick navigation menu"
class="euiButtonIcon euiCollapsedNavButton emotion-euiButtonIcon-s-empty-text-euiCollapsedNavButton"
data-test-subj="euiCollapsedNavButton"
href="#"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ exports[`EuiCollapsedNavPopover renders 1`] = `
class="euiToolTipAnchor emotion-euiToolTipAnchor-block"
>
<button
aria-label="Item"
aria-label="Item, quick navigation menu"
class="euiButtonIcon euiCollapsedNavButton emotion-euiButtonIcon-s-empty-text-euiCollapsedNavButton"
data-test-subj="euiCollapsedNavButton"
type="button"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
euiCollapsedNavButtonStyles,
euiCollapsedNavItemTooltipStyles,
} from './collapsed_nav_button.styles';
import { useEuiI18n } from '../../../i18n';

export const EuiCollapsedNavButton: FunctionComponent<
Omit<
Expand Down Expand Up @@ -63,6 +64,12 @@ export const EuiCollapsedNavButton: FunctionComponent<
hideToolTip && tooltipStyles.hidden,
];

const buttonIconAriaLabel = useEuiI18n(
'euiCollapsedNavButton.ariaLabelButtonIcon',
'{title}, quick navigation menu',
{ title }
);

return (
<EuiToolTip
content={title}
Expand All @@ -77,7 +84,7 @@ export const EuiCollapsedNavButton: FunctionComponent<
color="text"
href={href}
onClick={onClick}
aria-label={title}
aria-label={buttonIconAriaLabel}
{...(linkProps as EuiButtonIconPropsForAnchor)} // Exclusive union shenanigans
className={buttonClassName}
css={buttonCssStyles}
Expand Down