mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-27 03:19:56 +00:00
Widgets which are promoted by linking to a subgraphInput node are now also displayed in the subgraph configuration window. They can now be reordered by drag and drop along with proxyWidgets  Known Issues: - "Hide All" will incorrectly remove physically linked widgets ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-5981-Allow-reordering-of-linked-subgraph-widgets-2866d73d365081d9b27cf4a9c3078007) by [Unito](https://www.unito.io)
122 lines
5.0 KiB
TypeScript
122 lines
5.0 KiB
TypeScript
import { describe, expect, test, vi } from 'vitest'
|
|
|
|
import { registerProxyWidgets } from '@/core/graph/subgraph/proxyWidget'
|
|
import { parseProxyWidgets } from '@/core/schemas/proxyWidget'
|
|
import { LGraphNode } from '@/lib/litegraph/src/litegraph'
|
|
import type { LGraphCanvas, SubgraphNode } from '@/lib/litegraph/src/litegraph'
|
|
|
|
import {
|
|
createTestSubgraph,
|
|
createTestSubgraphNode
|
|
} from '../litegraph/subgraph/fixtures/subgraphHelpers'
|
|
|
|
const canvasEl: Partial<HTMLCanvasElement> = { addEventListener() {} }
|
|
const canvas: Partial<LGraphCanvas> = { canvas: canvasEl as HTMLCanvasElement }
|
|
registerProxyWidgets(canvas as LGraphCanvas)
|
|
|
|
vi.mock('@/renderer/core/canvas/canvasStore', () => ({
|
|
useCanvasStore: () => ({})
|
|
}))
|
|
vi.mock('@/stores/domWidgetStore', () => ({
|
|
useDomWidgetStore: () => ({ widgetStates: new Map() })
|
|
}))
|
|
vi.mock('@/services/litegraphService', () => ({
|
|
useLitegraphService: () => ({ updatePreviews: () => ({}) })
|
|
}))
|
|
|
|
function setupSubgraph(
|
|
innerNodeCount: number = 0
|
|
): [SubgraphNode, LGraphNode[]] {
|
|
const subgraph = createTestSubgraph()
|
|
const subgraphNode = createTestSubgraphNode(subgraph)
|
|
subgraphNode._internalConfigureAfterSlots()
|
|
const graph = subgraphNode.graph
|
|
graph.add(subgraphNode)
|
|
const innerNodes = []
|
|
for (let i = 0; i < innerNodeCount; i++) {
|
|
const innerNode = new LGraphNode(`InnerNode${i}`)
|
|
subgraph.add(innerNode)
|
|
innerNodes.push(innerNode)
|
|
}
|
|
return [subgraphNode, innerNodes]
|
|
}
|
|
|
|
describe('Subgraph proxyWidgets', () => {
|
|
test('Can add simple widget', () => {
|
|
const [subgraphNode, innerNodes] = setupSubgraph(1)
|
|
innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
|
|
subgraphNode.properties.proxyWidgets = [['1', 'stringWidget']]
|
|
expect(subgraphNode.widgets.length).toBe(1)
|
|
expect(subgraphNode.properties.proxyWidgets).toStrictEqual([
|
|
['1', 'stringWidget']
|
|
])
|
|
})
|
|
test('Can add multiple widgets with same name', () => {
|
|
const [subgraphNode, innerNodes] = setupSubgraph(2)
|
|
for (const innerNode of innerNodes)
|
|
innerNode.addWidget('text', 'stringWidget', 'value', () => {})
|
|
subgraphNode.properties.proxyWidgets = [
|
|
['1', 'stringWidget'],
|
|
['2', 'stringWidget']
|
|
]
|
|
expect(subgraphNode.widgets.length).toBe(2)
|
|
expect(subgraphNode.widgets[0].name).not.toEqual(
|
|
subgraphNode.widgets[1].name
|
|
)
|
|
})
|
|
test('Will serialize existing widgets', () => {
|
|
const [subgraphNode, innerNodes] = setupSubgraph(1)
|
|
innerNodes[0].addWidget('text', 'istringWidget', 'value', () => {})
|
|
subgraphNode.addWidget('text', 'stringWidget', 'value', () => {})
|
|
|
|
const proxyWidgets = parseProxyWidgets(subgraphNode.properties.proxyWidgets)
|
|
proxyWidgets.push(['1', 'istringWidget'])
|
|
subgraphNode.properties.proxyWidgets = proxyWidgets
|
|
|
|
expect(subgraphNode.widgets.length).toBe(2)
|
|
expect(subgraphNode.widgets[0].name).toBe('stringWidget')
|
|
subgraphNode.properties.proxyWidgets = [proxyWidgets[1], proxyWidgets[0]]
|
|
expect(subgraphNode.widgets[0].name).toBe('1: istringWidget')
|
|
})
|
|
test('Will mirror changes to value', () => {
|
|
const [subgraphNode, innerNodes] = setupSubgraph(1)
|
|
innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
|
|
subgraphNode.properties.proxyWidgets = [['1', 'stringWidget']]
|
|
expect(subgraphNode.widgets.length).toBe(1)
|
|
expect(subgraphNode.widgets[0].value).toBe('value')
|
|
innerNodes[0].widgets![0].value = 'test'
|
|
expect(subgraphNode.widgets[0].value).toBe('test')
|
|
subgraphNode.widgets[0].value = 'test2'
|
|
expect(innerNodes[0].widgets![0].value).toBe('test2')
|
|
})
|
|
test('Will not modify position or sizing of existing widgets', () => {
|
|
const [subgraphNode, innerNodes] = setupSubgraph(1)
|
|
innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
|
|
subgraphNode.properties.proxyWidgets = [['1', 'stringWidget']]
|
|
if (!innerNodes[0].widgets) throw new Error('node has no widgets')
|
|
innerNodes[0].widgets[0].y = 10
|
|
innerNodes[0].widgets[0].last_y = 11
|
|
innerNodes[0].widgets[0].computedHeight = 12
|
|
subgraphNode.widgets[0].y = 20
|
|
subgraphNode.widgets[0].last_y = 21
|
|
subgraphNode.widgets[0].computedHeight = 22
|
|
expect(innerNodes[0].widgets[0].y).toBe(10)
|
|
expect(innerNodes[0].widgets[0].last_y).toBe(11)
|
|
expect(innerNodes[0].widgets[0].computedHeight).toBe(12)
|
|
})
|
|
test('Can detach and re-attach widgets', () => {
|
|
const [subgraphNode, innerNodes] = setupSubgraph(1)
|
|
innerNodes[0].addWidget('text', 'stringWidget', 'value', () => {})
|
|
subgraphNode.properties.proxyWidgets = [['1', 'stringWidget']]
|
|
if (!innerNodes[0].widgets) throw new Error('node has no widgets')
|
|
expect(subgraphNode.widgets[0].value).toBe('value')
|
|
const poppedWidget = innerNodes[0].widgets.pop()
|
|
//simulate new draw frame
|
|
subgraphNode.widgets[0].computedHeight = 10
|
|
expect(subgraphNode.widgets[0].value).toBe(undefined)
|
|
innerNodes[0].widgets.push(poppedWidget!)
|
|
subgraphNode.widgets[0].computedHeight = 10
|
|
expect(subgraphNode.widgets[0].value).toBe('value')
|
|
})
|
|
})
|