Skip to content

Commit cd35f1d

Browse files
authored
[Refactor] Generate DOM widget id in constructor (#3508)
1 parent 5d58457 commit cd35f1d

File tree

4 files changed

+1
-14
lines changed

4 files changed

+1
-14
lines changed

src/composables/widgets/useComboWidget.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
type ComfyWidgetConstructorV2,
1919
addValueControlWidgets
2020
} from '@/scripts/widgets'
21-
import { generateUUID } from '@/utils/formatUtil'
2221

2322
import { useRemoteWidget } from './useRemoteWidget'
2423

@@ -32,7 +31,6 @@ const getDefaultValue = (inputSpec: ComboInputSpec) => {
3231
const addMultiSelectWidget = (node: LGraphNode, inputSpec: ComboInputSpec) => {
3332
const widgetValue = ref<string[]>([])
3433
const widget = new ComponentWidgetImpl({
35-
id: generateUUID(),
3634
node,
3735
name: inputSpec.name,
3836
component: MultiSelectWidget,

src/extensions/core/load3d.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget'
1414
import { useExtensionService } from '@/services/extensionService'
1515
import { useLoad3dService } from '@/services/load3dService'
1616
import { useToastStore } from '@/stores/toastStore'
17-
import { generateUUID } from '@/utils/formatUtil'
1817

1918
useExtensionService().registerExtension({
2019
name: 'Comfy.Load3D',
@@ -118,7 +117,6 @@ useExtensionService().registerExtension({
118117
}
119118

120119
const widget = new ComponentWidgetImpl({
121-
id: generateUUID(),
122120
node,
123121
name: inputSpec.name,
124122
component: Load3D,
@@ -259,7 +257,6 @@ useExtensionService().registerExtension({
259257
}
260258

261259
const widget = new ComponentWidgetImpl({
262-
id: generateUUID(),
263260
node,
264261
name: inputSpec.name,
265262
component: Load3DAnimation,
@@ -355,7 +352,6 @@ useExtensionService().registerExtension({
355352
}
356353

357354
const widget = new ComponentWidgetImpl({
358-
id: generateUUID(),
359355
node,
360356
name: inputSpec.name,
361357
component: Load3D,
@@ -432,7 +428,6 @@ useExtensionService().registerExtension({
432428
}
433429

434430
const widget = new ComponentWidgetImpl({
435-
id: generateUUID(),
436431
node,
437432
name: inputSpec.name,
438433
component: Load3DAnimation,

src/extensions/core/saveMesh.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { CustomInputSpec } from '@/schemas/nodeDef/nodeDefSchemaV2'
77
import { ComponentWidgetImpl, addWidget } from '@/scripts/domWidget'
88
import { useExtensionService } from '@/services/extensionService'
99
import { useLoad3dService } from '@/services/load3dService'
10-
import { generateUUID } from '@/utils/formatUtil'
1110

1211
useExtensionService().registerExtension({
1312
name: 'Comfy.SaveGLB',
@@ -30,7 +29,6 @@ useExtensionService().registerExtension({
3029
}
3130

3231
const widget = new ComponentWidgetImpl({
33-
id: generateUUID(),
3432
node,
3533
name: inputSpec.name,
3634
component: Load3D,

src/scripts/domWidget.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ abstract class BaseDOMWidgetImpl<V extends object | string>
103103
readonly node: LGraphNode
104104

105105
constructor(obj: {
106-
id: string
107106
node: LGraphNode
108107
name: string
109108
type: string
@@ -114,7 +113,7 @@ abstract class BaseDOMWidgetImpl<V extends object | string>
114113
this.name = obj.name
115114
this.options = obj.options
116115

117-
this.id = obj.id
116+
this.id = generateUUID()
118117
this.node = obj.node
119118
}
120119

@@ -172,7 +171,6 @@ export class DOMWidgetImpl<T extends HTMLElement, V extends object | string>
172171
readonly element: T
173172

174173
constructor(obj: {
175-
id: string
176174
node: LGraphNode
177175
name: string
178176
type: string
@@ -235,7 +233,6 @@ export class ComponentWidgetImpl<V extends object | string>
235233
readonly inputSpec: InputSpec
236234

237235
constructor(obj: {
238-
id: string
239236
node: LGraphNode
240237
name: string
241238
component: Component
@@ -293,7 +290,6 @@ LGraphNode.prototype.addDOMWidget = function <
293290
options: DOMWidgetOptions<V> = {}
294291
): DOMWidget<T, V> {
295292
const widget = new DOMWidgetImpl({
296-
id: generateUUID(),
297293
node: this,
298294
name,
299295
type,

0 commit comments

Comments
 (0)