diff --git a/browser_tests/rightClickMenu.spec.ts b/browser_tests/rightClickMenu.spec.ts index 69e683354f..3667519104 100644 --- a/browser_tests/rightClickMenu.spec.ts +++ b/browser_tests/rightClickMenu.spec.ts @@ -4,25 +4,19 @@ import { NodeBadgeMode } from '../src/types/nodeSource' import { comfyPageFixture as test } from './fixtures/ComfyPage' test.describe('Canvas Right Click Menu', () => { - // See https://github.com/comfyanonymous/ComfyUI/issues/3883 - // Right-click menu on canvas's option sequence is not stable. - test.skip('Can add node', async ({ comfyPage }) => { + test('Can add node', async ({ comfyPage }) => { await comfyPage.rightClickCanvas() await expect(comfyPage.canvas).toHaveScreenshot('right-click-menu.png') await comfyPage.page.getByText('Add Node').click() await comfyPage.nextFrame() - await expect(comfyPage.canvas).toHaveScreenshot('add-node-menu.png') await comfyPage.page.getByText('loaders').click() await comfyPage.nextFrame() - await expect(comfyPage.canvas).toHaveScreenshot('add-node-menu-loaders.png') await comfyPage.page.getByText('Load VAE').click() await comfyPage.nextFrame() await expect(comfyPage.canvas).toHaveScreenshot('add-node-node-added.png') }) - // See https://github.com/comfyanonymous/ComfyUI/issues/3883 - // Right-click menu on canvas's option sequence is not stable. - test.skip('Can add group', async ({ comfyPage }) => { + test('Can add group', async ({ comfyPage }) => { await comfyPage.rightClickCanvas() await expect(comfyPage.canvas).toHaveScreenshot('right-click-menu.png') await comfyPage.page.getByText('Add Group', { exact: true }).click() diff --git a/browser_tests/rightClickMenu.spec.ts-snapshots/add-group-group-added-chromium-2x-linux.png b/browser_tests/rightClickMenu.spec.ts-snapshots/add-group-group-added-chromium-2x-linux.png new file mode 100644 index 0000000000..234b0623c9 Binary files /dev/null and b/browser_tests/rightClickMenu.spec.ts-snapshots/add-group-group-added-chromium-2x-linux.png differ diff --git a/browser_tests/rightClickMenu.spec.ts-snapshots/add-group-group-added-chromium-linux.png b/browser_tests/rightClickMenu.spec.ts-snapshots/add-group-group-added-chromium-linux.png index e15265b56e..0abdf32940 100644 Binary files a/browser_tests/rightClickMenu.spec.ts-snapshots/add-group-group-added-chromium-linux.png and b/browser_tests/rightClickMenu.spec.ts-snapshots/add-group-group-added-chromium-linux.png differ diff --git a/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-menu-chromium-linux.png b/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-menu-chromium-linux.png deleted file mode 100644 index 14a53a319d..0000000000 Binary files a/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-menu-chromium-linux.png and /dev/null differ diff --git a/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-menu-loaders-chromium-linux.png b/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-menu-loaders-chromium-linux.png deleted file mode 100644 index 367d34c9e6..0000000000 Binary files a/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-menu-loaders-chromium-linux.png and /dev/null differ diff --git a/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-node-added-chromium-2x-linux.png b/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-node-added-chromium-2x-linux.png new file mode 100644 index 0000000000..4237a978e4 Binary files /dev/null and b/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-node-added-chromium-2x-linux.png differ diff --git a/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-node-added-chromium-linux.png b/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-node-added-chromium-linux.png index cb9f4ee3ff..287a30a105 100644 Binary files a/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-node-added-chromium-linux.png and b/browser_tests/rightClickMenu.spec.ts-snapshots/add-node-node-added-chromium-linux.png differ diff --git a/browser_tests/rightClickMenu.spec.ts-snapshots/right-click-menu-chromium-2x-linux.png b/browser_tests/rightClickMenu.spec.ts-snapshots/right-click-menu-chromium-2x-linux.png new file mode 100644 index 0000000000..3aa3e01ee4 Binary files /dev/null and b/browser_tests/rightClickMenu.spec.ts-snapshots/right-click-menu-chromium-2x-linux.png differ diff --git a/browser_tests/rightClickMenu.spec.ts-snapshots/right-click-menu-chromium-linux.png b/browser_tests/rightClickMenu.spec.ts-snapshots/right-click-menu-chromium-linux.png index 0a0387b831..0c0cc5bf67 100644 Binary files a/browser_tests/rightClickMenu.spec.ts-snapshots/right-click-menu-chromium-linux.png and b/browser_tests/rightClickMenu.spec.ts-snapshots/right-click-menu-chromium-linux.png differ diff --git a/package-lock.json b/package-lock.json index afc170112b..1108e804d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "^1.3.1", "@comfyorg/comfyui-electron-types": "^0.4.20", - "@comfyorg/litegraph": "^0.9.0", + "@comfyorg/litegraph": "^0.9.2", "@primevue/forms": "^4.2.5", "@primevue/themes": "^4.2.5", "@sentry/vue": "^8.48.0", @@ -297,9 +297,9 @@ "license": "GPL-3.0-only" }, "node_modules/@comfyorg/litegraph": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.9.0.tgz", - "integrity": "sha512-pdQVFqxTQQno2pJlOQtzKsDSoOPUKy4CYpGGf7gyhfjGuXNEwtCrkNwHljGIvBXTTL2txBYklQu/lLqTLG5ASQ==", + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.9.2.tgz", + "integrity": "sha512-b7DPy9ScM9zYIqaQzjIIJzcoIcyDgoKhF9xXsZ8bQu8VpKgbKZ7mfz6Ecxm9+xMIbMSJKy/ErnAHtYKAY76C5g==", "license": "MIT" }, "node_modules/@cspotcode/source-map-support": { diff --git a/package.json b/package.json index a4c1e4f19b..2314ac5023 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "^1.3.1", "@comfyorg/comfyui-electron-types": "^0.4.20", - "@comfyorg/litegraph": "^0.9.0", + "@comfyorg/litegraph": "^0.9.2", "@primevue/forms": "^4.2.5", "@primevue/themes": "^4.2.5", "@sentry/vue": "^8.48.0", diff --git a/src/extensions/core/groupOptions.ts b/src/extensions/core/groupOptions.ts index 3b0ae09618..9f0e21ba66 100644 --- a/src/extensions/core/groupOptions.ts +++ b/src/extensions/core/groupOptions.ts @@ -32,16 +32,17 @@ app.registerExtension({ this.graph_mouse[1] ) if (!group) { - options.push({ - content: 'Add Group For Selected Nodes', - disabled: !this.selectedItems?.size, - callback: () => { - const group = new LGraphGroup() - addNodesToGroup(group, this.selectedItems) - this.graph.add(group) - this.graph.change() - } - }) + if (this.selectedItems.size > 0) { + options.push({ + content: 'Add Group For Selected Nodes', + callback: () => { + const group = new LGraphGroup() + addNodesToGroup(group, this.selectedItems) + this.graph.add(group) + this.graph.change() + } + }) + } return options }