nits

Author: AustinMroz

src/core/graph/widgets/dynamicWidgets.ts

@@ -6,7 +6,7 @@ import { useLitegraphService } from '@/services/litegraphService'
 import { app } from '@/scripts/app'
 import type { ComfyApp } from '@/scripts/app'
 
-function COMFY_DYNAMICCOMBO_V3(
+function dynamicComboWidget(
   node: LGraphNode,
   inputName: string,
   untypedInputData: InputSpec,
@@ -111,4 +111,4 @@ function COMFY_DYNAMICCOMBO_V3(
   return { widget, minWidth, minHeight }
 }
 
-export const dynamicWidgets = { COMFY_DYNAMICCOMBO_V3 }
+export const dynamicWidgets = { COMFY_DYNAMICCOMBO_V3: dynamicComboWidget }

src/lib/litegraph/src/LGraphNode.ts

@@ -847,12 +847,13 @@ export class LGraphNode
       if (info.widgets_values) {
         const widgetsWithValue = this.widgets
           .values()
-          .filter((w) => w.serialize !== false)
-        widgetsWithValue.forEach((widget, i) => {
-          if (widget && i < info.widgets_values!.length) {
-            widget.value = info.widgets_values![i]
-          }
-        })
+          .filter(
+            (w, idx) =>
+              w.serialize !== false && idx < info.widgets_values!.length
+          )
+        widgetsWithValue.forEach(
+          (widget, i) => (widget.value = info.widgets_values![i])
+        )
       }
     }
 
@@ -1653,15 +1654,12 @@ export class LGraphNode
     deleteCount = -1,
     ...toAdd: INodeInputSlot[]
   ): INodeInputSlot[] {
-    if (deleteCount === -1) deleteCount = this.inputs.length - startIndex
-
-    const lengthDelta = toAdd.length - deleteCount
+    if (deleteCount < 0) return this.inputs.splice(startIndex)
     const ret = this.inputs.splice(startIndex, deleteCount, ...toAdd)
-    for (const input of this.inputs.slice(startIndex + toAdd.length)) {
+    this.inputs.slice(startIndex).forEach((input, index) => {
       const link = input.link && this.graph?.links?.get(input.link)
-      if (!link) continue
-      link.target_slot += lengthDelta
-    }
+      if (link) link.target_slot = startIndex + index
+    })
     return ret
   }
 

src/services/litegraphService.ts

@@ -59,7 +59,7 @@ import { getOrderedInputSpecs } from '@/workbench/utils/nodeDefOrderingUtil'
 
 import { useExtensionService } from './extensionService'
 
-interface HasInitialMinSize {
+export interface HasInitialMinSize {
   _initialMinSize: { width: number; height: number }
 }
 

tests-ui/tests/widgets/dynamicCombo.test.ts

@@ -1,11 +1,13 @@
-import { createPinia, setActivePinia } from 'pinia'
+import { setActivePinia } from 'pinia'
+import { createTestingPinia } from '@pinia/testing'
 import { describe, expect, test } from 'vitest'
 import { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { transformInputSpecV1ToV2 } from '@/schemas/nodeDef/migration'
 import type { InputSpec } from '@/schemas/nodeDefSchema'
 import { useLitegraphService } from '@/services/litegraphService'
+import type { HasInitialMinSize } from '@/services/litegraphService'
 
-setActivePinia(createPinia())
+setActivePinia(createTestingPinia())
 type DynamicInputs = ('INT' | 'STRING' | 'IMAGE' | DynamicInputs)[][]
 
 const { addNodeInput } = useLitegraphService()
@@ -39,9 +41,7 @@ function addDynamicCombo(node: LGraphNode, inputs: DynamicInputs) {
   )
 }
 function testNode() {
-  const node: LGraphNode & {
-    _initialMinSize?: { width: number; height: number }
-  } = new LGraphNode('test')
+  const node: LGraphNode & Partial<HasInitialMinSize> = new LGraphNode('test')
   node.widgets = []
   node._initialMinSize = { width: 1, height: 1 }
   node.constructor.nodeData = {