diff --git a/src/composables/widgets/useImageUploadWidget.ts b/src/composables/widgets/useImageUploadWidget.ts index b8f19d3211..f05d9be927 100644 --- a/src/composables/widgets/useImageUploadWidget.ts +++ b/src/composables/widgets/useImageUploadWidget.ts @@ -2,12 +2,13 @@ import type { LGraphNode } from '@comfyorg/litegraph' import type { IStringWidget } from '@comfyorg/litegraph/dist/types/widgets' import { api } from '@/scripts/api' +import type { ComfyWidgetConstructor } from '@/scripts/widgets' import { useToastStore } from '@/stores/toastStore' import type { ComfyApp } from '@/types' import type { InputSpec } from '@/types/apiTypes' export const useImageUploadWidget = () => { - const widgetConstructor = ( + const widgetConstructor: ComfyWidgetConstructor = ( node: LGraphNode, inputName: string, inputData: InputSpec, diff --git a/src/composables/widgets/useIntWidget.ts b/src/composables/widgets/useIntWidget.ts index 5cd9c68459..877f9944a7 100644 --- a/src/composables/widgets/useIntWidget.ts +++ b/src/composables/widgets/useIntWidget.ts @@ -15,7 +15,7 @@ export const useIntWidget = () => { node: LGraphNode, inputName: string, inputData: InputSpec, - app?: ComfyApp, + app: ComfyApp, widgetName?: string ) => { const settingStore = useSettingStore() diff --git a/src/composables/widgets/useMarkdownWidget.ts b/src/composables/widgets/useMarkdownWidget.ts index 147a491a11..cd234e2b4f 100644 --- a/src/composables/widgets/useMarkdownWidget.ts +++ b/src/composables/widgets/useMarkdownWidget.ts @@ -8,6 +8,7 @@ import TiptapTableRow from '@tiptap/extension-table-row' import TiptapStarterKit from '@tiptap/starter-kit' import { Markdown as TiptapMarkdown } from 'tiptap-markdown' +import type { ComfyWidgetConstructor } from '@/scripts/widgets' import type { ComfyApp } from '@/types' import type { InputSpec } from '@/types/apiTypes' @@ -101,13 +102,13 @@ function addMarkdownWidget( } export const useMarkdownWidget = () => { - const widgetConstructor = ( + const widgetConstructor: ComfyWidgetConstructor = ( node: LGraphNode, inputName: string, inputData: InputSpec, app: ComfyApp ) => { - const defaultVal = inputData[1].default || '' + const defaultVal = inputData[1]?.default || '' return addMarkdownWidget( node, inputName, diff --git a/src/composables/widgets/useSeedWidget.ts b/src/composables/widgets/useSeedWidget.ts index 8c868ed194..ed9c77c01f 100644 --- a/src/composables/widgets/useSeedWidget.ts +++ b/src/composables/widgets/useSeedWidget.ts @@ -13,7 +13,7 @@ export const useSeedWidget = () => { node: LGraphNode, inputName: string, inputData: InputSpec, - app?: ComfyApp, + app: ComfyApp, widgetName?: string ) => { inputData[1] = { diff --git a/src/composables/widgets/useStringWidget.ts b/src/composables/widgets/useStringWidget.ts index b340ff69aa..e45f4f4db7 100644 --- a/src/composables/widgets/useStringWidget.ts +++ b/src/composables/widgets/useStringWidget.ts @@ -1,5 +1,6 @@ import type { IWidget, LGraphNode } from '@comfyorg/litegraph' +import type { ComfyWidgetConstructor } from '@/scripts/widgets' import { useSettingStore } from '@/stores/settingStore' import type { ComfyApp } from '@/types' import type { InputSpec } from '@/types/apiTypes' @@ -57,14 +58,14 @@ function addMultilineWidget( } export const useStringWidget = () => { - const widgetConstructor = ( + const widgetConstructor: ComfyWidgetConstructor = ( node: LGraphNode, inputName: string, inputData: InputSpec, app: ComfyApp ) => { - const defaultVal = inputData[1].default || '' - const multiline = !!inputData[1].multiline + const defaultVal = inputData[1]?.default || '' + const multiline = !!inputData[1]?.multiline let res: { widget: IWidget } if (multiline) { diff --git a/src/scripts/widgets.ts b/src/scripts/widgets.ts index c5bf33615e..a30eb46a8f 100644 --- a/src/scripts/widgets.ts +++ b/src/scripts/widgets.ts @@ -20,7 +20,7 @@ export type ComfyWidgetConstructor = ( node: LGraphNode, inputName: string, inputData: InputSpec, - app?: ComfyApp, + app: ComfyApp, widgetName?: string ) => { widget: IWidget; minWidth?: number; minHeight?: number }