mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-26 19:09:52 +00:00
## Summary - Add `NodeContextMenu.vue` using PrimeVue ContextMenu component with native submenu support - Rename `SubmenuPopover.vue` to `ColorPickerMenu.vue` (specialized for color picker) - Delete old components: `NodeOptions.vue`, `MenuOptionItem.vue`, `useSubmenuPositioning.ts` - Wire up context menu converter in `useMoreOptionsMenu.ts` - Update tests to use hover instead of click for submenus ## Dependencies **This PR depends on #7113** - the context menu converter infrastructure PR. It should be merged after that PR. ## Benefits - Native PrimeVue submenu support with proper keyboard navigation - Constrained menu dimensions with overflow scrolling (max-h-[80vh]) - Cleaner component architecture with ~280 fewer lines of code - Better separation: ColorPickerMenu handles only the custom color picker UI ## Test plan - [x] Typecheck passes - [x] Lint passes - [x] Knip passes - [ ] Browser tests for submenu interactions pass - [ ] Manual testing of node context menu ## Screenshots (Menu UI should look the same, with improved submenu behavior) ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-7114-feat-Replace-NodeOptions-with-PrimeVue-ContextMenu-2be6d73d365081fda576fd691175eacf) by [Unito](https://www.unito.io) --------- Co-authored-by: GitHub Action <action@github.com>
184 lines
5.9 KiB
TypeScript
184 lines
5.9 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { comfyPageFixture as test } from '../fixtures/ComfyPage'
|
|
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.setSetting('Comfy.UseNewMenu', 'Disabled')
|
|
})
|
|
|
|
test.describe('Selection Toolbox - More Options Submenus', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.setSetting('Comfy.Canvas.SelectionToolbox', true)
|
|
await comfyPage.loadWorkflow('nodes/single_ksampler')
|
|
await comfyPage.nextFrame()
|
|
await comfyPage.selectNodes(['KSampler'])
|
|
await comfyPage.nextFrame()
|
|
})
|
|
|
|
const openMoreOptions = async (comfyPage: any) => {
|
|
const ksamplerNodes = await comfyPage.getNodeRefsByTitle('KSampler')
|
|
if (ksamplerNodes.length === 0) {
|
|
throw new Error('No KSampler nodes found')
|
|
}
|
|
|
|
// Drag the KSampler to the center of the screen
|
|
const nodePos = await ksamplerNodes[0].getPosition()
|
|
const viewportSize = comfyPage.page.viewportSize()
|
|
const centerX = viewportSize.width / 3
|
|
const centerY = viewportSize.height / 2
|
|
await comfyPage.dragAndDrop(
|
|
{ x: nodePos.x, y: nodePos.y },
|
|
{ x: centerX, y: centerY }
|
|
)
|
|
await comfyPage.nextFrame()
|
|
|
|
await ksamplerNodes[0].click('title')
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(comfyPage.page.locator('.selection-toolbox')).toBeVisible({
|
|
timeout: 5000
|
|
})
|
|
|
|
const moreOptionsBtn = comfyPage.page.locator(
|
|
'[data-testid="more-options-button"]'
|
|
)
|
|
await expect(moreOptionsBtn).toBeVisible({ timeout: 3000 })
|
|
|
|
await comfyPage.page.click('[data-testid="more-options-button"]')
|
|
|
|
await comfyPage.nextFrame()
|
|
|
|
const menuOptionsVisible = await comfyPage.page
|
|
.getByText('Rename')
|
|
.isVisible({ timeout: 2000 })
|
|
.catch(() => false)
|
|
if (menuOptionsVisible) {
|
|
return
|
|
}
|
|
|
|
await moreOptionsBtn.click({ force: true })
|
|
await comfyPage.nextFrame()
|
|
|
|
const menuOptionsVisibleAfterClick = await comfyPage.page
|
|
.getByText('Rename')
|
|
.isVisible({ timeout: 2000 })
|
|
.catch(() => false)
|
|
if (menuOptionsVisibleAfterClick) {
|
|
return
|
|
}
|
|
|
|
throw new Error('Could not open More Options menu - popover not showing')
|
|
}
|
|
|
|
test('opens Node Info from More Options menu', async ({ comfyPage }) => {
|
|
await openMoreOptions(comfyPage)
|
|
const nodeInfoButton = comfyPage.page.getByText('Node Info', {
|
|
exact: true
|
|
})
|
|
await expect(nodeInfoButton).toBeVisible()
|
|
await nodeInfoButton.click()
|
|
await comfyPage.nextFrame()
|
|
})
|
|
|
|
test('changes node shape via Shape submenu', async ({ comfyPage }) => {
|
|
const nodeRef = (await comfyPage.getNodeRefsByTitle('KSampler'))[0]
|
|
const initialShape = await nodeRef.getProperty<number>('shape')
|
|
|
|
await openMoreOptions(comfyPage)
|
|
await comfyPage.page.getByText('Shape', { exact: true }).hover()
|
|
await expect(comfyPage.page.getByText('Box', { exact: true })).toBeVisible({
|
|
timeout: 5000
|
|
})
|
|
await comfyPage.page.getByText('Box', { exact: true }).click()
|
|
await comfyPage.nextFrame()
|
|
|
|
const newShape = await nodeRef.getProperty<number>('shape')
|
|
expect(newShape).not.toBe(initialShape)
|
|
expect(newShape).toBe(1)
|
|
})
|
|
|
|
test('changes node color via Color submenu swatch', async ({ comfyPage }) => {
|
|
const nodeRef = (await comfyPage.getNodeRefsByTitle('KSampler'))[0]
|
|
const initialColor = await nodeRef.getProperty<string | undefined>('color')
|
|
|
|
await openMoreOptions(comfyPage)
|
|
await comfyPage.page.getByText('Color', { exact: true }).click()
|
|
const blueSwatch = comfyPage.page.locator('[title="Blue"]')
|
|
await expect(blueSwatch.first()).toBeVisible({ timeout: 5000 })
|
|
await blueSwatch.first().click()
|
|
await comfyPage.nextFrame()
|
|
|
|
const newColor = await nodeRef.getProperty<string | undefined>('color')
|
|
expect(newColor).toBe('#223')
|
|
if (initialColor) {
|
|
expect(newColor).not.toBe(initialColor)
|
|
}
|
|
})
|
|
|
|
test('renames a node using Rename action', async ({ comfyPage }) => {
|
|
const nodeRef = (await comfyPage.getNodeRefsByTitle('KSampler'))[0]
|
|
await openMoreOptions(comfyPage)
|
|
await comfyPage.page
|
|
.getByText('Rename', { exact: true })
|
|
.click({ force: true })
|
|
const input = comfyPage.page.locator(
|
|
'.group-title-editor.node-title-editor .editable-text input'
|
|
)
|
|
await expect(input).toBeVisible()
|
|
await input.fill('RenamedNode')
|
|
await input.press('Enter')
|
|
await comfyPage.nextFrame()
|
|
const newTitle = await nodeRef.getProperty<string>('title')
|
|
expect(newTitle).toBe('RenamedNode')
|
|
})
|
|
|
|
test('closes More Options menu when clicking outside', async ({
|
|
comfyPage
|
|
}) => {
|
|
await openMoreOptions(comfyPage)
|
|
const renameItem = comfyPage.page.getByText('Rename', { exact: true })
|
|
await expect(renameItem).toBeVisible({ timeout: 5000 })
|
|
|
|
// Wait for multiple frames to allow PrimeVue's outside click handler to initialize
|
|
for (let i = 0; i < 30; i++) {
|
|
await comfyPage.nextFrame()
|
|
}
|
|
|
|
await comfyPage.page
|
|
.locator('#graph-canvas')
|
|
.click({ position: { x: 0, y: 50 }, force: true })
|
|
|
|
await comfyPage.nextFrame()
|
|
await expect(
|
|
comfyPage.page.getByText('Rename', { exact: true })
|
|
).not.toBeVisible()
|
|
})
|
|
|
|
test('closes More Options menu when clicking the button again (toggle)', async ({
|
|
comfyPage
|
|
}) => {
|
|
await openMoreOptions(comfyPage)
|
|
await expect(
|
|
comfyPage.page.getByText('Rename', { exact: true })
|
|
).toBeVisible({ timeout: 5000 })
|
|
|
|
await comfyPage.page.evaluate(() => {
|
|
const btn = document.querySelector('[data-testid="more-options-button"]')
|
|
if (btn) {
|
|
const event = new MouseEvent('click', {
|
|
bubbles: true,
|
|
cancelable: true,
|
|
view: window,
|
|
detail: 1
|
|
})
|
|
btn.dispatchEvent(event)
|
|
}
|
|
})
|
|
await comfyPage.nextFrame()
|
|
|
|
await expect(
|
|
comfyPage.page.getByText('Rename', { exact: true })
|
|
).not.toBeVisible()
|
|
})
|
|
})
|