diff --git a/src/renderer/extensions/vueNodes/widgets/components/WidgetImage.vue b/src/renderer/extensions/vueNodes/widgets/components/WidgetImage.vue deleted file mode 100644 index d7af95cf09..0000000000 --- a/src/renderer/extensions/vueNodes/widgets/components/WidgetImage.vue +++ /dev/null @@ -1,29 +0,0 @@ - - - diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useImageWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useImageWidget.ts deleted file mode 100644 index a6d78956da..0000000000 --- a/src/renderer/extensions/vueNodes/widgets/composables/useImageWidget.ts +++ /dev/null @@ -1,20 +0,0 @@ -import type { LGraphNode } from '@/lib/litegraph/src/litegraph' -import type { IImageWidget } from '@/lib/litegraph/src/types/widgets' -import type { - ImageInputSpec, - InputSpec as InputSpecV2 -} from '@/schemas/nodeDef/nodeDefSchemaV2' -import type { ComfyWidgetConstructorV2 } from '@/scripts/widgets' - -export const useImageWidget = (): ComfyWidgetConstructorV2 => { - return (node: LGraphNode, inputSpec: InputSpecV2): IImageWidget => { - const { name, options = {} } = inputSpec as ImageInputSpec - - const widget = node.addWidget('image', name, '', () => {}, { - serialize: true, - ...options - }) as IImageWidget - - return widget - } -} diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.ts b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.ts index 5735501411..953f93d6bb 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.ts @@ -38,8 +38,6 @@ const TYPE_TO_ENUM_MAP: Record = { // Advanced widgets color: WidgetType.COLOR, COLOR: WidgetType.COLOR, - image: WidgetType.IMAGE, - IMAGE: WidgetType.IMAGE, imagecompare: WidgetType.IMAGECOMPARE, IMAGECOMPARE: WidgetType.IMAGECOMPARE, galleria: WidgetType.GALLERIA, diff --git a/src/renderer/extensions/vueNodes/widgets/registry/widgetRegistry.ts b/src/renderer/extensions/vueNodes/widgets/registry/widgetRegistry.ts index 528be31d7f..ccc0d770db 100644 --- a/src/renderer/extensions/vueNodes/widgets/registry/widgetRegistry.ts +++ b/src/renderer/extensions/vueNodes/widgets/registry/widgetRegistry.ts @@ -9,7 +9,6 @@ import WidgetChart from '../components/WidgetChart.vue' import WidgetColorPicker from '../components/WidgetColorPicker.vue' import WidgetFileUpload from '../components/WidgetFileUpload.vue' import WidgetGalleria from '../components/WidgetGalleria.vue' -import WidgetImage from '../components/WidgetImage.vue' import WidgetImageCompare from '../components/WidgetImageCompare.vue' import WidgetInputText from '../components/WidgetInputText.vue' import WidgetMarkdown from '../components/WidgetMarkdown.vue' @@ -67,7 +66,6 @@ export const widgetTypeToComponent: Record = { [WidgetType.TEXTAREA]: WidgetTextarea, [WidgetType.TOGGLESWITCH]: WidgetToggleSwitch, [WidgetType.CHART]: WidgetChart, - [WidgetType.IMAGE]: WidgetImage, [WidgetType.IMAGECOMPARE]: WidgetImageCompare, [WidgetType.GALLERIA]: WidgetGalleria, [WidgetType.FILEUPLOAD]: WidgetFileUpload, diff --git a/src/scripts/widgets.ts b/src/scripts/widgets.ts index 655ce44641..357dc2bf15 100644 --- a/src/scripts/widgets.ts +++ b/src/scripts/widgets.ts @@ -14,7 +14,6 @@ import { useFloatWidget } from '@/renderer/extensions/vueNodes/widgets/composabl import { useGalleriaWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useGalleriaWidget' import { useImageCompareWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useImageCompareWidget' import { useImageUploadWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useImageUploadWidget' -import { useImageWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useImageWidget' import { useIntWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useIntWidget' import { useMarkdownWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useMarkdownWidget' import { useMultiSelectWidget } from '@/renderer/extensions/vueNodes/widgets/composables/useMultiSelectWidget' @@ -301,7 +300,6 @@ export const ComfyWidgets: Record = { IMAGEUPLOAD: useImageUploadWidget(), FILEUPLOAD: transformWidgetConstructorV2ToV1(useFileUploadWidget()), COLOR: transformWidgetConstructorV2ToV1(useColorWidget()), - IMAGE: transformWidgetConstructorV2ToV1(useImageWidget()), IMAGECOMPARE: transformWidgetConstructorV2ToV1(useImageCompareWidget()), TREESELECT: transformWidgetConstructorV2ToV1(useTreeSelectWidget()), MULTISELECT: transformWidgetConstructorV2ToV1(useMultiSelectWidget()), diff --git a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts b/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts index 626a36780d..4cf6104747 100644 --- a/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts +++ b/tests-ui/tests/renderer/extensions/vueNodes/widgets/composables/useWidgetRenderer.test.ts @@ -66,11 +66,6 @@ describe('useWidgetRenderer', () => { expect(getWidgetComponent('COLOR')).toBe(WidgetType.COLOR) }) - it('should map image types to IMAGE widget', () => { - expect(getWidgetComponent('image')).toBe(WidgetType.IMAGE) - expect(getWidgetComponent('IMAGE')).toBe(WidgetType.IMAGE) - }) - it('should map file types to FILEUPLOAD widget', () => { expect(getWidgetComponent('file')).toBe(WidgetType.FILEUPLOAD) expect(getWidgetComponent('FILEUPLOAD')).toBe(WidgetType.FILEUPLOAD)