mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-04 15:10:06 +00:00
This pull request refactors the node selection logic in the Vue nodes event handler composable to simplify the function signature and improve single vs. multi-selection behavior. The main change is the removal of the `wasDragging` parameter from the `handleNodeSelect` function, with selection logic now determined by the current selection state. Related test code is updated to match the new function signature. **Node selection logic improvements:** * Refactored the `handleNodeSelect` function in `useNodeEventHandlersIndividual` to remove the `wasDragging` parameter, making the function signature simpler and relying on selection state to handle single vs. multi-selection. * Updated the selection logic to check if multiple nodes are already selected using `isLGraphNode`, and only perform single selection if not. **Code and test updates:** * Updated all calls to `handleNodeSelect` in the composable to remove the `wasDragging` argument, ensuring consistent usage throughout the codebase. [[1]](diffhunk://#diff-8d3820a1ca9c569bce00671fdd6290af81315ae11b8f3d6f29a5a9d30379d084L125-R123) [[2]](diffhunk://#diff-8d3820a1ca9c569bce00671fdd6290af81315ae11b8f3d6f29a5a9d30379d084L146-R144) [[3]](diffhunk://#diff-8d3820a1ca9c569bce00671fdd6290af81315ae11b8f3d6f29a5a9d30379d084L173-R171) * Updated all related test cases to use the new `handleNodeSelect` signature without the third parameter. [[1]](diffhunk://#diff-89bfc2a05201c6ff7116578efa45f96097594eb346f18446c70aa7125ab1811aL105-R105) [[2]](diffhunk://#diff-89bfc2a05201c6ff7116578efa45f96097594eb346f18446c70aa7125ab1811aL125-R125) [[3]](diffhunk://#diff-89bfc2a05201c6ff7116578efa45f96097594eb346f18446c70aa7125ab1811aL144-R144) [[4]](diffhunk://#diff-89bfc2a05201c6ff7116578efa45f96097594eb346f18446c70aa7125ab1811aL162-R162) [[5]](diffhunk://#diff-89bfc2a05201c6ff7116578efa45f96097594eb346f18446c70aa7125ab1811aL174-R174) [[6]](diffhunk://#diff-89bfc2a05201c6ff7116578efa45f96097594eb346f18446c70aa7125ab1811aL187-R187) **Utility import:** * Added an import for `isLGraphNode` from `@/utils/litegraphUtil` to support the updated selection logic.## Summary <!-- One sentence describing what changed and why. --> ## Screenshots (if applicable) https://github.com/user-attachments/assets/71e856d3-afc2-497d-826e-5b485066e7fe --------- Co-authored-by: github-actions <github-actions@github.com>
208 lines
5.3 KiB
TypeScript
208 lines
5.3 KiB
TypeScript
import { createTestingPinia } from '@pinia/testing'
|
|
import { mount } from '@vue/test-utils'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import { computed, toValue } from 'vue'
|
|
import type { ComponentProps } from 'vue-component-type-helpers'
|
|
import { createI18n } from 'vue-i18n'
|
|
|
|
import type { VueNodeData } from '@/composables/graph/useGraphNodeManager'
|
|
import { TransformStateKey } from '@/renderer/core/layout/injectionKeys'
|
|
import LGraphNode from '@/renderer/extensions/vueNodes/components/LGraphNode.vue'
|
|
import { useVueElementTracking } from '@/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking'
|
|
|
|
const mockData = vi.hoisted(() => ({
|
|
mockNodeIds: new Set<string>(),
|
|
mockExecuting: false
|
|
}))
|
|
|
|
vi.mock('@/renderer/core/canvas/canvasStore', () => {
|
|
const getCanvas = vi.fn()
|
|
const useCanvasStore = () => ({
|
|
getCanvas,
|
|
selectedNodeIds: computed(() => mockData.mockNodeIds)
|
|
})
|
|
return {
|
|
useCanvasStore
|
|
}
|
|
})
|
|
|
|
vi.mock(
|
|
'@/renderer/extensions/vueNodes/composables/useNodeEventHandlers',
|
|
() => {
|
|
const handleNodeSelect = vi.fn()
|
|
return { useNodeEventHandlers: () => ({ handleNodeSelect }) }
|
|
}
|
|
)
|
|
|
|
vi.mock(
|
|
'@/renderer/extensions/vueNodes/composables/useVueNodeResizeTracking',
|
|
() => ({
|
|
useVueElementTracking: vi.fn()
|
|
})
|
|
)
|
|
|
|
vi.mock('@/composables/useErrorHandling', () => ({
|
|
useErrorHandling: () => ({
|
|
toastErrorHandler: vi.fn()
|
|
})
|
|
}))
|
|
|
|
vi.mock('@/renderer/extensions/vueNodes/layout/useNodeLayout', () => ({
|
|
useNodeLayout: () => ({
|
|
position: { x: 100, y: 50 },
|
|
size: { width: 200, height: 100 },
|
|
startDrag: vi.fn(),
|
|
handleDrag: vi.fn(),
|
|
endDrag: vi.fn()
|
|
})
|
|
}))
|
|
|
|
vi.mock(
|
|
'@/renderer/extensions/vueNodes/execution/useNodeExecutionState',
|
|
() => ({
|
|
useNodeExecutionState: vi.fn(() => ({
|
|
executing: computed(() => mockData.mockExecuting),
|
|
progress: computed(() => undefined),
|
|
progressPercentage: computed(() => undefined),
|
|
progressState: computed(() => undefined as any),
|
|
executionState: computed(() => 'idle' as const)
|
|
}))
|
|
})
|
|
)
|
|
|
|
vi.mock('@/renderer/extensions/vueNodes/preview/useNodePreviewState', () => ({
|
|
useNodePreviewState: vi.fn(() => ({
|
|
latestPreviewUrl: computed(() => ''),
|
|
shouldShowPreviewImg: computed(() => false)
|
|
}))
|
|
}))
|
|
|
|
vi.mock('../composables/useNodeResize', () => ({
|
|
useNodeResize: vi.fn(() => ({
|
|
startResize: vi.fn(),
|
|
isResizing: computed(() => false)
|
|
}))
|
|
}))
|
|
|
|
const i18n = createI18n({
|
|
legacy: false,
|
|
locale: 'en',
|
|
messages: {
|
|
en: {
|
|
'Node Render Error': 'Node Render Error'
|
|
}
|
|
}
|
|
})
|
|
function mountLGraphNode(props: ComponentProps<typeof LGraphNode>) {
|
|
return mount(LGraphNode, {
|
|
props,
|
|
global: {
|
|
plugins: [
|
|
createTestingPinia({
|
|
createSpy: vi.fn
|
|
}),
|
|
i18n
|
|
],
|
|
provide: {
|
|
[TransformStateKey as symbol]: {
|
|
screenToCanvas: vi.fn(),
|
|
canvasToScreen: vi.fn(),
|
|
camera: { z: 1 },
|
|
isNodeInViewport: vi.fn()
|
|
}
|
|
},
|
|
stubs: {
|
|
NodeHeader: true,
|
|
NodeSlots: true,
|
|
NodeWidgets: true,
|
|
NodeContent: true,
|
|
SlotConnectionDot: true
|
|
}
|
|
}
|
|
})
|
|
}
|
|
const mockNodeData: VueNodeData = {
|
|
id: 'test-node-123',
|
|
title: 'Test Node',
|
|
type: 'TestNode',
|
|
mode: 0,
|
|
flags: {},
|
|
inputs: [],
|
|
outputs: [],
|
|
widgets: [],
|
|
selected: false,
|
|
executing: false
|
|
}
|
|
|
|
describe('LGraphNode', () => {
|
|
beforeEach(() => {
|
|
vi.resetAllMocks()
|
|
mockData.mockNodeIds = new Set()
|
|
mockData.mockExecuting = false
|
|
})
|
|
|
|
it('should call resize tracking composable with node ID', () => {
|
|
mountLGraphNode({ nodeData: mockNodeData })
|
|
|
|
expect(useVueElementTracking).toHaveBeenCalledWith(
|
|
expect.any(Function),
|
|
'node'
|
|
)
|
|
const idArg = vi.mocked(useVueElementTracking).mock.calls[0]?.[0]
|
|
const id = toValue(idArg)
|
|
expect(id).toEqual('test-node-123')
|
|
})
|
|
|
|
it('should render with data-node-id attribute', () => {
|
|
const wrapper = mountLGraphNode({ nodeData: mockNodeData })
|
|
|
|
expect(wrapper.attributes('data-node-id')).toBe('test-node-123')
|
|
})
|
|
|
|
it('should render node title', () => {
|
|
// Don't stub NodeHeader for this test so we can see the title
|
|
const wrapper = mount(LGraphNode, {
|
|
props: { nodeData: mockNodeData },
|
|
global: {
|
|
plugins: [
|
|
createTestingPinia({
|
|
createSpy: vi.fn
|
|
}),
|
|
i18n
|
|
],
|
|
provide: {
|
|
[TransformStateKey as symbol]: {
|
|
screenToCanvas: vi.fn(),
|
|
canvasToScreen: vi.fn(),
|
|
camera: { z: 1 },
|
|
isNodeInViewport: vi.fn()
|
|
}
|
|
},
|
|
stubs: {
|
|
NodeSlots: true,
|
|
NodeWidgets: true,
|
|
NodeContent: true,
|
|
SlotConnectionDot: true
|
|
}
|
|
}
|
|
})
|
|
|
|
expect(wrapper.text()).toContain('Test Node')
|
|
})
|
|
|
|
it('should apply selected styling when selected prop is true', () => {
|
|
mockData.mockNodeIds = new Set(['test-node-123'])
|
|
const wrapper = mountLGraphNode({ nodeData: mockNodeData })
|
|
expect(wrapper.classes()).toContain('outline-2')
|
|
expect(wrapper.classes()).toContain('outline-node-component-outline')
|
|
})
|
|
|
|
it('should apply executing animation when executing prop is true', () => {
|
|
mockData.mockExecuting = true
|
|
|
|
const wrapper = mountLGraphNode({ nodeData: mockNodeData })
|
|
|
|
expect(wrapper.classes()).toContain('animate-pulse')
|
|
})
|
|
})
|