Replace locking with pining in core (#734)

* Replace locking with pin in core

* Add extra expectation

* Update litegraph

* Update test expectations [skip ci]

---------

Co-authored-by: github-actions <github-actions@github.com>
This commit is contained in:
Chenlei Hu
2024-09-04 19:59:06 -04:00
committed by GitHub
parent 25a3c30fef
commit 6c7fb5041d
6 changed files with 11 additions and 5 deletions

View File

@@ -92,6 +92,7 @@ test.describe('Node Right Click Menu', () => {
await comfyPage.page.click('.litemenu-entry:has-text("Pin")')
await comfyPage.nextFrame()
await comfyPage.dragAndDrop({ x: 621, y: 617 }, { x: 16, y: 16 })
await expect(comfyPage.canvas).toHaveScreenshot('node-pinned.png')
await comfyPage.rightClickEmptyLatentNode()
await expect(comfyPage.canvas).toHaveScreenshot(
'right-click-pinned-node.png'

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 106 KiB

8
package-lock.json generated
View File

@@ -9,7 +9,7 @@
"version": "1.2.45",
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop": "^1.2.1",
"@comfyorg/litegraph": "^0.7.61",
"@comfyorg/litegraph": "^0.7.63",
"@primevue/themes": "^4.0.0-rc.2",
"@vitejs/plugin-vue": "^5.0.5",
"@vueuse/core": "^11.0.0",
@@ -1883,9 +1883,9 @@
"dev": true
},
"node_modules/@comfyorg/litegraph": {
"version": "0.7.61",
"resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.7.61.tgz",
"integrity": "sha512-u94k2zgOOkvD6G6kf/zxMcGkOQtJXtonsNfCi6eE5I3ErQtxocuGE06ijKxCYMtFXrhSNHipvBNnjF6tCag73w==",
"version": "0.7.63",
"resolved": "https://registry.npmjs.org/@comfyorg/litegraph/-/litegraph-0.7.63.tgz",
"integrity": "sha512-fMPUN7QoGv/sLY8OecN5dE6uNzdFgyZm16xBM2UmskxcWEkDnQzWKalqOlz1w9sl06SolvSvQ3DM0OueThfdjg==",
"license": "MIT"
},
"node_modules/@cspotcode/source-map-support": {

View File

@@ -59,7 +59,7 @@
},
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop": "^1.2.1",
"@comfyorg/litegraph": "^0.7.61",
"@comfyorg/litegraph": "^0.7.63",
"@primevue/themes": "^4.0.0-rc.2",
"@vitejs/plugin-vue": "^5.0.5",
"@vueuse/core": "^11.0.0",

View File

@@ -2881,6 +2881,11 @@ export class ComfyApp {
if (!extension.name) {
throw new Error("Extensions must have a 'name' property.")
}
// https://github.com/Comfy-Org/litegraph.js/pull/117
if (extension.name === 'pysssss.Locking') {
console.log('pysssss.Locking is replaced by pin/unpin in ComfyUI core.')
return
}
if (this.extensions.find((ext) => ext.name === extension.name)) {
throw new Error(`Extension named '${extension.name}' already registered.`)
}