1.18.7 (#3748)

Backport of major patches

.github/workflows/release.yaml

@@ -2,8 +2,8 @@ name: Create Release Draft
 
 on:
   pull_request:
-    types: [ closed ]
-    branches: [ main, core/* ]
+    types: [closed]
+    branches: [main, core/*, desktop/*]
     paths:
       - 'package.json'
 

browser_tests/fixtures/ComfyPage.ts

@@ -924,6 +924,12 @@ export class ComfyPage {
       return window['app'].canvas.ds.convertOffsetToCanvas(pos)
     }, pos)
   }
+
+  /** Get number of DOM widgets on the canvas. */
+  async getDOMWidgetCount() {
+    return await this.page.locator('.dom-widget').count()
+  }
+
   async getNodeRefById(id: NodeId) {
     return new NodeReference(id, this)
   }

browser_tests/tests/domWidget.spec.ts

@@ -31,4 +31,20 @@ test.describe('DOM Widget', () => {
     await comfyPage.nextFrame()
     await expect(comfyPage.canvas).toHaveScreenshot('focus-mode-on.png')
   })
+
+  // No DOM widget should be created by creation of interim LGraphNode objects.
+  test('Copy node with DOM widget by dragging + alt', async ({ comfyPage }) => {
+    const initialCount = await comfyPage.getDOMWidgetCount()
+
+    // TextEncodeNode1
+    await comfyPage.page.mouse.move(618, 191)
+    await comfyPage.page.keyboard.down('Alt')
+    await comfyPage.page.mouse.down()
+    await comfyPage.page.mouse.move(100, 100)
+    await comfyPage.page.mouse.up()
+    await comfyPage.page.keyboard.up('Alt')
+
+    const finalCount = await comfyPage.getDOMWidgetCount()
+    expect(finalCount).toBe(initialCount + 1)
+  })
 })

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@comfyorg/comfyui-frontend",
-  "version": "1.18.6",
+  "version": "1.18.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@comfyorg/comfyui-frontend",
-      "version": "1.18.6",
+      "version": "1.18.7",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comfyorg/comfyui-frontend",
   "private": true,
-  "version": "1.18.6",
+  "version": "1.18.7",
   "type": "module",
   "repository": "https://github.com/Comfy-Org/ComfyUI_frontend",
   "homepage": "https://comfy.org",

src/composables/setting/useSettingUI.ts

@@ -132,7 +132,8 @@ export function useSettingUI(
       creditsPanel,
       userPanel,
       keybindingPanel,
-      extensionPanel
+      extensionPanel,
+      ...(isElectron() ? [serverConfigPanel] : [])
     ].filter((panel) => panel.component)
   )
 

src/scripts/domWidget.ts

@@ -267,6 +267,15 @@ export const addWidget = <W extends BaseDOMWidget<object | string>>(
   widget: W
 ) => {
   node.addCustomWidget(widget)
+
+  if (node.graph) {
+    useDomWidgetStore().registerWidget(widget)
+  }
+
+  node.onAdded = useChainCallback(node.onAdded, () => {
+    useDomWidgetStore().registerWidget(widget)
+  })
+
   node.onRemoved = useChainCallback(node.onRemoved, () => {
     widget.onRemove?.()
   })
@@ -275,8 +284,6 @@ export const addWidget = <W extends BaseDOMWidget<object | string>>(
     widget.options.beforeResize?.call(widget, node)
     widget.options.afterResize?.call(widget, node)
   })
-
-  useDomWidgetStore().registerWidget(widget)
 }
 
 LGraphNode.prototype.addDOMWidget = function <