mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-26 19:09:52 +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>
128 lines
4.0 KiB
TypeScript
128 lines
4.0 KiB
TypeScript
import type { Response } from '@playwright/test'
|
|
import { expect, mergeTests } from '@playwright/test'
|
|
|
|
import type { StatusWsMessage } from '../../src/schemas/apiSchema.ts'
|
|
import { comfyPageFixture } from '../fixtures/ComfyPage.ts'
|
|
import { webSocketFixture } from '../fixtures/ws.ts'
|
|
|
|
const test = mergeTests(comfyPageFixture, webSocketFixture)
|
|
|
|
test.describe('Actionbar', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
|
|
})
|
|
|
|
/**
|
|
* This test ensures that the autoqueue change mode can only queue one change at a time
|
|
*/
|
|
test('Does not auto-queue multiple changes at a time', async ({
|
|
comfyPage,
|
|
ws
|
|
}) => {
|
|
// Enable change auto-queue mode
|
|
const queueOpts = await comfyPage.actionbar.queueButton.toggleOptions()
|
|
expect(await queueOpts.getMode()).toBe('disabled')
|
|
await queueOpts.setMode('change')
|
|
await comfyPage.nextFrame()
|
|
expect(await queueOpts.getMode()).toBe('change')
|
|
await comfyPage.actionbar.queueButton.toggleOptions()
|
|
|
|
// Intercept the prompt queue endpoint
|
|
let promptNumber = 0
|
|
await comfyPage.page.route('**/api/prompt', async (route, req) => {
|
|
await new Promise((r) => setTimeout(r, 100))
|
|
await route.fulfill({
|
|
status: 200,
|
|
body: JSON.stringify({
|
|
prompt_id: promptNumber,
|
|
number: ++promptNumber,
|
|
node_errors: {},
|
|
// Include the request data to validate which prompt was queued so we can validate the width
|
|
__request: req.postDataJSON()
|
|
})
|
|
})
|
|
})
|
|
|
|
// Start watching for a message to prompt
|
|
const requestPromise = comfyPage.page.waitForResponse('**/api/prompt')
|
|
|
|
// Find and set the width on the latent node
|
|
const triggerChange = async (value: number) => {
|
|
return await comfyPage.page.evaluate((value) => {
|
|
const node = window['app'].graph._nodes.find(
|
|
(n) => n.type === 'EmptyLatentImage'
|
|
)
|
|
node.widgets[0].value = value
|
|
window[
|
|
'app'
|
|
].extensionManager.workflow.activeWorkflow.changeTracker.checkState()
|
|
}, value)
|
|
}
|
|
|
|
// Trigger a status websocket message
|
|
const triggerStatus = async (queueSize: number) => {
|
|
await ws.trigger({
|
|
type: 'status',
|
|
data: {
|
|
status: {
|
|
exec_info: {
|
|
queue_remaining: queueSize
|
|
}
|
|
}
|
|
}
|
|
} as StatusWsMessage)
|
|
}
|
|
|
|
// Extract the width from the queue response
|
|
const getQueuedWidth = async (resp: Promise<Response>) => {
|
|
const obj = await (await resp).json()
|
|
return obj['__request']['prompt']['5']['inputs']['width']
|
|
}
|
|
|
|
// Trigger a bunch of changes
|
|
const START = 32
|
|
const END = 64
|
|
for (let i = START; i <= END; i += 8) {
|
|
await triggerChange(i)
|
|
}
|
|
|
|
// Ensure the queued width is the first value
|
|
expect(
|
|
await getQueuedWidth(requestPromise),
|
|
'the first queued prompt should be the first change width'
|
|
).toBe(START)
|
|
|
|
// Ensure that no other changes are queued
|
|
await expect(
|
|
comfyPage.page.waitForResponse('**/api/prompt', { timeout: 250 })
|
|
).rejects.toThrow()
|
|
expect(
|
|
promptNumber,
|
|
'only 1 prompt should have been queued even though there were multiple changes'
|
|
).toBe(1)
|
|
|
|
// Trigger a status update so auto-queue re-runs
|
|
await triggerStatus(1)
|
|
await triggerStatus(0)
|
|
|
|
// Ensure the queued width is the last queued value
|
|
expect(
|
|
await getQueuedWidth(comfyPage.page.waitForResponse('**/api/prompt')),
|
|
'last queued prompt width should be the last change'
|
|
).toBe(END)
|
|
expect(promptNumber, 'queued prompt count should be 2').toBe(2)
|
|
})
|
|
|
|
test('Can dock actionbar into top menu', async ({ comfyPage }) => {
|
|
await comfyPage.page.dragAndDrop(
|
|
'.actionbar .drag-handle',
|
|
'.actionbar-container',
|
|
{
|
|
targetPosition: { x: 50, y: 20 },
|
|
force: true
|
|
}
|
|
)
|
|
expect(await comfyPage.actionbar.isDocked()).toBe(true)
|
|
})
|
|
})
|