Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 5 commits into from
Sep 3, 2024
+184 −209
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7eca407
Editor store
huchenlei Sep 2, 2024
ef7a5f8
Merge editors
huchenlei Sep 2, 2024
a643184
nit
huchenlei Sep 2, 2024
cef0e32
Edit on group creation
huchenlei Sep 2, 2024
d69b672
nit
huchenlei Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions browser_tests/interaction.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
})
})
Expand Down
6 changes: 2 additions & 4 deletions src/components/graph/GraphCanvas.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
104 changes: 0 additions & 104 deletions src/components/graph/GroupTitleEditor.vue
View file
Open in desktop

This file was deleted.

101 changes: 0 additions & 101 deletions src/components/graph/NodeTitleEditor.vue
View file
Open in desktop

This file was deleted.

Loading
Loading