From c84218d6bbf25c2f76196d9d0b6f2a13b4d1dbfd Mon Sep 17 00:00:00 2001 From: filtered <176114999+webfiltered@users.noreply.github.com> Date: Thu, 22 May 2025 20:17:13 +1000 Subject: [PATCH] Remove deprecated group node conversion menu --- src/extensions/core/groupNode.ts | 56 +------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/src/extensions/core/groupNode.ts b/src/extensions/core/groupNode.ts index ef48e05c3..ccc973390 100644 --- a/src/extensions/core/groupNode.ts +++ b/src/extensions/core/groupNode.ts @@ -1,4 +1,4 @@ -import { LGraphCanvas, LiteGraph } from '@comfyorg/litegraph' +import { LiteGraph } from '@comfyorg/litegraph' import { LGraphNode, type NodeId } from '@comfyorg/litegraph/dist/LGraphNode' import { t } from '@/i18n' @@ -1583,57 +1583,6 @@ export class GroupNodeHandler { } } -function addConvertToGroupOptions() { - // @ts-expect-error fixme ts strict error - function addConvertOption(options, index) { - const selected = Object.values(app.canvas.selected_nodes ?? {}) - const disabled = - selected.length < 2 || - selected.find((n) => GroupNodeHandler.isGroupNode(n)) - options.splice(index, null, { - content: `Convert to Group Node`, - disabled, - callback: convertSelectedNodesToGroupNode - }) - } - - // @ts-expect-error fixme ts strict error - function addManageOption(options, index) { - const groups = app.graph.extra?.groupNodes - const disabled = !groups || !Object.keys(groups).length - options.splice(index, null, { - content: `Manage Group Nodes`, - disabled, - callback: () => manageGroupNodes() - }) - } - - // Add to canvas - const getCanvasMenuOptions = LGraphCanvas.prototype.getCanvasMenuOptions - LGraphCanvas.prototype.getCanvasMenuOptions = function () { - // @ts-expect-error fixme ts strict error - const options = getCanvasMenuOptions.apply(this, arguments) - const index = options.findIndex((o) => o?.content === 'Add Group') - const insertAt = index === -1 ? options.length - 1 : index + 2 - addConvertOption(options, insertAt) - addManageOption(options, insertAt + 1) - return options - } - - // Add to nodes - const getNodeMenuOptions = LGraphCanvas.prototype.getNodeMenuOptions - LGraphCanvas.prototype.getNodeMenuOptions = function (node) { - // @ts-expect-error fixme ts strict error - const options = getNodeMenuOptions.apply(this, arguments) - if (!GroupNodeHandler.isGroupNode(node)) { - const index = options.findIndex((o) => o?.content === 'Properties') - const insertAt = index === -1 ? options.length - 1 : index - addConvertOption(options, insertAt) - } - return options - } -} - const replaceLegacySeparators = (nodes: ComfyNode[]): void => { for (const node of nodes) { if (typeof node.type === 'string' && node.type.startsWith('workflow/')) { @@ -1723,9 +1672,6 @@ const ext: ComfyExtension = { } } ], - setup() { - addConvertToGroupOptions() - }, async beforeConfigureGraph( graphData: ComfyWorkflowJSON, missingNodeTypes: string[]