rubz
dd0c4d9b2e
- Add js/shared/{nodes2,canvas_widgets,preset_picker_widget}.mjs: widgets
registered with type "button" get hijacked by ComfyUI's Vue widget
registry (Nodes 2.0), which renders a generic button showing the raw
internal widget name instead of calling our draw(). Dividers/status
boxes now use type "custom" via addCustomWidget, which correctly falls
through to the legacy-canvas bridge in both renderers. The interactive
preset-chip picker is dual-path: canvas+hit-testing in classic mode,
real <button> elements via addDOMWidget in Nodes 2.0 (mirrors how
ComfyUI-Pixaroma solved the same problem for its own widgets)
- Rewire smart_batch_resize.js, smart_resize.js, smart_profile_switch.js,
smart_prompt_controller.js to use the shared factories, removing the
duplicated divider/status/preset-chip code that existed across them
- Fix a save/reload regression found during verification: repositioning
the Nodes 2.0 preset-chip DOM widget into the middle of node.widgets
after configure() has run desyncs Vue's value-to-row binding for every
later widget (values appear shifted by one row, though the saved JSON
itself is correct). The DOM widget is no longer repositioned under
Nodes 2.0; classic mode is unaffected and keeps the original placement
69 lines
2.8 KiB
JavaScript
69 lines
2.8 KiB
JavaScript
import { app } from "../../scripts/app.js";
|
|
import { createDividerWidget, createStatusWidget } from "./shared/canvas_widgets.mjs";
|
|
|
|
app.registerExtension({
|
|
name: "Craftopia.SmartProfileSwitch",
|
|
|
|
async nodeCreated(node) {
|
|
if (node.comfyClass !== "SmartProfileSwitch") return;
|
|
|
|
// Slot header dividers — visual only, not serialized
|
|
const dividers = [];
|
|
for (let i = 1; i <= 4; i++) {
|
|
const div = createDividerWidget(`SLOT ${i}`);
|
|
node.addCustomWidget(div);
|
|
dividers.push(div);
|
|
}
|
|
|
|
// Status widget — shows active slot after execution
|
|
const statusWidget = createStatusWidget("— RUN TO SEE RESULT —");
|
|
node.addCustomWidget(statusWidget);
|
|
|
|
// Reorder: index, [div1, label_1, w_1, h_1], ..., [div4, label_4, w_4, h_4], status
|
|
const indexWidget = node.widgets.find(w => w.name === "index");
|
|
const slotWidgets = [];
|
|
for (let i = 1; i <= 4; i++) {
|
|
slotWidgets.push(
|
|
dividers[i - 1],
|
|
node.widgets.find(w => w.name === `label_${i}`),
|
|
node.widgets.find(w => w.name === `width_${i}`),
|
|
node.widgets.find(w => w.name === `height_${i}`),
|
|
);
|
|
}
|
|
// Guard against a lookup returning undefined (e.g. a widget converted to
|
|
// an input) and never drop a widget we didn't explicitly place — append
|
|
// anything unrecognized at the end instead of silently discarding it.
|
|
const orderedWidgets = [indexWidget, ...slotWidgets, statusWidget].filter(Boolean);
|
|
const orderedSet = new Set(orderedWidgets);
|
|
const leftoverWidgets = node.widgets.filter(w => !orderedSet.has(w));
|
|
node.widgets = [...orderedWidgets, ...leftoverWidgets];
|
|
|
|
// Serialize override — keeps non-serializable widgets out of widgets_values
|
|
const origSerialize = node.serialize;
|
|
node.serialize = function () {
|
|
const data = origSerialize.call(this);
|
|
if (data.widgets_values) {
|
|
data.widgets_values = this.widgets
|
|
.filter(w => w.serialize !== false && w.options?.serialize !== false)
|
|
.map(w => w.value);
|
|
}
|
|
return data;
|
|
};
|
|
|
|
// onExecuted — update status, hide default customtext textarea
|
|
const origOnExecuted = node.onExecuted;
|
|
node.onExecuted = function (output) {
|
|
origOnExecuted?.call(this, output);
|
|
if (output?.text?.[0]) {
|
|
statusWidget._text = output.text[0];
|
|
for (const w of node.widgets) {
|
|
if (w !== statusWidget && w.type === "customtext") {
|
|
w.computeSize = () => [0, -4];
|
|
}
|
|
}
|
|
}
|
|
node.setDirtyCanvas(true);
|
|
};
|
|
},
|
|
});
|