FlakeDataSplitSelect (#164): - Remove 'selected_pins' STRING from Python INPUT_TYPES (was causing node load failure) - Store pin selection purely in node.properties._split_pins - Rewrite JS widget with attached-button dropdown style IntoFlakeDataSelect (#165): - Remove all optional fields from Python INPUT_TYPES; use None-sentinel pattern so only connected inputs override the original flake_data - JS now uses node.addInput/removeInput for dynamic pins — no default pins, no hidden widget fields interfering with click events - Dropdown styled as select + attached button (matching Load Image node) - Chips show active pins with x to remove
195 lines
8.1 KiB
JavaScript
195 lines
8.1 KiB
JavaScript
import { app } from "../../scripts/app.js";
|
|
import { setupFlakeWidget } from "./widgets/flake-stack.js";
|
|
import { setupFlakeComboWidget } from "./widgets/flake-combo.js";
|
|
import { setupFlakeModelPresetWidget } from "./widgets/flake-model-preset.js";
|
|
import { setupFlakeModelComboWidget } from "./widgets/flake-model-combo.js";
|
|
import { setupFlakeDataSplitSelect, setupIntoFlakeDataSelect, DEFAULT_SPLIT_PINS, DEFAULT_INTO_PINS } from "./widgets/flake-data-select.js";
|
|
import { setupPreviewFlakeDataWidget } from "./widgets/flake-preview.js";
|
|
import { setupFlakeGenerateWidget } from "./widgets/flake-generate.js";
|
|
import "./queue.js";
|
|
|
|
function removeHiddenInputs(node, names) {
|
|
for (let i = node.inputs.length - 1; i >= 0; i--) {
|
|
if (names.includes(node.inputs[i].name)) {
|
|
node.inputs.splice(i, 1);
|
|
}
|
|
}
|
|
}
|
|
|
|
function setDefaultSize(node, minWidth) {
|
|
const size = node.computeSize();
|
|
if (size[0] < minWidth) {
|
|
node.setSize([minWidth, size[1]]);
|
|
} else {
|
|
node.setSize(size);
|
|
}
|
|
}
|
|
|
|
app.registerExtension({
|
|
name: "comfyui-flakes.FlakeStack",
|
|
async beforeRegisterNodeDef(nodeType, nodeData) {
|
|
if (nodeData.name === "FlakeStack") {
|
|
const origOnNodeCreated = nodeType.prototype.onNodeCreated;
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
const r = origOnNodeCreated?.apply(this, arguments);
|
|
setupFlakeWidget(this);
|
|
removeHiddenInputs(this, ["model_family", "flakes_json"]);
|
|
if (!this._configured) {
|
|
setDefaultSize(this, 340);
|
|
}
|
|
return r;
|
|
};
|
|
|
|
const origOnConfigure = nodeType.prototype.onConfigure;
|
|
nodeType.prototype.onConfigure = function () {
|
|
const r = origOnConfigure?.apply(this, arguments);
|
|
this._configured = true;
|
|
removeHiddenInputs(this, ["model_family", "flakes_json"]);
|
|
this._flakes_render?.();
|
|
return r;
|
|
};
|
|
}
|
|
if (nodeData.name === "FlakeModelPreset") {
|
|
const origOnNodeCreated = nodeType.prototype.onNodeCreated;
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
const r = origOnNodeCreated?.apply(this, arguments);
|
|
setupFlakeModelPresetWidget(this);
|
|
removeHiddenInputs(this, ["model_family", "preset"]);
|
|
if (!this._configured) {
|
|
setDefaultSize(this, 300);
|
|
}
|
|
return r;
|
|
};
|
|
|
|
const origOnConfigure = nodeType.prototype.onConfigure;
|
|
nodeType.prototype.onConfigure = function () {
|
|
const r = origOnConfigure?.apply(this, arguments);
|
|
this._configured = true;
|
|
removeHiddenInputs(this, ["model_family", "preset"]);
|
|
this._preset_render?.();
|
|
return r;
|
|
};
|
|
}
|
|
if (nodeData.name === "FlakeCombo") {
|
|
const origOnNodeCreated = nodeType.prototype.onNodeCreated;
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
const r = origOnNodeCreated?.apply(this, arguments);
|
|
setupFlakeComboWidget(this);
|
|
removeHiddenInputs(this, ["model_family", "flakes_json"]);
|
|
if (!this._configured) {
|
|
setDefaultSize(this, 340);
|
|
}
|
|
return r;
|
|
};
|
|
|
|
const origOnConfigure = nodeType.prototype.onConfigure;
|
|
nodeType.prototype.onConfigure = function () {
|
|
const r = origOnConfigure?.apply(this, arguments);
|
|
this._configured = true;
|
|
removeHiddenInputs(this, ["model_family", "flakes_json"]);
|
|
this._combo_render?.();
|
|
return r;
|
|
};
|
|
}
|
|
if (nodeData.name === "FlakeModelCombo") {
|
|
const origOnNodeCreated = nodeType.prototype.onNodeCreated;
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
const r = origOnNodeCreated?.apply(this, arguments);
|
|
setupFlakeModelComboWidget(this);
|
|
removeHiddenInputs(this, ["model_family", "preset"]);
|
|
if (!this._configured) {
|
|
setDefaultSize(this, 300);
|
|
}
|
|
return r;
|
|
};
|
|
|
|
const origOnConfigure = nodeType.prototype.onConfigure;
|
|
nodeType.prototype.onConfigure = function () {
|
|
const r = origOnConfigure?.apply(this, arguments);
|
|
this._configured = true;
|
|
removeHiddenInputs(this, ["model_family", "preset"]);
|
|
this._model_combo_render?.();
|
|
return r;
|
|
};
|
|
}
|
|
if (nodeData.name === "FlakeDataSplitSelect") {
|
|
const origOnNodeCreated = nodeType.prototype.onNodeCreated;
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
const r = origOnNodeCreated?.apply(this, arguments);
|
|
setupFlakeDataSplitSelect(this);
|
|
if (!this._configured) {
|
|
setDefaultSize(this, 260);
|
|
}
|
|
return r;
|
|
};
|
|
|
|
const origOnConfigure = nodeType.prototype.onConfigure;
|
|
nodeType.prototype.onConfigure = function () {
|
|
const r = origOnConfigure?.apply(this, arguments);
|
|
this._configured = true;
|
|
if (!this.properties) this.properties = {};
|
|
// Migrate old property name
|
|
if (!this.properties._split_pins && this.properties._selected_split_pins) {
|
|
this.properties._split_pins = this.properties._selected_split_pins;
|
|
}
|
|
this._splitPinUpdate?.();
|
|
return r;
|
|
};
|
|
}
|
|
if (nodeData.name === "IntoFlakeDataSelect") {
|
|
const origOnNodeCreated = nodeType.prototype.onNodeCreated;
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
const r = origOnNodeCreated?.apply(this, arguments);
|
|
setupIntoFlakeDataSelect(this);
|
|
if (!this._configured) {
|
|
setDefaultSize(this, 260);
|
|
}
|
|
return r;
|
|
};
|
|
|
|
const origOnConfigure = nodeType.prototype.onConfigure;
|
|
nodeType.prototype.onConfigure = function () {
|
|
const r = origOnConfigure?.apply(this, arguments);
|
|
this._configured = true;
|
|
if (!this.properties) this.properties = {};
|
|
// Migrate old property name
|
|
if (!this.properties._into_pins && this.properties._selected_into_pins) {
|
|
this.properties._into_pins = this.properties._selected_into_pins;
|
|
}
|
|
setupIntoFlakeDataSelect(this);
|
|
this._intoPinUpdate?.();
|
|
return r;
|
|
};
|
|
}
|
|
if (nodeData.name === "PreviewFlakeData") {
|
|
const origOnNodeCreated = nodeType.prototype.onNodeCreated;
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
const r = origOnNodeCreated?.apply(this, arguments);
|
|
setupPreviewFlakeDataWidget(this);
|
|
if (!this._configured) {
|
|
setDefaultSize(this, 260);
|
|
}
|
|
return r;
|
|
};
|
|
}
|
|
if (nodeData.name === "FlakeGenerate") {
|
|
const origOnNodeCreated = nodeType.prototype.onNodeCreated;
|
|
nodeType.prototype.onNodeCreated = function () {
|
|
const r = origOnNodeCreated?.apply(this, arguments);
|
|
setupFlakeGenerateWidget(this);
|
|
if (!this._configured) {
|
|
setDefaultSize(this, 300);
|
|
}
|
|
return r;
|
|
};
|
|
|
|
const origOnConfigure = nodeType.prototype.onConfigure;
|
|
nodeType.prototype.onConfigure = function () {
|
|
const r = origOnConfigure?.apply(this, arguments);
|
|
this._configured = true;
|
|
return r;
|
|
};
|
|
}
|
|
},
|
|
});
|