[Feature] Enhance selection toolbox to support bypassing group nodes

src/components/graph/SelectionToolbox.vue

@@ -8,15 +8,22 @@
   >
     <ColorPickerButton v-show="nodeSelected || groupSelected" />
     <Button
-      v-show="nodeSelected"
+      v-show="nodeSelected || groupSelected"
       severity="secondary"
       text
       @click="
-        () => commandStore.execute('Comfy.Canvas.ToggleSelectedNodes.Bypass')
+        () =>
+          nodeSelected
+            ? commandStore.execute('Comfy.Canvas.ToggleSelectedNodes.Bypass')
+            : commandStore.execute(
+                'Comfy.Canvas.ToggleSelectedNodes.BypassGroup'
+              )
       "
       data-testid="bypass-button"
       v-tooltip.top="{
-        value: t('commands.Comfy_Canvas_ToggleSelectedNodes_Bypass.label'),
+        value: nodeSelected
+          ? t('commands.Comfy_Canvas_ToggleSelectedNodes_Bypass.label')
+          : t('commands.Comfy_Canvas_ToggleSelectedNodes_BypassGroup.label'),
         showDelay: 1000
       }"
     >

src/composables/useCoreCommands.ts

@@ -55,6 +55,32 @@ export function useCoreCommands(): ComfyCommand[] {
     })
   }
 
+  const getNodesInSelectedGroups = (): LGraphNode[] => {
+    const selectedGroups = Array.from(app.canvas.selectedItems).filter(
+      (item) => item instanceof LGraphGroup
+    ) as LGraphGroup[]
+    const nodes: LGraphNode[] = []
+    for (const group of selectedGroups) {
+      group.recomputeInsideNodes()
+      for (const node of group.nodes) {
+        if (!nodes.includes(node)) {
+          nodes.push(node)
+        }
+      }
+    }
+    return nodes
+  }
+
+  const toggleSelectedGroupsMode = (mode: LGraphEventMode) => {
+    getNodesInSelectedGroups().forEach((node) => {
+      if (node.mode === mode) {
+        node.mode = LGraphEventMode.ALWAYS
+      } else {
+        node.mode = mode
+      }
+    })
+  }
+
   return [
     {
       id: 'Comfy.NewBlankWorkflow',
@@ -379,6 +405,16 @@ export function useCoreCommands(): ComfyCommand[] {
         app.canvas.setDirty(true, true)
       }
     },
+    {
+      id: 'Comfy.Canvas.ToggleSelectedNodes.BypassGroup',
+      icon: 'pi pi-shield',
+      label: 'Bypass Group Nodes',
+      versionAdded: '1.13.5',
+      function: () => {
+        toggleSelectedGroupsMode(LGraphEventMode.BYPASS)
+        app.canvas.setDirty(true, true)
+      }
+    },
     {
       id: 'Comfy.Canvas.ToggleSelectedNodes.Pin',
       icon: 'pi pi-pin',

src/locales/en/commands.json

@@ -56,6 +56,9 @@
   "Comfy_Canvas_ToggleSelectedNodes_Bypass": {
     "label": "Bypass/Unbypass Selected Nodes"
   },
+  "Comfy_Canvas_ToggleSelectedNodes_BypassGroup": {
+    "label": "Bypass/Unbypass Group Nodes"
+  },
   "Comfy_Canvas_ToggleSelectedNodes_Collapse": {
     "label": "Collapse/Expand Selected Nodes"
   },