diff --git a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts index 9e6a02c8791..491424bdce3 100644 --- a/browser_tests/fixtures/components/ComfyNodeSearchBox.ts +++ b/browser_tests/fixtures/components/ComfyNodeSearchBox.ts @@ -2,14 +2,14 @@ import { expect } from '@playwright/test' import type { Locator, Page } from '@playwright/test' class ComfyNodeSearchFilterSelectionPanel { - readonly root: Locator readonly header: Locator + readonly root: Locator constructor(public readonly page: Page) { - this.root = page.getByRole('dialog') - this.header = this.root - .locator('div') - .filter({ hasText: 'Add node filter condition' }) + this.root = page.getByRole('dialog', { name: 'Add node filter condition' }) + this.header = this.root.getByRole('heading', { + name: 'Add node filter condition' + }) } async selectFilterType(filterType: string) { diff --git a/browser_tests/fixtures/helpers/MaskEditorHelper.ts b/browser_tests/fixtures/helpers/MaskEditorHelper.ts index 4727842723e..151bdbc43b6 100644 --- a/browser_tests/fixtures/helpers/MaskEditorHelper.ts +++ b/browser_tests/fixtures/helpers/MaskEditorHelper.ts @@ -10,9 +10,13 @@ const RGB_CANVAS_INDEX = 1 type BrushSliderLabel = 'thickness' class MaskEditorHelper { + public readonly dialog: Locator public readonly previewImage: Locator constructor(private comfyPage: ComfyPage) { + this.dialog = comfyPage.page.locator( + '[data-dialog-key="global-mask-editor"]' + ) this.previewImage = comfyPage.page.locator('.image-preview img').first() } @@ -46,7 +50,7 @@ class MaskEditorHelper { await imagePreview.getByRole('region').hover() await this.page.getByLabel('Edit or mask image').click() - const dialog = this.page.locator('.mask-editor-dialog') + const dialog = this.dialog await expect(dialog).toBeVisible() await expect( dialog.getByRole('heading', { name: 'Mask Editor' }) @@ -65,7 +69,7 @@ class MaskEditorHelper { await imagePreview.getByRole('region').hover() await this.page.getByLabel('Edit or mask image').click() - const dialog = this.page.locator('.mask-editor-dialog') + const dialog = this.dialog await expect(dialog).toBeVisible() await expect(dialog.getByTestId('pointer-zone')).toBeVisible() diff --git a/browser_tests/tests/dialogs/billingSessionSdkRail.spec.ts b/browser_tests/tests/dialogs/billingSessionSdkRail.spec.ts index cb7d6743132..285e91c6b00 100644 --- a/browser_tests/tests/dialogs/billingSessionSdkRail.spec.ts +++ b/browser_tests/tests/dialogs/billingSessionSdkRail.spec.ts @@ -227,7 +227,7 @@ async function recordTotalCreditStates(page: Page) { } const tile = label?.parentElement if (!tile) return - const state = tile.querySelector('[data-pc-name="skeleton"]') + const state = tile.querySelector('[data-slot="skeleton"]') ? 'loading' : tile.textContent .replace('Total credits', '') diff --git a/browser_tests/tests/dialogs/publishDialog.spec.ts b/browser_tests/tests/dialogs/publishDialog.spec.ts index 5888c41d882..51762550587 100644 --- a/browser_tests/tests/dialogs/publishDialog.spec.ts +++ b/browser_tests/tests/dialogs/publishDialog.spec.ts @@ -15,19 +15,8 @@ async function saveAndOpenPublishDialog( dialog: PublishDialog, workflowName: string ): Promise { + await comfyPage.workflow.setupWorkflowsDirectory({}) await comfyPage.menu.topbar.saveWorkflow(workflowName) - const overwriteDialog = comfyPage.page - .getByRole('dialog') - .filter({ hasText: 'Overwrite' }) - // Bounded wait: point-in-time isVisible() can miss dialogs that open - // slightly after saveWorkflow() resolves. - try { - await overwriteDialog.waitFor({ state: 'visible', timeout: 500 }) - await comfyPage.confirmDialog.click('overwrite') - } catch { - // No overwrite dialog — workflow name was unique. - } - await dialog.open() } @@ -398,6 +387,10 @@ test.describe('Publish dialog - layout', () => { await comfyPage.page.setViewportSize({ width, height: VIEWPORT_HEIGHT }) await expect(publishDialog.describeStep).toBeVisible() await expect(publishDialog.nameInput).toHaveValue(/test-layout-wf/) + await comfyPage.page.evaluate(() => { + if (document.activeElement instanceof HTMLElement) + document.activeElement.blur() + }) await comfyPage.toast.closeToasts() await comfyPage.canvas.evaluate((el) => { el.style.visibility = 'hidden' diff --git a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-2xl-chromium-linux.png b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-2xl-chromium-linux.png index 6f6c724ed4e..7351bd87ea4 100644 Binary files a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-2xl-chromium-linux.png and b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-2xl-chromium-linux.png differ diff --git a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-lg-chromium-linux.png b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-lg-chromium-linux.png index bf3b57193a0..ec9fc662aea 100644 Binary files a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-lg-chromium-linux.png and b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-lg-chromium-linux.png differ diff --git a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-md-chromium-linux.png b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-md-chromium-linux.png index 00b715380ec..0a00730845a 100644 Binary files a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-md-chromium-linux.png and b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-md-chromium-linux.png differ diff --git a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-mobile-chromium-linux.png b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-mobile-chromium-linux.png index 8ae309029ed..1cd6df88744 100644 Binary files a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-mobile-chromium-linux.png and b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-mobile-chromium-linux.png differ diff --git a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-sm-chromium-linux.png b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-sm-chromium-linux.png index 0c16167eb3f..fc12f86f6de 100644 Binary files a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-sm-chromium-linux.png and b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-sm-chromium-linux.png differ diff --git a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-wide-chromium-linux.png b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-wide-chromium-linux.png index 5c625c71395..61fde0d8e6b 100644 Binary files a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-wide-chromium-linux.png and b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-wide-chromium-linux.png differ diff --git a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-xl-chromium-linux.png b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-xl-chromium-linux.png index 5a95e7bb917..17b1fe1f92f 100644 Binary files a/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-xl-chromium-linux.png and b/browser_tests/tests/dialogs/publishDialog.spec.ts-snapshots/publish-dialog-xl-chromium-linux.png differ diff --git a/browser_tests/tests/extensionAPI.spec.ts b/browser_tests/tests/extensionAPI.spec.ts index 7e595e228c1..5444dba3797 100644 --- a/browser_tests/tests/extensionAPI.spec.ts +++ b/browser_tests/tests/extensionAPI.spec.ts @@ -314,6 +314,28 @@ test.describe('Topbar commands', () => { .toBe(true) }) + test('Should let a native modal dialog opened over Settings take clicks', async ({ + comfyPage + }) => { + await comfyPage.settingDialog.open() + await comfyPage.page.evaluate(() => { + const dialog = document.createElement('dialog') + const option = document.createElement('input') + option.type = 'checkbox' + option.setAttribute('aria-label', 'Extension option') + dialog.append(option) + document.body.append(dialog) + dialog.showModal() + }) + const option = comfyPage.page.getByRole('checkbox', { + name: 'Extension option' + }) + + await option.click() + + await expect(option).toBeChecked() + }) + test('Should allow dismissing a dialog', async ({ comfyPage }) => { await comfyPage.page.evaluate(() => { ;(window as unknown as Record)['value'] = 'foo' diff --git a/browser_tests/tests/keybindingPanel.spec.ts b/browser_tests/tests/keybindingPanel.spec.ts index faca716a961..7f74981d7da 100644 --- a/browser_tests/tests/keybindingPanel.spec.ts +++ b/browser_tests/tests/keybindingPanel.spec.ts @@ -477,6 +477,43 @@ test.describe('Keybinding Panel', { tag: '@keyboard' }, () => { await expect(confirmDialog).toBeHidden() }) + + test('Reset All confirmation traps focus and dismisses alone over Settings', async ({ + comfyPage + }) => { + const panel = comfyPage.settingDialog.keybindingPanel + const confirmDialog = panel.resetAllDialog + const cancel = confirmDialog.getByRole('button', { name: /Cancel/i }) + const confirm = confirmDialog.getByRole('button', { name: /Reset All/i }) + const close = confirmDialog.getByRole('button', { name: 'Close' }) + + await test.step('Tab cycles inside the confirmation', async () => { + await panel.resetAllButton.click() + await expect(cancel).toBeFocused() + await panel.page.keyboard.press('Tab') + await expect(confirm).toBeFocused() + await panel.page.keyboard.press('Tab') + await expect(close).toBeFocused() + await panel.page.keyboard.press('Shift+Tab') + await expect(confirm).toBeFocused() + }) + + await test.step('Escape closes only the confirmation', async () => { + await panel.page.keyboard.press('Escape') + await expect(confirmDialog).toBeHidden() + await expect(comfyPage.settingDialog.root).toBeVisible() + await expect(panel.resetAllButton).toBeFocused() + }) + + await test.step('An outside click closes only the confirmation', async () => { + await panel.resetAllButton.click() + await expect(confirmDialog).toBeVisible() + await panel.page.mouse.click(5, 5) + await expect(confirmDialog).toBeHidden() + await expect(comfyPage.settingDialog.root).toBeVisible() + await expect(comfyPage.toast.visibleToasts).toHaveCount(0) + }) + }) }) test.describe('Search Filter', () => { diff --git a/browser_tests/tests/maskEditor.spec.ts b/browser_tests/tests/maskEditor.spec.ts index d919d528b79..ccdcf6c3dda 100644 --- a/browser_tests/tests/maskEditor.spec.ts +++ b/browser_tests/tests/maskEditor.spec.ts @@ -116,7 +116,7 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => { await imagePreview.getByRole('region').hover() await comfyPage.page.getByLabel('Edit or mask image').click() - const dialog = comfyPage.page.locator('.mask-editor-dialog') + const dialog = maskEditor.dialog await expect(dialog).toBeVisible() await expect( @@ -160,7 +160,7 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => { await contextMenu.getByText('Open in Mask Editor').click() - const dialog = comfyPage.page.locator('.mask-editor-dialog') + const dialog = maskEditor.dialog await expect(dialog).toBeVisible() await expect( dialog.getByRole('heading', { name: 'Mask Editor' }) @@ -264,6 +264,24 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => { await expect(dialog).toBeHidden() }) + test('maximize fills the viewport and restore returns to the framed size', async ({ + comfyPage, + maskEditor + }) => { + const dialog = await maskEditor.openDialog() + const viewportWidth = await comfyPage.page.evaluate(() => window.innerWidth) + const width = async () => (await dialog.boundingBox())?.width ?? 0 + + const framedWidth = viewportWidth * 0.9 + await expect.poll(width).toBeCloseTo(framedWidth, 0) + + await dialog.getByRole('button', { name: 'Maximize dialog' }).click() + await expect.poll(width).toBeGreaterThan(viewportWidth - 24) + + await dialog.getByRole('button', { name: 'Restore dialog' }).click() + await expect.poll(width).toBeCloseTo(framedWidth, 0) + }) + test('invert button inverts the mask', async ({ maskEditor }) => { const dialog = await maskEditor.openDialog() @@ -460,7 +478,7 @@ test.describe('Mask Editor', { tag: '@vue-nodes' }, () => { wstest( 'Will not use stale litegraph previews', { tag: '@vue-nodes' }, - async ({ comfyPage, getWebSocket }) => { + async ({ comfyPage, getWebSocket, maskEditor }) => { const executionHelper = new ExecutionHelper(comfyPage, await getWebSocket()) await comfyPage.menu.topbar.setVueNodesEnabled(false) await comfyPage.menu.topbar.newWorkflowButton.click() @@ -492,6 +510,6 @@ wstest( // On previous versions, attempting to open the mask editor here would // incorrectly reference the non-existant test1.png // This causes the mask editor to throw in setup and not display - await expect(comfyPage.page.locator('.mask-editor-dialog')).toBeVisible() + await expect(maskEditor.dialog).toBeVisible() } ) diff --git a/browser_tests/tests/maskEditor.spec.ts-snapshots/mask-editor-dialog-from-context-menu-chromium-linux.png b/browser_tests/tests/maskEditor.spec.ts-snapshots/mask-editor-dialog-from-context-menu-chromium-linux.png index ff485b301ed..7be910d7cb1 100644 Binary files a/browser_tests/tests/maskEditor.spec.ts-snapshots/mask-editor-dialog-from-context-menu-chromium-linux.png and b/browser_tests/tests/maskEditor.spec.ts-snapshots/mask-editor-dialog-from-context-menu-chromium-linux.png differ diff --git a/browser_tests/tests/maskEditor.spec.ts-snapshots/mask-editor-dialog-open-chromium-linux.png b/browser_tests/tests/maskEditor.spec.ts-snapshots/mask-editor-dialog-open-chromium-linux.png index 74157ee29c3..89e7ad6b5f3 100644 Binary files a/browser_tests/tests/maskEditor.spec.ts-snapshots/mask-editor-dialog-open-chromium-linux.png and b/browser_tests/tests/maskEditor.spec.ts-snapshots/mask-editor-dialog-open-chromium-linux.png differ diff --git a/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png b/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png index 59783da0481..c7a4a2c2f83 100644 Binary files a/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png and b/browser_tests/tests/mobileBaseline.spec.ts-snapshots/mobile-settings-dialog-mobile-chrome-linux.png differ diff --git a/browser_tests/tests/nodeSearchBox.spec.ts b/browser_tests/tests/nodeSearchBox.spec.ts index d60e4d7a2a7..3997707a305 100644 --- a/browser_tests/tests/nodeSearchBox.spec.ts +++ b/browser_tests/tests/nodeSearchBox.spec.ts @@ -86,6 +86,18 @@ test.describe('Node search box', { tag: '@node' }, () => { .toHaveLength(initialSamplers.length + 1) }) + test('One Escape closes the search while results are listed', async ({ + comfyPage + }) => { + await comfyPage.command.executeCommand('Workspace.SearchBox.Toggle') + await comfyPage.searchBox.typeQuery('KSampler') + await expect(comfyPage.searchBox.resultsListbox).toBeVisible() + + await comfyPage.page.keyboard.press('Escape') + + await expect(comfyPage.searchBox.input).toBeHidden() + }) + test('Can auto link node', { tag: '@screenshot' }, async ({ comfyPage }) => { const initialNodeCount = await comfyPage.nodeOps.getGraphNodesCount() await comfyPage.canvasOps.disconnectEdge() @@ -243,8 +255,7 @@ test.describe('Node search box', { tag: '@node' }, () => { const panel = comfyPage.searchBox.filterSelectionPanel await panel.header.waitFor({ state: 'visible' }) await comfyPage.page - .locator('.p-dialog-mask') - .filter({ has: panel.header }) + .getByTestId('node-search-filter-overlay') .click({ position: { x: 10, y: 10 } }) // Verify the filter selection panel is hidden @@ -264,6 +275,19 @@ test.describe('Node search box', { tag: '@node' }, () => { ).toBeFocused() }) + test('ignores Escape during IME composition', async ({ comfyPage }) => { + const panel = comfyPage.searchBox.filterSelectionPanel + await panel.root.dispatchEvent('keydown', { + key: 'Escape', + isComposing: true + }) + await expect(panel.header).toBeVisible() + await expect(comfyPage.searchBox.input).toBeVisible() + await comfyPage.page.keyboard.press('Escape') + await expect(panel.header).toBeHidden() + await expect(comfyPage.searchBox.input).toBeFocused() + }) + test('keeps search open when the filter has keyboard focus', async ({ comfyPage }) => { diff --git a/browser_tests/tests/nodeSearchBoxV2.spec.ts b/browser_tests/tests/nodeSearchBoxV2.spec.ts index d764852156a..e2926066f0c 100644 --- a/browser_tests/tests/nodeSearchBoxV2.spec.ts +++ b/browser_tests/tests/nodeSearchBoxV2.spec.ts @@ -26,6 +26,14 @@ test.describe('Node search box V2', { tag: '@node' }, () => { .toBe(initialCount + 1) }) + test('Opens fully inside the viewport', async ({ comfyPage }) => { + const { searchBoxV2 } = comfyPage + + await searchBoxV2.open() + + await expect(searchBoxV2.dialog).toBeInViewport({ ratio: 1 }) + }) + test('Can add first default result with Enter', async ({ comfyPage }) => { const { searchBoxV2 } = comfyPage const initialCount = await comfyPage.nodeOps.getGraphNodesCount() diff --git a/browser_tests/tests/templates.spec.ts-snapshots/template-cards-with-overlay-tags-chromium-linux.png b/browser_tests/tests/templates.spec.ts-snapshots/template-cards-with-overlay-tags-chromium-linux.png index ab40dffad3d..7086a3aadbc 100644 Binary files a/browser_tests/tests/templates.spec.ts-snapshots/template-cards-with-overlay-tags-chromium-linux.png and b/browser_tests/tests/templates.spec.ts-snapshots/template-cards-with-overlay-tags-chromium-linux.png differ diff --git a/browser_tests/tests/templates.spec.ts-snapshots/template-filter-bar-select-components-chromium-linux.png b/browser_tests/tests/templates.spec.ts-snapshots/template-filter-bar-select-components-chromium-linux.png index 0eb16833dfd..2a28743c74d 100644 Binary files a/browser_tests/tests/templates.spec.ts-snapshots/template-filter-bar-select-components-chromium-linux.png and b/browser_tests/tests/templates.spec.ts-snapshots/template-filter-bar-select-components-chromium-linux.png differ diff --git a/browser_tests/tests/toastNotifications.spec.ts b/browser_tests/tests/toastNotifications.spec.ts index 94176ef06ba..abfe3d5b436 100644 --- a/browser_tests/tests/toastNotifications.spec.ts +++ b/browser_tests/tests/toastNotifications.spec.ts @@ -3,6 +3,18 @@ import { comfyExpect as expect } from '@e2e/fixtures/ComfyPage' import type { ComfyPage } from '@e2e/fixtures/ComfyPage' +import type { Locator } from '@playwright/test' + +type Box = NonNullable>> + +function overlaps(a: Box, b: Box): boolean { + return ( + a.x < b.x + b.width && + b.x < a.x + a.width && + a.y < b.y + b.height && + b.y < a.y + a.height + ) +} test.describe('Toast Notifications', { tag: '@ui' }, () => { async function triggerErrorToast(comfyPage: ComfyPage) { @@ -67,6 +79,60 @@ test.describe('Toast Notifications', { tag: '@ui' }, () => { ) }) + test('A toast raised before a dialog opens stays above it', async ({ + comfyPage + }) => { + await triggerErrorToast(comfyPage) + await comfyPage.settingDialog.open() + const errorToast = comfyPage.toast.withText('Test execution error') + + await comfyPage.toast.dismiss(errorToast) + + await expect(comfyPage.toast.visibleToasts).toHaveCount(0) + await expect(comfyPage.settingDialog.root).toBeVisible() + }) + + for (const { dialog, open, closeButton } of [ + { + dialog: 'Settings', + open: (comfyPage: ComfyPage) => comfyPage.settingDialog.open(), + closeButton: (comfyPage: ComfyPage) => + comfyPage.settingDialog.root.getByRole('button', { name: 'Close' }) + }, + { + dialog: 'a maximized dialog', + open: (comfyPage: ComfyPage) => + comfyPage.page.evaluate(() => { + window.app!.extensionManager.dialog.showExtensionDialog({ + key: 'maximized-toast-test', + title: 'Maximized', + component: { render: () => null }, + dialogComponentProps: { maximizable: true, maximized: true } + }) + }), + closeButton: (comfyPage: ComfyPage) => + comfyPage.page + .getByRole('dialog', { name: 'Maximized' }) + .getByRole('button', { name: 'Close' }) + } + ]) { + test(`Toasts stay clear of the close button of ${dialog}`, async ({ + comfyPage + }) => { + await open(comfyPage) + await triggerErrorToast(comfyPage) + const errorToast = comfyPage.toast.withText('Test execution error') + await expect(errorToast).toBeVisible() + + const toastBounds = await errorToast.boundingBox() + const closeBounds = await closeButton(comfyPage).boundingBox() + + expect(toastBounds).not.toBeNull() + expect(closeBounds).not.toBeNull() + expect(overlaps(toastBounds!, closeBounds!)).toBe(false) + }) + } + test('Toast can be dismissed via close button', async ({ comfyPage }) => { await triggerErrorToast(comfyPage) const errorToast = comfyPage.toast.toastErrors.filter({ diff --git a/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts b/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts index 234bfd9b414..59482f19eda 100644 --- a/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts +++ b/browser_tests/tests/vueNodes/interactions/node/imagePreview.spec.ts @@ -57,7 +57,9 @@ test.describe('Vue Nodes Image Preview', { tag: '@vue-nodes' }, () => { await imagePreview.getByRole('region').hover() await comfyPage.page.getByLabel('Edit or mask image').click() - await expect(comfyPage.page.locator('.mask-editor-dialog')).toBeVisible() + await expect( + comfyPage.page.getByRole('heading', { name: 'Mask Editor' }) + ).toBeVisible() }) test('hides mask and download buttons when image is missing', async ({ diff --git a/browser_tests/tests/vueNodes/widgets/emptyNameWidget.spec.ts b/browser_tests/tests/vueNodes/widgets/emptyNameWidget.spec.ts index 27d733c603b..1e08f29c072 100644 --- a/browser_tests/tests/vueNodes/widgets/emptyNameWidget.spec.ts +++ b/browser_tests/tests/vueNodes/widgets/emptyNameWidget.spec.ts @@ -26,9 +26,9 @@ test.describe( x: 400, y: 200 }) - await comfyPage.page.evaluate(() => + await comfyPage.page.evaluate(() => { graph!.nodes[0].addWidget('text', '', '', () => {}) - ) + }) }) test('renders schema widgets despite an un-keyable sibling', async ({ diff --git a/packages/design-system/src/css/style.css b/packages/design-system/src/css/style.css index df1da122102..a328dcaed1e 100644 --- a/packages/design-system/src/css/style.css +++ b/packages/design-system/src/css/style.css @@ -1196,6 +1196,10 @@ dialog { box-shadow: 0 0 20px #888888; } +dialog:modal { + pointer-events: auto; +} + dialog::backdrop { background: rgb(0 0 0 / 0.5); } diff --git a/scripts/primevue-import-allowlist.json b/scripts/primevue-import-allowlist.json index ee2ae0e22a6..1902ce8a6cd 100644 --- a/scripts/primevue-import-allowlist.json +++ b/scripts/primevue-import-allowlist.json @@ -4,51 +4,28 @@ { "files": ["src/**/*.{ts,tsx,vue}"], "excludeFiles": [ - "src/components/breadcrumb/SubgraphBreadcrumb.vue", - "src/components/common/InputKnob.vue", - "src/components/common/LazyImage.vue", - "src/components/common/UserCredit.vue", - "src/components/dialog/GlobalDialog.test.ts", - "src/components/dialog/GlobalDialog.vue", - "src/components/dialog/bodyPointerEventsRestore.test.ts", "src/components/dialog/content/setting/UsageLogsTable.test.ts", - "src/components/graph/GraphCanvasMenu.vue", "src/components/graph/SelectionToolbox.test.ts", - "src/components/graph/widgets/TextPreviewWidget.test.ts", - "src/components/graph/widgets/TextPreviewWidget.vue", "src/components/node/NodePreview.test.ts", "src/components/rightSidePanel/errors/ErrorGroupList.test.ts", "src/components/rightSidePanel/errors/ErrorNodeCard.test.ts", "src/components/rightSidePanel/errors/MissingPackGroupRow.test.ts", "src/components/rightSidePanel/errors/TabErrors.test.ts", - "src/components/searchbox/NodeSearchBox.vue", - "src/components/searchbox/NodeSearchBoxPopover.test.ts", - "src/components/searchbox/NodeSearchBoxPopover.vue", "src/components/sidebar/SideToolbar.test.ts", - "src/components/topbar/CurrentUserButton.vue", - "src/components/topbar/CurrentUserPopoverLegacy.vue", "src/main.ts", - "src/platform/cloud/onboarding/CloudSubscriptionRedirectView.vue", - "src/platform/cloud/onboarding/skeletons/CloudLoginViewSkeleton.vue", - "src/platform/cloud/onboarding/skeletons/CloudSurveyViewSkeleton.vue", - "src/platform/cloud/subscription/components/CreditsTile.vue", "src/platform/missingModel/components/MissingModelCard.test.ts", "src/platform/nodeReplacement/components/SwapNodeGroupRow.test.ts", "src/platform/nodeReplacement/components/SwapNodesCard.test.ts", "src/platform/updates/components/WhatsNewPopup.test.ts", - "src/platform/workspace/components/CurrentUserPopoverWorkspace.vue", - "src/renderer/extensions/vueNodes/VideoPreview.vue", "src/renderer/extensions/vueNodes/widgets/components/WidgetInputNumberInput.test.ts", "src/renderer/extensions/vueNodes/widgets/components/WidgetRecordAudio.vue", "src/renderer/extensions/vueNodes/widgets/components/WidgetSelect.asset-mode.test.ts", "src/renderer/extensions/vueNodes/widgets/components/WidgetSelectDropdown.test.ts", "src/renderer/extensions/vueNodes/widgets/components/form/FormSelectButton.test.ts", "src/renderer/extensions/vueNodes/widgets/components/form/dropdown/FormDropdown.test.ts", - "src/stores/dialogStore.ts", "src/workbench/extensions/manager/components/manager/button/PackEnableToggle.test.ts", "src/workbench/extensions/manager/components/manager/packCard/PackCardFooter.test.ts", - "src/workbench/extensions/manager/components/manager/skeleton/PackCardGridSkeleton.test.ts", - "src/workbench/extensions/manager/components/manager/skeleton/PackCardSkeleton.vue" + "src/workbench/extensions/manager/components/manager/skeleton/PackCardGridSkeleton.test.ts" ], "rules": { "comfy/no-primevue-imports": "error" } } diff --git a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue index 14b376e4eff..468ce589a86 100644 --- a/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue +++ b/src/components/actionbar/ComfyRunButton/CloudRunButtonWrapper.vue @@ -138,10 +138,7 @@ function showPaymentRecoveryDialog() { onUpdatePayment: updatePayment }, dialogComponentProps: { - renderer: 'reka', - headless: true, - contentClass: - 'w-[min(360px,95vw)] max-w-[min(360px,95vw)] sm:max-w-[min(360px,95vw)] border-0 bg-transparent shadow-none' + headless: true } }) } diff --git a/src/components/breadcrumb/SubgraphBreadcrumb.vue b/src/components/breadcrumb/SubgraphBreadcrumb.vue index 55707d7596f..a738318fcbc 100644 --- a/src/components/breadcrumb/SubgraphBreadcrumb.vue +++ b/src/components/breadcrumb/SubgraphBreadcrumb.vue @@ -24,9 +24,8 @@ v-if="isInSubgraph" class="back-button pointer-events-auto ml-1.5 size-8 shrink-0 border border-transparent bg-transparent p-0 transition-all hover:rounded-lg hover:border-interface-stroke hover:bg-comfy-menu-bg" data-testid="subgraph-breadcrumb-back" - text - severity="secondary" - size="small" + variant="muted-textonly" + size="icon" @click="handleBackClick" > @@ -65,12 +64,12 @@ - - diff --git a/src/components/dialog/bodyPointerEventsRestore.test.ts b/src/components/dialog/bodyPointerEventsRestore.test.ts index 2a549824ed1..4f821f47b3f 100644 --- a/src/components/dialog/bodyPointerEventsRestore.test.ts +++ b/src/components/dialog/bodyPointerEventsRestore.test.ts @@ -1,5 +1,4 @@ import { render } from '@testing-library/vue' -import PrimeVue from 'primevue/config' import { DropdownMenuContent, DropdownMenuItem, @@ -54,7 +53,7 @@ const BodyWithMenu = defineComponent({ const settle = () => new Promise((resolve) => setTimeout(resolve, 0)) function mountDialogHost() { - render(GlobalDialog, { global: { plugins: [PrimeVue, i18n] } }) + render(GlobalDialog, { global: { plugins: [i18n] } }) return useDialogStore() } @@ -66,8 +65,7 @@ function openModal( store.showDialog({ key, title: key, - component, - dialogComponentProps: { renderer: 'reka', modal: true } + component }) } diff --git a/src/components/dialog/confirm/ConfirmFooter.vue b/src/components/dialog/confirm/ConfirmFooter.vue index 2cb3fe7fc07..9de67af8cef 100644 --- a/src/components/dialog/confirm/ConfirmFooter.vue +++ b/src/components/dialog/confirm/ConfirmFooter.vue @@ -5,7 +5,7 @@ variant="muted-textonly" size="lg" autofocus - @click="$emit('cancel')" + @click="settle('cancel')" > {{ cancelTextX }} @@ -14,14 +14,14 @@ :variant="confirmVariant ?? 'textonly'" size="lg" :class="confirmClass" - @click="$emit('confirm')" + @click="settle('confirm')" > {{ confirmTextX }} diff --git a/src/components/dialog/confirm/confirmDialog.test.ts b/src/components/dialog/confirm/confirmDialog.test.ts index 489f04e54b3..2de956cd9db 100644 --- a/src/components/dialog/confirm/confirmDialog.test.ts +++ b/src/components/dialog/confirm/confirmDialog.test.ts @@ -1,47 +1,121 @@ -/** - * Dialog migration regression net: the showConfirmDialog helper must open - * its dialog through the Reka renderer with zeroed section padding (the - * Confirm* sections carry their own). Catches accidental reverts of the - * Phase 6 renderer flip. - */ +import { render, screen, waitFor, within } from '@testing-library/vue' +import userEvent from '@testing-library/user-event' import { describe, expect, it, vi } from 'vitest' +import { createI18n } from 'vue-i18n' -import ConfirmBody from '@/components/dialog/confirm/ConfirmBody.vue' +import GlobalDialog from '@/components/dialog/GlobalDialog.vue' import { showConfirmDialog } from '@/components/dialog/confirm/confirmDialog' -import ConfirmFooter from '@/components/dialog/confirm/ConfirmFooter.vue' -import ConfirmHeader from '@/components/dialog/confirm/ConfirmHeader.vue' import { useDialogStore } from '@/stores/dialogStore' -describe('showConfirmDialog Reka renderer opt-in', () => { - it("sets renderer 'reka' with size 'md' and zeroed section padding", () => { - showConfirmDialog() - - const { showDialog } = useDialogStore() - const [args] = vi.mocked(showDialog).mock.calls[0] - expect(args.dialogComponentProps?.renderer).toBe('reka') - expect(args.dialogComponentProps?.size).toBe('md') - expect(args.dialogComponentProps?.headerClass).toBe('p-0 pr-3') - expect(args.dialogComponentProps?.bodyClass).toBe('p-0') - expect(args.dialogComponentProps?.footerClass).toBe('p-0') - expect(args.dialogComponentProps?.pt).toBeUndefined() +const i18n = createI18n({ + legacy: false, + locale: 'en', + messages: { en: { g: { cancel: 'Cancel', close: 'Close' } } }, + missingWarn: false, + fallbackWarn: false +}) + +function renderConfirm( + onConfirm: () => unknown = vi.fn(), + optionsDisabled = false +) { + render( + { + components: { GlobalDialog }, + template: '' + }, + { global: { plugins: [i18n] } } + ) + const opener = screen.getByRole('button', { name: 'Open' }) + opener.focus() + + const dialogStore = useDialogStore() + const dialog = showConfirmDialog({ + key: 'confirm-test', + headerProps: { title: 'Delete secret' }, + props: { promptText: 'This cannot be undone.' }, + footerProps: { + confirmText: 'Delete', + optionsDisabled, + onCancel: () => dialogStore.closeDialog(dialog), + onConfirm + } + }) + return { opener, dialogStore } +} + +describe('showConfirmDialog', () => { + it('opens a labelled dialog with focus on cancel and traps Tab inside it', async () => { + const user = userEvent.setup() + renderConfirm() + + const dialog = await screen.findByRole('dialog', { name: 'Delete secret' }) + const close = within(dialog).getByRole('button', { name: 'Close' }) + const cancel = within(dialog).getByRole('button', { name: 'Cancel' }) + const confirm = within(dialog).getByRole('button', { name: 'Delete' }) + await waitFor(() => expect(cancel).toHaveFocus()) + + await user.tab() + expect(confirm).toHaveFocus() + await user.tab() + expect(close).toHaveFocus() + await user.tab({ shift: true }) + expect(confirm).toHaveFocus() + }) + + it('moves focus into the dialog when its autofocus button opens disabled', async () => { + renderConfirm(vi.fn(), true) + + const dialog = await screen.findByRole('dialog', { name: 'Delete secret' }) + + await waitFor(() => + expect( + within(dialog).getByRole('button', { name: 'Close' }) + ).toHaveFocus() + ) }) - it('forwards the confirm section components and caller props', () => { - showConfirmDialog({ - key: 'confirm-test', - headerProps: { title: 'Title' }, - props: { promptText: 'Prompt' }, - footerProps: { confirmText: 'Delete' } - }) - - const { showDialog } = useDialogStore() - const [args] = vi.mocked(showDialog).mock.calls[0] - expect(args.key).toBe('confirm-test') - expect(args.headerComponent).toBe(ConfirmHeader) - expect(args.component).toBe(ConfirmBody) - expect(args.footerComponent).toBe(ConfirmFooter) - expect(args.headerProps).toEqual({ title: 'Title' }) - expect(args.props).toEqual({ promptText: 'Prompt' }) - expect(args.footerProps).toEqual({ confirmText: 'Delete' }) + it.for([ + { + dismissal: 'Escape', + dismiss: (user: ReturnType) => + user.keyboard('{Escape}') + }, + { + dismissal: 'an overlay click', + dismiss: (user: ReturnType) => + user.click(screen.getByTestId('dialog-overlay')) + } + ])( + 'closes on $dismissal without confirming and returns focus to the opener', + async ({ dismiss }) => { + const user = userEvent.setup() + const onConfirm = vi.fn() + const { opener, dialogStore } = renderConfirm(onConfirm) + await screen.findByRole('dialog', { name: 'Delete secret' }) + + await dismiss(user) + + await waitFor(() => + expect(screen.queryByRole('dialog')).not.toBeInTheDocument() + ) + expect(dialogStore.isDialogOpen('confirm-test')).toBe(false) + expect(onConfirm).not.toHaveBeenCalled() + await waitFor(() => expect(opener).toHaveFocus()) + } + ) + + it('confirms exactly once when the confirm button is activated repeatedly', async () => { + const user = userEvent.setup() + const onConfirm = vi.fn(() => new Promise(() => {})) + renderConfirm(onConfirm) + const dialog = await screen.findByRole('dialog', { name: 'Delete secret' }) + const confirm = within(dialog).getByRole('button', { name: 'Delete' }) + + await user.dblClick(confirm) + confirm.focus() + await user.keyboard('{Enter}') + + expect(onConfirm).toHaveBeenCalledOnce() }) }) diff --git a/src/components/dialog/confirm/confirmDialog.ts b/src/components/dialog/confirm/confirmDialog.ts index 06edff2730f..0307a5687b4 100644 --- a/src/components/dialog/confirm/confirmDialog.ts +++ b/src/components/dialog/confirm/confirmDialog.ts @@ -26,14 +26,7 @@ export function showConfirmDialog( props, footerProps, dialogComponentProps: { - renderer: 'reka', - size: 'md', - contentClass: 'rounded-2xl border-border-default sm:max-w-lg', - // Confirm sections carry their own padding — zero out the dialog - // chrome padding, like the PrimeVue `pt` overrides did. - headerClass: 'p-0 pr-3', - bodyClass: 'p-0', - footerClass: 'p-0' + flush: true } }) } diff --git a/src/components/dialog/content/setting/KeybindingPanel.test.ts b/src/components/dialog/content/setting/KeybindingPanel.test.ts index eb1986acc44..e2722c6ee6d 100644 --- a/src/components/dialog/content/setting/KeybindingPanel.test.ts +++ b/src/components/dialog/content/setting/KeybindingPanel.test.ts @@ -5,9 +5,11 @@ import type { UserEvent } from '@testing-library/user-event' import { describe, expect, it, onTestFinished, vi } from 'vitest' import { nextTick } from 'vue' +import GlobalDialog from '@/components/dialog/GlobalDialog.vue' import { testI18n } from '@/utils/__tests__/testI18n' import { KeybindingImpl } from '@/platform/keybindings/keybinding' import { useKeybindingStore } from '@/platform/keybindings/keybindingStore' +import { useSettingStore } from '@/platform/settings/settingStore' import { useCommandStore } from '@/stores/commandStore' import KeybindingPanel from './KeybindingPanel.vue' @@ -306,6 +308,30 @@ describe('KeybindingPanel', () => { ) }) + it('closes the reset-all confirmation when saving fails', async () => { + const user = userEvent.setup() + const saveError = new Error('offline') + vi.mocked(useSettingStore().setMany).mockRejectedValueOnce(saveError) + const errorHandler = vi.fn() + renderPanel() + render(GlobalDialog, { + global: { plugins: [testI18n], config: { errorHandler } } + }) + + await user.click(screen.getByRole('button', { name: 'Reset All' })) + const dialog = await screen.findByRole('dialog') + await user.click(within(dialog).getByRole('button', { name: 'Reset All' })) + + await waitFor(() => + expect(screen.queryByRole('dialog')).not.toBeInTheDocument() + ) + expect(errorHandler).toHaveBeenCalledWith( + saveError, + expect.anything(), + expect.anything() + ) + }) + it.for(['{Shift>}{F10}{/Shift}', '{ContextMenu}'])( 'opens the focused row menu with %s and refocuses the row on Escape', async (keys) => { diff --git a/src/components/dialog/content/setting/KeybindingPanel.vue b/src/components/dialog/content/setting/KeybindingPanel.vue index 03307503c82..674fa246179 100644 --- a/src/components/dialog/content/setting/KeybindingPanel.vue +++ b/src/components/dialog/content/setting/KeybindingPanel.vue @@ -398,8 +398,11 @@ function handleRemoveAllKeybindings(command: KeybindingCommand) { onCancel: () => dialogStore.closeDialog(dialog), onConfirm: async () => { keybindingStore.removeAllKeybindingsForCommand(command.id) - await keybindingService.persistUserKeybindings() - dialogStore.closeDialog(dialog) + try { + await keybindingService.persistUserKeybindings() + } finally { + dialogStore.closeDialog(dialog) + } } } }) @@ -448,8 +451,11 @@ function resetAllKeybindings() { }, onConfirm: async () => { keybindingStore.resetAllKeybindings() - await keybindingService.persistUserKeybindings() - dialogStore.closeDialog(dialog) + try { + await keybindingService.persistUserKeybindings() + } finally { + dialogStore.closeDialog(dialog) + } toast.info(t('g.info'), { description: t('g.allKeybindingsReset'), duration: 3000 diff --git a/src/components/dialog/dialogDismissGuards.ts b/src/components/dialog/dialogDismissGuards.ts new file mode 100644 index 00000000000..76645ccdf24 --- /dev/null +++ b/src/components/dialog/dialogDismissGuards.ts @@ -0,0 +1,36 @@ +// Reka portals its dialogs / popovers / menus into the body. When a +// separately rooted Reka layer opens on top of a dialog, the dialog's +// DismissableLayer sees a pointer-down on it as "outside" and would dismiss +// itself. These selectors cover the portaled roots so we can treat +// interactions on them as inside. +const REKA_PORTAL_SELECTORS = + '[data-reka-popper-content-wrapper], [data-reka-dialog-content], [data-reka-menu-content], [data-reka-context-menu-content], [data-reka-nested-dialog-overlay], [role="dialog"], [role="menu"], [role="listbox"], [role="tooltip"]' + +// Dismissing a toast or using a docked progress panel over a dialog must not +// take the dialog with it; the empty viewport space beside a toast stays an +// ordinary scrim click. +const TOAST_SELECTORS = '[data-toast-kind], [data-toast-dock]' + +const OUTSIDE_LAYER_SELECTORS = `${REKA_PORTAL_SELECTORS}, ${TOAST_SELECTORS}` + +type OutsideEvent = CustomEvent<{ originalEvent: Event }> + +function isInsideOverlay(target: EventTarget | null): boolean { + return ( + target instanceof Element && + target.closest(OUTSIDE_LAYER_SELECTORS) !== null + ) +} + +export function onRekaPointerDownOutside( + options: { dismissOnPointerDownOutside?: boolean }, + event: OutsideEvent +) { + if (isInsideOverlay(event.detail.originalEvent.target)) { + event.preventDefault() + return + } + if (options.dismissOnPointerDownOutside === false) { + event.preventDefault() + } +} diff --git a/src/components/dialog/rekaPrimeVueBridge.ts b/src/components/dialog/rekaPrimeVueBridge.ts deleted file mode 100644 index 05b4008ab44..00000000000 --- a/src/components/dialog/rekaPrimeVueBridge.ts +++ /dev/null @@ -1,77 +0,0 @@ -// PrimeVue Dialogs (the node search box and GlobalDialog's `primevue` -// renderer) teleport to body. Reka treats clicks on body-portaled elements as -// outside its dialog and would auto-dismiss on the first interaction. Treat a -// click on a PrimeVue Dialog or its mask as inside. -const PRIMEVUE_OVERLAY_SELECTORS = '.p-overlay-mask, .p-dialog' - -// Reka portals its own dialogs / popovers / menus into the body too. When a -// nested Reka layer opens on top of a non-modal parent, the parent's -// DismissableLayer sees the focus shift / pointer-down as "outside" and would -// dismiss itself. These selectors cover the portaled roots so we can treat -// interactions on them as inside. -const REKA_PORTAL_SELECTORS = - '[data-reka-popper-content-wrapper], [data-reka-dialog-content], [data-reka-menu-content], [data-reka-context-menu-content], [data-reka-nested-dialog-overlay], [role="dialog"], [role="menu"], [role="listbox"], [role="tooltip"]' - -// Dismissing a toast or using a docked progress panel over a dialog must not -// take the dialog with it; the empty viewport space beside a toast stays an -// ordinary scrim click. -const TOAST_SELECTORS = '[data-toast-kind], [data-toast-dock]' - -const OUTSIDE_LAYER_SELECTORS = `${PRIMEVUE_OVERLAY_SELECTORS}, ${REKA_PORTAL_SELECTORS}, ${TOAST_SELECTORS}` - -type OutsideEvent = CustomEvent<{ originalEvent: Event }> - -function isInsideOverlay(target: EventTarget | null): boolean { - return ( - target instanceof Element && - target.closest(OUTSIDE_LAYER_SELECTORS) !== null - ) -} - -export function onRekaPointerDownOutside( - options: { dismissableMask?: boolean }, - event: OutsideEvent, - isActive = true -) { - // Stacked dialogs each render an independent Reka `Dialog` root, so a lower - // dialog's DismissableLayer sees a pointer-down that opened (or landed on) - // the dialog above it as "outside" and would dismiss itself. Only the - // top-most dialog may dismiss on an outside pointer, mirroring the escape-key - // handling in `GlobalDialog`. - if (!isActive) { - event.preventDefault() - return - } - if (isInsideOverlay(event.detail.originalEvent.target)) { - event.preventDefault() - return - } - if (options.dismissableMask === false) { - event.preventDefault() - } -} - -// Focus / interact-outside fires when focus moves to a sibling portal (a -// nested Reka or PrimeVue dialog teleported to body). Without this guard a -// non-modal Reka dialog would dismiss itself the moment a nested dialog -// receives focus. -// -// A container dialog (e.g. Settings) that hosts nested confirm/edit dialogs can -// also lose focus to an ordinary app element — not just a portal — when a -// nested dialog closes and the element it focused was removed (deleting the -// selected row). That programmatic focus shift is not a dismiss intent, so such -// a dialog opts out of focus-outside dismissal entirely via -// `dismissOnFocusOutside: false`; it still dismisses on escape or an outside -// pointer. -export function onRekaFocusOutside( - event: OutsideEvent, - options: { dismissOnFocusOutside?: boolean } = {} -) { - if (options.dismissOnFocusOutside === false) { - event.preventDefault() - return - } - if (isInsideOverlay(event.detail.originalEvent.target)) { - event.preventDefault() - } -} diff --git a/src/components/dialog/vRekaZIndex.ts b/src/components/dialog/vRekaZIndex.ts index bb4cdc9d055..756791de197 100644 --- a/src/components/dialog/vRekaZIndex.ts +++ b/src/components/dialog/vRekaZIndex.ts @@ -1,16 +1,16 @@ import { ZIndex } from '@primeuix/utils/zindex' import type { Directive } from 'vue' -/** Shared PrimeVue/Reka modal stacking sequence; later registrations cover earlier ones. */ +/** Shared modal stacking sequence; later registrations cover earlier ones. */ export const MODAL_Z_KEY = 'modal' export const MODAL_Z_BASE = 1700 +/** Toasts stay above every modal layer, whichever opened first. */ +export const TOAST_Z_INDEX = 9999 -// Both Reka and PrimeVue dialogs can appear at any depth in dialogStack, in -// any order. PrimeVue auto-increments a per-key z-index counter so later -// dialogs always cover earlier ones; Reka uses a static z-1700 class which -// can lose to an already-open PrimeVue dialog. Registering Reka's content -// element with the same ZIndex counter (key 'modal', base 1700) makes both -// renderers share one stacking sequence: whichever dialog opens last wins. +// Dialogs and other overlays open in any order, and each portals with the +// same static z-1700 class. Registering an element with the shared ZIndex +// counter (key 'modal', base 1700) gives every open overlay its own step in +// one stacking sequence, so whichever opened last covers the rest. export const vRekaZIndex: Directive = { mounted(el) { ZIndex.set(MODAL_Z_KEY, el, MODAL_Z_BASE) diff --git a/src/components/graph/GraphCanvasMenu.vue b/src/components/graph/GraphCanvasMenu.vue index 54188370ab5..8f95cdc0439 100644 --- a/src/components/graph/GraphCanvasMenu.vue +++ b/src/components/graph/GraphCanvasMenu.vue @@ -14,10 +14,10 @@ auto margin pins the toolbar to the right instead, and the width cap keeps any overflow inside the canvas as a scroll. -->
-