mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-11 16:30:57 +00:00
## Summary Phase 1 of the dialog migration kicked off in #11719. Migrates the two simplest production dialogs — `PromptDialogContent` and `ConfirmationDialogContent` — from PrimeVue `Dialog` onto the Reka-UI primitives landed in Phase 0. Public API of `useDialogService` / `dialogStore` is unchanged. Parent: [FE-571](https://linear.app/comfyorg/issue/FE-571/dialog-system-migration-primevue-reka-ui-parent) This phase: [FE-573](https://linear.app/comfyorg/issue/FE-573/phase-1-migrate-promptdialog-confirmationdialog-closes-11688) Predecessor: #11719 (merged at `0788e7139`) Refs #11688 (closed manually after Phase 0; the actual user-visible max-width fix ships in this PR) ## Changes ### `src/services/dialogService.ts` | Call site | Renderer | Size | Width override | | --- | --- | --- | --- | | `prompt()` | `'reka'` | `md` | — | | `confirm()` | `'reka'` | `md` | — | | `showBillingComingSoonDialog()` | `'reka'` | `sm` | `contentClass: 'max-w-[360px]'` | ### `src/components/dialog/content/ConfirmationDialogContent.vue` - Drops `import Message from 'primevue/message'` — the only PrimeVue dependency in the component - Replaces `<Message>` with a Tailwind `role="status"` alert keeping the `pi pi-info-circle` icon and muted-foreground severity ### `src/stores/dialogStore.ts` + `src/components/dialog/GlobalDialog.vue` - Adds `contentClass?: HTMLAttributes['class']` on `CustomDialogComponentProps` - Forwards it to `<DialogContent :class="...">` on the Reka branch (PrimeVue path keeps using `pt`) ## Why this scope 1. **Smallest content surface** — `PromptDialogContent` is 43 LOC; the only PrimeVue dependency in `ConfirmationDialogContent` is the `<Message>` info banner. 2. **Closes #11688 ergonomics** — Reka's `md` size = `max-w-xl` (576px / 36rem), exactly the max-width the issue reporter asked for. 3. **Three known callers** — all in `dialogService.ts`. No other callers needed to change. 4. **Renderer branch is already proven by Phase 0**; this PR just flips the flag. ## Visual proof Verified live in Storybook (`Components / Dialog / Dialog → Default` and `… → All Sizes`) at viewport `1920×1080`. DOM inspection confirms the rendered widths match the design intent: | Story | size | Rendered width | Computed `max-width` | | --- | --- | --- | --- | | `Default` | `md` | **576 px** | **576 px (= 36rem)** | | `All Sizes` (sm slot) | `sm` | 384 px | 384 px (= 24rem) | The `md` measurement directly answers the #11688 reporter screenshot (1558 px wide PrimeVue dialog → 576 px Reka dialog on the same display). Local screenshot artifacts (not committed): `temp/screenshots/phase1-md-576px-1920w.png`, `temp/screenshots/phase1-md-allsizes-1920w.png`, `temp/screenshots/phase1-sm-384px-1920w.png` — drag-drop into the PR body before marking ready for review. ## Quality gates - [x] `pnpm typecheck` — clean - [x] `pnpm lint` — clean - [x] `pnpm format` — applied (oxfmt) - [x] `pnpm test:unit` (touched files): **26/26 passed** - `ConfirmationDialogContent.test.ts` (9 tests, no longer needs PrimeVue plugin) - `PromptDialogContent.test.ts` (5 tests, unchanged) - `GlobalDialog.test.ts` (9 tests, Phase 0 coverage still passes after the contentClass forwarder addition) - `dialogService.renderer.test.ts` **new** — 3 tests asserting each call site sets `renderer: 'reka'` (regression net) - [ ] `pnpm test:browser:local --grep "@mobile confirm dialog"` — **could not run locally** (no ComfyUI Python backend on `localhost:8188` in this session); CI will gate the existing fixture, which is already renderer-agnostic (`getByRole('dialog')` + `getByRole('button', ...)` in `browser_tests/fixtures/components/ConfirmDialog.ts`). ## Public API impact None. `useDialogService().prompt(...)` / `confirm(...)` / `showBillingComingSoonDialog(...)` keep their existing signatures. Custom-node extensions calling `app.extensionManager.dialog.*` continue to work. ## Out of scope (later phases) - `ErrorDialogContent`, `NodeSearchBox`, `SecretFormDialog`, `VideoHelpDialog`, `CustomizationDialog` — Phase 2 (FE-574) - Settings dialog — Phase 3 (FE-575) - Manager dialog — Phase 4 (FE-576) - `ConfirmDialog` callers (`SecretsPanel`, `BaseWorkflowsSidebarTab`) — Phase 5 (FE-577) - Removing PrimeVue `Dialog` imports + `<style>` cleanup in `GlobalDialog.vue` — Phase 6 (FE-578) - Legacy `ComfyDialog` (`src/scripts/ui/dialog.ts`) - Deduplicating `Dialogue.vue` / `ImageLightbox.vue` ## Screenshot <img width="865" height="497" alt="Screenshot 2026-05-08 at 4 35 45 PM" src="https://github.com/user-attachments/assets/6aead2ad-2e0b-478a-9154-bb632a6bf3d1" /> <img width="1363" height="964" alt="Screenshot 2026-05-08 at 4 38 16 PM" src="https://github.com/user-attachments/assets/10647752-a063-4901-a206-842799cc5d7a" /> <img width="889" height="486" alt="Screenshot 2026-05-08 at 4 46 57 PM" src="https://github.com/user-attachments/assets/81899a81-205a-46f2-bddd-7639624607f6" /> ## Test plan - [x] Unit: 26/26 pass on touched files - [ ] CI: `@mobile confirm dialog` spec on the migrated path - [ ] Manual (post-CI on a real backend): open prompt and confirm dialogs on 1920×1080 viewport, verify ≤ 36rem max-width, ESC closes, backdrop click closes, Enter submits prompt, focus trap holds - [ ] Manual: open Billing Coming Soon dialog — verify it stays at the existing `max-w-[360px]` width
298 lines
9.4 KiB
TypeScript
298 lines
9.4 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
|
|
|
|
async function pressKeyAndExpectRequest(
|
|
comfyPage: ComfyPage,
|
|
key: string,
|
|
urlPattern: string,
|
|
method: string = 'POST'
|
|
) {
|
|
const requestPromise = comfyPage.page.waitForRequest(
|
|
(req) => req.url().includes(urlPattern) && req.method() === method,
|
|
{ timeout: 5000 }
|
|
)
|
|
await comfyPage.page.keyboard.press(key)
|
|
return requestPromise
|
|
}
|
|
|
|
test.describe('Default Keybindings', { tag: '@keyboard' }, () => {
|
|
test.describe('Sidebar Toggle Shortcuts', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.canvas.click({ position: { x: 400, y: 400 } })
|
|
await comfyPage.nextFrame()
|
|
})
|
|
|
|
const sidebarTabs = [
|
|
{ key: 'KeyW', tabId: 'workflows', label: 'workflows' },
|
|
{ key: 'KeyN', tabId: 'node-library', label: 'node library' },
|
|
{ key: 'KeyM', tabId: 'model-library', label: 'model library' },
|
|
{ key: 'KeyA', tabId: 'assets', label: 'assets' }
|
|
] as const
|
|
|
|
for (const { key, tabId, label } of sidebarTabs) {
|
|
test(`'${key}' toggles ${label} sidebar`, async ({ comfyPage }) => {
|
|
const selectedButton = comfyPage.page.locator(
|
|
`.${tabId}-tab-button.side-bar-button-selected`
|
|
)
|
|
|
|
await expect(selectedButton).toBeHidden()
|
|
|
|
await comfyPage.canvas.press(key)
|
|
await expect(selectedButton).toBeVisible()
|
|
|
|
await comfyPage.canvas.press(key)
|
|
await expect(selectedButton).toBeHidden()
|
|
})
|
|
}
|
|
})
|
|
|
|
test.describe('Canvas View Controls', () => {
|
|
test("'Alt+=' zooms in", async ({ comfyPage }) => {
|
|
const initialScale = await comfyPage.canvasOps.getScale()
|
|
|
|
await comfyPage.keyboard.press('Alt+Equal')
|
|
|
|
await expect
|
|
.poll(() => comfyPage.canvasOps.getScale())
|
|
.toBeGreaterThan(initialScale)
|
|
})
|
|
|
|
test("'Alt+-' zooms out", async ({ comfyPage }) => {
|
|
const initialScale = await comfyPage.canvasOps.getScale()
|
|
|
|
await comfyPage.keyboard.press('Alt+Minus')
|
|
|
|
await expect
|
|
.poll(() => comfyPage.canvasOps.getScale())
|
|
.toBeLessThan(initialScale)
|
|
})
|
|
|
|
test("'.' fits view to nodes", async ({ comfyPage }) => {
|
|
// Set scale very small so fit-view will zoom back to fit nodes
|
|
await comfyPage.canvasOps.setScale(0.1)
|
|
await expect
|
|
.poll(() => comfyPage.canvasOps.getScale())
|
|
.toBeCloseTo(0.1, 1)
|
|
|
|
// Click canvas to ensure focus is within graph-canvas-container
|
|
await comfyPage.canvas.click({ position: { x: 400, y: 400 } })
|
|
await comfyPage.nextFrame()
|
|
|
|
await comfyPage.keyboard.press('Period')
|
|
|
|
await expect
|
|
.poll(() => comfyPage.canvasOps.getScale())
|
|
.toBeGreaterThan(0.1)
|
|
})
|
|
|
|
test("'h' locks canvas", async ({ comfyPage }) => {
|
|
await expect.poll(() => comfyPage.canvasOps.isReadOnly()).toBe(false)
|
|
|
|
await comfyPage.keyboard.press('KeyH')
|
|
|
|
await expect.poll(() => comfyPage.canvasOps.isReadOnly()).toBe(true)
|
|
})
|
|
|
|
test("'v' unlocks canvas", async ({ comfyPage }) => {
|
|
// Lock first
|
|
await comfyPage.command.executeCommand('Comfy.Canvas.Lock')
|
|
await expect.poll(() => comfyPage.canvasOps.isReadOnly()).toBe(true)
|
|
|
|
await comfyPage.keyboard.press('KeyV')
|
|
|
|
await expect.poll(() => comfyPage.canvasOps.isReadOnly()).toBe(false)
|
|
})
|
|
})
|
|
|
|
test.describe('Node State Toggles', () => {
|
|
test("'Alt+c' collapses and expands selected nodes", async ({
|
|
comfyPage
|
|
}) => {
|
|
const nodes = await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
|
|
expect(nodes.length).toBeGreaterThan(0)
|
|
const node = nodes[0]
|
|
|
|
await node.click('title')
|
|
|
|
await expect.poll(() => node.isCollapsed()).toBe(false)
|
|
|
|
await comfyPage.keyboard.press('Alt+KeyC')
|
|
await expect.poll(() => node.isCollapsed()).toBe(true)
|
|
|
|
await comfyPage.keyboard.press('Alt+KeyC')
|
|
await expect.poll(() => node.isCollapsed()).toBe(false)
|
|
})
|
|
|
|
test("'Ctrl+m' mutes and unmutes selected nodes", async ({ comfyPage }) => {
|
|
const nodes = await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')
|
|
expect(nodes.length).toBeGreaterThan(0)
|
|
const node = nodes[0]
|
|
|
|
await node.click('title')
|
|
|
|
// Normal mode is ALWAYS (0)
|
|
const getMode = () =>
|
|
comfyPage.page.evaluate((nodeId) => {
|
|
return window.app!.canvas.graph!.getNodeById(nodeId)!.mode
|
|
}, node.id)
|
|
|
|
await expect.poll(() => getMode()).toBe(0)
|
|
|
|
await comfyPage.keyboard.press('Control+KeyM')
|
|
// NEVER (2) = muted
|
|
await expect.poll(() => getMode()).toBe(2)
|
|
|
|
await comfyPage.keyboard.press('Control+KeyM')
|
|
await expect.poll(() => getMode()).toBe(0)
|
|
})
|
|
})
|
|
|
|
test.describe('Mode and Panel Toggles', () => {
|
|
test("'Alt+m' toggles app mode", async ({ comfyPage }) => {
|
|
// Set up linearData so app mode has something to show
|
|
await comfyPage.appMode.enterAppModeWithInputs([])
|
|
await expect(comfyPage.appMode.linearWidgets).toBeVisible()
|
|
|
|
// Toggle off with Alt+m
|
|
await comfyPage.page.keyboard.press('Alt+KeyM')
|
|
await expect(comfyPage.appMode.linearWidgets).toBeHidden()
|
|
|
|
// Toggle on again
|
|
await comfyPage.page.keyboard.press('Alt+KeyM')
|
|
await expect(comfyPage.appMode.linearWidgets).toBeVisible()
|
|
})
|
|
|
|
test("'Alt+Shift+m' toggles minimap", async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.Minimap.Visible', true)
|
|
await comfyPage.settings.setSetting('Comfy.Graph.CanvasMenu', true)
|
|
await comfyPage.workflow.loadWorkflow('default')
|
|
|
|
const minimap = comfyPage.page.locator('.litegraph-minimap')
|
|
await expect(minimap).toBeVisible()
|
|
|
|
await comfyPage.page.keyboard.press('Alt+Shift+KeyM')
|
|
await expect(minimap).toBeHidden()
|
|
|
|
await comfyPage.page.keyboard.press('Alt+Shift+KeyM')
|
|
await expect(minimap).toBeVisible()
|
|
})
|
|
|
|
test("'Ctrl+`' toggles terminal/logs panel", async ({ comfyPage }) => {
|
|
await expect(comfyPage.bottomPanel.root).toBeHidden()
|
|
|
|
await comfyPage.page.keyboard.press('Control+Backquote')
|
|
await expect(comfyPage.bottomPanel.root).toBeVisible()
|
|
|
|
await comfyPage.page.keyboard.press('Control+Backquote')
|
|
await expect(comfyPage.bottomPanel.root).toBeHidden()
|
|
})
|
|
})
|
|
|
|
test.describe('Queue and Execution', () => {
|
|
test("'Ctrl+Enter' queues prompt", async ({ comfyPage }) => {
|
|
const request = await pressKeyAndExpectRequest(
|
|
comfyPage,
|
|
'Control+Enter',
|
|
'/prompt',
|
|
'POST'
|
|
)
|
|
expect(request.url()).toContain('/prompt')
|
|
})
|
|
|
|
test("'Ctrl+Shift+Enter' queues prompt to front", async ({ comfyPage }) => {
|
|
const request = await pressKeyAndExpectRequest(
|
|
comfyPage,
|
|
'Control+Shift+Enter',
|
|
'/prompt',
|
|
'POST'
|
|
)
|
|
const body = request.postDataJSON()
|
|
expect(body.front).toBe(true)
|
|
})
|
|
|
|
test("'Ctrl+Alt+Enter' interrupts execution", async ({ comfyPage }) => {
|
|
const request = await pressKeyAndExpectRequest(
|
|
comfyPage,
|
|
'Control+Alt+Enter',
|
|
'/interrupt',
|
|
'POST'
|
|
)
|
|
expect(request.url()).toContain('/interrupt')
|
|
})
|
|
})
|
|
|
|
test.describe('File Operations', () => {
|
|
test("'Ctrl+s' triggers save workflow", async ({ comfyPage }) => {
|
|
// On a new unsaved workflow, Ctrl+s triggers Save As dialog.
|
|
// The dialog appearing proves the keybinding was intercepted by the app.
|
|
await comfyPage.keyboard.press('Control+s')
|
|
|
|
// The Save As dialog should appear
|
|
const saveDialog = comfyPage.page.getByRole('dialog')
|
|
await expect(saveDialog).toBeVisible()
|
|
|
|
// Dismiss the dialog
|
|
await comfyPage.keyboard.press('Escape')
|
|
})
|
|
|
|
test("'Ctrl+o' triggers open workflow", async ({ comfyPage }) => {
|
|
// Ctrl+o calls app.ui.loadFile() which clicks a hidden file input.
|
|
// Detect the file input click via an event listener.
|
|
await comfyPage.page.evaluate(() => {
|
|
window.TestCommand = false
|
|
const fileInputs =
|
|
document.querySelectorAll<HTMLInputElement>('input[type="file"]')
|
|
for (const input of fileInputs) {
|
|
input.addEventListener('click', () => {
|
|
window.TestCommand = true
|
|
})
|
|
}
|
|
})
|
|
|
|
await comfyPage.keyboard.press('Control+o')
|
|
|
|
await expect
|
|
.poll(() => comfyPage.page.evaluate(() => window.TestCommand))
|
|
.toBe(true)
|
|
})
|
|
})
|
|
|
|
test.describe('Graph Operations', () => {
|
|
test("'Ctrl+Shift+e' converts selection to subgraph", async ({
|
|
comfyPage
|
|
}) => {
|
|
await expect
|
|
.poll(
|
|
() => comfyPage.nodeOps.getGraphNodesCount(),
|
|
'Default workflow should have multiple nodes'
|
|
)
|
|
.toBeGreaterThan(1)
|
|
|
|
const initialCount = await comfyPage.nodeOps.getGraphNodesCount()
|
|
|
|
// Select all nodes
|
|
await comfyPage.keyboard.press('Control+a')
|
|
|
|
await comfyPage.keyboard.press('Control+Shift+KeyE')
|
|
|
|
// After conversion, node count should decrease
|
|
// (multiple nodes replaced by single subgraph node)
|
|
await expect
|
|
.poll(() => comfyPage.nodeOps.getGraphNodesCount())
|
|
.toBeLessThan(initialCount)
|
|
})
|
|
|
|
test("'r' refreshes node definitions", async ({ comfyPage }) => {
|
|
const request = await pressKeyAndExpectRequest(
|
|
comfyPage,
|
|
'KeyR',
|
|
'/object_info',
|
|
'GET'
|
|
)
|
|
expect(request.url()).toContain('/object_info')
|
|
})
|
|
})
|
|
})
|