Skip to content
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

Jump to bottom

Fix topbar submenu width on mobile/tablet #1047

Merged
merged 5 commits into from
Sep 30, 2024
Merged

Fix topbar submenu width on mobile/tablet #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
480f944
Fix topbar submenu width on tablet
christian-byrne Sep 29, 2024
20423a3
Add Playwright test
christian-byrne Sep 29, 2024
e0d0c46
Use better selector
christian-byrne Sep 29, 2024
19d8158
Merge branch 'main' into topbar-submenu-mobile
huchenlei Sep 30, 2024
7caa8a6
nit
huchenlei Sep 30, 2024
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
4 changes: 4 additions & 0 deletions browser_tests/ComfyPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,10 @@ class Topbar {
.allInnerTexts()
}

async openSubmenuMobile() {
await this.page.locator('.p-menubar-mobile .p-menubar-button').click()
}

async getMenuItem(itemLabel: string): Promise<Locator> {
return this.page.locator(`.p-menubar-item-label:text-is("${itemLabel}")`)
}
Expand Down
15 changes: 15 additions & 0 deletions browser_tests/menu.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,21 @@ test.describe('Menu', () => {
})
})

test.describe('Topbar submmenus', () => {
test('@mobile Items fully visible on mobile screen width', async ({
comfyPage
}) => {
await comfyPage.menu.topbar.openSubmenuMobile()
const topLevelMenuItem = comfyPage.page
.locator('a.p-menubar-item-link')
.first()
const isTextCutoff = await topLevelMenuItem.evaluate((el) => {
return el.scrollWidth > el.clientWidth
})
expect(isTextCutoff).toBe(false)
})
})

// Only test 'Top' to reduce test time.
// ['Bottom', 'Top']
;['Top'].forEach(async (position) => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/topbar/TopMenubar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:model="items"
class="top-menubar border-none p-0 bg-transparent"
:pt="{
rootList: 'gap-0 flex-nowrap'
rootList: 'gap-0 flex-nowrap w-auto'
}"
/>
<Divider layout="vertical" class="mx-2" />
Expand Down
Loading