mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-08 17:10:07 +00:00
- Fix deserialization of matchtype inputs spawned by autogrow. - Rotate multitype slot indicators to align with design changes. - Fix several instance of incorrect group matching - MatchType reactively updates input type in vue - Support the "hollow circle" optional input indicator in vue - Custom combo sends index of selection to backend ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-8026-Further-dynamic-input-fixes-2e76d73d3650819680fef327a94f4294) by [Unito](https://www.unito.io)
127 lines
3.5 KiB
TypeScript
127 lines
3.5 KiB
TypeScript
import { shallowReactive } from 'vue'
|
|
|
|
import { useChainCallback } from '@/composables/functional/useChainCallback'
|
|
import type { CanvasPointerEvent } from '@/lib/litegraph/src/types/events'
|
|
import { LGraphNode } from '@/lib/litegraph/src/LGraphNode'
|
|
import { LLink } from '@/lib/litegraph/src/litegraph'
|
|
import { app } from '@/scripts/app'
|
|
|
|
function applyToGraph(this: LGraphNode, extraLinks: LLink[] = []) {
|
|
if (!this.outputs[0].links?.length || !this.graph) return
|
|
|
|
const links = [
|
|
...this.outputs[0].links.map((l) => this.graph!.links[l]),
|
|
...extraLinks
|
|
]
|
|
let v = this.widgets?.[0].value
|
|
// For each output link copy our value over the original widget value
|
|
for (const linkInfo of links) {
|
|
const node = this.graph?.getNodeById(linkInfo.target_id)
|
|
const input = node?.inputs[linkInfo.target_slot]
|
|
if (!input) {
|
|
console.warn('Unable to resolve node or input for link', linkInfo)
|
|
continue
|
|
}
|
|
|
|
const widgetName = input.widget?.name
|
|
if (!widgetName) {
|
|
console.warn('Invalid widget or widget name', input.widget)
|
|
continue
|
|
}
|
|
|
|
const widget = node.widgets?.find((w) => w.name === widgetName)
|
|
if (!widget) {
|
|
console.warn(`Unable to find widget "${widgetName}" on node [${node.id}]`)
|
|
continue
|
|
}
|
|
|
|
widget.value = v
|
|
widget.callback?.(
|
|
widget.value,
|
|
app.canvas,
|
|
node,
|
|
app.canvas.graph_mouse,
|
|
{} as CanvasPointerEvent
|
|
)
|
|
}
|
|
}
|
|
|
|
function onNodeCreated(this: LGraphNode) {
|
|
this.applyToGraph = useChainCallback(this.applyToGraph, applyToGraph)
|
|
|
|
const comboWidget = this.widgets![0]
|
|
const values = shallowReactive<string[]>([])
|
|
comboWidget.options.values = values
|
|
|
|
const updateCombo = () => {
|
|
values.splice(
|
|
0,
|
|
values.length,
|
|
...this.widgets!.filter(
|
|
(w) => w.name.startsWith('option') && w.value
|
|
).map((w) => `${w.value}`)
|
|
)
|
|
if (app.configuringGraph) return
|
|
if (values.includes(`${comboWidget.value}`)) return
|
|
comboWidget.value = values[0] ?? ''
|
|
comboWidget.callback?.(comboWidget.value)
|
|
}
|
|
comboWidget.callback = useChainCallback(comboWidget.callback, () =>
|
|
this.applyToGraph!()
|
|
)
|
|
|
|
function addOption(node: LGraphNode) {
|
|
if (!node.widgets) return
|
|
const newCount = node.widgets.length - 1
|
|
node.addWidget('string', `option${newCount}`, '', () => {})
|
|
const widget = node.widgets.at(-1)
|
|
if (!widget) return
|
|
|
|
let value = ''
|
|
Object.defineProperty(widget, 'value', {
|
|
get() {
|
|
return value
|
|
},
|
|
set(v) {
|
|
value = v
|
|
updateCombo()
|
|
if (!node.widgets) return
|
|
const lastWidget = node.widgets.at(-1)
|
|
if (lastWidget === this) {
|
|
if (v) addOption(node)
|
|
return
|
|
}
|
|
if (v || node.widgets.at(-2) !== this || lastWidget?.value) return
|
|
node.widgets.pop()
|
|
node.computeSize(node.size)
|
|
this.callback(v)
|
|
}
|
|
})
|
|
}
|
|
const widgets = this.widgets!
|
|
widgets.push({
|
|
name: 'index',
|
|
type: 'hidden',
|
|
get value() {
|
|
return widgets.slice(2).findIndex((w) => w.value === comboWidget.value)
|
|
},
|
|
set value(_) {},
|
|
draw: () => undefined,
|
|
computeSize: () => [0, -4],
|
|
options: { hidden: true },
|
|
y: 0
|
|
})
|
|
addOption(this)
|
|
}
|
|
|
|
app.registerExtension({
|
|
name: 'Comfy.CustomCombo',
|
|
beforeRegisterNodeDef(nodeType, nodeData) {
|
|
if (nodeData?.name !== 'CustomCombo') return
|
|
nodeType.prototype.onNodeCreated = useChainCallback(
|
|
nodeType.prototype.onNodeCreated,
|
|
onNodeCreated
|
|
)
|
|
}
|
|
})
|