Skip to content

fix: make the header user menu reachable by keyboard #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chennaji9 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: make the header user menu reachable by keyboard #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 59 additions & 0 deletions apps/web/src/common/components/Header/User.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import User from './User';

jest.mock('next/router', () => ({
useRouter: () => ({ push: jest.fn() }),
}));

jest.mock('next/image', () => ({
__esModule: true,
default: (props: any) => {
// eslint-disable-next-line @next/next/no-img-element
return <img src={props.src} alt={props.alt} />;
},
}));

jest.mock('@modules/auth', () => ({
useUserInfo: () => ({
providerUser: { avatarUrl: 'https://example.com/a.png', name: 'alice' },
roleLevel: 0,
dashboardRole: false,
}),
}));

jest.mock('@modules/auth/UserInfoStore', () => ({
resetUserInfo: jest.fn(),
}));

jest.mock('@oss-compass/graphql', () => ({
useSignOutMutation: () => ({ mutate: jest.fn() }),
}));

describe('Header User menu', () => {
it('exposes the avatar as a focusable menu trigger button', () => {
render(<User />);

const trigger = screen.getByRole('button', { name: 'alice' });
expect(trigger).toHaveAttribute('aria-haspopup', 'menu');
});

it('exposes the sign-out action as a button', () => {
render(<User />);

expect(
screen.getByRole('button', { name: /common:signout/i })
).toBeInTheDocument();
});

it('renders the menu entries as links reachable after the trigger', () => {
render(<User />);

expect(
screen.getByRole('link', { name: /common:profile_setting/i })
).toBeInTheDocument();
expect(
screen.getByRole('link', { name: /common:subscribe/i })
).toBeInTheDocument();
});
});
18 changes: 12 additions & 6 deletions apps/web/src/common/components/Header/User.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,12 @@ const User = () => {

return (
<div className="group relative flex h-full items-center pl-6 transition">
<div className="border-secondary relative flex h-[32px] w-[32px] cursor-pointer items-center justify-center overflow-hidden rounded-full border group-hover:bg-[#333333]">
<button
type="button"
aria-haspopup="menu"
aria-label={user?.name || t('common:profile_setting')}
className="border-secondary relative flex h-[32px] w-[32px] cursor-pointer items-center justify-center overflow-hidden rounded-full border group-focus-within:bg-[#333333] group-hover:bg-[#333333]"
>
<Image
src={user?.avatarUrl!}
referrerPolicy="no-referrer"
Expand All @@ -46,9 +51,9 @@ const User = () => {
}}
alt=""
/>
</div>
</button>

<div className="z-dropdown absolute -right-4 top-[100%] hidden w-auto group-hover:block">
<div className="z-dropdown absolute -right-4 top-[100%] hidden w-auto group-focus-within:block group-hover:block">
<div className="mt-[2px] bg-black/90 text-white">
<Link
href="/settings/subscribe"
Expand Down Expand Up @@ -93,8 +98,9 @@ const User = () => {
{t('common:profile_setting')}
</Link>

<div
className="flex cursor-pointer items-center whitespace-nowrap border-b border-white/20 py-4 pl-6 text-center last:border-b-0 hover:bg-[#333333]"
<button
type="button"
className="flex w-full cursor-pointer items-center whitespace-nowrap border-b border-white/20 py-4 pl-6 text-center last:border-b-0 hover:bg-[#333333]"
onClick={() => {
mutation.mutate(
{},
Expand All @@ -108,7 +114,7 @@ const User = () => {
}}
>
<MdOutlineLogout className="mr-2 text-base" /> {t('common:signout')}
</div>
</button>
</div>
</div>
</div>
Expand Down