mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-31 05:19:53 +00:00
* WIP
* WIP: UI design for right click menu
* feat: add composable for node customization and information handling
* fix: correct v-show directive in MaskEditorButton and enhance MoreOptions functionality
* feat: add selection and subgraph operations composables for enhanced graph management
* fix: update computed properties to use 'void' for non-reactive calls and add MenuOptionItem component
* feat: add composables for More Options menu and submenu positioning logic
* feat: refactor MoreOptions component to use MenuOptionItem for menu rendering and streamline submenu handling
* feat: implement SubmenuPopover component for enhanced submenu functionality and selection handling
* feat: add 'More Options' label and enhance shape options in localization file
* refactor: simplify shape name handling by removing Pascal case conversion and using localized names
* refactor: enhance submenu handling by dynamically setting refs and improving key assignment
* feat: implement useNodeArrangement composable for node alignment and distribution functionality
* feat: enhance useMoreOptionsMenu with image node operations and alignment options
* feat: localize context menu options and enhance submenu handling
* refactor: improve type safety for title assignment in selection operations and enhance color option retrieval in node customization
* fix: adjust component order in SelectionToolbox for improved layout
* feat: update FrameNodes button visibility and tooltip, and add localization for frameNodes
* feat: enhance button visibility logic in SelectionToolbox based on selection types
* refactor: reorganize properties panel option in More Options menu for single nodes
* remove excessive logging and alerts
* fix component tests
* ad browser tests
* feat: enhance popover behavior in MoreOptions component to manage visibility state during selection overlay changes
* refactor: update visibility logic for buttons in SelectionToolbox and ExecuteButton components
* refactor: remove duplicate shape option and clean up shapeOptions array
* refactor: update help toggle logic in InfoButton and useMoreOptionsMenu to manage sidebar and help state
* refactor: streamline node info handling and integrate output node filtering in useNodeInfo and useMoreOptionsMenu
* Added useSelectionState composable consolidating all selection-derived state and the node help toggle
* Updated toolbox buttons (InfoButton, BookmarkButton, BypassButton, MaskEditorButton, ConvertToSubgraphButton, PinButton, DeleteButton, ColorPickerButton, ExecuteButton, FrameNodes, Load3DViewerButton) to remove duplicated selection logic and use useSelectionState
* Introduced HideReason ('manual' | 'drag') to differentiate drag-induced hides from manual/outside hides in MoreOptions
* refactor: enhance popover visibility handling during drag events using canvas state
* fix: update shape option name from 'default' to 'box' and add localization for 'box'
* refactor: streamline BypassButton logic and enhance MoreOptions menu with state bumping
* refactor: remove toast notifications from subgraph operations for cleaner logic
* refactor: ensure menu options re-compute when selection flags change
* feat: Enhance MoreOptions behavior with drag-and-drop support
* fix: Update mask icon class for consistent styling in MaskEditorButton
* refactor: Standardize icon sizes and classes across selection toolbox buttons
* refactor: Update layout and styling in SelectionToolbox and MoreOptions components
* refactor: Improve selection toolbox behavior with more options state management
* Refactor: Remove unused imports and conditionally add subgraph option in menu
* Enhance popover behavior: add show/hide event handlers and improve positioning logic
* Cleanup: Remove debug comments from popover functions for clarity
* Refactor: Clean up FrameNodes component and add MenuOptionBadge for better option display
* Cleanup: Remove debug comments from useSelectionToolboxPosition for clarity
* Add useFrameNodes composable for grouping selected nodes
* Refactor: Update shape options in useNodeCustomization and localize frame nodes label
* fix tests
* Cleanup: Remove packageManager entry from package.json
* Refactor: Replace ILucide icons with named imports from lucide-vue-next
* Refactor: Update shape selection and improve color picker behavior in selection toolbox
* Update test expectations [skip ci]
* feat: Enhance More Options Menu for group node management and update localization strings
* refactor: Comment out PublishButton
* refactor: Comment out test for bookmark button visibility in SelectionToolbox
* refactor: Update class names for dark theme compatibility in ExecuteButton and MenuOptionItem components
* refactor: Modularize menu options by creating dedicated composables for group, image, node, and selection operations
* refactor: Update selectors in tests to match design changes
* refactor: Update help button selector in Node Help tests
* refactor: Update getGroupColorOptions to accept groupContext and bump parameters
* Update test expectations [skip ci]
* refactor: Center KSampler node before interaction in More Options submenu tests
* refactor: Adjust KSampler node positioning and simplify button click in More Options submenu tests
* refactor: Rename comfyPageFixture import for clarity
* refactor: use gap-1 instead of the explicit gap-[4px]
* refactor: Replace app.canvas with canvasStore.getCanvas for state management
* refactor: Simplify prop access by removing 'props.' prefix in MenuOptionItem component
* refactor: Remove explicit type annotation for item in buildSelectionSignature function
* refactor: Replace Lucide icons with string-based icon references in menu options
* refactor: Remove export from interface declarations for improved clarity
* refactor: Simplify class binding in BypassButton component for improved readability
* refactor: Update button class for consistent sizing in ExecuteButton component
* refactor: Update help button locator class for consistency in Node Help tests
* fix node help test
* refactor: Remove unused imports and simplify visibility conditions in selection toolbox components
* feat: Add 3D node selection logic and cleanup on unmount for selection toolbox
* refactor: Update help button locator to use consistent data-testid in Node Help tests
* fix: Correct help button locator syntax in Node Help tests
* refactor: Change resetMoreOptionsState to an internal function in useSelectionToolboxPosition
* test: Add Load3D node visibility logic for ColorPickerButton and remove redundant test case
* fix: Increase tooltip show delay for ColorPickerButton
* fix: Update selectedOutputNodes computation to filter by isLGraphNode
* fix: Remove unused nodeDef reference from InfoButton and submenu trigger from MenuOptionItem
* fix: Update showInfoButton logic to depend on nodeDef value
* refactor: Remove deprecated getBasicNodeOptions function for cleaner code
* refactor: Replace useNodeInfo with useSelectedNodeActions
* refactor: Integrate useNodeDefStore for improved node definition handling in SelectionToolbox and InfoButton tests
* refactor: Introduce useCanvasRefresh composable for consistent canvas refresh logic across node operations
* refactor: Remove irrelevant append-to attribute from Popover
* refactor: Use storeToRefs for selectedItems in useSelectionState and add tests for selection logic
* refactor: Update ExecuteButton to use hasOutputNodesSelected for visibility and remove unnecessary computed property
* refactor: move display of execution button tests to selectionToolbox
---------
Co-authored-by: github-actions <github-actions@github.com>
366 lines
12 KiB
TypeScript
366 lines
12 KiB
TypeScript
import { expect } from '@playwright/test'
|
|
|
|
import { ComfyPage, comfyPageFixture as test } from '../fixtures/ComfyPage'
|
|
|
|
test.describe('Remote COMBO Widget', () => {
|
|
const mockOptions = ['d', 'c', 'b', 'a']
|
|
|
|
const addRemoteWidgetNode = async (
|
|
comfyPage: ComfyPage,
|
|
nodeName: string,
|
|
count: number = 1
|
|
) => {
|
|
const tab = comfyPage.menu.nodeLibraryTab
|
|
await tab.open()
|
|
await tab.getFolder('DevTools').click()
|
|
const nodeEntry = tab.getNode(nodeName).first()
|
|
for (let i = 0; i < count; i++) {
|
|
await nodeEntry.click()
|
|
await comfyPage.nextFrame()
|
|
}
|
|
}
|
|
|
|
const getWidgetOptions = async (
|
|
comfyPage: ComfyPage,
|
|
nodeName: string
|
|
): Promise<string[] | undefined> => {
|
|
return await comfyPage.page.evaluate((name) => {
|
|
const node = window['app'].graph.nodes.find((node) => node.title === name)
|
|
return node.widgets[0].options.values
|
|
}, nodeName)
|
|
}
|
|
|
|
const getWidgetValue = async (comfyPage: ComfyPage, nodeName: string) => {
|
|
return await comfyPage.page.evaluate((name) => {
|
|
const node = window['app'].graph.nodes.find((node) => node.title === name)
|
|
return node.widgets[0].value
|
|
}, nodeName)
|
|
}
|
|
|
|
const clickRefreshButton = (comfyPage: ComfyPage, nodeName: string) => {
|
|
return comfyPage.page.evaluate((name) => {
|
|
const node = window['app'].graph.nodes.find((node) => node.title === name)
|
|
const buttonWidget = node.widgets.find((w) => w.name === 'refresh')
|
|
return buttonWidget?.callback()
|
|
}, nodeName)
|
|
}
|
|
|
|
const waitForWidgetUpdate = async (comfyPage: ComfyPage) => {
|
|
// Force re-render to trigger first access of widget's options
|
|
await comfyPage.page.mouse.click(400, 300)
|
|
// Wait for the widget to actually update instead of fixed timeout
|
|
await comfyPage.page.waitForTimeout(300)
|
|
}
|
|
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
|
|
})
|
|
|
|
test.describe('Loading options', () => {
|
|
test.beforeEach(async ({ comfyPage }) => {
|
|
await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route, request) => {
|
|
const params = new URL(request.url()).searchParams
|
|
const sort = params.get('sort')
|
|
await route.fulfill({
|
|
body: JSON.stringify(sort ? [...mockOptions].sort() : mockOptions),
|
|
status: 200
|
|
})
|
|
}
|
|
)
|
|
})
|
|
|
|
test.afterEach(async ({ comfyPage }) => {
|
|
await comfyPage.page.unroute('**/api/models/checkpoints**')
|
|
})
|
|
|
|
test('lazy loads options when widget is added from node library', async ({
|
|
comfyPage
|
|
}) => {
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
const widgetOptions = await getWidgetOptions(comfyPage, nodeName)
|
|
expect(widgetOptions).toEqual(mockOptions)
|
|
})
|
|
|
|
test('lazy loads options when widget is added via workflow load', async ({
|
|
comfyPage
|
|
}) => {
|
|
const nodeName = 'Remote Widget Node'
|
|
await comfyPage.loadWorkflow('inputs/remote_widget')
|
|
await comfyPage.page.waitForTimeout(512)
|
|
|
|
const node = await comfyPage.page.evaluate((name) => {
|
|
return window['app'].graph.nodes.find((node) => node.title === name)
|
|
}, nodeName)
|
|
expect(node).toBeDefined()
|
|
|
|
await waitForWidgetUpdate(comfyPage)
|
|
const widgetOptions = await getWidgetOptions(comfyPage, nodeName)
|
|
expect(widgetOptions).toEqual(mockOptions)
|
|
})
|
|
|
|
test('applies query parameters from input spec', async ({ comfyPage }) => {
|
|
const nodeName = 'Remote Widget Node With Sort Query Param'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
const widgetOptions = await getWidgetOptions(comfyPage, nodeName)
|
|
expect(widgetOptions).not.toEqual(mockOptions)
|
|
expect(widgetOptions).toEqual([...mockOptions].sort())
|
|
})
|
|
|
|
test('handles empty list of options', async ({ comfyPage }) => {
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
await route.fulfill({ body: JSON.stringify([]), status: 200 })
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
const widgetOptions = await getWidgetOptions(comfyPage, nodeName)
|
|
expect(widgetOptions).toEqual([])
|
|
})
|
|
|
|
test('falls back to default value when non-200 response', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
await route.fulfill({ status: 500 })
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
const widgetOptions = await getWidgetOptions(comfyPage, nodeName)
|
|
|
|
const defaultValue = 'Loading...'
|
|
expect(widgetOptions).toEqual(defaultValue)
|
|
})
|
|
})
|
|
|
|
test.describe('Lazy Loading Behavior', () => {
|
|
test('does not fetch options before widget is added to graph', async ({
|
|
comfyPage
|
|
}) => {
|
|
let requestWasMade = false
|
|
|
|
comfyPage.page.on('request', (request) => {
|
|
if (request.url().includes('/api/models/checkpoints')) {
|
|
requestWasMade = true
|
|
}
|
|
})
|
|
|
|
// Wait a reasonable time to ensure no request is made
|
|
await comfyPage.page.waitForTimeout(512)
|
|
expect(requestWasMade).toBe(false)
|
|
})
|
|
|
|
test('fetches options immediately after widget is added to graph', async ({
|
|
comfyPage
|
|
}) => {
|
|
const requestPromise = comfyPage.page.waitForRequest((request) =>
|
|
request.url().includes('/api/models/checkpoints')
|
|
)
|
|
await addRemoteWidgetNode(comfyPage, 'Remote Widget Node')
|
|
const request = await requestPromise
|
|
expect(request.url()).toContain('/api/models/checkpoints')
|
|
})
|
|
})
|
|
|
|
test.describe('Refresh Behavior', () => {
|
|
test('refresh button is visible in selection toolbar when node is selected', async ({
|
|
comfyPage
|
|
}) => {
|
|
await comfyPage.setSetting('Comfy.Canvas.SelectionToolbox', true)
|
|
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
|
|
// Select remote widget node
|
|
await comfyPage.page.keyboard.press('Control+A')
|
|
|
|
await expect(
|
|
comfyPage.page.locator(
|
|
'.selection-toolbox button[data-testid="refresh-button"]'
|
|
)
|
|
).toBeVisible()
|
|
})
|
|
|
|
test('refreshes options when TTL expires', async ({ comfyPage }) => {
|
|
// Fulfill each request with a unique timestamp
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route, request) => {
|
|
await route.fulfill({
|
|
body: JSON.stringify([Date.now()]),
|
|
status: 200
|
|
})
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node With 300ms Refresh'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
const initialOptions = await getWidgetOptions(comfyPage, nodeName)
|
|
|
|
// Wait for the refresh (TTL) to expire with extra buffer for processing
|
|
// TTL is 300ms, wait 600ms to ensure it has expired
|
|
await comfyPage.page.waitForTimeout(600)
|
|
|
|
// Click on the canvas to trigger widget refresh
|
|
await comfyPage.page.mouse.click(400, 300)
|
|
|
|
// Wait a bit for the refresh to complete
|
|
await comfyPage.page.waitForTimeout(100)
|
|
|
|
const refreshedOptions = await getWidgetOptions(comfyPage, nodeName)
|
|
expect(refreshedOptions).not.toEqual(initialOptions)
|
|
})
|
|
|
|
test('does not refresh when TTL is not set', async ({ comfyPage }) => {
|
|
let requestCount = 0
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
requestCount++
|
|
await route.fulfill({ body: JSON.stringify(['test']), status: 200 })
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
|
|
// Force multiple re-renders
|
|
for (let i = 0; i < 3; i++) {
|
|
await comfyPage.page.mouse.click(100, 100)
|
|
await comfyPage.nextFrame()
|
|
}
|
|
|
|
expect(requestCount).toBe(1) // Should only make initial request
|
|
})
|
|
|
|
test('retries failed requests with backoff', async ({ comfyPage }) => {
|
|
const timestamps: number[] = []
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
timestamps.push(Date.now())
|
|
await route.fulfill({ status: 500 })
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
|
|
// Wait for timeout and backoff, then force re-render, repeat
|
|
const requestTimeout = 512
|
|
await comfyPage.page.waitForTimeout(requestTimeout)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
await comfyPage.page.waitForTimeout(requestTimeout * 2)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
await comfyPage.page.waitForTimeout(requestTimeout * 3)
|
|
|
|
// Verify exponential backoff between retries
|
|
const intervals = timestamps.slice(1).map((t, i) => t - timestamps[i])
|
|
expect(intervals[1]).toBeGreaterThan(intervals[0])
|
|
})
|
|
|
|
test('clicking refresh button forces a refresh', async ({ comfyPage }) => {
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
await route.fulfill({
|
|
body: JSON.stringify([`${Date.now()}`]),
|
|
status: 200
|
|
})
|
|
}
|
|
)
|
|
|
|
const nodeName = 'Remote Widget Node With Refresh Button'
|
|
|
|
// Trigger initial fetch when adding node to the graph
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
const initialOptions = await getWidgetOptions(comfyPage, nodeName)
|
|
|
|
// Click refresh button
|
|
await clickRefreshButton(comfyPage, nodeName)
|
|
|
|
// Verify refresh occurred
|
|
const refreshedOptions = await getWidgetOptions(comfyPage, nodeName)
|
|
expect(refreshedOptions).not.toEqual(initialOptions)
|
|
})
|
|
|
|
test('control_after_refresh is applied after refresh', async ({
|
|
comfyPage
|
|
}) => {
|
|
const options = [
|
|
['first option', 'second option', 'third option'],
|
|
['new first option', 'first option', 'second option', 'third option']
|
|
]
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
const next = options.shift()
|
|
await route.fulfill({
|
|
body: JSON.stringify(next),
|
|
status: 200
|
|
})
|
|
}
|
|
)
|
|
|
|
const nodeName =
|
|
'Remote Widget Node With Refresh Button and Control After Refresh'
|
|
|
|
// Trigger initial fetch when adding node to the graph
|
|
await addRemoteWidgetNode(comfyPage, nodeName)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
|
|
// Click refresh button
|
|
await clickRefreshButton(comfyPage, nodeName)
|
|
await comfyPage.page.waitForTimeout(200)
|
|
|
|
// Verify the selected value of the widget is the first option in the refreshed list
|
|
const refreshedValue = await getWidgetValue(comfyPage, nodeName)
|
|
expect(refreshedValue).toEqual('new first option')
|
|
})
|
|
})
|
|
|
|
test.describe('Cache Behavior', () => {
|
|
test('reuses cached data between widgets with same params', async ({
|
|
comfyPage
|
|
}) => {
|
|
let requestCount = 0
|
|
await comfyPage.page.route(
|
|
'**/api/models/checkpoints**',
|
|
async (route) => {
|
|
requestCount++
|
|
await route.fulfill({
|
|
body: JSON.stringify(mockOptions),
|
|
status: 200
|
|
})
|
|
}
|
|
)
|
|
|
|
// Add two widgets with same config
|
|
const nodeName = 'Remote Widget Node'
|
|
await addRemoteWidgetNode(comfyPage, nodeName, 2)
|
|
await waitForWidgetUpdate(comfyPage)
|
|
|
|
expect(requestCount).toBe(1) // Should reuse cached data
|
|
})
|
|
})
|
|
})
|