Edit group name on group creation (With Ctrl + g) (#715)

* Editor store * Merge editors * nit * Edit on group creation * nit
Comfy-Org · Sep 3, 2024 · 4a230f7 · 4a230f7
1 parent 4ad1e67
commit 4a230f7
Show file tree

Hide file tree

Showing 7 changed files with 184 additions and 209 deletions.
diff --git a/browser_tests/interaction.spec.ts b/browser_tests/interaction.spec.ts
@@ -165,6 +165,9 @@ test.describe('Node Interaction', () => {
     await comfyPage.page.keyboard.press('KeyG')
     await comfyPage.page.keyboard.up('Control')
     await comfyPage.nextFrame()
+    // Confirm group title
+    await comfyPage.page.keyboard.press('Enter')
+    await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('group-selected-nodes.png')
   })
 })

diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue
@@ -5,17 +5,15 @@
         <SideToolbar />
       </template>
     </LiteGraphCanvasSplitterOverlay>
-    <NodeTitleEditor />
-    <GroupTitleEditor />
+    <TitleEditor />
     <canvas ref="canvasRef" id="graph-canvas" tabindex="1" />
   </teleport>
   <NodeSearchboxPopover v-if="nodeSearchEnabled" />
   <NodeTooltip />
 </template>
 
 <script setup lang="ts">
-import NodeTitleEditor from '@/components/graph/NodeTitleEditor.vue'
-import GroupTitleEditor from '@/components/graph/GroupTitleEditor.vue'
+import TitleEditor from '@/components/graph/TitleEditor.vue'
 import SideToolbar from '@/components/sidebar/SideToolbar.vue'
 import LiteGraphCanvasSplitterOverlay from '@/components/LiteGraphCanvasSplitterOverlay.vue'
 import NodeSearchboxPopover from '@/components/searchbox/NodeSearchBoxPopover.vue'

diff --git a/src/components/graph/GroupTitleEditor.vue b/src/components/graph/GroupTitleEditor.vue
diff --git a/src/components/graph/NodeTitleEditor.vue b/src/components/graph/NodeTitleEditor.vue