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
18 changes: 14 additions & 4 deletions frontend/src/app/layout/app-header.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -486,13 +486,12 @@ describe('AppHeader', () => {
)
})

it('账号菜单在点击外部、按 Escape 或指针移出账号区域时关闭', async () => {
it('账号菜单在点击外部或按 Escape 时关闭', async () => {
window.localStorage.setItem('windup.auth.refresh-token', 'stored-refresh-token')
renderHeader('/workspace')

const trigger = await screen.findByRole('button', { name: '打开账号菜单' })
const menu = screen.getByTestId('account-menu')
const accountRegion = screen.getByLabelText('账号')

fireEvent.click(trigger)
fireEvent.pointerDown(document.body)
Expand All @@ -502,11 +501,22 @@ describe('AppHeader', () => {
fireEvent.click(trigger)
fireEvent.keyDown(document, { key: 'Escape' })
expect(menu.getAttribute('data-state')).toBe('closing')
fireEvent.animationEnd(menu)
})

it('指针移出头像所在区域时账号菜单保持打开,否则鼠标够不到菜单项', async () => {
window.localStorage.setItem('windup.auth.refresh-token', 'stored-refresh-token')
renderHeader('/workspace')

const trigger = await screen.findByRole('button', { name: '打开账号菜单' })
const menu = screen.getByTestId('account-menu')
const accountRegion = screen.getByLabelText('账号')

fireEvent.click(trigger)
expect(menu.getAttribute('data-state')).toBe('open')

fireEvent.pointerLeave(accountRegion)
expect(menu.getAttribute('data-state')).toBe('closing')
expect(menu.getAttribute('data-state')).toBe('open')
expect(screen.getByRole('link', { name: '打开账号中心' })).toBeTruthy()
})

it('让登录用户从 Header 的账号信息进入账号中心', async () => {
Expand Down
7 changes: 6 additions & 1 deletion frontend/src/app/layout/app-header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,15 @@ export function AppHeader({
})}
</nav>

{/*
不挂 pointerleave 关闭:菜单是点击打开的,而它右对齐、比头像宽,
与头像之间还隔着 0.5rem。鼠标从头像走向菜单的任何一条路径都会先离开本区域,
于是菜单在指针到达之前就关掉,鼠标用户永远点不到里面的项。
关闭交给区域外 pointerdown、Escape 和焦点移出。
*/}
<div
ref={accountRegionRef}
aria-label="账号"
onPointerLeave={accountMenu.close}
onBlur={(event) => {
if (!event.currentTarget.contains(event.relatedTarget as Node | null)) {
accountMenu.close()
Expand Down
Loading