From 33761d82fe5e0788fda9ff2120bc2894a4edaf39 Mon Sep 17 00:00:00 2001 From: Austin Mroz Date: Sat, 7 Feb 2026 12:08:34 -0800 Subject: [PATCH] Support keeping value across dynamic combo options --- src/core/graph/widgets/dynamicWidgets.ts | 16 +++++++++++++++- .../vueNodes/widgets/composables/useIntWidget.ts | 4 ++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/core/graph/widgets/dynamicWidgets.ts b/src/core/graph/widgets/dynamicWidgets.ts index 3058e813106..3aa6c8ca84b 100644 --- a/src/core/graph/widgets/dynamicWidgets.ts +++ b/src/core/graph/widgets/dynamicWidgets.ts @@ -95,7 +95,9 @@ function dynamicComboWidget( const newSpec = value ? options[value] : undefined const removedInputs = remove(node.inputs, isInGroup) - for (const widget of remove(node.widgets, isInGroup)) widget.onRemove?.() + + const removedWidgets = remove(node.widgets, isInGroup) + for (const widget of removedWidgets) widget.onRemove?.() if (!newSpec) return @@ -174,6 +176,18 @@ function dynamicComboWidget( ) } } + for (const widget of removedWidgets) { + const newMatchingWidget = addedWidgets.find((w) => w.name === widget.name) + if (!newMatchingWidget || newMatchingWidget.type !== widget.type) continue + + const nameSegment = widget.name.slice(widget.name.lastIndexOf('.') + 1) + const spec = + newSpec.required?.[nameSegment] ?? newSpec.optional?.[nameSegment] + if (spec?.[1] && 'default' in spec?.[1]) continue + + newMatchingWidget.value = widget.value + newMatchingWidget.callback?.(widget.value) + } node.size[1] = node.computeSize([...node.size])[1] if (!node.graph) return diff --git a/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts b/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts index f307aa0e14b..1ee3c23100d 100644 --- a/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts +++ b/src/renderer/extensions/vueNodes/widgets/composables/useIntWidget.ts @@ -24,6 +24,10 @@ function onValueChange(this: INumericWidget, v: number) { // Round to nearest step, accounting for offset this.value = Math.round((v - offset) / step) * step + offset } + if (this.options.min !== undefined && this.value < this.options.min) + this.value = this.options.min + if (this.options.max !== undefined && this.value > this.options.max) + this.value = this.options.max } export const _for_testing = {