mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-06-07 00:05:11 +00:00
*PR Created by the Glary-Bot Agent*
---
## Summary
The node-canvas COLOR widget (`WidgetColorPicker.vue`) already migrated
off PrimeVue; this PR finishes FE-804 by porting the two remaining
`primevue/colorpicker` consumers — `FormColorPicker.vue` (settings form
`type: 'color'`) and `ColorCustomizationSelector.vue`
(folder-customization dialog) — to the in-house Reka-UI based
`ColorPicker`. The now-dead PrimeVue overlay workaround in
`CustomizationDialog.vue` is removed.
After this lands there are **zero `primevue/colorpicker` imports left**
in `src/`.
## Changes
- **What**: `FormColorPicker.vue` swaps `primevue/colorpicker` +
`primevue/inputtext` for the in-house `ColorPicker` + `Input`. The
legacy "hex without `#`" storage contract (e.g. `load3d`'s
`BackgroundColor` default `'282828'`) is preserved on read and on write.
- **What**: The text input now uses a separate draft value and only
commits on blur / Enter when the input is a complete 6- or 8-digit hex.
This fixes the "type `#f` and watch it snap to black" regression that a
naive shared-`v-model` implementation re-introduces.
- **What**: `disabled`, `id`, and `aria-labelledby` are now explicit
props on `FormColorPicker` and are forwarded to both children. The
custom `ColorPicker` learned a `disabled` prop that propagates to its
`<PopoverTrigger>` button.
- **What**: `ColorCustomizationSelector.vue` swaps
`primevue/colorpicker` for the in-house `ColorPicker` (still uses
`primevue/selectbutton` — intentionally out of scope per FE-804's title;
`SelectButton` migration is a separate effort).
- **What**: `CustomizationDialog.vue` drops the `.p-colorpicker-panel,
.p-overlay, .p-overlay-mask` `pointer-down-outside` guard. With PrimeVue
ColorPicker gone, no descendant of this dialog teleports an overlay to
`<body>` anymore.
- **What**: Updates two affected browser tests — `extensionAPI.spec.ts`
(the `disabled` attr smoke check) and `sidebar/nodeLibrary.spec.ts` (the
bookmark color customization flow) — to target the new picker via stable
accessible names (`role="slider"` + i18n aria-label `Color saturation
and brightness`) and the `.color-picker-wrapper > button` trigger. The
disabled-attr eval helper now handles `HTMLButtonElement` in addition to
`HTMLInputElement`.
- **What**: Adds `FormColorPicker.test.ts` with focused regression
coverage for the manual-entry contract: legacy no-`#` storage
round-trip, no commit on partial hex, revert on partial-then-Enter,
8-digit alpha hex, and `disabled` propagation.
- **Dependencies**: none added; removes two PrimeVue imports.
- **Breaking**: no breaking change to the documented FormItem `'color'`
setting contract. Manual-entry semantics change: typing partial hex no
longer immediately writes mangled state — it commits on blur or Enter
when the value fully parses. Existing settings values are unaffected.
## Verification
- `pnpm typecheck` clean
- `pnpm typecheck:browser` clean
- `pnpm exec eslint` on every touched file clean
- `pnpm test:unit` over the affected directories — **216 passed**
- Manual QA via Playwright against the running dev server:
- Registered a test extension with `type: 'color'` + a `disabled: true`
variant
- Confirmed the new picker renders, opens its Reka popover, and the
disabled row has `button.disabled === true` and `input.disabled ===
true`
- Confirmed partial hex (`#ab`) does **not** clobber the swatch
- Confirmed `#1133aa` + blur commits and round-trips through the picker
## Review focus
1. The manual-entry commit gate in `FormColorPicker.vue`
(`commitDraft()` + `FULL_HEX`) — is the regex strict enough? Should
3/4-digit shorthand hex be accepted on commit too? PrimeVue accepted
3-digit shorthand; the existing `toHexFromFormat()` already does, so
adding `|[0-9a-f]{3}|[0-9a-f]{4}` is a one-line change if reviewers want
parity.
2. Disabled-attr E2E selector swap (`.p-colorpicker-preview` →
`.color-picker-wrapper > button`) + the eval-helper update that now
handles `HTMLButtonElement` in addition to `HTMLInputElement`. The
structural selector matches what PrimeVue had; happy to add a
`data-testid` if reviewers prefer.
3. `ColorPicker.vue` gained a `disabled` prop — kept explicit (peer of
`class`) to match the existing prop shape rather than forwarding through
`$attrs`.
## Follow-up (NOT in this PR)
Discussed in-thread — the **Reka-UI `ColorField` migration** (full
picker rebuild) and the **Kijai regression suite** for alpha-disabled +
manual-entry on the node-canvas COLOR widget belong in a separate,
scoped PR alongside the `ColorInputSpec` schema additions (`hasAlpha`,
`format`). The custom picker also has a known lossy HSV-percent
quantization (e.g. `#1133aa` round-trips to `#1033a9`) that pre-dates
this PR and would be addressed by the Reka primitives.
- Fixes FE-804
## Screenshots




---------
Co-authored-by: Glary-Bot <glary-bot@users.noreply.github.com>
390 lines
13 KiB
TypeScript
390 lines
13 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import type { ComfyPage } from '@e2e/fixtures/ComfyPage'
|
|
import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage'
|
|
|
|
const bookmarksSettingId = 'Comfy.NodeLibrary.Bookmarks.V2'
|
|
const bookmarksCustomizationSettingId =
|
|
'Comfy.NodeLibrary.BookmarksCustomization'
|
|
|
|
type BookmarkCustomizationMap = Record<
|
|
string,
|
|
{
|
|
icon?: string
|
|
color?: string
|
|
}
|
|
>
|
|
|
|
async function expectBookmarks(comfyPage: ComfyPage, bookmarks: string[]) {
|
|
await expect
|
|
.poll(() => comfyPage.settings.getSetting<string[]>(bookmarksSettingId))
|
|
.toEqual(bookmarks)
|
|
}
|
|
|
|
async function expectBookmarkCustomization(
|
|
comfyPage: ComfyPage,
|
|
customization: BookmarkCustomizationMap
|
|
) {
|
|
await expect
|
|
.poll(() =>
|
|
comfyPage.settings.getSetting<BookmarkCustomizationMap>(
|
|
bookmarksCustomizationSettingId
|
|
)
|
|
)
|
|
.toEqual(customization)
|
|
}
|
|
|
|
async function renameInlineFolder(comfyPage: ComfyPage, newName: string) {
|
|
const renameInput = comfyPage.page.locator('.editable-text input')
|
|
await expect(renameInput).toBeVisible()
|
|
await renameInput.fill(newName)
|
|
await renameInput.press('Enter')
|
|
}
|
|
|
|
test.describe('Node library sidebar', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting('Comfy.NodeLibrary.NewDesign', false)
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, [])
|
|
await comfyPage.settings.setSetting(bookmarksCustomizationSettingId, {})
|
|
// Open the sidebar
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await tab.open()
|
|
})
|
|
|
|
test('Node preview and drag to canvas', async ({ comfyPage }) => {
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await tab.getFolder('sampling').click()
|
|
|
|
// Hover over a node to display the preview
|
|
const nodeSelector = tab.nodeSelector('KSampler (Advanced)')
|
|
await comfyPage.page.locator(nodeSelector).hover()
|
|
|
|
// Verify the preview is displayed
|
|
await expect(tab.nodePreview).toBeVisible()
|
|
|
|
const count = await comfyPage.nodeOps.getGraphNodesCount()
|
|
// Drag the node onto the canvas
|
|
const canvasSelector = '#graph-canvas'
|
|
|
|
// Get the bounding box of the canvas element
|
|
const canvasBoundingBox = (await comfyPage.page
|
|
.locator(canvasSelector)
|
|
.boundingBox())!
|
|
|
|
// Calculate the center position of the canvas
|
|
const targetPosition = {
|
|
x: canvasBoundingBox.x + canvasBoundingBox.width / 2,
|
|
y: canvasBoundingBox.y + canvasBoundingBox.height / 2
|
|
}
|
|
|
|
await comfyPage.page
|
|
.locator(nodeSelector)
|
|
.dragTo(comfyPage.page.locator(canvasSelector), { targetPosition })
|
|
await comfyPage.nextFrame()
|
|
|
|
// Verify the node is added to the canvas
|
|
await expect
|
|
.poll(() => comfyPage.nodeOps.getGraphNodesCount())
|
|
.toBe(count + 1)
|
|
})
|
|
|
|
test('Bookmark node', async ({ comfyPage }) => {
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await tab.getFolder('sampling').click()
|
|
|
|
// Bookmark the node
|
|
await tab.getNode('KSampler (Advanced)').locator('.bookmark-button').click()
|
|
|
|
// Verify the bookmark is added to the bookmarks tab
|
|
await expectBookmarks(comfyPage, ['KSamplerAdvanced'])
|
|
// Verify the bookmark node with the same name is added to the tree.
|
|
await expect(tab.getNode('KSampler (Advanced)')).toHaveCount(2)
|
|
|
|
// Hover on the bookmark node to display the preview
|
|
await comfyPage.page
|
|
.locator('.node-lib-bookmark-tree-explorer .tree-leaf')
|
|
.hover()
|
|
await expect(tab.nodePreview).toBeVisible()
|
|
})
|
|
|
|
test('Ignores unrecognized node', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, ['foo'])
|
|
await expectBookmarks(comfyPage, ['foo'])
|
|
await comfyPage.nextFrame()
|
|
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getFolder('sampling')).toHaveCount(1)
|
|
await expect(tab.getNode('foo')).toHaveCount(0)
|
|
})
|
|
|
|
test('Displays empty bookmarks folder', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, ['foo/'])
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getFolder('foo')).toHaveCount(1)
|
|
})
|
|
|
|
test('Can add new bookmark folder', async ({ comfyPage }) => {
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await tab.newFolderButton.click()
|
|
const textInput = comfyPage.page.locator('.editable-text input')
|
|
await textInput.waitFor({ state: 'visible' })
|
|
await textInput.fill('New Folder')
|
|
await textInput.press('Enter')
|
|
await expect(tab.getFolder('New Folder')).toHaveCount(1)
|
|
await expectBookmarks(comfyPage, ['New Folder/'])
|
|
})
|
|
|
|
test('Can add nested bookmark folder', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, ['foo/'])
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getFolder('foo')).toBeVisible()
|
|
|
|
await tab.getFolder('foo').click({ button: 'right' })
|
|
await comfyPage.page.getByRole('menuitem', { name: 'New Folder' }).click()
|
|
const textInput = comfyPage.page.locator('.editable-text input')
|
|
await textInput.waitFor({ state: 'visible' })
|
|
await textInput.fill('bar')
|
|
await textInput.press('Enter')
|
|
|
|
await expect(tab.getFolder('bar')).toHaveCount(1)
|
|
await expectBookmarks(comfyPage, ['foo/', 'foo/bar/'])
|
|
})
|
|
|
|
test('Can delete bookmark folder', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, ['foo/'])
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getFolder('foo')).toBeVisible()
|
|
|
|
await tab.getFolder('foo').click({ button: 'right' })
|
|
await comfyPage.page.getByLabel('Delete').click()
|
|
|
|
await expectBookmarks(comfyPage, [])
|
|
})
|
|
|
|
test('Can rename bookmark folder', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, ['foo/'])
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getFolder('foo')).toBeVisible()
|
|
|
|
await tab.getFolder('foo').click({ button: 'right' })
|
|
await comfyPage.page
|
|
.locator('.p-contextmenu-item-label:has-text("Rename")')
|
|
.click()
|
|
await renameInlineFolder(comfyPage, 'bar')
|
|
|
|
await expectBookmarks(comfyPage, ['bar/'])
|
|
})
|
|
|
|
test('Can add bookmark by dragging node to bookmark folder', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, ['foo/'])
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getFolder('foo')).toBeVisible()
|
|
await tab.getFolder('sampling').click()
|
|
await comfyPage.page.dragAndDrop(
|
|
tab.nodeSelector('KSampler (Advanced)'),
|
|
tab.folderSelector('foo')
|
|
)
|
|
await expectBookmarks(comfyPage, ['foo/', 'foo/KSamplerAdvanced'])
|
|
})
|
|
|
|
test('Can add bookmark by clicking bookmark button', async ({
|
|
comfyPage
|
|
}) => {
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await tab.getFolder('sampling').click()
|
|
await tab.getNode('KSampler (Advanced)').locator('.bookmark-button').click()
|
|
await expectBookmarks(comfyPage, ['KSamplerAdvanced'])
|
|
})
|
|
|
|
test('Can unbookmark node (Top level bookmark)', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, [
|
|
'KSamplerAdvanced'
|
|
])
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getNode('KSampler (Advanced)')).toHaveCount(1)
|
|
await tab.getNode('KSampler (Advanced)').locator('.bookmark-button').click()
|
|
await expectBookmarks(comfyPage, [])
|
|
})
|
|
|
|
test('Can unbookmark node (Library node bookmark)', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, [
|
|
'KSamplerAdvanced'
|
|
])
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await tab.getFolder('sampling').click()
|
|
await expect(tab.getNode('KSampler (Advanced)')).toHaveCount(2)
|
|
await tab
|
|
.getNodeInFolder('KSampler (Advanced)', 'sampling')
|
|
.locator('.bookmark-button')
|
|
.click()
|
|
await expectBookmarks(comfyPage, [])
|
|
})
|
|
|
|
test('Can customize icon', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, ['foo/'])
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getFolder('foo')).toBeVisible()
|
|
await tab.getFolder('foo').click({ button: 'right' })
|
|
await comfyPage.page.getByLabel('Customize').click()
|
|
const dialog = comfyPage.page.getByRole('dialog', {
|
|
name: 'Customize Folder'
|
|
})
|
|
// Select Folder icon (2nd button in Icon group)
|
|
const iconGroup = dialog.getByText('Icon').locator('..').getByRole('group')
|
|
await iconGroup.getByRole('button').nth(1).click()
|
|
// Select Blue color (2nd button in Color group)
|
|
const colorGroup = dialog
|
|
.getByText('Color')
|
|
.locator('..')
|
|
.getByRole('group')
|
|
await colorGroup.getByRole('button').nth(1).click()
|
|
await dialog.getByRole('button', { name: 'Confirm' }).click()
|
|
await comfyPage.nextFrame()
|
|
await expectBookmarkCustomization(comfyPage, {
|
|
'foo/': {
|
|
icon: 'pi-folder',
|
|
color: '#007bff'
|
|
}
|
|
})
|
|
})
|
|
|
|
// If color is left as default, it should not be saved
|
|
test('Can customize icon (default field)', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, ['foo/'])
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getFolder('foo')).toBeVisible()
|
|
await tab.getFolder('foo').click({ button: 'right' })
|
|
await comfyPage.page.getByLabel('Customize').click()
|
|
const dialog = comfyPage.page.getByRole('dialog', {
|
|
name: 'Customize Folder'
|
|
})
|
|
// Select Folder icon (2nd button in Icon group)
|
|
const iconGroup = dialog.getByText('Icon').locator('..').getByRole('group')
|
|
await iconGroup.getByRole('button').nth(1).click()
|
|
await dialog.getByRole('button', { name: 'Confirm' }).click()
|
|
await comfyPage.nextFrame()
|
|
await expectBookmarkCustomization(comfyPage, {
|
|
'foo/': {
|
|
icon: 'pi-folder'
|
|
}
|
|
})
|
|
})
|
|
|
|
test('Can customize bookmark color after interacting with color options', async ({
|
|
comfyPage
|
|
}) => {
|
|
// Open customization dialog
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, ['foo/'])
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getFolder('foo')).toBeVisible()
|
|
await tab.getFolder('foo').click({ button: 'right' })
|
|
await comfyPage.page.getByLabel('Customize').click()
|
|
|
|
// Click a color option multiple times
|
|
const customColorOption = comfyPage.page.locator(
|
|
'.p-togglebutton-content > .pi-palette'
|
|
)
|
|
await customColorOption.click()
|
|
await customColorOption.click()
|
|
|
|
const dialog = comfyPage.page.getByRole('dialog', {
|
|
name: 'Customize Folder'
|
|
})
|
|
await dialog
|
|
.locator('.color-customization-selector-container > button')
|
|
.last()
|
|
.click()
|
|
await comfyPage.page
|
|
.getByLabel('Color saturation and brightness')
|
|
.click({ position: { x: 10, y: 10 } })
|
|
|
|
// Select Folder icon (2nd button in Icon group)
|
|
const iconGroup = dialog.getByText('Icon').locator('..').getByRole('group')
|
|
await iconGroup.getByRole('button').nth(1).click()
|
|
await dialog.getByRole('button', { name: 'Confirm' }).click()
|
|
await comfyPage.nextFrame()
|
|
|
|
// Verify the color selection is saved
|
|
await expect
|
|
.poll(async () => {
|
|
return (
|
|
(
|
|
await comfyPage.settings.getSetting<BookmarkCustomizationMap>(
|
|
bookmarksCustomizationSettingId
|
|
)
|
|
)['foo/']?.color ?? ''
|
|
)
|
|
})
|
|
.toMatch(/^#.+/)
|
|
})
|
|
|
|
test('Can rename customized bookmark folder', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, ['foo/'])
|
|
await comfyPage.settings.setSetting(bookmarksCustomizationSettingId, {
|
|
'foo/': {
|
|
icon: 'pi-folder',
|
|
color: '#007bff'
|
|
}
|
|
})
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getFolder('foo')).toBeVisible()
|
|
await tab.getFolder('foo').click({ button: 'right' })
|
|
await comfyPage.page
|
|
.locator('.p-contextmenu-item-label:has-text("Rename")')
|
|
.click()
|
|
await renameInlineFolder(comfyPage, 'bar')
|
|
await comfyPage.nextFrame()
|
|
await expect
|
|
.poll(async () => {
|
|
return {
|
|
bookmarks:
|
|
await comfyPage.settings.getSetting<string[]>(bookmarksSettingId),
|
|
customization:
|
|
await comfyPage.settings.getSetting<BookmarkCustomizationMap>(
|
|
bookmarksCustomizationSettingId
|
|
)
|
|
}
|
|
})
|
|
.toEqual({
|
|
bookmarks: ['bar/'],
|
|
customization: {
|
|
'bar/': {
|
|
icon: 'pi-folder',
|
|
color: '#007bff'
|
|
}
|
|
}
|
|
})
|
|
})
|
|
|
|
test('Can delete customized bookmark folder', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, ['foo/'])
|
|
await comfyPage.settings.setSetting(bookmarksCustomizationSettingId, {
|
|
'foo/': {
|
|
icon: 'pi-folder',
|
|
color: '#007bff'
|
|
}
|
|
})
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await expect(tab.getFolder('foo')).toBeVisible()
|
|
await tab.getFolder('foo').click({ button: 'right' })
|
|
await comfyPage.page.getByLabel('Delete').click()
|
|
await comfyPage.nextFrame()
|
|
await expectBookmarks(comfyPage, [])
|
|
await expectBookmarkCustomization(comfyPage, {})
|
|
})
|
|
|
|
test('Can filter nodes in both trees', async ({ comfyPage }) => {
|
|
await comfyPage.settings.setSetting(bookmarksSettingId, [
|
|
'foo/',
|
|
'foo/KSamplerAdvanced',
|
|
'KSampler'
|
|
])
|
|
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await tab.nodeLibrarySearchBoxInput.fill('KSampler')
|
|
await expect(tab.getNode('KSampler (Advanced)')).toHaveCount(2)
|
|
})
|
|
})
|