From 96f02dbf8071406580ca5d9ac2af44c8f2521482 Mon Sep 17 00:00:00 2001 From: Chenlei Hu Date: Thu, 27 Feb 2025 11:47:56 -0500 Subject: [PATCH] [Refactor] Use util.clone in mergeIfValid (#2752) --- src/extensions/core/widgetInputs.ts | 8 ++------ src/scripts/utils.ts | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/extensions/core/widgetInputs.ts b/src/extensions/core/widgetInputs.ts index c5c20fb4f..dd8d434ec 100644 --- a/src/extensions/core/widgetInputs.ts +++ b/src/extensions/core/widgetInputs.ts @@ -13,7 +13,7 @@ import type { import type { CanvasMouseEvent } from '@comfyorg/litegraph/dist/types/events' import { app } from '@/scripts/app' -import { applyTextReplacements } from '@/scripts/utils' +import { applyTextReplacements, clone } from '@/scripts/utils' import { ComfyWidgets, addValueControlWidgets } from '@/scripts/widgets' import { useNodeDefStore } from '@/stores/nodeDefStore' import { useSettingStore } from '@/stores/settingStore' @@ -647,11 +647,7 @@ export function mergeIfValid( let customConfig: Record | undefined const getCustomConfig = () => { if (!customConfig) { - if (typeof structuredClone === 'undefined') { - customConfig = JSON.parse(JSON.stringify(config1[1] ?? {})) - } else { - customConfig = structuredClone(config1[1] ?? {}) - } + customConfig = clone(config1[1] ?? {}) } return customConfig } diff --git a/src/scripts/utils.ts b/src/scripts/utils.ts index 4f4717b3d..0c283daee 100644 --- a/src/scripts/utils.ts +++ b/src/scripts/utils.ts @@ -28,7 +28,7 @@ function formatDate(text: string, date: Date) { }) } -export function clone(obj: any) { +export function clone(obj: T): T { try { if (typeof structuredClone !== 'undefined') { return structuredClone(obj)