From 44d57ce041e32519e4f1abbd371ea3d0d7936964 Mon Sep 17 00:00:00 2001
From: Austin Mroz <austin@comfy.org>
Date: Sat, 27 Sep 2025 12:23:45 -0500
Subject: [PATCH] Move widget configuration out of sidebar

---
 src/components/graph/SelectionToolbox.vue     |   8 +-
 .../selectionToolbox/ConfigureSubgraph.vue    |  24 +++
 src/components/selectionbar/SubgraphNode.vue  | 150 +++++++++---------
 .../sidebarTabs/useSubgraphNodeTab.ts         |  19 ---
 .../graph/subgraph/useSubgraphNodeDialog.ts   |  21 +++
 src/services/litegraphService.ts              |  21 ++-
 src/stores/workspace/sidebarTabStore.ts       |   2 -
 7 files changed, 136 insertions(+), 109 deletions(-)
 create mode 100644 src/components/graph/selectionToolbox/ConfigureSubgraph.vue
 delete mode 100644 src/composables/sidebarTabs/useSubgraphNodeTab.ts
 create mode 100644 src/core/graph/subgraph/useSubgraphNodeDialog.ts

diff --git a/src/components/graph/SelectionToolbox.vue b/src/components/graph/SelectionToolbox.vue
index 9970c0b47..870bea2ba 100644
--- a/src/components/graph/SelectionToolbox.vue
+++ b/src/components/graph/SelectionToolbox.vue
@@ -22,7 +22,8 @@
         <ColorPickerButton v-if="showColorPicker" />
         <FrameNodes v-if="showFrameNodes" />
         <ConvertToSubgraphButton v-if="showConvertToSubgraph" />
-        <PublishSubgraphButton v-if="showPublishSubgraph" />
+        <ConfigureSubgraph v-if="showSubgraphButtons" />
+        <PublishSubgraphButton v-if="showSubgraphButtons" />
         <MaskEditorButton v-if="showMaskEditor" />
         <VerticalDivider
           v-if="showAnyPrimaryActions && showAnyControlActions"
@@ -50,6 +51,7 @@ import { computed, ref } from 'vue'
 
 import BypassButton from '@/components/graph/selectionToolbox/BypassButton.vue'
 import ColorPickerButton from '@/components/graph/selectionToolbox/ColorPickerButton.vue'
+import ConfigureSubgraph from '@/components/graph/selectionToolbox/ConfigureSubgraph.vue'
 import ConvertToSubgraphButton from '@/components/graph/selectionToolbox/ConvertToSubgraphButton.vue'
 import DeleteButton from '@/components/graph/selectionToolbox/DeleteButton.vue'
 import ExecuteButton from '@/components/graph/selectionToolbox/ExecuteButton.vue'
@@ -112,7 +114,7 @@ const showInfoButton = computed(() => !!nodeDef.value)
 const showColorPicker = computed(() => hasAnySelection.value)
 const showConvertToSubgraph = computed(() => hasAnySelection.value)
 const showFrameNodes = computed(() => hasMultipleSelection.value)
-const showPublishSubgraph = computed(() => isSingleSubgraph.value)
+const showSubgraphButtons = computed(() => isSingleSubgraph.value)
 
 const showBypass = computed(
   () =>
@@ -130,7 +132,7 @@ const showAnyPrimaryActions = computed(
     showColorPicker.value ||
     showConvertToSubgraph.value ||
     showFrameNodes.value ||
-    showPublishSubgraph.value
+    showSubgraphButtons.value
 )
 
 const showAnyControlActions = computed(() => showBypass.value)
diff --git a/src/components/graph/selectionToolbox/ConfigureSubgraph.vue b/src/components/graph/selectionToolbox/ConfigureSubgraph.vue
new file mode 100644
index 000000000..00e8db986
--- /dev/null
+++ b/src/components/graph/selectionToolbox/ConfigureSubgraph.vue
@@ -0,0 +1,24 @@
+<template>
+  <Button
+    v-tooltip.top="{
+      value: t('Edit Subgraph Widgets'),
+      showDelay: 1000
+    }"
+    severity="secondary"
+    text
+    @click="showSubgraphNodeDialog"
+  >
+    <template #icon>
+      <i-lucide:settings2 />
+    </template>
+  </Button>
+</template>
+
+<script setup lang="ts">
+import Button from 'primevue/button'
+import { useI18n } from 'vue-i18n'
+
+import { showSubgraphNodeDialog } from '@/core/graph/subgraph/useSubgraphNodeDialog'
+
+const { t } = useI18n()
+</script>
diff --git a/src/components/selectionbar/SubgraphNode.vue b/src/components/selectionbar/SubgraphNode.vue
index 2af45a245..c032741dd 100644
--- a/src/components/selectionbar/SubgraphNode.vue
+++ b/src/components/selectionbar/SubgraphNode.vue
@@ -5,7 +5,6 @@ import draggable from 'vuedraggable'
 
 import SearchBox from '@/components/common/SearchBox.vue'
 import SubgraphNodeWidget from '@/components/selectionbar/SubgraphNodeWidget.vue'
-import SidebarTabTemplate from '@/components/sidebar/tabs/SidebarTabTemplate.vue'
 import {
   type ProxyWidgetsProperty,
   parseProxyWidgets
@@ -14,6 +13,7 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph'
 import { SubgraphNode } from '@/lib/litegraph/src/subgraph/SubgraphNode'
 import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets'
 import { useCanvasStore } from '@/renderer/core/canvas/canvasStore'
+import { useDialogStore } from '@/stores/dialogStore'
 
 type WidgetItem = [LGraphNode, IBaseWidget]
 
@@ -32,6 +32,7 @@ function toKey(item: WidgetItem) {
 const activeNode = computed(() => {
   const node = canvasStore.selectedItems[0]
   if (node instanceof SubgraphNode) return node
+  useDialogStore().closeDialog()
   return undefined
 })
 
@@ -184,85 +185,76 @@ const filteredActive = computed<WidgetItem[]>(() => {
 })
 </script>
 <template>
-  <SidebarTabTemplate
-    :title="'Parameters'"
-    class="workflows-sidebar-tab bg-[var(--p-tree-background)]"
-  >
-    <template #header>
-      <SearchBox
-        v-model:model-value="searchQuery"
-        class="model-lib-search-box p-2 2xl:p-4"
-        :placeholder="$t('g.search') + '...'"
+  <SearchBox
+    v-model:model-value="searchQuery"
+    class="model-lib-search-box p-2 2xl:p-4"
+    :placeholder="$t('g.search') + '...'"
+  />
+  <div v-if="filteredActive.length" class="widgets-section">
+    <div class="widgets-section-header">
+      <div>{{ t('subgraphStore.shown') }}</div>
+      <a @click.stop="hideAll"> {{ t('subgraphStore.hideAll') }}</a>
+    </div>
+    <div v-if="searchQuery" class="w-full">
+      <div
+        v-for="element in filteredActive"
+        :key="toKey(element)"
+        class="w-full"
+      >
+        <SubgraphNodeWidget
+          :node-id="`${element[0].id}`"
+          :node-title="element[0].title"
+          :widget-name="element[1].name"
+          :toggle-visibility="toggleVisibility"
+          :is-shown="true"
+        />
+      </div>
+    </div>
+    <draggable
+      v-else
+      v-model="activeWidgets"
+      group="enabledWidgets"
+      class="w-full cursor-grab"
+      chosen-class="cursor-grabbing"
+      drag-class="cursor-grabbing"
+      :animation="100"
+      item-key="id"
+    >
+      <template #item="{ element }">
+        <SubgraphNodeWidget
+          :node-id="`${element[0].id}`"
+          :node-title="element[0].title"
+          :widget-name="element[1].name"
+          :is-shown="true"
+          :toggle-visibility="toggleVisibility"
+          :is-draggable="true"
+        />
+      </template>
+    </draggable>
+  </div>
+  <div v-if="filteredCandidates.length" class="widgets-section">
+    <div class="widgets-section-header">
+      <div>{{ t('subgraphStore.hidden') }}</div>
+      <a @click.stop="showAll"> {{ t('subgraphStore.showAll') }}</a>
+    </div>
+    <div
+      v-for="element in filteredCandidates"
+      :key="toKey(element)"
+      class="w-full"
+    >
+      <SubgraphNodeWidget
+        :node-id="`${element[0].id}`"
+        :node-title="element[0].title"
+        :widget-name="element[1].name"
+        :toggle-visibility="toggleVisibility"
       />
-    </template>
-    <template #body>
-      <div v-if="filteredActive.length" class="widgets-section">
-        <div class="widgets-section-header">
-          <div>{{ t('subgraphStore.shown') }}</div>
-          <a @click.stop="hideAll"> {{ t('subgraphStore.hideAll') }}</a>
-        </div>
-        <div v-if="searchQuery" class="w-full">
-          <div
-            v-for="element in filteredActive"
-            :key="toKey(element)"
-            class="w-full"
-          >
-            <SubgraphNodeWidget
-              :node-id="`${element[0].id}`"
-              :node-title="element[0].title"
-              :widget-name="element[1].name"
-              :toggle-visibility="toggleVisibility"
-              :is-shown="true"
-            />
-          </div>
-        </div>
-        <draggable
-          v-else
-          v-model="activeWidgets"
-          group="enabledWidgets"
-          class="w-full cursor-grab"
-          chosen-class="cursor-grabbing"
-          drag-class="cursor-grabbing"
-          :animation="100"
-          item-key="id"
-        >
-          <template #item="{ element }">
-            <SubgraphNodeWidget
-              :node-id="`${element[0].id}`"
-              :node-title="element[0].title"
-              :widget-name="element[1].name"
-              :is-shown="true"
-              :toggle-visibility="toggleVisibility"
-              :is-draggable="true"
-            />
-          </template>
-        </draggable>
-      </div>
-      <div v-if="filteredCandidates.length" class="widgets-section">
-        <div class="widgets-section-header">
-          <div>{{ t('subgraphStore.hidden') }}</div>
-          <a @click.stop="showAll"> {{ t('subgraphStore.showAll') }}</a>
-        </div>
-        <div
-          v-for="element in filteredCandidates"
-          :key="toKey(element)"
-          class="w-full"
-        >
-          <SubgraphNodeWidget
-            :node-id="`${element[0].id}`"
-            :node-title="element[0].title"
-            :widget-name="element[1].name"
-            :toggle-visibility="toggleVisibility"
-          />
-        </div>
-      </div>
-      <div v-if="recommendedWidgets.length" class="justify-center flex py-4">
-        <Button size="small" @click.stop="showRecommended">
-          {{ t('subgraphStore.showRecommended') }}
-        </Button>
-      </div>
-    </template>
-  </SidebarTabTemplate>
+    </div>
+  </div>
+  <div v-if="recommendedWidgets.length" class="justify-center flex py-4">
+    <Button size="small" @click.stop="showRecommended">
+      {{ t('subgraphStore.showRecommended') }}
+    </Button>
+  </div>
 </template>
 <style scoped>
 .widgets-section-header {
diff --git a/src/composables/sidebarTabs/useSubgraphNodeTab.ts b/src/composables/sidebarTabs/useSubgraphNodeTab.ts
deleted file mode 100644
index 31d19cefc..000000000
--- a/src/composables/sidebarTabs/useSubgraphNodeTab.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { markRaw } from 'vue'
-
-import SubgraphNode from '@/components/selectionbar/SubgraphNode.vue'
-import type { SidebarTabExtension } from '@/types/extensionTypes'
-
-export const useSubgraphNodeTab = (): SidebarTabExtension => {
-  return {
-    id: 'sgn',
-    icon: 'pi pi-chart-bar',
-    iconBadge: () => {
-      return null
-    },
-    title: 'subgraph widgets',
-    tooltip: 'Change displayed subgraph widgets',
-    label: 'subgraph widgets',
-    component: markRaw(SubgraphNode),
-    type: 'vue'
-  }
-}
diff --git a/src/core/graph/subgraph/useSubgraphNodeDialog.ts b/src/core/graph/subgraph/useSubgraphNodeDialog.ts
new file mode 100644
index 000000000..7977dd626
--- /dev/null
+++ b/src/core/graph/subgraph/useSubgraphNodeDialog.ts
@@ -0,0 +1,21 @@
+import SubgraphNode from '@/components/selectionbar/SubgraphNode.vue'
+import { type DialogComponentProps, useDialogStore } from '@/stores/dialogStore'
+
+const key = 'global-subgraph-node-config'
+
+export function showSubgraphNodeDialog() {
+  const dialogStore = useDialogStore()
+  const dialogComponentProps: DialogComponentProps = {
+    headless: true,
+    modal: false,
+    closable: false,
+    position: 'right'
+  }
+
+  dialogStore.showDialog({
+    title: 'Parameters',
+    key,
+    component: SubgraphNode,
+    dialogComponentProps
+  })
+}
diff --git a/src/services/litegraphService.ts b/src/services/litegraphService.ts
index 0aa25889f..8289018c7 100644
--- a/src/services/litegraphService.ts
+++ b/src/services/litegraphService.ts
@@ -5,6 +5,7 @@ import { useNodeAnimatedImage } from '@/composables/node/useNodeAnimatedImage'
 import { useNodeCanvasImagePreview } from '@/composables/node/useNodeCanvasImagePreview'
 import { useNodeImage, useNodeVideo } from '@/composables/node/useNodeImage'
 import { addWidgetPromotionOptions } from '@/core/graph/subgraph/proxyWidgetUtils'
+import { showSubgraphNodeDialog } from '@/core/graph/subgraph/useSubgraphNodeDialog'
 import { st, t } from '@/i18n'
 import {
   type IContextMenuValue,
@@ -825,13 +826,21 @@ export const useLitegraphService = () => {
         }
       }
       if (this instanceof SubgraphNode) {
-        options.unshift({
-          content: 'Unpack Subgraph',
-          callback: () => {
-            useNodeOutputStore().revokeSubgraphPreviews(this)
-            this.graph.unpackSubgraph(this)
+        options.unshift(
+          {
+            content: 'Edit Subgraph Widgets',
+            callback: () => {
+              showSubgraphNodeDialog()
+            }
+          },
+          {
+            content: 'Unpack Subgraph',
+            callback: () => {
+              useNodeOutputStore().revokeSubgraphPreviews(this)
+              this.graph.unpackSubgraph(this)
+            }
           }
-        })
+        )
       }
       if (this.graph && !this.graph.isRootGraph) {
         const [x, y] = canvas.canvas_mouse
diff --git a/src/stores/workspace/sidebarTabStore.ts b/src/stores/workspace/sidebarTabStore.ts
index ad4cc7d8c..fec3df08b 100644
--- a/src/stores/workspace/sidebarTabStore.ts
+++ b/src/stores/workspace/sidebarTabStore.ts
@@ -4,7 +4,6 @@ import { computed, ref } from 'vue'
 import { useModelLibrarySidebarTab } from '@/composables/sidebarTabs/useModelLibrarySidebarTab'
 import { useNodeLibrarySidebarTab } from '@/composables/sidebarTabs/useNodeLibrarySidebarTab'
 import { useQueueSidebarTab } from '@/composables/sidebarTabs/useQueueSidebarTab'
-import { useSubgraphNodeTab } from '@/composables/sidebarTabs/useSubgraphNodeTab'
 import { t, te } from '@/i18n'
 import { useWorkflowsSidebarTab } from '@/platform/workflow/management/composables/useWorkflowsSidebarTab'
 import { useCommandStore } from '@/stores/commandStore'
@@ -93,7 +92,6 @@ export const useSidebarTabStore = defineStore('sidebarTab', () => {
     registerSidebarTab(useNodeLibrarySidebarTab())
     registerSidebarTab(useModelLibrarySidebarTab())
     registerSidebarTab(useWorkflowsSidebarTab())
-    registerSidebarTab(useSubgraphNodeTab())
 
     const menuStore = useMenuItemStore()