alphard/ComfyUI-Lora-Manager
1
0
Fork 0
mirror of https://github.com/willmiao/ComfyUI-Lora-Manager.git synced 2026-03-25 23:25:43 -03:00
Code Issues Packages Projects Releases Wiki Activity

feat(comfyui): fix trigger word toggle widget initialization

Browse Source 
Change from loadedGraphNode to nodeCreated lifecycle method to ensure proper widget initialization timing. Wrap widget creation and highlight logic in requestAnimationFrame to prevent race conditions with node setup. This ensures the trigger word toggle widget functions correctly when nodes are created.
This commit is contained in:
Will Miao
2025-11-08 19:39:25 +08:00
parent 5ee93a27ee
commit 837bb17b08
1 changed files with 119 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

231
web/comfyui/trigger_word_toggle.js
View File

@@ -62,7 +62,7 @@ app.registerExtension({
}); });
}, },
async loadedGraphNode(node) { async nodeCreated(node) {
if (node.comfyClass === "TriggerWord Toggle (LoraManager)") { if (node.comfyClass === "TriggerWord Toggle (LoraManager)") {
// Enable widget serialization // Enable widget serialization
node.serialize_widgets = true; node.serialize_widgets = true;
@@ -71,135 +71,138 @@ app.registerExtension({
"shape": 7 // 7 is the shape of the optional input "shape": 7 // 7 is the shape of the optional input
}); });
// Get the wheel sensitivity setting // Wait for node to be properly initialized
const wheelSensitivity = getWheelSensitivity(); requestAnimationFrame(async () => {
// Get the wheel sensitivity setting
const wheelSensitivity = getWheelSensitivity();
// Get the widget object directly from the returned object // Get the widget object directly from the returned object
const result = addTagsWidget(node, "toggle_trigger_words", { const result = addTagsWidget(node, "toggle_trigger_words", {
defaultVal: [] defaultVal: []
}, null, wheelSensitivity); }, null, wheelSensitivity);
node.tagWidget = result.widget; node.tagWidget = result.widget;
const normalizeTagText = (text) => const normalizeTagText = (text) =>
(typeof text === 'string' ? text.trim().toLowerCase() : ''); (typeof text === 'string' ? text.trim().toLowerCase() : '');
const collectHighlightTokens = (wordsArray) => { const collectHighlightTokens = (wordsArray) => {
const tokens = new Set(); const tokens = new Set();
const addToken = (text) => { const addToken = (text) => {
const normalized = normalizeTagText(text); const normalized = normalizeTagText(text);
if (normalized) { if (normalized) {
tokens.add(normalized); tokens.add(normalized);
} }
}; };
wordsArray.forEach((rawWord) => { wordsArray.forEach((rawWord) => {
if (typeof rawWord !== 'string') { if (typeof rawWord !== 'string') {
return; return;
} }
addToken(rawWord); addToken(rawWord);
const groupParts = rawWord.split(/,{2,}/); const groupParts = rawWord.split(/,{2,}/);
groupParts.forEach((groupPart) => { groupParts.forEach((groupPart) => {
addToken(groupPart); addToken(groupPart);
groupPart.split(',').forEach(addToken); groupPart.split(',').forEach(addToken);
});
rawWord.split(',').forEach(addToken);
}); });
rawWord.split(',').forEach(addToken); return tokens;
}); };
return tokens; const applyHighlightState = () => {
}; if (!node.tagWidget) return;
const highlightSet = node._highlightedTriggerWords || new Set();
const applyHighlightState = () => { const updatedTags = (node.tagWidget.value || []).map(tag => ({
if (!node.tagWidget) return;
const highlightSet = node._highlightedTriggerWords || new Set();
const updatedTags = (node.tagWidget.value || []).map(tag => ({
...tag,
highlighted: highlightSet.size > 0 && highlightSet.has(normalizeTagText(tag.text))
}));
node.tagWidget.value = updatedTags;
};
node.highlightTriggerWords = (triggerWords) => {
const wordsArray = Array.isArray(triggerWords)
? triggerWords
: triggerWords
? [triggerWords]
: [];
node._highlightedTriggerWords = collectHighlightTokens(wordsArray);
applyHighlightState();
};
if (node.__pendingHighlightWords !== undefined) {
const pending = node.__pendingHighlightWords;
delete node.__pendingHighlightWords;
node.highlightTriggerWords(pending);
}
node.applyTriggerHighlightState = applyHighlightState;
// Add hidden widget to store original message
const hiddenWidget = node.addWidget('text', 'orinalMessage', '');
hiddenWidget.type = CONVERTED_TYPE;
hiddenWidget.hidden = true;
hiddenWidget.computeSize = () => [0, -4];
// Restore saved value if exists
if (node.widgets_values && node.widgets_values.length > 0) {
// 0 is group mode, 1 is default_active, 2 is tag widget, 3 is original message
const savedValue = node.widgets_values[2];
if (savedValue) {
result.widget.value = Array.isArray(savedValue) ? savedValue : [];
}
const originalMessage = node.widgets_values[3];
if (originalMessage) {
hiddenWidget.value = originalMessage;
}
}
requestAnimationFrame(() => node.applyTriggerHighlightState?.());
const groupModeWidget = node.widgets[0];
groupModeWidget.callback = (value) => {
if (node.widgets[3].value) {
this.updateTagsBasedOnMode(node, node.widgets[3].value, value);
}
}
// Add callback for default_active widget
const defaultActiveWidget = node.widgets[1];
defaultActiveWidget.callback = (value) => {
// Set all existing tags' active state to the new value
if (node.tagWidget && node.tagWidget.value) {
const updatedTags = node.tagWidget.value.map(tag => ({
...tag, ...tag,
active: value highlighted: highlightSet.size > 0 && highlightSet.has(normalizeTagText(tag.text))
})); }));
node.tagWidget.value = updatedTags; node.tagWidget.value = updatedTags;
node.applyTriggerHighlightState?.(); };
}
}
// Override the serializeValue method to properly format trigger words with strength node.highlightTriggerWords = (triggerWords) => {
const originalSerializeValue = result.widget.serializeValue; const wordsArray = Array.isArray(triggerWords)
result.widget.serializeValue = function() { ? triggerWords
const value = this.value || []; : triggerWords
// Transform the values to include strength in the proper format ? [triggerWords]
const transformedValue = value.map(tag => { : [];
// If strength is defined (even if it's 1.0), format as {text: "(original_text:strength)", ...} node._highlightedTriggerWords = collectHighlightTokens(wordsArray);
if (tag.strength !== undefined && tag.strength !== null) { applyHighlightState();
return { };
...tag,
text: `(${tag.text}:${tag.strength.toFixed(2)})` if (node.__pendingHighlightWords !== undefined) {
}; const pending = node.__pendingHighlightWords;
delete node.__pendingHighlightWords;
node.highlightTriggerWords(pending);
}
node.applyTriggerHighlightState = applyHighlightState;
// Add hidden widget to store original message
const hiddenWidget = node.addWidget('text', 'orinalMessage', '');
hiddenWidget.type = CONVERTED_TYPE;
hiddenWidget.hidden = true;
hiddenWidget.computeSize = () => [0, -4];
// Restore saved value if exists
if (node.widgets_values && node.widgets_values.length > 0) {
// 0 is group mode, 1 is default_active, 2 is tag widget, 3 is original message
const savedValue = node.widgets_values[2];
if (savedValue) {
result.widget.value = Array.isArray(savedValue) ? savedValue : [];
} }
return tag; const originalMessage = node.widgets_values[3];
}); if (originalMessage) {
return transformedValue; hiddenWidget.value = originalMessage;
}; }
}
requestAnimationFrame(() => node.applyTriggerHighlightState?.());
const groupModeWidget = node.widgets[0];
groupModeWidget.callback = (value) => {
if (node.widgets[3].value) {
this.updateTagsBasedOnMode(node, node.widgets[3].value, value);
}
}
// Add callback for default_active widget
const defaultActiveWidget = node.widgets[1];
defaultActiveWidget.callback = (value) => {
// Set all existing tags' active state to the new value
if (node.tagWidget && node.tagWidget.value) {
const updatedTags = node.tagWidget.value.map(tag => ({
...tag,
active: value
}));
node.tagWidget.value = updatedTags;
node.applyTriggerHighlightState?.();
}
}
// Override the serializeValue method to properly format trigger words with strength
const originalSerializeValue = result.widget.serializeValue;
result.widget.serializeValue = function() {
const value = this.value || [];
// Transform the values to include strength in the proper format
const transformedValue = value.map(tag => {
// If strength is defined (even if it's 1.0), format as {text: "(original_text:strength)", ...}
if (tag.strength !== undefined && tag.strength !== null) {
return {
...tag,
text: `(${tag.text}:${tag.strength.toFixed(2)})`
};
}
return tag;
});
return transformedValue;
};
});
} }
}, },