mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-20 14:30:41 +00:00
Backport of #10195 to core/1.42.
Cherry-picked merge commit 657ae6a with conflict resolution in
`src/utils/widgetUtil.test.ts` (added missing mock imports for the new
`renameWidget` tests).
All other files applied cleanly.
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-10413-backport-core-1-42-fix-subgraph-promoted-widget-input-label-rename-32d6d73d3650817fb524d220c340b758)
by [Unito](https://www.unito.io)
168 lines
4.9 KiB
TypeScript
168 lines
4.9 KiB
TypeScript
import { createSharedComposable, whenever } from '@vueuse/core'
|
|
import { shallowRef, watch } from 'vue'
|
|
|
|
import { useGraphNodeManager } from '@/composables/graph/useGraphNodeManager'
|
|
import type { GraphNodeManager } from '@/composables/graph/useGraphNodeManager'
|
|
import { useVueFeatureFlags } from '@/composables/useVueFeatureFlags'
|
|
import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
|
|
import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
|
|
import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations'
|
|
import { layoutStore } from '@/renderer/core/layout/store/layoutStore'
|
|
import { useLayoutSync } from '@/renderer/core/layout/sync/useLayoutSync'
|
|
import { app as comfyApp } from '@/scripts/app'
|
|
|
|
function useVueNodeLifecycleIndividual() {
|
|
const canvasStore = useCanvasStore()
|
|
const layoutMutations = useLayoutMutations()
|
|
const { shouldRenderVueNodes } = useVueFeatureFlags()
|
|
const nodeManager = shallowRef<GraphNodeManager | null>(null)
|
|
const { startSync, stopSync } = useLayoutSync()
|
|
|
|
const initializeNodeManager = () => {
|
|
// Use canvas graph if available (handles subgraph contexts), fallback to app graph
|
|
const activeGraph = comfyApp.canvas?.graph
|
|
if (!activeGraph || nodeManager.value) return
|
|
|
|
// Initialize the core node manager
|
|
const manager = useGraphNodeManager(activeGraph)
|
|
nodeManager.value = manager
|
|
|
|
// Initialize layout system with existing nodes from active graph
|
|
const nodes = activeGraph._nodes.map((node: LGraphNode) => ({
|
|
id: node.id.toString(),
|
|
pos: [node.pos[0], node.pos[1]] as [number, number],
|
|
size: [node.size[0], node.size[1]] as [number, number]
|
|
}))
|
|
layoutStore.initializeFromLiteGraph(nodes)
|
|
|
|
// Seed reroutes into the Layout Store so hit-testing uses the new path
|
|
for (const reroute of activeGraph.reroutes.values()) {
|
|
const [x, y] = reroute.pos
|
|
const parent = reroute.parentId ?? undefined
|
|
const linkIds = Array.from(reroute.linkIds)
|
|
layoutMutations.createReroute(reroute.id, { x, y }, parent, linkIds)
|
|
}
|
|
|
|
// Seed existing links into the Layout Store (topology only)
|
|
for (const link of activeGraph._links.values()) {
|
|
layoutMutations.createLink(
|
|
link.id,
|
|
link.origin_id,
|
|
link.origin_slot,
|
|
link.target_id,
|
|
link.target_slot
|
|
)
|
|
}
|
|
|
|
// Start sync AFTER seeding so bootstrap operations don't trigger
|
|
// the Layout→LiteGraph writeback loop redundantly.
|
|
startSync(canvasStore.canvas)
|
|
}
|
|
|
|
const disposeNodeManagerAndSyncs = () => {
|
|
stopSync()
|
|
if (!nodeManager.value) return
|
|
|
|
try {
|
|
nodeManager.value.cleanup()
|
|
} catch {
|
|
/* empty */
|
|
}
|
|
nodeManager.value = null
|
|
}
|
|
|
|
// Watch for Vue nodes enabled state changes
|
|
watch(
|
|
() => shouldRenderVueNodes.value && Boolean(comfyApp.canvas?.graph),
|
|
(enabled) => {
|
|
if (enabled) {
|
|
initializeNodeManager()
|
|
}
|
|
},
|
|
{ immediate: true }
|
|
)
|
|
|
|
whenever(
|
|
() => !shouldRenderVueNodes.value,
|
|
() => {
|
|
disposeNodeManagerAndSyncs()
|
|
|
|
// Force arrange() on all nodes so input.pos is computed before
|
|
// the first legacy drawConnections frame (which may run before
|
|
// drawNode on the foreground canvas).
|
|
const graph = comfyApp.canvas?.graph
|
|
if (!graph) {
|
|
comfyApp.canvas?.setDirty(true, true)
|
|
return
|
|
}
|
|
for (const node of graph._nodes) {
|
|
if (node.flags.collapsed) continue
|
|
try {
|
|
node.arrange()
|
|
} catch {
|
|
/* skip nodes not fully initialized */
|
|
}
|
|
}
|
|
|
|
comfyApp.canvas?.setDirty(true, true)
|
|
}
|
|
)
|
|
|
|
// Clear stale slot layouts when switching modes
|
|
watch(
|
|
() => shouldRenderVueNodes.value,
|
|
() => {
|
|
layoutStore.clearAllSlotLayouts()
|
|
}
|
|
)
|
|
|
|
// Handle case where Vue nodes are enabled but graph starts empty
|
|
const setupEmptyGraphListener = () => {
|
|
const activeGraph = comfyApp.canvas?.graph
|
|
if (
|
|
!shouldRenderVueNodes.value ||
|
|
nodeManager.value ||
|
|
activeGraph?._nodes.length !== 0
|
|
) {
|
|
return
|
|
}
|
|
const originalOnNodeAdded = activeGraph.onNodeAdded
|
|
activeGraph.onNodeAdded = function (node: LGraphNode) {
|
|
// Restore original handler
|
|
activeGraph.onNodeAdded = originalOnNodeAdded
|
|
|
|
// Initialize node manager if needed
|
|
if (shouldRenderVueNodes.value && !nodeManager.value) {
|
|
initializeNodeManager()
|
|
}
|
|
|
|
// Call original handler
|
|
if (originalOnNodeAdded) {
|
|
originalOnNodeAdded.call(this, node)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Cleanup function for component unmounting
|
|
const cleanup = () => {
|
|
if (nodeManager.value) {
|
|
nodeManager.value.cleanup()
|
|
nodeManager.value = null
|
|
}
|
|
}
|
|
|
|
return {
|
|
nodeManager,
|
|
|
|
// Lifecycle methods
|
|
initializeNodeManager,
|
|
disposeNodeManagerAndSyncs,
|
|
setupEmptyGraphListener,
|
|
cleanup
|
|
}
|
|
}
|
|
|
|
export const useVueNodeLifecycle = createSharedComposable(
|
|
useVueNodeLifecycleIndividual
|
|
)
|