Deprecate widgetType:widgetName key in widgets map (#2879)

This commit is contained in:
Chenlei Hu
2025-03-05 13:32:47 -05:00
committed by GitHub
parent 35e6cabfe7
commit ba4e4ed0b8
4 changed files with 10 additions and 29 deletions

View File

@@ -71,7 +71,15 @@ export const useIntWidget = () => {
}
)
if (inputSpec.control_after_generate) {
const controlAfterGenerate =
inputSpec.control_after_generate ??
/**
* Compatibility with legacy node convention. Int input with name
* 'seed' or 'noise_seed' get automatically added a control widget.
*/
['seed', 'noise_seed'].includes(inputSpec.name)
if (controlAfterGenerate) {
const seedControl = addValueControlWidget(
node,
widget,

View File

@@ -934,8 +934,6 @@ export class ComfyApp {
if (Array.isArray(type)) {
return 'COMBO'
} else if (`${type}:${inputName}` in this.widgets) {
return `${type}:${inputName}`
} else if (type in this.widgets) {
return type
} else {

View File

@@ -278,16 +278,7 @@ export function addValueControlWidgets(
return widgets
}
const seedWidget = transformWidgetConstructorV2ToV1((node, inputSpec) => {
return useIntWidget()(node, {
...inputSpec,
control_after_generate: true
})
})
export const ComfyWidgets: Record<string, ComfyWidgetConstructor> = {
'INT:seed': seedWidget,
'INT:noise_seed': seedWidget,
INT: transformWidgetConstructorV2ToV1(useIntWidget()),
FLOAT: transformWidgetConstructorV2ToV1(useFloatWidget()),
BOOLEAN: transformWidgetConstructorV2ToV1(useBooleanWidget()),

View File

@@ -12,23 +12,8 @@ export const useWidgetStore = defineStore('widget', () => {
...coreWidgets
}))
function getWidgetType(type: string, inputName: string) {
if (type === 'COMBO') {
return 'COMBO'
/**
* @deprecated Group node logic. Remove once group node feature is removed.
*/
} else if (`${type}:${inputName}` in widgets.value) {
return `${type}:${inputName}`
} else if (type in widgets.value) {
return type
} else {
return null
}
}
function inputIsWidget(spec: InputSpecV2) {
return getWidgetType(spec.type, spec.name) !== null
return spec.type in widgets.value
}
function registerCustomWidgets(
@@ -42,7 +27,6 @@ export const useWidgetStore = defineStore('widget', () => {
return {
widgets,
getWidgetType,
inputIsWidget,
registerCustomWidgets
}