diff --git a/src/composables/maskeditor/useMaskEditorLoader.ts b/src/composables/maskeditor/useMaskEditorLoader.ts index 01aaaf0e3..74d39a5a2 100644 --- a/src/composables/maskeditor/useMaskEditorLoader.ts +++ b/src/composables/maskeditor/useMaskEditorLoader.ts @@ -104,7 +104,8 @@ export function useMaskEditorLoader() { // If we have a widget filename, we should prioritize it over the node image // because the node image might be stale (e.g. from a previous save) // while the widget value reflects the current selection. - if (widgetFilename) { + // Skip internal reference formats (e.g. "$35-0" used by some plugins like Impact-Pack) + if (widgetFilename && !widgetFilename.startsWith('$')) { try { // Parse the widget value which might be in format "subfolder/filename [type]" or just "filename" let filename = widgetFilename diff --git a/src/extensions/core/maskeditor.ts b/src/extensions/core/maskeditor.ts index a0084cfb9..d5bbe5e97 100644 --- a/src/extensions/core/maskeditor.ts +++ b/src/extensions/core/maskeditor.ts @@ -1,7 +1,7 @@ import _ from 'es-toolkit/compat' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' -import { app } from '@/scripts/app' +import { app, ComfyApp } from '@/scripts/app' import { useMaskEditorStore } from '@/stores/maskEditorStore' import { useDialogStore } from '@/stores/dialogStore' import { useMaskEditor } from '@/composables/maskeditor/useMaskEditor' @@ -20,6 +20,18 @@ function openMaskEditor(node: LGraphNode): void { useMaskEditor().openMaskEditor(node) } +// Open mask editor from clipspace (for plugin compatibility) +// This is called when ComfyApp.open_maskeditor() is invoked without arguments +function openMaskEditorFromClipspace(): void { + const node = ComfyApp.clipspace_return_node as LGraphNode | null + if (!node) { + console.error('[MaskEditor] No clipspace_return_node found') + return + } + + openMaskEditor(node) +} + // Check if the dialog is already opened function isOpened(): boolean { return useDialogStore().isDialogOpen('global-mask-editor') @@ -78,7 +90,16 @@ app.registerExtension({ label: 'Decrease Brush Size in MaskEditor', function: () => changeBrushSize((old) => _.clamp(old - 4, 1, 100)) } - ] + ], + init() { + // Set up ComfyApp static methods for plugin compatibility (deprecated) + ComfyApp.open_maskeditor = openMaskEditorFromClipspace + + console.warn( + '[MaskEditor] ComfyApp.open_maskeditor is deprecated. ' + + 'Plugins should migrate to using the command system or direct node context menu integration.' + ) + } }) const changeBrushSize = async (sizeChanger: (oldSize: number) => number) => {