mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-31 13:29:55 +00:00
This pull request introduces a new extension API for context menu customization, allowing extensions to contribute items to both canvas and node right-click menus. It adds two collection methods to the `ComfyApp` class to aggregate these menu items from all registered extensions, and updates the extension interface accordingly. Comprehensive unit tests are included to verify the correct aggregation behavior and error handling. **Extension API for Context Menus:** * Added optional `getCanvasMenuItems` and `getNodeMenuItems` methods to the `ComfyExtension` interface, enabling extensions to provide context menu items for canvas and node right-click menus (`src/types/comfy.ts`). * Updated type imports to support the new API, including `IContextMenuValue`, `LGraphCanvas`, and `LGraphNode` (`src/types/comfy.ts`, `src/scripts/app.ts`). [[1]](diffhunk://#diff-c29886a1b0c982c6fff3545af0ca8ec269876c2cf3948f867d08c14032c04d66L1-R5) [[2]](diffhunk://#diff-bde0dce9fe2403685d27b0e94a938c3d72824d02d01d1fd6167a0dddc6e585ddR10) **Core Implementation:** * Implemented `collectCanvasMenuItems` and `collectNodeMenuItems` methods in the `ComfyApp` class to gather menu items from all extensions, with robust error handling and logging for extension failures (`src/scripts/app.ts`). **Testing:** * Added a comprehensive test suite for the new context menu extension API, covering aggregation logic, error handling, and integration scenarios (`tests-ui/tests/extensions/contextMenuExtension.test.ts`). This is PR 1 of the 3 PRs in the Contextmenu standardizations. -https://github.com/Comfy-Org/ComfyUI_frontend/pull/5992 -https://github.com/Comfy-Org/ComfyUI_frontend/pull/5993
201 lines
6.2 KiB
TypeScript
201 lines
6.2 KiB
TypeScript
import { createTestingPinia } from '@pinia/testing'
|
|
import { setActivePinia } from 'pinia'
|
|
import { beforeEach, describe, expect, it } from 'vitest'
|
|
|
|
import type { IContextMenuValue } from '@/lib/litegraph/src/interfaces'
|
|
import type { LGraphCanvas, LGraphNode } from '@/lib/litegraph/src/litegraph'
|
|
import { useExtensionService } from '@/services/extensionService'
|
|
import { useExtensionStore } from '@/stores/extensionStore'
|
|
import type { ComfyExtension } from '@/types/comfy'
|
|
|
|
describe('Context Menu Extension API', () => {
|
|
let mockCanvas: LGraphCanvas
|
|
let mockNode: LGraphNode
|
|
let extensionStore: ReturnType<typeof useExtensionStore>
|
|
let extensionService: ReturnType<typeof useExtensionService>
|
|
|
|
// Mock menu items
|
|
const canvasMenuItem1: IContextMenuValue = {
|
|
content: 'Canvas Item 1',
|
|
callback: () => {}
|
|
}
|
|
const canvasMenuItem2: IContextMenuValue = {
|
|
content: 'Canvas Item 2',
|
|
callback: () => {}
|
|
}
|
|
const nodeMenuItem1: IContextMenuValue = {
|
|
content: 'Node Item 1',
|
|
callback: () => {}
|
|
}
|
|
const nodeMenuItem2: IContextMenuValue = {
|
|
content: 'Node Item 2',
|
|
callback: () => {}
|
|
}
|
|
|
|
// Mock extensions
|
|
const createCanvasMenuExtension = (
|
|
name: string,
|
|
items: IContextMenuValue[]
|
|
): ComfyExtension => ({
|
|
name,
|
|
getCanvasMenuItems: () => items
|
|
})
|
|
|
|
const createNodeMenuExtension = (
|
|
name: string,
|
|
items: IContextMenuValue[]
|
|
): ComfyExtension => ({
|
|
name,
|
|
getNodeMenuItems: () => items
|
|
})
|
|
|
|
beforeEach(() => {
|
|
setActivePinia(createTestingPinia({ stubActions: false }))
|
|
extensionStore = useExtensionStore()
|
|
extensionService = useExtensionService()
|
|
|
|
mockCanvas = {
|
|
graph_mouse: [100, 100],
|
|
selectedItems: new Set()
|
|
} as unknown as LGraphCanvas
|
|
|
|
mockNode = {
|
|
id: 1,
|
|
type: 'TestNode',
|
|
pos: [0, 0]
|
|
} as unknown as LGraphNode
|
|
})
|
|
|
|
describe('collectCanvasMenuItems', () => {
|
|
it('should call getCanvasMenuItems and collect into flat array', () => {
|
|
const ext1 = createCanvasMenuExtension('Extension 1', [canvasMenuItem1])
|
|
const ext2 = createCanvasMenuExtension('Extension 2', [
|
|
canvasMenuItem2,
|
|
{ content: 'Item 3', callback: () => {} }
|
|
])
|
|
|
|
extensionStore.registerExtension(ext1)
|
|
extensionStore.registerExtension(ext2)
|
|
|
|
const items = extensionService
|
|
.invokeExtensions('getCanvasMenuItems', mockCanvas)
|
|
.flat() as IContextMenuValue[]
|
|
|
|
expect(items).toHaveLength(3)
|
|
expect(items[0]).toMatchObject({ content: 'Canvas Item 1' })
|
|
expect(items[1]).toMatchObject({ content: 'Canvas Item 2' })
|
|
expect(items[2]).toMatchObject({ content: 'Item 3' })
|
|
})
|
|
|
|
it('should support submenus and separators', () => {
|
|
const extension = createCanvasMenuExtension('Test Extension', [
|
|
{
|
|
content: 'Menu with Submenu',
|
|
has_submenu: true,
|
|
submenu: {
|
|
options: [
|
|
{ content: 'Submenu Item 1', callback: () => {} },
|
|
{ content: 'Submenu Item 2', callback: () => {} }
|
|
]
|
|
}
|
|
},
|
|
null as unknown as IContextMenuValue,
|
|
{ content: 'After Separator', callback: () => {} }
|
|
])
|
|
|
|
extensionStore.registerExtension(extension)
|
|
|
|
const items = extensionService
|
|
.invokeExtensions('getCanvasMenuItems', mockCanvas)
|
|
.flat() as IContextMenuValue[]
|
|
|
|
expect(items).toHaveLength(3)
|
|
expect(items[0].content).toBe('Menu with Submenu')
|
|
expect(items[0].submenu?.options).toHaveLength(2)
|
|
expect(items[1]).toBeNull()
|
|
expect(items[2].content).toBe('After Separator')
|
|
})
|
|
|
|
it('should skip extensions without getCanvasMenuItems', () => {
|
|
const canvasExtension = createCanvasMenuExtension('Canvas Ext', [
|
|
canvasMenuItem1
|
|
])
|
|
const extensionWithoutCanvasMenu: ComfyExtension = {
|
|
name: 'No Canvas Menu'
|
|
}
|
|
|
|
extensionStore.registerExtension(canvasExtension)
|
|
extensionStore.registerExtension(extensionWithoutCanvasMenu)
|
|
|
|
const items = extensionService
|
|
.invokeExtensions('getCanvasMenuItems', mockCanvas)
|
|
.flat() as IContextMenuValue[]
|
|
|
|
expect(items).toHaveLength(1)
|
|
expect(items[0].content).toBe('Canvas Item 1')
|
|
})
|
|
})
|
|
|
|
describe('collectNodeMenuItems', () => {
|
|
it('should call getNodeMenuItems and collect into flat array', () => {
|
|
const ext1 = createNodeMenuExtension('Extension 1', [nodeMenuItem1])
|
|
const ext2 = createNodeMenuExtension('Extension 2', [
|
|
nodeMenuItem2,
|
|
{ content: 'Item 3', callback: () => {} }
|
|
])
|
|
|
|
extensionStore.registerExtension(ext1)
|
|
extensionStore.registerExtension(ext2)
|
|
|
|
const items = extensionService
|
|
.invokeExtensions('getNodeMenuItems', mockNode)
|
|
.flat() as IContextMenuValue[]
|
|
|
|
expect(items).toHaveLength(3)
|
|
expect(items[0]).toMatchObject({ content: 'Node Item 1' })
|
|
expect(items[1]).toMatchObject({ content: 'Node Item 2' })
|
|
})
|
|
|
|
it('should support submenus', () => {
|
|
const extension = createNodeMenuExtension('Submenu Extension', [
|
|
{
|
|
content: 'Node Menu with Submenu',
|
|
has_submenu: true,
|
|
submenu: {
|
|
options: [
|
|
{ content: 'Node Submenu 1', callback: () => {} },
|
|
{ content: 'Node Submenu 2', callback: () => {} }
|
|
]
|
|
}
|
|
}
|
|
])
|
|
|
|
extensionStore.registerExtension(extension)
|
|
|
|
const items = extensionService
|
|
.invokeExtensions('getNodeMenuItems', mockNode)
|
|
.flat() as IContextMenuValue[]
|
|
|
|
expect(items[0].content).toBe('Node Menu with Submenu')
|
|
expect(items[0].submenu?.options).toHaveLength(2)
|
|
})
|
|
|
|
it('should skip extensions without getNodeMenuItems', () => {
|
|
const nodeExtension = createNodeMenuExtension('Node Ext', [nodeMenuItem1])
|
|
const extensionWithoutNodeMenu: ComfyExtension = {
|
|
name: 'No Node Menu'
|
|
}
|
|
|
|
extensionStore.registerExtension(nodeExtension)
|
|
extensionStore.registerExtension(extensionWithoutNodeMenu)
|
|
|
|
const items = extensionService
|
|
.invokeExtensions('getNodeMenuItems', mockNode)
|
|
.flat() as IContextMenuValue[]
|
|
|
|
expect(items).toHaveLength(1)
|
|
expect(items[0].content).toBe('Node Item 1')
|
|
})
|
|
})
|
|
})
|