diff --git a/src/extensions/core/clipspace.ts b/src/extensions/core/clipspace.ts index bc644d8d76..2fe7378de4 100644 --- a/src/extensions/core/clipspace.ts +++ b/src/extensions/core/clipspace.ts @@ -47,8 +47,9 @@ export class ClipspaceDialog extends ComfyDialog { if (ClipspaceDialog.instance) { const self = ClipspaceDialog.instance // allow reconstruct controls when copying from non-image to image content. + const imgSettings = self.createImgSettings() const children = $el('div.comfy-modal-content', [ - self.createImgSettings(), + ...(imgSettings ? [imgSettings] : []), ...self.createButtons() ]) @@ -103,7 +104,7 @@ export class ClipspaceDialog extends ComfyDialog { return buttons } - createImgSettings() { + createImgSettings(): HTMLTableElement | null { if (ComfyApp.clipspace?.imgs) { const combo_items = [] const imgs = ComfyApp.clipspace.imgs @@ -167,14 +168,14 @@ export class ClipspaceDialog extends ComfyDialog { return $el('table', {}, [row1, row2, row3]) } else { - return [] + return null } } - createImgPreview() { + createImgPreview(): HTMLImageElement | null { if (ComfyApp.clipspace?.imgs) { return $el('img', { id: 'clipspace_preview', ondragstart: () => false }) - } else return [] + } else return null } override show() { diff --git a/src/scripts/metadata/isobmff.ts b/src/scripts/metadata/isobmff.ts index a9a7f88265..6272a9c2fb 100644 --- a/src/scripts/metadata/isobmff.ts +++ b/src/scripts/metadata/isobmff.ts @@ -72,7 +72,7 @@ const findIsobmffBoxByType = ( return null } -const extractJson = (data: Uint8Array, start: number, end: number): any => { +const extractJson = (data: Uint8Array, start: number, end: number): unknown => { let jsonStart = start while (jsonStart < end && data[jsonStart] !== ASCII.OPEN_BRACE) { jsonStart++ @@ -133,7 +133,11 @@ const extractMetadataValueFromDataBox = ( lowerKeyName === ComfyMetadataTags.PROMPT.toLowerCase() || lowerKeyName === ComfyMetadataTags.WORKFLOW.toLowerCase() ) { - return extractJson(data, valueStart, dataBoxEnd) || null + return ( + (extractJson(data, valueStart, dataBoxEnd) as + | ComfyWorkflowJSON + | ComfyApiWorkflow) || null + ) } return null } diff --git a/src/scripts/ui.ts b/src/scripts/ui.ts index 9a0f9d5cca..0d1b383fb4 100644 --- a/src/scripts/ui.ts +++ b/src/scripts/ui.ts @@ -28,7 +28,7 @@ type Props = { style?: Partial for?: string textContent?: string - [key: string]: any + [key: string]: unknown } type Children = Element[] | Element | string | string[] diff --git a/src/utils/fuseUtil.ts b/src/utils/fuseUtil.ts index 6969bbe06a..ddfbaa9a47 100644 --- a/src/utils/fuseUtil.ts +++ b/src/utils/fuseUtil.ts @@ -75,8 +75,12 @@ export interface FuseSearchable { postProcessSearchScores: (scores: SearchAuxScore) => SearchAuxScore } -function isFuseSearchable(item: any): item is FuseSearchable { - return 'postProcessSearchScores' in item +function isFuseSearchable(item: unknown): item is FuseSearchable { + return ( + typeof item === 'object' && + item !== null && + 'postProcessSearchScores' in item + ) } /**