root/goodbuddy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(workspace): align project menu edge

Browse Source
This commit is contained in:
mesalogo
2026-10-13 01:30:18 +08:00
parent 05838d2c50
commit 2e204e6a4b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/src/ProjectSwitcher.test.tsx
+3 -1
View File
@@ -395,12 +395,14 @@ describe('ProjectSwitcher runtime fields', () => {
it('floats the project menu outside the sidebar and keeps menu interactions open', async () => { it('floats the project menu outside the sidebar and keeps menu interactions open', async () => {
renderSwitcher() renderSwitcher()
const trigger = screen.getByRole('button', { name: '当前项目' }) const trigger = screen.getByRole('button', { name: '当前项目' })
vi.spyOn(trigger, 'getBoundingClientRect').mockReturnValue(new DOMRect(16, 16, 240, 60))
fireEvent.click(trigger) fireEvent.click(trigger)
const menu = screen.getByRole('menu') const menu = screen.getByRole('menu')
expect(trigger.closest('.project-switcher')).not.toContainElement(menu) expect(trigger.closest('.project-switcher')).not.toContainElement(menu)
expect(menu.closest('.floating-portal')?.parentElement).toBe(document.body) expect(menu.closest('.floating-portal')?.parentElement).toBe(document.body)
const surface = screen.getByRole('dialog', { name: '项目与活动' }) const surface = screen.getByRole('dialog', { name: '项目与活动' })
expect(surface.style.width).toBe('680px') expect(surface.style.width).toBe('680px')
expect(surface.style.left).toBe('14px')
const selected = within(menu).getByRole('menuitemradio', { checked: true }) const selected = within(menu).getByRole('menuitemradio', { checked: true })
await waitFor(() => expect(screen.getByRole('tab', { name: '全部项目' })).toHaveFocus()) await waitFor(() => expect(screen.getByRole('tab', { name: '全部项目' })).toHaveFocus())
fireEvent.pointerDown(selected) fireEvent.pointerDown(selected)
@@ -409,7 +411,7 @@ describe('ProjectSwitcher runtime fields', () => {
const width = vi.spyOn(window, 'innerWidth', 'get').mockReturnValue(360) const width = vi.spyOn(window, 'innerWidth', 'get').mockReturnValue(360)
fireEvent(window, new Event('resize')) fireEvent(window, new Event('resize'))
expect(surface.style.width).toBe('328px') expect(surface.style.width).toBe('328px')
expect(surface.style.left).toBe('16px') expect(surface.style.left).toBe('14px')
width.mockRestore() width.mockRestore()
fireEvent.keyDown(selected, { key: 'Escape' }) fireEvent.keyDown(selected, { key: 'Escape' })
expect(screen.queryByRole('menu')).not.toBeInTheDocument() expect(screen.queryByRole('menu')).not.toBeInTheDocument()
src/renderer/src/WorkspaceMenu.tsx
+1 -1
View File
@@ -174,7 +174,7 @@ export function WorkspaceMenu({
const rect = anchor.getBoundingClientRect() const rect = anchor.getBoundingClientRect()
const width = Math.min(680, window.innerWidth - 32) const width = Math.min(680, window.innerWidth - 32)
menu.style.width = `${width}px` menu.style.width = `${width}px`
menu.style.left = `${Math.max(16, Math.min(rect.left, window.innerWidth - width - 16))}px` menu.style.left = `${Math.max(14, Math.min(rect.left - 2, window.innerWidth - width - 16))}px`
const top = Math.max(16, rect.bottom + 8) const top = Math.max(16, rect.bottom + 8)
menu.style.top = `${top}px` menu.style.top = `${top}px`
menu.style.maxHeight = `${Math.max(0, window.innerHeight - top - 16)}px` menu.style.maxHeight = `${Math.max(0, window.innerHeight - top - 16)}px`