mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-27 11:29:53 +00:00
## Summary
Enhancing and further modernizing the UI, giving users more usable area
whilst keeping farmiliar positioning and feel of elements.
## Changes
- **What**: Significant restructure of the UI elements, changing
elements from large blocks to floating elements, updating:
- Side toolbar menu (floating style, supports small/normal mode,
combines to scroll on height overflow)
- Bottom tabs panel (floating style, tabs redesigned)
- Action bar (support for docking/undocking menu)
- Added login/user menu button to top right
- Restyled breadcrumbs (still collapse when overflows)
- Add litegraph support for fps info position (so it isn't covered by
the sidebar)
- **Breaking**:
- Removed various elements and added new ones, I have tested custom
sidebars, custom actions, etc but if scripts are inserting elements into
"other" elements they may have been (re)moved.
- Remove support for bottom menu
- Remove support for 2nd-row tabs
## Screenshots
<img width="1116" height="907" alt="ui"
src="https://github.com/user-attachments/assets/b040a215-67d3-4c88-8c4d-f402a16a34f6"
/>
https://github.com/user-attachments/assets/571dbda5-01ec-47e8-b235-ee1b88c93dd0
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-5980-Floating-Menus-UI-rework-2866d73d3650810aac60cc1afe979b60)
by [Unito](https://www.unito.io)
---------
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: github-actions <github-actions@github.com>
264 lines
8.5 KiB
TypeScript
264 lines
8.5 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { comfyPageFixture as test } from '../fixtures/ComfyPage'
|
|
|
|
test.describe('Menu', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
|
|
})
|
|
|
|
test('Can register sidebar tab', async ({ comfyPage }) => {
|
|
const initialChildrenCount = await comfyPage.menu.buttons.count()
|
|
|
|
await comfyPage.page.evaluate(async () => {
|
|
window['app'].extensionManager.registerSidebarTab({
|
|
id: 'search',
|
|
icon: 'pi pi-search',
|
|
title: 'search',
|
|
tooltip: 'search',
|
|
type: 'custom',
|
|
render: (el) => {
|
|
el.innerHTML = '<div>Custom search tab</div>'
|
|
}
|
|
})
|
|
})
|
|
await comfyPage.nextFrame()
|
|
|
|
const newChildrenCount = await comfyPage.menu.buttons.count()
|
|
expect(newChildrenCount).toBe(initialChildrenCount + 1)
|
|
})
|
|
|
|
test.describe('Workflows topbar tabs', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.setSetting(
|
|
'Comfy.Workflow.WorkflowTabsPosition',
|
|
'Topbar'
|
|
)
|
|
await comfyPage.setupWorkflowsDirectory({})
|
|
})
|
|
|
|
test('Can show opened workflows', async ({ comfyPage }) => {
|
|
expect(await comfyPage.menu.topbar.getTabNames()).toEqual([
|
|
'Unsaved Workflow'
|
|
])
|
|
})
|
|
|
|
test('Can close saved-workflow tabs', async ({ comfyPage }) => {
|
|
const workflowName = `tempWorkflow-${test.info().title}`
|
|
await comfyPage.menu.topbar.saveWorkflow(workflowName)
|
|
expect(await comfyPage.menu.topbar.getTabNames()).toEqual([workflowName])
|
|
await comfyPage.menu.topbar.closeWorkflowTab(workflowName)
|
|
await comfyPage.nextFrame()
|
|
expect(await comfyPage.menu.topbar.getTabNames()).toEqual([
|
|
'Unsaved Workflow'
|
|
])
|
|
})
|
|
})
|
|
|
|
test.describe('Topbar submmenus', () => {
|
|
test('@mobile Items fully visible on mobile screen width', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.menu.topbar.openTopbarMenu()
|
|
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)
|
|
})
|
|
|
|
test('Clicking on active state items does not close menu', async ({
|
|
comfyPage
|
|
}) => {
|
|
// Open the menu
|
|
await comfyPage.menu.topbar.openTopbarMenu()
|
|
const menu = comfyPage.page.locator('.comfy-command-menu')
|
|
|
|
// Navigate to View menu
|
|
const viewMenuItem = comfyPage.page.locator(
|
|
'.p-menubar-item-label:text-is("View")'
|
|
)
|
|
await viewMenuItem.hover()
|
|
|
|
// Wait for submenu to appear
|
|
const viewSubmenu = comfyPage.page
|
|
.locator('.p-tieredmenu-submenu:visible')
|
|
.first()
|
|
await viewSubmenu.waitFor({ state: 'visible' })
|
|
|
|
// Find Bottom Panel menu item
|
|
const bottomPanelMenuItem = viewSubmenu
|
|
.locator('.p-tieredmenu-item:has-text("Bottom Panel")')
|
|
.first()
|
|
const bottomPanelItem = bottomPanelMenuItem.locator(
|
|
'.p-menubar-item-label:text-is("Bottom Panel")'
|
|
)
|
|
await bottomPanelItem.waitFor({ state: 'visible' })
|
|
|
|
// Get checkmark icon element
|
|
const checkmark = bottomPanelMenuItem.locator('.pi-check')
|
|
|
|
// Check initial state of bottom panel (it's initially hidden)
|
|
const bottomPanel = comfyPage.page.locator('.bottom-panel')
|
|
await expect(bottomPanel).not.toBeVisible()
|
|
|
|
// Checkmark should be invisible initially (panel is hidden)
|
|
await expect(checkmark).toHaveClass(/invisible/)
|
|
|
|
// Click Bottom Panel to toggle it on
|
|
await bottomPanelItem.click()
|
|
|
|
// Verify menu is still visible after clicking
|
|
await expect(menu).toBeVisible()
|
|
await expect(viewSubmenu).toBeVisible()
|
|
|
|
// Verify bottom panel is now visible
|
|
await expect(bottomPanel).toBeVisible()
|
|
|
|
// Checkmark should now be visible (panel is shown)
|
|
await expect(checkmark).not.toHaveClass(/invisible/)
|
|
|
|
// Click Bottom Panel again to toggle it off
|
|
await bottomPanelItem.click()
|
|
|
|
// Verify menu is still visible after second click
|
|
await expect(menu).toBeVisible()
|
|
await expect(viewSubmenu).toBeVisible()
|
|
|
|
// Verify bottom panel is hidden again
|
|
await expect(bottomPanel).not.toBeVisible()
|
|
|
|
// Checkmark should be invisible again (panel is hidden)
|
|
await expect(checkmark).toHaveClass(/invisible/)
|
|
|
|
// Click outside to close menu
|
|
await comfyPage.page.locator('body').click({ position: { x: 10, y: 10 } })
|
|
|
|
// Verify menu is now closed
|
|
await expect(menu).not.toBeVisible()
|
|
})
|
|
|
|
test('Displays keybinding next to item', async ({ comfyPage }) => {
|
|
await comfyPage.menu.topbar.openTopbarMenu()
|
|
const workflowMenuItem = comfyPage.menu.topbar.getMenuItem('File')
|
|
await workflowMenuItem.hover()
|
|
const exportTag = comfyPage.page.locator('.keybinding-tag', {
|
|
hasText: 'Ctrl + s'
|
|
})
|
|
expect(await exportTag.count()).toBe(1)
|
|
})
|
|
|
|
test('Can catch error when executing command', async ({ comfyPage }) => {
|
|
await comfyPage.page.evaluate(() => {
|
|
window['app'].registerExtension({
|
|
name: 'TestExtension1',
|
|
commands: [
|
|
{
|
|
id: 'foo',
|
|
label: 'foo-command',
|
|
function: () => {
|
|
throw new Error('foo!')
|
|
}
|
|
}
|
|
],
|
|
menuCommands: [
|
|
{
|
|
path: ['ext'],
|
|
commands: ['foo']
|
|
}
|
|
]
|
|
})
|
|
})
|
|
await comfyPage.menu.topbar.triggerTopbarCommand(['ext', 'foo-command'])
|
|
expect(await comfyPage.getVisibleToastCount()).toBe(1)
|
|
})
|
|
|
|
test('Can navigate Theme menu and switch between Dark and Light themes', async ({
|
|
comfyPage
|
|
}) => {
|
|
const { topbar } = comfyPage.menu
|
|
|
|
// Take initial screenshot with default theme
|
|
await comfyPage.attachScreenshot('theme-initial')
|
|
|
|
// Open the topbar menu
|
|
const menu = await topbar.openTopbarMenu()
|
|
await expect(menu).toBeVisible()
|
|
|
|
// Get theme menu items
|
|
const {
|
|
submenu: themeSubmenu,
|
|
darkTheme: darkThemeItem,
|
|
lightTheme: lightThemeItem
|
|
} = await topbar.getThemeMenuItems()
|
|
|
|
await expect(darkThemeItem).toBeVisible()
|
|
await expect(lightThemeItem).toBeVisible()
|
|
|
|
// Switch to Light theme
|
|
await topbar.switchTheme('light')
|
|
|
|
// Verify menu stays open and Light theme shows as active
|
|
await expect(menu).toBeVisible()
|
|
await expect(themeSubmenu).toBeVisible()
|
|
|
|
// Check that Light theme is active
|
|
expect(await topbar.isMenuItemActive(lightThemeItem)).toBe(true)
|
|
|
|
// Screenshot with light theme active
|
|
await comfyPage.attachScreenshot('theme-menu-light-active')
|
|
|
|
// Verify ColorPalette setting is set to "light"
|
|
expect(await comfyPage.getSetting('Comfy.ColorPalette')).toBe('light')
|
|
|
|
// Close menu to see theme change
|
|
await topbar.closeTopbarMenu()
|
|
|
|
// Re-open menu and get theme items again
|
|
await topbar.openTopbarMenu()
|
|
const themeItems2 = await topbar.getThemeMenuItems()
|
|
|
|
// Switch back to Dark theme
|
|
await topbar.switchTheme('dark')
|
|
|
|
// Verify menu stays open and Dark theme shows as active
|
|
await expect(menu).toBeVisible()
|
|
await expect(themeItems2.submenu).toBeVisible()
|
|
|
|
// Check that Dark theme is active and Light theme is not
|
|
expect(await topbar.isMenuItemActive(themeItems2.darkTheme)).toBe(true)
|
|
expect(await topbar.isMenuItemActive(themeItems2.lightTheme)).toBe(false)
|
|
|
|
// Screenshot with dark theme active
|
|
await comfyPage.attachScreenshot('theme-menu-dark-active')
|
|
|
|
// Verify ColorPalette setting is set to "dark"
|
|
expect(await comfyPage.getSetting('Comfy.ColorPalette')).toBe('dark')
|
|
|
|
// Close menu
|
|
await topbar.closeTopbarMenu()
|
|
})
|
|
})
|
|
|
|
// Only test 'Top' to reduce test time.
|
|
// ['Bottom', 'Top']
|
|
;['Top'].forEach(async (position) => {
|
|
test(`Can migrate deprecated menu positions (${position})`, async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.setSetting('Comfy.UseNewMenu', position)
|
|
expect(await comfyPage.getSetting('Comfy.UseNewMenu')).toBe('Top')
|
|
})
|
|
|
|
test(`Can migrate deprecated menu positions on initial load (${position})`, async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.setSetting('Comfy.UseNewMenu', position)
|
|
await comfyPage.setup()
|
|
expect(await comfyPage.getSetting('Comfy.UseNewMenu')).toBe('Top')
|
|
})
|
|
})
|
|
})
|