Support associated socket for widgets (#3326)

Co-authored-by: github-actions <github-actions@github.com>

browser_tests/fixtures/utils/litegraphUtils.ts

@@ -81,7 +81,7 @@ export class NodeWidgetReference {
         if (!widget) throw new Error(`Widget ${index} not found.`)
 
         const [x, y, w, h] = node.getBounding()
-        return window['app'].canvas.ds.convertOffsetToCanvas([
+        return window['app'].canvasPosToClientPos([
           x + w / 2,
           y + window['LiteGraph']['NODE_TITLE_HEIGHT'] + widget.last_y + 1
         ])
@@ -94,6 +94,36 @@ export class NodeWidgetReference {
     }
   }
 
+  /**
+   * @returns The position of the widget's associated socket
+   */
+  async getSocketPosition(): Promise<Position> {
+    const pos: [number, number] = await this.node.comfyPage.page.evaluate(
+      ([id, index]) => {
+        const node = window['app'].graph.getNodeById(id)
+        if (!node) throw new Error(`Node ${id} not found.`)
+        const widget = node.widgets[index]
+        if (!widget) throw new Error(`Widget ${index} not found.`)
+
+        const slot = node.inputs.find(
+          (slot) => slot.widget?.name === widget.name
+        )
+        if (!slot) throw new Error(`Socket ${widget.name} not found.`)
+
+        const [x, y] = node.getBounding()
+        return window['app'].canvasPosToClientPos([
+          x + slot.pos[0],
+          y + slot.pos[1] + window['LiteGraph']['NODE_TITLE_HEIGHT']
+        ])
+      },
+      [this.node.id, this.index] as const
+    )
+    return {
+      x: pos[0],
+      y: pos[1]
+    }
+  }
+
   async click() {
     await this.node.comfyPage.canvas.click({
       position: await this.getPosition()
@@ -250,7 +280,7 @@ export class NodeReference {
     const targetWidget = await targetNode.getWidget(targetWidgetIndex)
     await this.comfyPage.dragAndDrop(
       await originSlot.getPosition(),
-      await targetWidget.getPosition()
+      await targetWidget.getSocketPosition()
     )
     return originSlot
   }

browser_tests/tests/rightClickMenu.spec.ts

@@ -88,63 +88,6 @@ test.describe('Node Right Click Menu', () => {
     )
   })
 
-  test.describe('Widget conversion', () => {
-    const convertibleWidgetTypes = ['text', 'string', 'number', 'toggle']
-
-    test('Can convert widget to input', async ({ comfyPage }) => {
-      await comfyPage.rightClickEmptyLatentNode()
-      await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
-      await comfyPage.page.getByText('Convert Widget to Input').click()
-      await comfyPage.nextFrame()
-      // The submenu has an identical entry as the base menu - use last
-      await comfyPage.page.getByText('Convert width to input').last().click()
-      await comfyPage.nextFrame()
-      await expect(comfyPage.canvas).toHaveScreenshot(
-        'right-click-node-widget-converted.png'
-      )
-    })
-
-    test('Can convert widget without submenu', async ({ comfyPage }) => {
-      // Right-click the width widget
-      await comfyPage.rightClickEmptyLatentNode()
-      await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')
-      await comfyPage.page.getByText('Convert width to input').click()
-      await comfyPage.nextFrame()
-      await expect(comfyPage.canvas).toHaveScreenshot(
-        'right-click-node-widget-converted.png'
-      )
-    })
-
-    convertibleWidgetTypes.forEach((widgetType) => {
-      test(`Can convert ${widgetType} widget to input`, async ({
-        comfyPage
-      }) => {
-        const nodeType = 'KSampler'
-
-        // To avoid needing multiple clicks, disable nesting of conversion options
-        await comfyPage.setSetting('Comfy.NodeInputConversionSubmenus', false)
-
-        // Add the widget using the node's `addWidget` method
-        await comfyPage.page.evaluate(
-          ([nodeType, widgetType]) => {
-            const node = window['app'].graph.nodes.find(
-              (n) => n.type === nodeType
-            )
-            node.addWidget(widgetType, widgetType, 'defaultValue', () => {}, {})
-          },
-          [nodeType, widgetType]
-        )
-
-        // Verify the context menu includes the conversion option
-        const node = (await comfyPage.getNodeRefsByType(nodeType))[0]
-        const menuOptions = await node.getContextMenuOptionNames()
-        expect(menuOptions.includes(`Convert ${widgetType} to input`)).toBe(
-          true
-        )
-      })
-    })
-  })
-
   test('Can pin and unpin', async ({ comfyPage }) => {
     await comfyPage.rightClickEmptyLatentNode()
     await expect(comfyPage.canvas).toHaveScreenshot('right-click-node.png')