Merge branch 'undoredo-fix-modifiers' of https://github.com/pythongosssss/ComfyUI

web/extensions/core/groupNode.js

@@ -884,6 +884,7 @@ export class GroupNodeHandler {
 			const r = onDrawForeground?.apply?.(this, arguments);
 			if (+app.runningNodeId === this.id && this.runningInternalNodeId !== null) {
 				const n = groupData.nodes[this.runningInternalNodeId];
+				if(!n) return;
 				const message = `Running ${n.title || n.type} (${this.runningInternalNodeId}/${groupData.nodes.length})`;
 				ctx.save();
 				ctx.font = "12px sans-serif";

web/extensions/core/undoRedo.js

@@ -106,6 +106,7 @@ const bindInput = (activeEl) => {
 	}
 };
 
+let keyIgnored = false;
 window.addEventListener(
 	"keydown",
 	(e) => {
@@ -116,6 +117,9 @@ window.addEventListener(
 				return;
 			}
 
+			keyIgnored = e.key === "Control" || e.key === "Shift" || e.key === "Alt" || e.key === "Meta";
+			if (keyIgnored) return;
+
 			// Check if this is a ctrl+z ctrl+y
 			if (await undoRedo(e)) return;
 
@@ -127,6 +131,13 @@ window.addEventListener(
 	true
 );
 
+window.addEventListener("keyup", (e) => {
+	if (keyIgnored) {
+		keyIgnored = false;
+		checkState();
+	}
+});
+
 // Handle clicking DOM elements (e.g. widgets)
 window.addEventListener("mouseup", () => {
 	checkState();