From 5b27171fe0f10550406ee7471bf4da1b7ee8b417 Mon Sep 17 00:00:00 2001 From: Amp Date: Fri, 4 Sep 2026 23:22:47 +0000 Subject: [PATCH 01/11] feat: add selectionStore with command-only mutation and derive canvasStore selection (FE-2040) Amp-Thread-ID: https://ampcode.com/threads/T-01a06d2f-2dce-700c-925b-4453696769e4 --- src/components/graph/GraphCanvas.vue | 6 - src/components/graph/SelectionToolbox.test.ts | 65 +++++------ .../selectionToolbox/BypassButton.test.ts | 14 +-- .../ColorPickerButton.test.ts | 6 +- .../rightSidePanel/RightSidePanel.test.ts | 5 +- .../errors/ErrorGroupList.test.ts | 25 ++-- .../rightSidePanel/errors/TabErrors.test.ts | 10 +- .../errors/useErrorGroups.test.ts | 51 ++------ .../parameters/SectionWidgets.test.ts | 6 +- .../subgraph/SubgraphEditor.test.ts | 18 +-- .../graph/useGroupContextMenu.test.ts | 21 +--- src/composables/graph/useGroupContextMenu.ts | 11 +- .../graph/useGroupMenuOptions.test.ts | 5 +- .../graph/useSelectionOperations.ts | 3 +- .../graph/useSelectionState.test.ts | 39 ++----- .../graph/useSubgraphOperations.test.ts | 14 +-- .../graph/useSubgraphOperations.ts | 1 - src/composables/useCoreCommands.ts | 1 - src/composables/useViewErrorsInGraph.test.ts | 9 +- src/composables/useViewErrorsInGraph.ts | 1 - src/core/selection/selectionState.test.ts | 110 ++++++++++++++++++ src/core/selection/selectionState.ts | 105 +++++++++++++++++ src/extensions/core/agentPanel.test.ts | 7 -- src/extensions/core/agentPanel.ts | 2 - .../src/LGraphCanvas.selection.test.ts | 32 ++++- src/lib/litegraph/src/LGraphCanvas.ts | 47 +++++--- .../litegraph/src/utils/selectableItems.ts | 38 ++++++ src/renderer/core/canvas/canvasStore.test.ts | 38 ++++-- src/renderer/core/canvas/canvasStore.ts | 27 ++--- .../core/canvas/selectionStore.test.ts | 46 ++++++++ src/renderer/core/canvas/selectionStore.ts | 66 +++++++++++ .../composables/useNodeEventHandlers.test.ts | 32 +++-- .../composables/useNodeEventHandlers.ts | 6 - .../vueNodes/layout/useNodeDrag.test.ts | 9 +- src/stores/agentNodeSelectionStore.ts | 1 - .../__tests__/canvasSelectionTestUtils.ts | 11 ++ .../extensions/agent/AgentPanelRoot.test.ts | 60 ++++++---- .../extensions/agent/AgentPanelRoot.vue | 2 - 38 files changed, 657 insertions(+), 293 deletions(-) create mode 100644 src/core/selection/selectionState.test.ts create mode 100644 src/core/selection/selectionState.ts create mode 100644 src/lib/litegraph/src/utils/selectableItems.ts create mode 100644 src/renderer/core/canvas/selectionStore.test.ts create mode 100644 src/renderer/core/canvas/selectionStore.ts create mode 100644 src/utils/__tests__/canvasSelectionTestUtils.ts diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue index 0e0b0b00ab5..bb6aa5f5fe7 100644 --- a/src/components/graph/GraphCanvas.vue +++ b/src/components/graph/GraphCanvas.vue @@ -163,7 +163,6 @@ import SideToolbar from '@/components/sidebar/SideToolbar.vue' import TopbarBadges from '@/components/topbar/TopbarBadges.vue' import TopbarSubscribeButton from '@/components/topbar/TopbarSubscribeButton.vue' import WorkflowTabs from '@/components/topbar/WorkflowTabs.vue' -import { useChainCallback } from '@/composables/functional/useChainCallback' import { useGroupContextMenu } from '@/composables/graph/useGroupContextMenu' import { installErrorClearingHooks } from '@/composables/graph/useErrorClearingHooks' import type { NodeState } from '@/types/nodeState' @@ -595,11 +594,6 @@ onMounted(async () => { const sharedStatus = await workflowPersistence.loadSharedWorkflowFromUrlIfPresent() - comfyApp.canvas.onSelectionChange = useChainCallback( - comfyApp.canvas.onSelectionChange, - () => canvasStore.updateSelectedItems() - ) - // Run query-param deep-link loaders (?invite, ?create_workspace, ?pricing, ?topup) await runUrlActionLoaders() diff --git a/src/components/graph/SelectionToolbox.test.ts b/src/components/graph/SelectionToolbox.test.ts index 591724180c4..b4a5d628136 100644 --- a/src/components/graph/SelectionToolbox.test.ts +++ b/src/components/graph/SelectionToolbox.test.ts @@ -10,6 +10,7 @@ import { useSettingStore } from '@/platform/settings/settingStore' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useCanvasInteractions } from '@/renderer/core/canvas/useCanvasInteractions' import { useExtensionService } from '@/services/extensionService' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { useCommandStore } from '@/stores/commandStore' import { ComfyNodeDefImpl, useNodeDefStore } from '@/stores/nodeDefStore' import { @@ -210,21 +211,18 @@ describe('SelectionToolbox', () => { it('should show info button only for single selections', () => { // Single node selection - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() expect(container.querySelector('.info-button')).toBeTruthy() // Multiple node selection - render in separate test scope - canvasStore.selectedItems = [ - createMockPositionable(), - createMockPositionable() - ] + setCanvasSelection([createMockPositionable(), createMockPositionable()]) const { container: container2 } = renderComponent() expect(container2.querySelector('.info-button')).toBeFalsy() }) it('should not show info button when node definition is not found', () => { - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) vi.mocked(useNodeDefStore().fromLGraphNode).mockReturnValue(null) const { container } = renderComponent() expect(container.querySelector('.info-button')).toBeFalsy() @@ -235,7 +233,7 @@ describe('SelectionToolbox', () => { 'Comfy.UseNewMenu': 'Disabled', 'Comfy.NodeLibrary.NewDesign': true }) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() @@ -247,7 +245,7 @@ describe('SelectionToolbox', () => { 'Comfy.UseNewMenu': 'Disabled', 'Comfy.NodeLibrary.NewDesign': false }) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() @@ -259,7 +257,7 @@ describe('SelectionToolbox', () => { 'Comfy.UseNewMenu': 'Top', 'Comfy.NodeLibrary.NewDesign': false }) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() @@ -268,17 +266,14 @@ describe('SelectionToolbox', () => { it('should show color picker for all selections', () => { // Single node selection - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() expect( container.querySelector('[data-testid="color-picker-button"]') ).toBeTruthy() // Multiple node selection - canvasStore.selectedItems = [ - createMockPositionable(), - createMockPositionable() - ] + setCanvasSelection([createMockPositionable(), createMockPositionable()]) const { container: container2 } = renderComponent() expect( container2.querySelector('[data-testid="color-picker-button"]') @@ -287,32 +282,26 @@ describe('SelectionToolbox', () => { it('should show frame nodes only for multiple selections', () => { // Single node selection - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() expect(container.querySelector('.frame-nodes')).toBeFalsy() // Multiple node selection - canvasStore.selectedItems = [ - createMockPositionable(), - createMockPositionable() - ] + setCanvasSelection([createMockPositionable(), createMockPositionable()]) const { container: container2 } = renderComponent() expect(container2.querySelector('.frame-nodes')).toBeTruthy() }) it('should show bypass button for appropriate selections', () => { // Single node selection - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() expect( container.querySelector('[data-testid="bypass-button"]') ).toBeTruthy() // Multiple node selection - canvasStore.selectedItems = [ - createMockPositionable(), - createMockPositionable() - ] + setCanvasSelection([createMockPositionable(), createMockPositionable()]) const { container: container2 } = renderComponent() expect( container2.querySelector('[data-testid="bypass-button"]') @@ -320,7 +309,7 @@ describe('SelectionToolbox', () => { }) it('should show common buttons for all selections', () => { - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() expect( @@ -339,13 +328,13 @@ describe('SelectionToolbox', () => { // Single image node isImageNodeSpy.mockReturnValue(true) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() expect(container.querySelector('.mask-editor-button')).toBeTruthy() // Single non-image node isImageNodeSpy.mockReturnValue(false) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container: container2 } = renderComponent() expect(container2.querySelector('.mask-editor-button')).toBeFalsy() }) @@ -355,13 +344,13 @@ describe('SelectionToolbox', () => { // Single Load3D node isLoad3dNodeSpy.mockReturnValue(true) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() expect(container.querySelector('.load-3d-viewer-button')).toBeTruthy() // Single non-Load3D node isLoad3dNodeSpy.mockReturnValue(false) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container: container2 } = renderComponent() expect(container2.querySelector('.load-3d-viewer-button')).toBeFalsy() }) @@ -375,19 +364,19 @@ describe('SelectionToolbox', () => { filterOutputNodesSpy.mockReturnValue([ { type: 'SaveImage' } ] as LGraphNode[]) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() expect(container.querySelector('.execute-button')).toBeTruthy() // Without output node selected isOutputNodeSpy.mockReturnValue(false) filterOutputNodesSpy.mockReturnValue([]) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container: container2 } = renderComponent() expect(container2.querySelector('.execute-button')).toBeFalsy() // No selection at all - canvasStore.selectedItems = [] + setCanvasSelection([]) const { container: container3 } = renderComponent() expect(container3.querySelector('.execute-button')).toBeFalsy() }) @@ -396,7 +385,7 @@ describe('SelectionToolbox', () => { describe('Divider Visibility Logic', () => { it('should show dividers between button groups when both groups have buttons', () => { // Setup single node to show info + other buttons - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() const dividers = container.querySelectorAll('.vertical-divider') @@ -405,7 +394,7 @@ describe('SelectionToolbox', () => { it('should not show dividers when adjacent groups are empty', () => { // No selection should show minimal buttons and dividers - canvasStore.selectedItems = [] + setCanvasSelection([]) const { container } = renderComponent() expect( @@ -434,7 +423,7 @@ describe('SelectionToolbox', () => { invokeExtensionsAsync: vi.fn() } as ReturnType) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() expect(container.querySelector('.extension-command-button')).toBeTruthy() @@ -444,7 +433,7 @@ describe('SelectionToolbox', () => { const mockExtensionService = vi.mocked(useExtensionService) mockExtensionService.mockReturnValue(createMockExtensionService()) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() expect(container.querySelector('.extension-command-button')).toBeFalsy() @@ -469,7 +458,7 @@ describe('SelectionToolbox', () => { const mockExtensionService = vi.mocked(useExtensionService) mockExtensionService.mockReturnValue(createMockExtensionService()) - canvasStore.selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { container } = renderComponent() const panel = container.querySelector('[data-testid="selection-toolbox"]') @@ -487,7 +476,7 @@ describe('SelectionToolbox', () => { }) it('should hide most buttons when no items selected', () => { - canvasStore.selectedItems = [] + setCanvasSelection([]) const { container } = renderComponent() expect(container.querySelector('.info-button')).toBeFalsy() diff --git a/src/components/graph/selectionToolbox/BypassButton.test.ts b/src/components/graph/selectionToolbox/BypassButton.test.ts index a10b0ab7d02..8ca5467fdf6 100644 --- a/src/components/graph/selectionToolbox/BypassButton.test.ts +++ b/src/components/graph/selectionToolbox/BypassButton.test.ts @@ -9,8 +9,8 @@ import { createI18n } from 'vue-i18n' import BypassButton from '@/components/graph/selectionToolbox/BypassButton.vue' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import { LGraphEventMode } from '@/lib/litegraph/src/litegraph' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useCommandStore } from '@/stores/commandStore' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils' function getMockLGraphNode(): LGraphNode { @@ -22,7 +22,6 @@ vi.mock(import('@/utils/litegraphUtil'), () => ({ })) describe('BypassButton', () => { - let canvasStore: ReturnType let commandStore: ReturnType const i18n = createI18n({ @@ -40,7 +39,6 @@ describe('BypassButton', () => { }) beforeEach(() => { - canvasStore = useCanvasStore() commandStore = useCommandStore() }) @@ -61,19 +59,19 @@ describe('BypassButton', () => { } it('should render bypass button', () => { - canvasStore.selectedItems = [getMockLGraphNode()] + setCanvasSelection([getMockLGraphNode()]) renderComponent() expect(screen.getByTestId('bypass-button')).toBeInTheDocument() }) it('should have correct test id', () => { - canvasStore.selectedItems = [getMockLGraphNode()] + setCanvasSelection([getMockLGraphNode()]) renderComponent() expect(screen.getByTestId('bypass-button')).toBeInTheDocument() }) it('should execute bypass command when clicked', async () => { - canvasStore.selectedItems = [getMockLGraphNode()] + setCanvasSelection([getMockLGraphNode()]) const executeSpy = vi.spyOn(commandStore, 'execute').mockResolvedValue() const { user } = renderComponent() @@ -88,7 +86,7 @@ describe('BypassButton', () => { const bypassedNode = Object.assign(getMockLGraphNode(), { mode: LGraphEventMode.BYPASS }) - canvasStore.selectedItems = [bypassedNode] + setCanvasSelection([bypassedNode]) vi.spyOn(commandStore, 'execute').mockResolvedValue() const { user } = renderComponent() @@ -100,7 +98,7 @@ describe('BypassButton', () => { it('should handle multiple selected items', () => { vi.spyOn(commandStore, 'execute').mockResolvedValue() - canvasStore.selectedItems = [getMockLGraphNode(), getMockLGraphNode()] + setCanvasSelection([getMockLGraphNode(), getMockLGraphNode()]) renderComponent() expect(screen.getByTestId('bypass-button')).toBeInTheDocument() }) diff --git a/src/components/graph/selectionToolbox/ColorPickerButton.test.ts b/src/components/graph/selectionToolbox/ColorPickerButton.test.ts index 07219014af1..1d1c8d3ca53 100644 --- a/src/components/graph/selectionToolbox/ColorPickerButton.test.ts +++ b/src/components/graph/selectionToolbox/ColorPickerButton.test.ts @@ -8,7 +8,7 @@ import { createI18n } from 'vue-i18n' import ColorPickerButton from '@/components/graph/selectionToolbox/ColorPickerButton.vue' import type { Positionable } from '@/lib/litegraph/src/litegraph' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { toGroupId } from '@/types/groupId' function createMockPositionable(): Positionable { @@ -49,13 +49,13 @@ describe('ColorPickerButton', () => { } it('should render when nodes are selected', () => { - useCanvasStore().selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) renderComponent() expect(screen.getByTestId('color-picker-button')).toBeInTheDocument() }) it('should toggle color picker visibility on button click', async () => { - useCanvasStore().selectedItems = [createMockPositionable()] + setCanvasSelection([createMockPositionable()]) const { user } = renderComponent() const button = screen.getByTestId('color-picker-button') diff --git a/src/components/rightSidePanel/RightSidePanel.test.ts b/src/components/rightSidePanel/RightSidePanel.test.ts index b7bd926953e..c925d807c65 100644 --- a/src/components/rightSidePanel/RightSidePanel.test.ts +++ b/src/components/rightSidePanel/RightSidePanel.test.ts @@ -18,6 +18,7 @@ import { useWorkflowStore } from '@/platform/workflow/management/stores/workflow import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useExecutionErrorStore } from '@/stores/executionErrorStore' import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { toNodeId } from '@/types/nodeId' import { getExecutionIdByNode } from '@/utils/graphTraversalUtil' @@ -84,7 +85,7 @@ function renderPanel( const canvasStore = useCanvasStore() canvasStore.currentGraph = currentGraph - canvasStore.selectedItems = [markRaw(node)] + setCanvasSelection([markRaw(node)]) const rightSidePanelStore = useRightSidePanelStore() rightSidePanelStore.activeTab = activeTab @@ -229,7 +230,7 @@ describe('RightSidePanel global parameters tab', () => { const canvasStore = useCanvasStore() canvasStore.currentGraph = rootGraph - canvasStore.selectedItems = [] + setCanvasSelection([]) const rightSidePanelStore = useRightSidePanelStore() rightSidePanelStore.activeTab = 'parameters' diff --git a/src/components/rightSidePanel/errors/ErrorGroupList.test.ts b/src/components/rightSidePanel/errors/ErrorGroupList.test.ts index fe6ae0a0356..640af0720ed 100644 --- a/src/components/rightSidePanel/errors/ErrorGroupList.test.ts +++ b/src/components/rightSidePanel/errors/ErrorGroupList.test.ts @@ -10,6 +10,7 @@ import { createMemoryHistory, createRouter } from 'vue-router' import { testI18n } from '@/components/searchbox/v2/__test__/testUtils' import { useMissingModelStore } from '@/platform/missingModel/missingModelStore' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { app } from '@/scripts/app' import { useExecutionErrorStore } from '@/stores/executionErrorStore' import { isLGraphNode } from '@/utils/litegraphUtil' @@ -33,6 +34,7 @@ vi.mock(import('@/scripts/app'), () => { serialize: vi.fn(() => ({})), getNodeById: vi.fn() } + Object.assign(rootGraph, { rootGraph }) return { app: { rootGraph, @@ -208,20 +210,19 @@ describe('ErrorGroupList selection emphasis', () => { const pinia = getActivePinia()! seedTwoErrorGroups(pinia) renderList(pinia) - const canvasStore = useCanvasStore(pinia) const samplerSection = getSectionByTitle('Missing connection') const loaderSection = getSectionByTitle('Validation failed') expect(isSectionExpanded(samplerSection)).toBe(true) expect(isSectionExpanded(loaderSection)).toBe(true) - canvasStore.selectedItems = [SAMPLER_NODE] + setCanvasSelection([SAMPLER_NODE]) await waitFor(() => { expect(isSectionExpanded(loaderSection)).toBe(false) }) expect(isSectionExpanded(samplerSection)).toBe(true) - canvasStore.selectedItems = [] + setCanvasSelection([]) await waitFor(() => { expect(isSectionExpanded(loaderSection)).toBe(true) }) @@ -231,8 +232,7 @@ describe('ErrorGroupList selection emphasis', () => { it('expands only matched groups for a selection that predates mount', async () => { const pinia = getActivePinia()! seedTwoErrorGroups(pinia) - const canvasStore = useCanvasStore(pinia) - canvasStore.selectedItems = [SAMPLER_NODE] + setCanvasSelection([SAMPLER_NODE]) renderList(pinia) @@ -250,16 +250,15 @@ describe('ErrorGroupList selection emphasis', () => { const pinia = getActivePinia()! seedTwoErrorGroups(pinia) const { user } = renderList(pinia) - const canvasStore = useCanvasStore(pinia) const loaderSection = getSectionByTitle('Validation failed') const [loaderHeader] = within(loaderSection).getAllByRole('button') await user.click(loaderHeader) expect(isSectionExpanded(loaderSection)).toBe(false) - canvasStore.selectedItems = [ + setCanvasSelection([ createNodeFixture('99', 'Unrelated', ROOT_GRAPH, [0, 0, 0, 0]) - ] + ]) await waitFor(() => { // No emphasis: the strip falls back to the workflow summary expect(screen.getByTestId('selection-context-strip')).toHaveTextContent( @@ -276,22 +275,21 @@ describe('ErrorGroupList selection emphasis', () => { const pinia = getActivePinia()! seedTwoErrorGroups(pinia) renderList(pinia) - const canvasStore = useCanvasStore(pinia) const strip = screen.getByTestId('selection-context-strip') expect(strip).toHaveTextContent('2 nodes — 2 errors') - canvasStore.selectedItems = [SAMPLER_NODE] + setCanvasSelection([SAMPLER_NODE]) await waitFor(() => { expect(strip).toHaveTextContent('SamplerNode — 1 issue') }) - canvasStore.selectedItems = [SAMPLER_NODE, LOADER_NODE] + setCanvasSelection([SAMPLER_NODE, LOADER_NODE]) await waitFor(() => { expect(strip).toHaveTextContent('2 nodes selected — 2 issues') }) - canvasStore.selectedItems = [] + setCanvasSelection([]) await waitFor(() => { expect(strip).toHaveTextContent('2 nodes — 2 errors') }) @@ -310,9 +308,8 @@ describe('ErrorGroupList selection emphasis', () => { } ]) renderList(pinia) - const canvasStore = useCanvasStore(pinia) - canvasStore.selectedItems = [SAMPLER_NODE] + setCanvasSelection([SAMPLER_NODE]) const strip = screen.getByTestId('selection-context-strip') await waitFor(() => { diff --git a/src/components/rightSidePanel/errors/TabErrors.test.ts b/src/components/rightSidePanel/errors/TabErrors.test.ts index dc97f5538f1..085bdcc7a50 100644 --- a/src/components/rightSidePanel/errors/TabErrors.test.ts +++ b/src/components/rightSidePanel/errors/TabErrors.test.ts @@ -16,11 +16,11 @@ import { useMissingModelStore } from '@/platform/missingModel/missingModelStore' import type { MissingModelCandidate } from '@/platform/missingModel/types' import { useMissingNodesErrorStore } from '@/platform/nodeReplacement/missingNodesErrorStore' import { useSettingStore } from '@/platform/settings/settingStore' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useExecutionErrorStore } from '@/stores/executionErrorStore' import type { useComfyRegistryService } from '@/services/comfyRegistryService' import type { MissingNodeType } from '@/types/comfy' import { toNodeId } from '@/types/nodeId' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { nodeError, validationError } from '@/utils/__tests__/nodeErrorHelpers' import TabErrors from './TabErrors.vue' @@ -1035,10 +1035,8 @@ describe('TabErrors.vue', () => { }) ) - let canvasStore!: ReturnType let executionErrorStore!: ReturnType renderComponent((pinia) => { - canvasStore = useCanvasStore(pinia) executionErrorStore = useExecutionErrorStore(pinia) executionErrorStore.recordNodeErrors({ '1': nodeError( @@ -1083,7 +1081,7 @@ describe('TabErrors.vue', () => { const missingMediaNode = new LGraphNode('LoadImage') missingMediaNode.id = toNodeId(3) - canvasStore.selectedItems = [missingMediaNode] + setCanvasSelection([missingMediaNode]) await nextTick() expect(errorChip).toHaveAttribute('aria-pressed', 'false') @@ -1099,10 +1097,8 @@ describe('TabErrors.vue', () => { }) ) - let canvasStore!: ReturnType let executionErrorStore!: ReturnType renderComponent((pinia) => { - canvasStore = useCanvasStore(pinia) executionErrorStore = useExecutionErrorStore(pinia) executionErrorStore.recordNodeErrors({ '1': nodeError( @@ -1132,7 +1128,7 @@ describe('TabErrors.vue', () => { const missingMediaNode = new LGraphNode('LoadImage') missingMediaNode.id = toNodeId(3) - canvasStore.selectedItems = [missingMediaNode] + setCanvasSelection([missingMediaNode]) await nextTick() const user = userEvent.setup() diff --git a/src/components/rightSidePanel/errors/useErrorGroups.test.ts b/src/components/rightSidePanel/errors/useErrorGroups.test.ts index 09fdc1bdb64..50aa091f913 100644 --- a/src/components/rightSidePanel/errors/useErrorGroups.test.ts +++ b/src/components/rightSidePanel/errors/useErrorGroups.test.ts @@ -3,15 +3,16 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { nextTick, ref } from 'vue' import { SubgraphNode } from '@/lib/litegraph/src/litegraph' +import type { Positionable } from '@/lib/litegraph/src/interfaces' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import { createBoundaryLinkedSubgraph } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' import type { MissingMediaCandidate } from '@/platform/missingMedia/types' import { useMissingNodesErrorStore } from '@/platform/nodeReplacement/missingNodesErrorStore' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useExecutionErrorStore } from '@/stores/executionErrorStore' import type { useComfyRegistryService } from '@/services/comfyRegistryService' import type { MissingNodeType } from '@/types/comfy' import type { NodeExecutionId } from '@/types/nodeIdentification' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { toNodeId } from '@/types/nodeId' import { nodeError, validationError } from '@/utils/__tests__/nodeErrorHelpers' import { @@ -740,12 +741,8 @@ describe('useErrorGroups', () => { it('includes prompt error when a node is selected', async () => { const { store, groups } = createErrorGroups() - const canvasStore = useCanvasStore() vi.mocked(isLGraphNode).mockReturnValue(true) - canvasStore.selectedItems = fromAny< - typeof canvasStore.selectedItems, - unknown - >([{ id: '1' }]) + setCanvasSelection(fromAny([{ id: '1' }])) store.recordPromptError({ type: 'prompt_no_outputs', message: 'No outputs', @@ -1110,11 +1107,7 @@ describe('useErrorGroups', () => { makeModel('b.safetensors', { nodeId: '2', directory: 'checkpoints' }) ]) vi.mocked(isLGraphNode).mockReturnValue(true) - const canvasStore = useCanvasStore() - canvasStore.selectedItems = fromAny< - typeof canvasStore.selectedItems, - unknown - >([{ id: '1' }]) + setCanvasSelection(fromAny([{ id: '1' }])) await nextTick() // Displayed groups never shrink with canvas selection — the count @@ -1154,12 +1147,8 @@ describe('useErrorGroups', () => { describe('selection emphasis', () => { it('never marks workflow-level prompt errors as matched by a selection', async () => { const { store, groups } = createErrorGroups() - const canvasStore = useCanvasStore() vi.mocked(isLGraphNode).mockReturnValue(true) - canvasStore.selectedItems = fromAny< - typeof canvasStore.selectedItems, - unknown - >([{ id: '1' }]) + setCanvasSelection(fromAny([{ id: '1' }])) store.recordPromptError({ type: 'prompt_no_outputs', message: 'No outputs', @@ -1196,7 +1185,6 @@ describe('useErrorGroups', () => { it('matches groups and cards of the selected error node', async () => { const { store, groups } = createErrorGroups() - const canvasStore = useCanvasStore() vi.mocked(isLGraphNode).mockReturnValue(true) const selectedNode = { id: '1' } vi.mocked(getNodeByExecutionId).mockImplementation((_, nodeId) => @@ -1204,10 +1192,7 @@ describe('useErrorGroups', () => { nodeId === '1' ? selectedNode : { id: nodeId } ) ) - canvasStore.selectedItems = fromAny< - typeof canvasStore.selectedItems, - unknown - >([selectedNode]) + setCanvasSelection(fromAny([selectedNode])) store.recordNodeErrors({ '1': { class_type: 'KSampler', @@ -1243,15 +1228,11 @@ describe('useErrorGroups', () => { it('narrows missing-node emphasis to packs containing the selected node', async () => { const { groups } = createErrorGroups() const missingNodesStore = useMissingNodesErrorStore() - const canvasStore = useCanvasStore() vi.mocked(isLGraphNode).mockReturnValue(true) vi.mocked(getNodeByExecutionId).mockImplementation((_, nodeId) => fromAny({ id: nodeId }) ) - canvasStore.selectedItems = fromAny< - typeof canvasStore.selectedItems, - unknown - >([{ id: '2' }]) + setCanvasSelection(fromAny([{ id: '2' }])) missingNodesStore.setMissingNodeTypes([ makeMissingNodeType('NodeB', { cnrId: 'pack-1', nodeId: '2' }), makeMissingNodeType('NodeC', { cnrId: 'pack-2', nodeId: '3' }) @@ -1276,15 +1257,11 @@ describe('useErrorGroups', () => { it('does not emphasize missing-node groups for unrelated selections', async () => { const { groups } = createErrorGroups() const missingNodesStore = useMissingNodesErrorStore() - const canvasStore = useCanvasStore() vi.mocked(isLGraphNode).mockReturnValue(true) vi.mocked(getNodeByExecutionId).mockImplementation((_, nodeId) => fromAny({ id: nodeId }) ) - canvasStore.selectedItems = fromAny< - typeof canvasStore.selectedItems, - unknown - >([{ id: '99' }]) + setCanvasSelection(fromAny([{ id: '99' }])) missingNodesStore.setMissingNodeTypes([ makeMissingNodeType('NodeB', { cnrId: 'pack-1', nodeId: '2' }) ]) @@ -1303,7 +1280,6 @@ describe('useErrorGroups', () => { it('matches errors through graph resolution, not raw execution ids', async () => { const { store, groups } = createErrorGroups() - const canvasStore = useCanvasStore() vi.mocked(isLGraphNode).mockReturnValue(true) // The error is keyed by a subgraph execution id ('2:5') that resolves // to a different graph node id ('7') at the current graph level. @@ -1313,10 +1289,7 @@ describe('useErrorGroups', () => { nodeId === '2:5' ? selectedNode : undefined ) ) - canvasStore.selectedItems = fromAny< - typeof canvasStore.selectedItems, - unknown - >([selectedNode]) + setCanvasSelection(fromAny([selectedNode])) store.recordNodeErrors({ '2:5': { class_type: 'KSampler', @@ -1332,7 +1305,6 @@ describe('useErrorGroups', () => { it('matches interior errors when a subgraph container is selected', async () => { const { store, groups } = createErrorGroups() - const canvasStore = useCanvasStore() vi.mocked(isLGraphNode).mockReturnValue(true) // A container selection matches interior errors by execution-id prefix, // even when the interior node does not resolve at the current level. @@ -1345,10 +1317,7 @@ describe('useErrorGroups', () => { vi.mocked(getExecutionIdByNode).mockReturnValue( fromAny('2') ) - canvasStore.selectedItems = fromAny< - typeof canvasStore.selectedItems, - unknown - >([containerNode]) + setCanvasSelection(fromAny([containerNode])) store.recordNodeErrors({ '2:5': { class_type: 'KSampler', diff --git a/src/components/rightSidePanel/parameters/SectionWidgets.test.ts b/src/components/rightSidePanel/parameters/SectionWidgets.test.ts index 423c880f4c4..db7dcff2a83 100644 --- a/src/components/rightSidePanel/parameters/SectionWidgets.test.ts +++ b/src/components/rightSidePanel/parameters/SectionWidgets.test.ts @@ -123,7 +123,11 @@ describe('SectionWidgets', () => { beforeEach(() => { useCanvasStore().canvas = fromPartial({ setDirty, - graph: fromPartial({ getNodeById }), + graph: fromPartial({ + id: 'root', + rootGraph: { id: 'root' }, + getNodeById + }), animateToBounds }) }) diff --git a/src/components/rightSidePanel/subgraph/SubgraphEditor.test.ts b/src/components/rightSidePanel/subgraph/SubgraphEditor.test.ts index 65fb2e7914d..84ad6743e91 100644 --- a/src/components/rightSidePanel/subgraph/SubgraphEditor.test.ts +++ b/src/components/rightSidePanel/subgraph/SubgraphEditor.test.ts @@ -10,7 +10,7 @@ import { } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' import { LGraphNode } from '@/lib/litegraph/src/litegraph' import { useSettingStore } from '@/platform/settings/settingStore' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { usePreviewExposureStore } from '@/stores/previewExposureStore' import { promotedInputWidget } from '@/core/graph/subgraph/promotedInputWidget' @@ -78,7 +78,7 @@ describe('SubgraphEditor', () => { sourcePreviewName: '$$canvas-image-preview' } ) - useCanvasStore().selectedItems = [host] + setCanvasSelection([host]) render(SubgraphEditor, { container: document.body.appendChild(document.createElement('div')), @@ -125,7 +125,7 @@ describe('SubgraphEditor', () => { secondInput.widget = { name: secondWidget.name } promoteValueWidgetViaSubgraphInput(host, firstNode, firstWidget) promoteValueWidgetViaSubgraphInput(host, secondNode, secondWidget) - useCanvasStore().selectedItems = [host] + setCanvasSelection([host]) let listSetter: ((value: PromotedRow[]) => void) | undefined const draggableListStub = { @@ -194,7 +194,7 @@ describe('SubgraphEditor', () => { const sourceInput = sourceNode.addInput('first', 'STRING') const sourceWidget = sourceNode.addWidget('text', 'first', '', () => {}) sourceInput.widget = { name: sourceWidget.name } - useCanvasStore().selectedItems = [host] + setCanvasSelection([host]) render(SubgraphEditor, { container: document.body.appendChild(document.createElement('div')), @@ -234,7 +234,7 @@ describe('SubgraphEditor', () => { hiddenWidget.visibility.surfaces.vueNode = 'never' pseudoWidget.visibility.surfaces.vueNode = 'never' useSettingStore().settingValues['Comfy.VueNodes.Enabled'] = true - useCanvasStore().selectedItems = [host] + setCanvasSelection([host]) render(SubgraphEditor, { container: document.body.appendChild(document.createElement('div')), @@ -264,7 +264,7 @@ describe('SubgraphEditor', () => { secondInput.widget = { name: secondWidget.name } promoteValueWidgetViaSubgraphInput(host, firstNode, firstWidget) promoteValueWidgetViaSubgraphInput(host, secondNode, secondWidget) - useCanvasStore().selectedItems = [host] + setCanvasSelection([host]) render(SubgraphEditor, { container: document.body.appendChild(document.createElement('div')), @@ -297,7 +297,7 @@ describe('SubgraphEditor', () => { const sourceWidget = sourceNode.addWidget('text', 'first', '', () => {}) sourceInput.widget = { name: sourceWidget.name } promoteValueWidgetViaSubgraphInput(host, sourceNode, sourceWidget) - useCanvasStore().selectedItems = [host] + setCanvasSelection([host]) render(SubgraphEditor, { container: document.body.appendChild(document.createElement('div')), @@ -324,7 +324,7 @@ describe('SubgraphEditor', () => { const sourceInput = sourceNode.addInput('first', 'STRING') const sourceWidget = sourceNode.addWidget('text', 'first', '', () => {}) sourceInput.widget = { name: sourceWidget.name } - useCanvasStore().selectedItems = [host] + setCanvasSelection([host]) render(SubgraphEditor, { container: document.body.appendChild(document.createElement('div')), @@ -358,7 +358,7 @@ describe('SubgraphEditor', () => { sourcePreviewName: '$$canvas-image-preview' }) - useCanvasStore().selectedItems = [host] + setCanvasSelection([host]) render(SubgraphEditor, { container: document.body.appendChild(document.createElement('div')), diff --git a/src/composables/graph/useGroupContextMenu.test.ts b/src/composables/graph/useGroupContextMenu.test.ts index 9b42921cdb1..f3b092d2aa6 100644 --- a/src/composables/graph/useGroupContextMenu.test.ts +++ b/src/composables/graph/useGroupContextMenu.test.ts @@ -7,7 +7,6 @@ import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import { LGraphCanvas, LiteGraph } from '@/lib/litegraph/src/litegraph' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' const { mockShowNodeOptions, mockGetCanvasContextMenuTarget } = vi.hoisted( () => ({ @@ -30,7 +29,7 @@ vi.mock( ) interface StubCanvas { - graph: object + graph: { id: string; rootGraph: { id: string } } deselectAll: ReturnType selectedItems: Set state: { selectionChanged: boolean } @@ -57,7 +56,7 @@ describe('useGroupContextMenu', () => { useGroupContextMenu() stubCanvas = { - graph: {}, + graph: { id: 'root', rootGraph: { id: 'root' } }, deselectAll: vi.fn(), selectedItems: new Set(), state: { selectionChanged: false } @@ -83,14 +82,10 @@ describe('useGroupContextMenu', () => { expect(stubCanvas.selectedItems.has(group)).toBe(true) expect(stubCanvas.state.selectionChanged).toBe(true) expect(group.recomputeInsideNodes).toHaveBeenCalledOnce() - expect( - vi.mocked(useCanvasStore().updateSelectedItems) - ).toHaveBeenCalledOnce() expect(mockShowNodeOptions).toHaveBeenCalledWith(event) - expect( - vi.mocked(useCanvasStore().updateSelectedItems).mock - .invocationCallOrder[0] - ).toBeLessThan(mockShowNodeOptions.mock.invocationCallOrder[0]) + expect(stubCanvas.deselectAll.mock.invocationCallOrder[0]).toBeLessThan( + mockShowNodeOptions.mock.invocationCallOrder[0] + ) expect(legacyMenuMock).not.toHaveBeenCalled() }) @@ -159,9 +154,6 @@ describe('useGroupContextMenu', () => { expect(stubCanvas.selectedItems.has(group)).toBe(true) expect(stubCanvas.state.selectionChanged).toBe(false) expect(group.recomputeInsideNodes).not.toHaveBeenCalled() - expect( - vi.mocked(useCanvasStore().updateSelectedItems) - ).toHaveBeenCalledOnce() expect(mockShowNodeOptions).toHaveBeenCalledWith(event) expect(legacyMenuMock).not.toHaveBeenCalled() }) @@ -179,9 +171,6 @@ describe('useGroupContextMenu', () => { expect(stubCanvas.selectedItems.has(group)).toBe(true) expect(stubCanvas.state.selectionChanged).toBe(true) expect(group.recomputeInsideNodes).toHaveBeenCalledOnce() - expect( - vi.mocked(useCanvasStore().updateSelectedItems) - ).toHaveBeenCalledOnce() expect(mockShowNodeOptions).toHaveBeenCalledWith(event) expect(legacyMenuMock).not.toHaveBeenCalled() }) diff --git a/src/composables/graph/useGroupContextMenu.ts b/src/composables/graph/useGroupContextMenu.ts index ac277514f10..32eb9981ce9 100644 --- a/src/composables/graph/useGroupContextMenu.ts +++ b/src/composables/graph/useGroupContextMenu.ts @@ -1,7 +1,9 @@ import { showNodeOptions } from '@/composables/graph/useMoreOptionsMenu' import { getCanvasContextMenuTarget } from '@/lib/litegraph/src/canvas/getCanvasContextMenuTarget' import { LGraphCanvas, LiteGraph } from '@/lib/litegraph/src/litegraph' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' +import { selectableKeyOf } from '@/lib/litegraph/src/utils/selectableItems' +import { useSelectionStore } from '@/renderer/core/canvas/selectionStore' +import { graphScopeOf } from '@/types/graphScopeId' /** * Routes Nodes 2.0 group right-clicks to Vue while nodes, reroutes, @@ -40,8 +42,13 @@ export function useGroupContextMenu() { group.recomputeInsideNodes() this.selectedItems.add(group) this.state.selectionChanged = true + if (this.graph) { + useSelectionStore().apply(graphScopeOf(this.graph), { + type: 'selection.add', + keys: [selectableKeyOf(group)] + }) + } } - useCanvasStore().updateSelectedItems() showNodeOptions(event) } diff --git a/src/composables/graph/useGroupMenuOptions.test.ts b/src/composables/graph/useGroupMenuOptions.test.ts index a8fb3194697..b9604c1d4bc 100644 --- a/src/composables/graph/useGroupMenuOptions.test.ts +++ b/src/composables/graph/useGroupMenuOptions.test.ts @@ -5,7 +5,7 @@ import { describe, expect, it, vi } from 'vitest' import { useGroupMenuOptions } from '@/composables/graph/useGroupMenuOptions' import { LGraphCanvas, LGraphGroup } from '@/lib/litegraph/src/litegraph' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' // canvasStore transitively imports the app singleton; stub it so the real // ComfyApp module never loads during these unit tests. @@ -24,8 +24,7 @@ const i18n = createI18n({ describe('useGroupMenuOptions.getGroupColorOptions', () => { it('applies the same colour as the circle-swatch picker (LGraphCanvas.node_colors groupcolor)', () => { const group = new LGraphGroup('Test Group') - const canvasStore = useCanvasStore() - canvasStore.selectedItems = [group] + setCanvasSelection([group]) let submenu: { label: string; action: () => void }[] = [] const Wrapper = defineComponent({ diff --git a/src/composables/graph/useSelectionOperations.ts b/src/composables/graph/useSelectionOperations.ts index 3faa19a1822..7dc93a7009d 100644 --- a/src/composables/graph/useSelectionOperations.ts +++ b/src/composables/graph/useSelectionOperations.ts @@ -67,8 +67,7 @@ export function useSelectionOperations() { canvas.copyToClipboard() // Clear selection to avoid confusion - canvas.selectedItems.clear() - canvasStore.updateSelectedItems() + canvas.deselectAll() // Paste to create duplicates canvas.pasteFromClipboard({ connectInputs: false }) diff --git a/src/composables/graph/useSelectionState.test.ts b/src/composables/graph/useSelectionState.test.ts index 93e8e9ae3de..c1affeceb01 100644 --- a/src/composables/graph/useSelectionState.test.ts +++ b/src/composables/graph/useSelectionState.test.ts @@ -4,9 +4,9 @@ import { beforeEach, describe, expect, test, vi } from 'vitest' import { useSelectionState } from '@/composables/graph/useSelectionState' import { LGraphEventMode } from '@/lib/litegraph/src/litegraph' import { useSettingStore } from '@/platform/settings/settingStore' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { ComfyNodeDefImpl, useNodeDefStore } from '@/stores/nodeDefStore' import { useRightSidePanelStore } from '@/stores/workspace/rightSidePanelStore' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { isImageNode, isLGraphNode } from '@/utils/litegraphUtil' import { filterOutputNodes } from '@/utils/nodeFilterUtil' import { @@ -51,12 +51,9 @@ function createMockNodeDef() { } function selectSingleNodeWithNodeDef(id: number) { - const canvasStore = useCanvasStore() const nodeDefStore = useNodeDefStore() - canvasStore.$state.selectedItems = [ - createMockLGraphNode({ id, type: 'TestNode' }) - ] + setCanvasSelection([createMockLGraphNode({ id, type: 'TestNode' })]) vi.mocked(nodeDefStore.fromLGraphNode).mockReturnValue(createMockNodeDef()) } @@ -99,29 +96,26 @@ describe('useSelectionState', () => { }) test('should return true when items selected', () => { - const canvasStore = useCanvasStore() const node1 = createMockLGraphNode({ id: 1 }) const node2 = createMockLGraphNode({ id: 2 }) - canvasStore.$state.selectedItems = [node1, node2] + setCanvasSelection([node1, node2]) const { hasAnySelection } = useSelectionState() expect(hasAnySelection.value).toBe(true) }) test('hasMultipleSelection should be true when 2+ items selected', () => { - const canvasStore = useCanvasStore() const node1 = createMockLGraphNode({ id: 1 }) const node2 = createMockLGraphNode({ id: 2 }) - canvasStore.$state.selectedItems = [node1, node2] + setCanvasSelection([node1, node2]) const { hasMultipleSelection } = useSelectionState() expect(hasMultipleSelection.value).toBe(true) }) test('hasMultipleSelection should be false when only 1 item selected', () => { - const canvasStore = useCanvasStore() const node1 = createMockLGraphNode({ id: 1 }) - canvasStore.$state.selectedItems = [node1] + setCanvasSelection([node1]) const { hasMultipleSelection } = useSelectionState() expect(hasMultipleSelection.value).toBe(false) @@ -130,13 +124,8 @@ describe('useSelectionState', () => { describe('Node Type Filtering', () => { test('should pick only LGraphNodes from mixed selections', () => { - const canvasStore = useCanvasStore() const graphNode = createMockLGraphNode({ id: 3 }) - canvasStore.$state.selectedItems = [ - graphNode, - mockComment, - mockConnection - ] + setCanvasSelection([graphNode, mockComment, mockConnection]) const { selectedNodes } = useSelectionState() expect(selectedNodes.value).toHaveLength(1) @@ -146,12 +135,11 @@ describe('useSelectionState', () => { describe('Node State Computation', () => { test('should detect bypassed nodes', () => { - const canvasStore = useCanvasStore() const bypassedNode = createMockLGraphNode({ id: 4, mode: LGraphEventMode.BYPASS }) - canvasStore.$state.selectedItems = [bypassedNode] + setCanvasSelection([bypassedNode]) const { selectedNodes } = useSelectionState() const isBypassed = selectedNodes.value.some( @@ -161,13 +149,12 @@ describe('useSelectionState', () => { }) test('should detect pinned/collapsed states', () => { - const canvasStore = useCanvasStore() const pinnedNode = createMockLGraphNode({ id: 5, pinned: true }) const collapsedNode = createMockLGraphNode({ id: 6, flags: { collapsed: true } }) - canvasStore.$state.selectedItems = [pinnedNode, collapsedNode] + setCanvasSelection([pinnedNode, collapsedNode]) const { selectedNodes } = useSelectionState() const isPinned = selectedNodes.value.some((n) => n.pinned) @@ -183,9 +170,8 @@ describe('useSelectionState', () => { }) test('should provide non-reactive state computation', () => { - const canvasStore = useCanvasStore() const node = createMockLGraphNode({ id: 7, pinned: true }) - canvasStore.$state.selectedItems = [node] + setCanvasSelection([node]) const { selectedNodes } = useSelectionState() const isPinned = selectedNodes.value.some((n) => n.pinned) @@ -201,7 +187,7 @@ describe('useSelectionState', () => { expect(isBypassed).toBe(false) // Test with empty selection using new composable instance - canvasStore.$state.selectedItems = [] + setCanvasSelection([]) const { selectedNodes: newSelectedNodes } = useSelectionState() const newIsPinned = newSelectedNodes.value.some((n) => n.pinned) expect(newIsPinned).toBe(false) @@ -221,12 +207,11 @@ describe('useSelectionState', () => { }) test('should not open the right side panel for multiple selected nodes', () => { - const canvasStore = useCanvasStore() const rightSidePanelStore = useRightSidePanelStore() - canvasStore.$state.selectedItems = [ + setCanvasSelection([ createMockLGraphNode({ id: 9, type: 'TestNode' }), createMockLGraphNode({ id: 10, type: 'TestNode' }) - ] + ]) const { canOpenNodeInfo, openNodeInfo } = useSelectionState() expect(canOpenNodeInfo.value).toBe(false) diff --git a/src/composables/graph/useSubgraphOperations.test.ts b/src/composables/graph/useSubgraphOperations.test.ts index c423b1cd0e1..6b39ebde8e6 100644 --- a/src/composables/graph/useSubgraphOperations.test.ts +++ b/src/composables/graph/useSubgraphOperations.test.ts @@ -8,6 +8,7 @@ import { useWorkflowStore } from '@/platform/workflow/management/stores/workflow import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useNodeOutputStore } from '@/stores/nodeOutputStore' import { useSubgraphStore } from '@/stores/subgraphStore' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { useSubgraphOperations } from './useSubgraphOperations' const captureCanvasState = vi.fn() @@ -32,7 +33,7 @@ function createRegularNode(): LGraphNode { describe('useSubgraphOperations', () => { beforeEach(() => { - useCanvasStore().selectedItems = [] + setCanvasSelection([]) useWorkflowStore().activeWorkflow = fromPartial({ changeTracker: { captureCanvasState } }) @@ -87,7 +88,7 @@ describe('useSubgraphOperations', () => { }) it('addSubgraphToLibrary calls publishSubgraph when single SubgraphNode selected', async () => { - useCanvasStore().selectedItems = [createSubgraphNode()] + setCanvasSelection([createSubgraphNode()]) const { addSubgraphToLibrary } = useSubgraphOperations() await addSubgraphToLibrary() @@ -96,7 +97,7 @@ describe('useSubgraphOperations', () => { }) it('addSubgraphToLibrary does not call publishSubgraph when no items selected', async () => { - useCanvasStore().selectedItems = [] + setCanvasSelection([]) const { addSubgraphToLibrary } = useSubgraphOperations() await addSubgraphToLibrary() @@ -105,10 +106,7 @@ describe('useSubgraphOperations', () => { }) it('addSubgraphToLibrary does not call publishSubgraph when multiple items selected', async () => { - useCanvasStore().selectedItems = [ - createSubgraphNode(), - createSubgraphNode() - ] + setCanvasSelection([createSubgraphNode(), createSubgraphNode()]) const { addSubgraphToLibrary } = useSubgraphOperations() await addSubgraphToLibrary() @@ -117,7 +115,7 @@ describe('useSubgraphOperations', () => { }) it('addSubgraphToLibrary does not call publishSubgraph when selected item is not a SubgraphNode', async () => { - useCanvasStore().selectedItems = [createRegularNode()] + setCanvasSelection([createRegularNode()]) const { addSubgraphToLibrary } = useSubgraphOperations() await addSubgraphToLibrary() diff --git a/src/composables/graph/useSubgraphOperations.ts b/src/composables/graph/useSubgraphOperations.ts index 111071160aa..02bd4746739 100644 --- a/src/composables/graph/useSubgraphOperations.ts +++ b/src/composables/graph/useSubgraphOperations.ts @@ -25,7 +25,6 @@ export function useSubgraphOperations() { const res = graph.convertToSubgraph(canvas.selectedItems) const { node } = res canvas.select(node) - canvasStore.updateSelectedItems() // Trigger change tracking workflowStore.activeWorkflow?.changeTracker.captureCanvasState() } diff --git a/src/composables/useCoreCommands.ts b/src/composables/useCoreCommands.ts index 5aaa8f7f69c..7695b946b28 100644 --- a/src/composables/useCoreCommands.ts +++ b/src/composables/useCoreCommands.ts @@ -1065,7 +1065,6 @@ export function useCoreCommands(): ComfyCommand[] { const res = graph.convertToSubgraph(canvas.selectedItems) const { node } = res canvas.select(node) - canvasStore.updateSelectedItems() } }, { diff --git a/src/composables/useViewErrorsInGraph.test.ts b/src/composables/useViewErrorsInGraph.test.ts index 1ddecd84e8d..9e8a4080dee 100644 --- a/src/composables/useViewErrorsInGraph.test.ts +++ b/src/composables/useViewErrorsInGraph.test.ts @@ -1,3 +1,4 @@ +import { nextTick } from 'vue' import { beforeEach, describe, expect, it, vi } from 'vitest' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' @@ -50,8 +51,7 @@ function createSelectedCanvas() { }) const node = new LGraphNode('Selected Node') graph.add(node) - canvas.selectedItems.add(node) - node.selected = true + canvas.select(node) return { canvas, node } } @@ -63,7 +63,7 @@ describe('useViewErrorsInGraph', () => { apiMock.storeSettings.mockResolvedValue(undefined) }) - it('opens graph errors and clears app-mode error UI state', () => { + it('opens graph errors and clears app-mode error UI state', async () => { const canvasStore = useCanvasStore() const executionErrorStore = useExecutionErrorStore() const rightSidePanelStore = useRightSidePanelStore() @@ -73,7 +73,8 @@ describe('useViewErrorsInGraph', () => { activeMode: 'app' } as typeof workflowStore.activeWorkflow canvasStore.canvas = canvas - canvasStore.selectedItems = [node] + await nextTick() + expect(canvasStore.selectedItems).toEqual([node]) executionErrorStore.showErrorOverlay() useViewErrorsInGraph().viewErrorsInGraph() diff --git a/src/composables/useViewErrorsInGraph.ts b/src/composables/useViewErrorsInGraph.ts index 6a7d68fd250..c817bc7ba49 100644 --- a/src/composables/useViewErrorsInGraph.ts +++ b/src/composables/useViewErrorsInGraph.ts @@ -11,7 +11,6 @@ export function useViewErrorsInGraph() { canvasStore.linearMode = false if (canvasStore.canvas) { canvasStore.canvas.deselectAll() - canvasStore.updateSelectedItems() } rightSidePanelStore.openPanel('errors') diff --git a/src/core/selection/selectionState.test.ts b/src/core/selection/selectionState.test.ts new file mode 100644 index 00000000000..1f82c3aaf0a --- /dev/null +++ b/src/core/selection/selectionState.test.ts @@ -0,0 +1,110 @@ +import { describe, expect, it } from 'vitest' + +import { + EMPTY_SELECTION, + parseSelectableKey, + reduceSelection, + toSelectableKey +} from './selectionState' +import type { SelectionCommand, SelectionState } from './selectionState' + +const [a, b, c] = ['1', '2', '3'].map((id) => toSelectableKey('node', id)) +const group = toSelectableKey('group', 7) + +function selection(...keys: (typeof a)[]): SelectionState { + return { order: keys } +} + +describe('reduceSelection', () => { + it.for<{ + name: string + state: SelectionState + command: SelectionCommand + order: readonly (typeof a)[] + status: 'applied' | 'no-op' + }>([ + { + name: 'add appends new keys in command order and skips present ones', + state: selection(a), + command: { type: 'selection.add', keys: [b, a, c, b] }, + order: [a, b, c], + status: 'applied' + }, + { + name: 'add of already-selected keys is a no-op', + state: selection(a, b), + command: { type: 'selection.add', keys: [b, a] }, + order: [a, b], + status: 'no-op' + }, + { + name: 'remove drops keys and keeps the remaining order', + state: selection(a, b, c), + command: { type: 'selection.remove', keys: [b] }, + order: [a, c], + status: 'applied' + }, + { + name: 'remove of absent keys is a no-op', + state: selection(a), + command: { type: 'selection.remove', keys: [b] }, + order: [a], + status: 'no-op' + }, + { + name: 'replace dedupes and makes the last key primary', + state: selection(a, b), + command: { type: 'selection.replace', keys: [c, group, c] }, + order: [c, group], + status: 'applied' + }, + { + name: 'replace with the same order is a no-op', + state: selection(a, b), + command: { type: 'selection.replace', keys: [a, b] }, + order: [a, b], + status: 'no-op' + }, + { + name: 'toggle removes present keys and appends absent ones', + state: selection(a, b), + command: { type: 'selection.toggle', keys: [b, c] }, + order: [a, c], + status: 'applied' + }, + { + name: 'clear empties the selection', + state: selection(a, group), + command: { type: 'selection.clear' }, + order: [], + status: 'applied' + }, + { + name: 'clear of an empty selection is a no-op', + state: EMPTY_SELECTION, + command: { type: 'selection.clear' }, + order: [], + status: 'no-op' + } + ])('$name', ({ state, command, order, status }) => { + const transition = reduceSelection(state, command) + expect(transition.status).toBe(status) + expect(transition.state.order).toEqual(order) + if (status === 'no-op') expect(transition.state).toBe(state) + }) + + it('does not mutate the previous state', () => { + const state = selection(a) + reduceSelection(state, { type: 'selection.add', keys: [b] }) + expect(state.order).toEqual([a]) + }) +}) + +describe('selectable keys', () => { + it('round-trips kind and id, including ids containing separators', () => { + const key = toSelectableKey('node', 'a:b') + expect(key).toBe('node:a:b') + expect(parseSelectableKey(key)).toEqual({ kind: 'node', id: 'a:b' }) + expect(parseSelectableKey(group)).toEqual({ kind: 'group', id: '7' }) + }) +}) diff --git a/src/core/selection/selectionState.ts b/src/core/selection/selectionState.ts new file mode 100644 index 00000000000..02e9e4bc262 --- /dev/null +++ b/src/core/selection/selectionState.ts @@ -0,0 +1,105 @@ +export type SelectableKind = 'node' | 'group' | 'reroute' | 'io' + +/** `kind:id` identity of one selectable canvas item within a graph scope. */ +export type SelectableKey = string & { readonly __brand: 'SelectableKey' } + +export function toSelectableKey( + kind: SelectableKind, + id: string | number +): SelectableKey { + return `${kind}:${id}` as SelectableKey +} + +export function parseSelectableKey(key: SelectableKey): { + kind: SelectableKind + id: string +} { + const separator = key.indexOf(':') + return { + kind: key.slice(0, separator) as SelectableKind, + id: key.slice(separator + 1) + } +} + +/** Insertion-ordered selection; the last key is the primary selection. */ +export interface SelectionState { + readonly order: readonly SelectableKey[] +} + +export const EMPTY_SELECTION: SelectionState = { order: [] } + +export type SelectionCommand = + | { + readonly type: 'selection.replace' + readonly keys: readonly SelectableKey[] + } + | { readonly type: 'selection.add'; readonly keys: readonly SelectableKey[] } + | { + readonly type: 'selection.remove' + readonly keys: readonly SelectableKey[] + } + | { + readonly type: 'selection.toggle' + readonly keys: readonly SelectableKey[] + } + | { readonly type: 'selection.clear' } + +export interface SelectionTransition { + readonly state: SelectionState + readonly status: 'applied' | 'no-op' +} + +export function reduceSelection( + state: SelectionState, + command: SelectionCommand +): SelectionTransition { + const order = nextOrder(state.order, command) + return sameOrder(state.order, order) + ? { state, status: 'no-op' } + : { state: { order }, status: 'applied' } +} + +function nextOrder( + order: readonly SelectableKey[], + command: SelectionCommand +): readonly SelectableKey[] { + switch (command.type) { + case 'selection.clear': + return [] + case 'selection.replace': + return unique(command.keys) + case 'selection.add': + return [...order, ...unique(command.keys, new Set(order))] + case 'selection.remove': { + const removed = new Set(command.keys) + return order.filter((key) => !removed.has(key)) + } + case 'selection.toggle': { + const toggled = new Set(command.keys) + return [ + ...order.filter((key) => !toggled.has(key)), + ...unique(command.keys, new Set(order)) + ] + } + } +} + +function unique( + keys: readonly SelectableKey[], + seen = new Set() +): SelectableKey[] { + const result: SelectableKey[] = [] + for (const key of keys) { + if (seen.has(key)) continue + seen.add(key) + result.push(key) + } + return result +} + +function sameOrder( + a: readonly SelectableKey[], + b: readonly SelectableKey[] +): boolean { + return a.length === b.length && a.every((key, index) => key === b[index]) +} diff --git a/src/extensions/core/agentPanel.test.ts b/src/extensions/core/agentPanel.test.ts index ff87eb27e00..c87033f34ef 100644 --- a/src/extensions/core/agentPanel.test.ts +++ b/src/extensions/core/agentPanel.test.ts @@ -10,7 +10,6 @@ import { useAgentConsentStore } from '@/workbench/extensions/agent/stores/agent/ import type { ComfyExtension } from '@/types/comfy' import type { LGraphNode } from '@/lib/litegraph/src/litegraph' import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useAgentNodeSelectionStore } from '@/stores/agentNodeSelectionStore' import { useAgentPanelStore } from '@/workbench/extensions/agent/stores/agent/agentPanelStore' import { createMockLoadedWorkflow } from '@/utils/__tests__/litegraphTestUtils' @@ -18,7 +17,6 @@ import { getNodeByLocatorId } from '@/utils/graphTraversalUtil' import { isLGraphNode } from '@/utils/litegraphUtil' let agentStore: Mocked> -let canvasStore: Mocked> let nodeSelectionStore: Mocked> let workflowStore: ReturnType let consentStore: ReturnType @@ -114,10 +112,8 @@ describe('AgentPanel extension flag gate', () => { vi.mocked(getNodeByLocatorId).mockImplementation(mocks.getNodeByLocatorId) agentStore = vi.mocked(useAgentPanelStore()) agentStore.consentAccepted = false - canvasStore = vi.mocked(useCanvasStore()) nodeSelectionStore = vi.mocked(useAgentNodeSelectionStore()) workflowStore = useWorkflowStore() - canvasStore.updateSelectedItems.mockImplementation(() => {}) nodeSelectionStore.restoreNodeIds.mockImplementation(() => {}) mocks.capturedExtensions.length = 0 mocks.notifyAfterGraphConfigure.mockClear() @@ -128,7 +124,6 @@ describe('AgentPanel extension flag gate', () => { mocks.flagEnabled = undefined mocks.flagListener = null mocks.registerTracker.mockClear() - canvasStore.updateSelectedItems.mockClear() mocks.getNodeByLocatorId.mockReset() nodeSelectionStore.beginWorkflowLoad.mockClear() nodeSelectionStore.finishWorkflowLoad.mockClear() @@ -270,7 +265,6 @@ describe('AgentPanel extension flag gate', () => { expect(mocks.getNodeByLocatorId).toHaveBeenCalledWith(rootGraph, '12') expect(selectItems).toHaveBeenCalledWith([secondNode]) expect(nodeSelectionStore.restoreNodeIds).toHaveBeenCalledWith(['12']) - expect(canvasStore.updateSelectedItems).toHaveBeenCalledOnce() expect(nodeSelectionStore.finishWorkflowLoad).not.toHaveBeenCalled() }) @@ -340,7 +334,6 @@ describe('AgentPanel extension flag gate', () => { expect(nodeSelectionStore.finishWorkflowLoad).toHaveBeenCalledOnce() expect(mocks.getNodeByLocatorId).not.toHaveBeenCalled() - expect(canvasStore.updateSelectedItems).not.toHaveBeenCalled() }) it('finishes restoration when graph configuration fails', async () => { diff --git a/src/extensions/core/agentPanel.ts b/src/extensions/core/agentPanel.ts index fe8d2565a11..2d2d64a59ec 100644 --- a/src/extensions/core/agentPanel.ts +++ b/src/extensions/core/agentPanel.ts @@ -7,7 +7,6 @@ import { registerWorkflowTabActivityTracker } from '@/workbench/extensions/agent import { useAgentConsentStore } from '@/workbench/extensions/agent/stores/agent/agentConsentStore' import { useAgentPanelStore } from '@/workbench/extensions/agent/stores/agent/agentPanelStore' import { useWorkflowStore } from '@/platform/workflow/management/stores/workflowStore' -import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' import { useExtensionService } from '@/services/extensionService' import { useAgentNodeSelectionStore } from '@/stores/agentNodeSelectionStore' import { getNodeByLocatorId } from '@/utils/graphTraversalUtil' @@ -54,7 +53,6 @@ export function registerAgentPanelExtension(): void { nodes.map((node) => workflowStore.nodeToNodeLocatorId(node)) ) canvas?.selectItems(nodes) - useCanvasStore().updateSelectedItems() } catch (error) { nodeSelectionStore.finishWorkflowLoad() throw error diff --git a/src/lib/litegraph/src/LGraphCanvas.selection.test.ts b/src/lib/litegraph/src/LGraphCanvas.selection.test.ts index 65c927c9c89..4f0dce9c164 100644 --- a/src/lib/litegraph/src/LGraphCanvas.selection.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.selection.test.ts @@ -1,4 +1,4 @@ -import { beforeEach, describe, expect, it, vi } from 'vitest' +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import type { Positionable, Rect } from '@/lib/litegraph/src/interfaces' import type { CanvasPointerEvent } from '@/lib/litegraph/src/types/events' @@ -9,6 +9,9 @@ import { LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' +import { selectableKeyOf } from '@/lib/litegraph/src/utils/selectableItems' +import { useSelectionStore } from '@/renderer/core/canvas/selectionStore' +import { graphScopeOf } from '@/types/graphScopeId' import { createMockCanvasRenderingContext2D } from '@/utils/__tests__/litegraphTestUtils' vi.mock(import('@/renderer/core/layout/store/layoutStore')) @@ -30,6 +33,7 @@ function createCanvas(graph: LGraph): LGraphCanvas { width: 800, height: 600 }) + document.body.append(canvasElement) return new LGraphCanvas(canvasElement, graph, { skip_render: true }) } @@ -128,6 +132,12 @@ describe('LGraphCanvas selection', () => { canvas.onSelectionChange = onSelectionChange }) + afterEach(() => { + expect(useSelectionStore().selectedKeys(graphScopeOf(graph))).toEqual( + [...canvas.selectedItems].map(selectableKeyOf) + ) + }) + describe('click', () => { it.for<{ name: string; modifiers: Modifiers; expected: string[] }>([ { name: 'plain click replaces', modifiers: {}, expected: ['B'] }, @@ -241,6 +251,26 @@ describe('LGraphCanvas selection', () => { expect(onSelectionChange).toHaveBeenCalledTimes(2) }) + it('deleteSelected() empties the selection', () => { + canvas.select(a) + canvas.select(b) + + canvas.deleteSelected() + + expect(canvas.selectedItems.size).toBe(0) + expect(graph.nodes).toHaveLength(0) + }) + + it('setGraph() clears the selection of the graph being left', () => { + canvas.select(a) + const scope = graphScopeOf(graph) + + canvas.setGraph(new LGraph()) + + expect(useSelectionStore().selectedKeys(scope)).toEqual([]) + expect(a.selected).toBeFalsy() + }) + it('deselectAll() reports only when something was selected', () => { canvas.deselectAll() expect(onSelectionChange).not.toHaveBeenCalled() diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index ee7b39088c4..8169a09ff6f 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -17,6 +17,9 @@ import { import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations' import { layoutStore } from '@/renderer/core/layout/store/layoutStore' import { LayoutSource } from '@/renderer/core/layout/types' +import type { SelectionCommand } from '@/core/selection/selectionState' +import { selectableKeyOf } from '@/lib/litegraph/src/utils/selectableItems' +import { useSelectionStore } from '@/renderer/core/canvas/selectionStore' import { useLinkPresentationStore } from '@/stores/linkPresentationStore' import { useLinkStore } from '@/stores/linkStore' import { graphScopeOf } from '@/types/graphScopeId' @@ -1848,6 +1851,7 @@ export class LGraphCanvas implements CustomEventDispatcher this.selected_nodes = {} this.selected_group = null this.selectedItems.clear() + this.#applySelection({ type: 'selection.clear' }) this.state.selectionChanged = true this.onSelectionChange?.(this.selected_nodes) @@ -4538,9 +4542,7 @@ export class LGraphCanvas implements CustomEventDispatcher // remove the user's ability to keep children selected (e.g. for // deletion) after toggling the group off. if (item instanceof LGraphGroup && this.groupSelectChildren) { - item.selected = false - this.selectedItems.delete(item) - this.state.selectionChanged = true + this.#setSelected(item, false) } else { this.deselect(item) } @@ -4563,9 +4565,7 @@ export class LGraphCanvas implements CustomEventDispatcher if (this.selectOnly && !(item instanceof LGraphNode)) return if (item.selected && this.selectedItems.has(item)) return - item.selected = true - this.selectedItems.add(item) - this.state.selectionChanged = true + this.#setSelected(item, true) if (item instanceof LGraphGroup) { item.recomputeInsideNodes() @@ -4574,9 +4574,7 @@ export class LGraphCanvas implements CustomEventDispatcher item, (child) => { if (!child.selected || !this.selectedItems.has(child)) { - child.selected = true - this.selectedItems.add(child) - this.state.selectionChanged = true + this.#setSelected(child, true) } }, (child) => this.select(child) @@ -4620,18 +4618,14 @@ export class LGraphCanvas implements CustomEventDispatcher ): void { if (!item.selected && !this.selectedItems.has(item)) return - item.selected = false - this.selectedItems.delete(item) - this.state.selectionChanged = true + this.#setSelected(item, false) if (item instanceof LGraphGroup && this.groupSelectChildren) { this.#traverseGroupChildren( item, (child) => { if (child.selected || this.selectedItems.has(child)) { - child.selected = false - this.selectedItems.delete(child) - this.state.selectionChanged = true + this.#setSelected(child, false) } }, (child) => this.deselect(child) @@ -4671,6 +4665,23 @@ export class LGraphCanvas implements CustomEventDispatcher } } + #setSelected(item: Positionable, selected: boolean): void { + item.selected = selected + if (selected) this.selectedItems.add(item) + else this.selectedItems.delete(item) + this.state.selectionChanged = true + this.#applySelection({ + type: selected ? 'selection.add' : 'selection.remove', + keys: [selectableKeyOf(item)] + }) + } + + #applySelection(command: SelectionCommand): void { + const { graph } = this + if (!graph) return + useSelectionStore().apply(graphScopeOf(graph), command) + } + /** * Iterative traversal of a group's descendants. * Calls {@link groupAction} on nested groups and {@link leafAction} on @@ -4773,6 +4784,11 @@ export class LGraphCanvas implements CustomEventDispatcher } selected.clear() if (wasSelected) selected.add(wasSelected) + this.#applySelection( + wasSelected + ? { type: 'selection.replace', keys: [selectableKeyOf(wasSelected)] } + : { type: 'selection.clear' } + ) this.setDirty(true) @@ -4843,6 +4859,7 @@ export class LGraphCanvas implements CustomEventDispatcher this.selected_nodes = {} this.selectedItems.clear() + this.#applySelection({ type: 'selection.clear' }) this.current_node = null this.highlighted_links = {} diff --git a/src/lib/litegraph/src/utils/selectableItems.ts b/src/lib/litegraph/src/utils/selectableItems.ts new file mode 100644 index 00000000000..48f31f11778 --- /dev/null +++ b/src/lib/litegraph/src/utils/selectableItems.ts @@ -0,0 +1,38 @@ +import { + parseSelectableKey, + toSelectableKey +} from '@/core/selection/selectionState' +import type { SelectableKey } from '@/core/selection/selectionState' +import { toNodeId } from '@/types/nodeId' +import { toRerouteId } from '@/types/rerouteId' + +import type { LGraph } from '../LGraph' +import type { Positionable } from '../interfaces' +import { LGraphGroup, LGraphNode, Reroute, Subgraph } from '../litegraph' + +export function selectableKeyOf(item: Positionable): SelectableKey { + if (item instanceof LGraphNode) return toSelectableKey('node', item.id) + if (item instanceof LGraphGroup) return toSelectableKey('group', item.id) + if (item instanceof Reroute) return toSelectableKey('reroute', item.id) + return toSelectableKey('io', item.id) +} + +export function resolveSelectable( + graph: LGraph, + key: SelectableKey +): Positionable | undefined { + const { kind, id } = parseSelectableKey(key) + switch (kind) { + case 'node': + return graph.getNodeById(toNodeId(id)) ?? undefined + case 'group': + return graph._groups.find((group) => String(group.id) === id) + case 'reroute': + return graph.getReroute(toRerouteId(Number(id))) + case 'io': + if (!(graph instanceof Subgraph)) return undefined + return [graph.inputNode, graph.outputNode].find( + (ioNode) => String(ioNode.id) === id + ) + } +} diff --git a/src/renderer/core/canvas/canvasStore.test.ts b/src/renderer/core/canvas/canvasStore.test.ts index c0ea3080864..cc76647e984 100644 --- a/src/renderer/core/canvas/canvasStore.test.ts +++ b/src/renderer/core/canvas/canvasStore.test.ts @@ -6,7 +6,10 @@ import { beforeEach, describe, expect, it, vi } from 'vitest' import { LGraphGroup } from '@/lib/litegraph/src/LGraphGroup' import type { LGraphCanvas, Positionable } from '@/lib/litegraph/src/litegraph' import { LGraph, LGraphNode } from '@/lib/litegraph/src/litegraph' +import { selectableKeyOf } from '@/lib/litegraph/src/utils/selectableItems' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' +import { useSelectionStore } from '@/renderer/core/canvas/selectionStore' +import { graphScopeOf } from '@/types/graphScopeId' const { appModeState } = vi.hoisted(() => ({ appModeState: {} as { isAppMode: Ref } @@ -105,18 +108,24 @@ describe('useCanvasStore', () => { const node = new LGraphNode('test') graph.add(node) - const selectedItems = new Set([node]) + const scope = graphScopeOf(graph) + const selectionStore = useSelectionStore() const fakeCanvas = { canvas: document.createElement('canvas'), graph, - selectedItems, deselect: vi.fn((item: Positionable) => { - selectedItems.delete(item) + selectionStore.apply(scope, { + type: 'selection.remove', + keys: [selectableKeyOf(item)] + }) }) } store.canvas = fakeCanvas as unknown as LGraphCanvas await nextTick() - store.updateSelectedItems() + selectionStore.apply(scope, { + type: 'selection.add', + keys: [selectableKeyOf(node)] + }) expect(store.selectedItems).toContain(node) let stillSelectedInOnRemoved: boolean | undefined @@ -153,10 +162,25 @@ describe('useCanvasStore', () => { }) }) - it('Does not include groups in selected nodeIds', async () => { - store.selectedItems = [new LGraphGroup()] + it('resolves selected keys against the current graph and excludes groups from selectedNodeIds', async () => { + const graph = new LGraph() + const node = new LGraphNode('test') + const group = new LGraphGroup() + graph.add(node) + graph.add(group) + store.canvas = fromPartial({ + canvas: document.createElement('canvas'), + graph + }) + await nextTick() + + useSelectionStore().apply(graphScopeOf(graph), { + type: 'selection.replace', + keys: [selectableKeyOf(group), selectableKeyOf(node)] + }) - expect(store.selectedNodeIds).toHaveLength(0) + expect(store.selectedItems).toEqual([group, node]) + expect([...store.selectedNodeIds]).toEqual([node.id]) }) describe('isReadOnly', () => { diff --git a/src/renderer/core/canvas/canvasStore.ts b/src/renderer/core/canvas/canvasStore.ts index 323f979d8ae..4e794567a26 100644 --- a/src/renderer/core/canvas/canvasStore.ts +++ b/src/renderer/core/canvas/canvasStore.ts @@ -1,7 +1,6 @@ import { useEventListener, whenever } from '@vueuse/core' import { defineStore } from 'pinia' -import { computed, markRaw, ref, shallowRef } from 'vue' -import type { Raw } from 'vue' +import { computed, ref, shallowRef } from 'vue' import { useAppMode } from '@/composables/useAppMode' @@ -13,10 +12,13 @@ import type { LGraphNode, SubgraphNode } from '@/lib/litegraph/src/litegraph' +import { resolveSelectable } from '@/lib/litegraph/src/utils/selectableItems' import { promoteRecommendedWidgets } from '@/core/graph/subgraph/promotionUtils' +import { useSelectionStore } from '@/renderer/core/canvas/selectionStore' import { useLayoutMutations } from '@/renderer/core/layout/operations/layoutMutations' import { LayoutSource } from '@/renderer/core/layout/types' import { app } from '@/scripts/app' +import { graphScopeOf } from '@/types/graphScopeId' import type { NodeId } from '@/types/nodeId' import { isLGraphNode } from '@/utils/litegraphUtil' @@ -43,14 +45,7 @@ export const useCanvasStore = defineStore('canvas', () => { * The root LGraphCanvas object is a shallow ref. */ const canvas = shallowRef(null) - /** - * The selected items on the canvas. All stored items are raw. - */ - const selectedItems = ref[]>([]) - const updateSelectedItems = () => { - const items = Array.from(canvas.value?.selectedItems ?? []) - selectedItems.value = items.map((item) => markRaw(item)) - } + const selectionStore = useSelectionStore() // Reactive scale percentage that syncs with app.canvas.ds.scale const appScalePercentage = ref(100) @@ -130,7 +125,15 @@ export const useCanvasStore = defineStore('canvas', () => { const isInSubgraph = ref(false) const isGhostPlacing = ref(false) - // Provide selection state to all Vue nodes + /** The selected items of the on-screen graph, derived from the selection store. */ + const selectedItems = computed(() => { + const graph = currentGraph.value + if (!graph) return [] + return selectionStore + .selectedKeys(graphScopeOf(graph)) + .flatMap((key) => resolveSelectable(graph, key) ?? []) + }) + const selectedNodeIds = computed>( () => new Set(selectedItems.value.filter(isLGraphNode).map((item) => item.id)) @@ -147,7 +150,6 @@ export const useCanvasStore = defineStore('canvas', () => { 'node:before-removed', (e: CustomEvent<{ node: LGraphNode }>) => { newCanvas.deselect(e.detail.node) - updateSelectedItems() } ) @@ -205,7 +207,6 @@ export const useCanvasStore = defineStore('canvas', () => { appScalePercentage, linearMode, isReadOnly, - updateSelectedItems, getCanvas, setAppZoomFromPercentage, initScaleSync, diff --git a/src/renderer/core/canvas/selectionStore.test.ts b/src/renderer/core/canvas/selectionStore.test.ts new file mode 100644 index 00000000000..77296b79213 --- /dev/null +++ b/src/renderer/core/canvas/selectionStore.test.ts @@ -0,0 +1,46 @@ +import { computed } from 'vue' +import { describe, expect, it } from 'vitest' + +import { toSelectableKey } from '@/core/selection/selectionState' +import { useSelectionStore } from '@/renderer/core/canvas/selectionStore' +import { toOwningGraphId, toRootGraphId } from '@/types/graphScopeId' +import type { GraphScope } from '@/types/graphScopeId' + +const root = toRootGraphId('root') +const rootScope: GraphScope = { + rootGraphId: root, + owningGraphId: toOwningGraphId('root') +} +const subgraphScope: GraphScope = { + rootGraphId: root, + owningGraphId: toOwningGraphId('sub') +} +const node = toSelectableKey('node', 1) +const group = toSelectableKey('group', 2) + +describe('useSelectionStore', () => { + it('keeps each graph scope independent', () => { + const store = useSelectionStore() + + store.apply(rootScope, { type: 'selection.add', keys: [node] }) + store.apply(subgraphScope, { type: 'selection.add', keys: [group] }) + + expect(store.selectedKeys(rootScope)).toEqual([node]) + expect(store.selectedKeys(subgraphScope)).toEqual([group]) + expect(store.isSelected(rootScope, group)).toBe(false) + }) + + it('reports the transition status and leaves no-ops unobservable', () => { + const store = useSelectionStore() + const keys = computed(() => store.selectedKeys(rootScope)) + const before = keys.value + + expect(store.apply(rootScope, { type: 'selection.clear' })).toBe('no-op') + expect(keys.value).toBe(before) + + expect( + store.apply(rootScope, { type: 'selection.add', keys: [node] }) + ).toBe('applied') + expect(keys.value).toEqual([node]) + }) +}) diff --git a/src/renderer/core/canvas/selectionStore.ts b/src/renderer/core/canvas/selectionStore.ts new file mode 100644 index 00000000000..d0955483864 --- /dev/null +++ b/src/renderer/core/canvas/selectionStore.ts @@ -0,0 +1,66 @@ +import { defineStore } from 'pinia' +import { reactive } from 'vue' + +import { + EMPTY_SELECTION, + reduceSelection +} from '@/core/selection/selectionState' +import type { + SelectableKey, + SelectionCommand, + SelectionState, + SelectionTransition +} from '@/core/selection/selectionState' +import type { + GraphScope, + OwningGraphId, + RootGraphId +} from '@/types/graphScopeId' + +/** + * Canvas selection, one insertion-ordered key list per graph scope. All + * mutation goes through {@link apply}; everything else is derived. + * See ADR-CANVAS-SELECTION-0028. + */ +export const useSelectionStore = defineStore('selection', () => { + const roots = reactive( + new Map>() + ) + + function stateOf(scope: GraphScope): SelectionState { + return ( + roots.get(scope.rootGraphId)?.get(scope.owningGraphId) ?? EMPTY_SELECTION + ) + } + + function apply( + scope: GraphScope, + command: SelectionCommand + ): SelectionTransition['status'] { + const transition = reduceSelection(stateOf(scope), command) + if (transition.status === 'applied') { + ownersOf(scope.rootGraphId).set(scope.owningGraphId, transition.state) + } + return transition.status + } + + function ownersOf( + rootGraphId: RootGraphId + ): Map { + const existing = roots.get(rootGraphId) + if (existing) return existing + const created = reactive(new Map()) + roots.set(rootGraphId, created) + return created + } + + function selectedKeys(scope: GraphScope): readonly SelectableKey[] { + return stateOf(scope).order + } + + function isSelected(scope: GraphScope, key: SelectableKey): boolean { + return stateOf(scope).order.includes(key) + } + + return { apply, selectedKeys, isSelected } +}) diff --git a/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts b/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts index c001685ccee..289e9826bc0 100644 --- a/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts +++ b/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.test.ts @@ -8,6 +8,7 @@ import { LayoutSource } from '@/renderer/core/layout/types' import { useNodeEventHandlers as createNodeEventHandlers } from '@/renderer/extensions/vueNodes/composables/useNodeEventHandlers' import { toNodeId } from '@/types/nodeId' import type { UUID } from '@/utils/uuid' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { createMockLGraphNode } from '@/utils/__tests__/litegraphTestUtils' const ROOT_GRAPH_ID = vi.hoisted(() => 'root-graph') @@ -61,7 +62,6 @@ beforeEach(() => { }) store.currentGraph = graph Object.assign(store, { rootGraphId: ROOT_GRAPH_ID }) - vi.mocked(store.updateSelectedItems).mockImplementation(() => undefined) scope = effectScope() }) @@ -72,13 +72,13 @@ describe('useNodeEventHandlers', () => { const testNodeId = toNodeId('node-1') beforeEach(async () => { - useCanvasStore().selectedItems.length = 0 + setCanvasSelection([]) }) describe('handleNodeSelect', () => { it('should select single node on regular click', () => { const { handleNodeSelect } = useNodeEventHandlers() - const { canvas, updateSelectedItems } = useCanvasStore() + const { canvas } = useCanvasStore() const event = new PointerEvent('pointerdown', { bubbles: true, @@ -90,7 +90,6 @@ describe('useNodeEventHandlers', () => { expect(canvas?.deselectAll).toHaveBeenCalledOnce() expect(canvas?.select).toHaveBeenCalledWith(mockNode) - expect(updateSelectedItems).toHaveBeenCalledOnce() }) it('on pointer down with ctrl+click: selects node immediately', () => { @@ -207,10 +206,10 @@ describe('useNodeEventHandlers', () => { const { canvas } = useCanvasStore() mockNode.selected = true - useCanvasStore().selectedItems.push( + setCanvasSelection([ createMockLGraphNode({ id: toNodeId('node-1') }), createMockLGraphNode({ id: toNodeId('node-2') }) - ) + ]) const event = new PointerEvent('pointerdown', { bubbles: true, @@ -254,58 +253,53 @@ describe('useNodeEventHandlers', () => { describe('toggleNodeSelectionAfterPointerUp', () => { it('on pointer up with multi-select: deselects node that was selected at pointer down', () => { const { toggleNodeSelectionAfterPointerUp } = useNodeEventHandlers() - const { canvas, updateSelectedItems } = useCanvasStore() + const { canvas } = useCanvasStore() mockNode.selected = true toggleNodeSelectionAfterPointerUp(testNodeId, true) expect(canvas?.deselect).toHaveBeenCalledWith(mockNode) - expect(updateSelectedItems).toHaveBeenCalledOnce() }) it('on pointer up with multi-select and node not previously selected: no-op', () => { const { toggleNodeSelectionAfterPointerUp } = useNodeEventHandlers() - const { canvas, updateSelectedItems } = useCanvasStore() + const { canvas } = useCanvasStore() mockNode.selected = true toggleNodeSelectionAfterPointerUp(testNodeId, true) expect(canvas?.select).not.toHaveBeenCalled() - expect(updateSelectedItems).toHaveBeenCalled() + expect(canvas?.deselect).toHaveBeenCalledWith(mockNode) }) it('on pointer up without multi-select: collapses multi-selection to clicked node', () => { const { toggleNodeSelectionAfterPointerUp } = useNodeEventHandlers() - const { canvas, updateSelectedItems } = useCanvasStore() + const { canvas } = useCanvasStore() mockNode.selected = true - useCanvasStore().selectedItems.push( + setCanvasSelection([ createMockLGraphNode({ id: toNodeId('node-1') }), createMockLGraphNode({ id: toNodeId('node-2') }) - ) + ]) toggleNodeSelectionAfterPointerUp(testNodeId, false) expect(canvas?.deselectAll).toHaveBeenCalledOnce() expect(canvas?.select).toHaveBeenCalledWith(mockNode) - expect(updateSelectedItems).toHaveBeenCalledOnce() }) it('on pointer up without multi-select: keeps single selection intact', () => { const { toggleNodeSelectionAfterPointerUp } = useNodeEventHandlers() - const { canvas, updateSelectedItems } = useCanvasStore() + const { canvas } = useCanvasStore() mockNode.selected = true - useCanvasStore().selectedItems.push( - createMockLGraphNode({ id: toNodeId('node-1') }) - ) + setCanvasSelection([createMockLGraphNode({ id: toNodeId('node-1') })]) toggleNodeSelectionAfterPointerUp(testNodeId, false) expect(canvas?.select).toHaveBeenCalledWith(mockNode) - expect(updateSelectedItems).toHaveBeenCalled() }) }) }) diff --git a/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.ts b/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.ts index f8a5fdea139..991976e1e0a 100644 --- a/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.ts +++ b/src/renderer/extensions/vueNodes/composables/useNodeEventHandlers.ts @@ -57,9 +57,6 @@ function useNodeEventHandlersIndividual() { if (!node.flags.pinned) { bringNodeToFront(nodeId) } - - // Update canvas selection tracking - canvasStore.updateSelectedItems() } /** @@ -136,7 +133,6 @@ function useNodeEventHandlersIndividual() { if (!multiSelect) { canvasStore.canvas.deselectAll() canvasStore.canvas.select(node) - canvasStore.updateSelectedItems() // Bring node to front when selected (unless pinned) if (!node.flags.pinned) { bringNodeToFront(nodeId) @@ -153,8 +149,6 @@ function useNodeEventHandlersIndividual() { bringNodeToFront(nodeId) } } - - canvasStore.updateSelectedItems() } return { diff --git a/src/renderer/extensions/vueNodes/layout/useNodeDrag.test.ts b/src/renderer/extensions/vueNodes/layout/useNodeDrag.test.ts index b48a7ab124d..4200a594ae1 100644 --- a/src/renderer/extensions/vueNodes/layout/useNodeDrag.test.ts +++ b/src/renderer/extensions/vueNodes/layout/useNodeDrag.test.ts @@ -9,6 +9,7 @@ import { LayoutSource } from '@/renderer/core/layout/types' import type { NodeLayout } from '@/renderer/core/layout/types' import { toNodeId } from '@/types/nodeId' import type { UUID } from '@/utils/uuid' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' // TODO: Simplify test setup — use real layoutStore + createTestingPinia instead // of manually mocking every dependency. See https://github.com/Comfy-Org/ComfyUI_frontend/issues/10765 @@ -125,7 +126,7 @@ beforeEach(() => { return fromPartial(controller) }) Object.assign(useCanvasStore(), { selectedNodeIds: new Set() }) - useCanvasStore().selectedItems = [] + setCanvasSelection([]) testState.nodeLayouts.clear() testState.nodeSnap.shouldSnap.mockReturnValue(false) testState.nodeSnap.applySnapToPosition.mockImplementation( @@ -211,7 +212,7 @@ describe('useNodeDrag', () => { const selectedGroup = new LGraphGroup('selected') selectedGroup.pos = [500, 600] Object.assign(useCanvasStore(), { selectedNodeIds: new Set([node1]) }) - useCanvasStore().selectedItems = [selectedNode, selectedGroup] + setCanvasSelection([selectedNode, selectedGroup]) testState.nodeLayouts.set('1', { position: { x: 100, y: 100 }, size: { width: 200, height: 120 } @@ -269,7 +270,7 @@ describe('useNodeDrag', () => { describe('useNodeDrag auto-pan', () => { beforeEach(() => { Object.assign(useCanvasStore(), { selectedNodeIds: new Set([node1]) }) - useCanvasStore().selectedItems = [] + setCanvasSelection([]) testState.nodeLayouts.clear() testState.nodeLayouts.set('1', { position: { x: 100, y: 200 }, @@ -417,7 +418,7 @@ describe('useNodeDrag non-node positionables', () => { pos[1] += deltaY } } - useCanvasStore().selectedItems = [fromPartial(group)] + setCanvasSelection([fromPartial(group)]) return group } diff --git a/src/stores/agentNodeSelectionStore.ts b/src/stores/agentNodeSelectionStore.ts index 092eb2477f1..3664366b2fa 100644 --- a/src/stores/agentNodeSelectionStore.ts +++ b/src/stores/agentNodeSelectionStore.ts @@ -166,7 +166,6 @@ export const useAgentNodeSelectionStore = defineStore( const canvas = canvasStore.canvas if (!canvas?.selectedItems.size) return canvas.deselectAll() - canvasStore.updateSelectedItems() } function saveNodeIds( diff --git a/src/utils/__tests__/canvasSelectionTestUtils.ts b/src/utils/__tests__/canvasSelectionTestUtils.ts new file mode 100644 index 00000000000..03ba30d663c --- /dev/null +++ b/src/utils/__tests__/canvasSelectionTestUtils.ts @@ -0,0 +1,11 @@ +import type { Positionable } from '@/lib/litegraph/src/interfaces' +import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' + +/** + * Overrides the derived `canvasStore.selectedItems` for tests whose items + * belong to no graph. Relies on `@pinia/testing` making getters writable. + */ +export function setCanvasSelection(items: Positionable[]): void { + const store: { selectedItems: Positionable[] } = useCanvasStore() + store.selectedItems = items +} diff --git a/src/workbench/extensions/agent/AgentPanelRoot.test.ts b/src/workbench/extensions/agent/AgentPanelRoot.test.ts index 8ef63dcc22b..d897df0bdd0 100644 --- a/src/workbench/extensions/agent/AgentPanelRoot.test.ts +++ b/src/workbench/extensions/agent/AgentPanelRoot.test.ts @@ -53,6 +53,7 @@ import { useWorkflowStore } from '@/platform/workflow/management/stores/workflow import type { LoadedComfyWorkflow } from '@/platform/workflow/management/stores/workflowStore' // eslint-disable-next-line import-x/no-restricted-paths import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' import { useExecutionErrorStore } from '@/stores/executionErrorStore' import { createMockLoadedWorkflow, @@ -270,6 +271,10 @@ import { useAgentWorkflowTabBindingStore } from './stores/agent/agentWorkflowTab import AgentPanelRoot from './AgentPanelRoot.vue' +function syncFakeSelection() { + setCanvasSelection([...(canvasStore.canvas?.selectedItems ?? [])]) +} + beforeEach(() => { Object.assign(useAgentConsentStore(), { accepted: true }) vi.mocked(validateComfyWorkflow).mockImplementation(async (content) => @@ -319,7 +324,7 @@ beforeEach(() => { ) workflowStore.activeWorkflow = null - canvasStore.selectedItems = [] + setCanvasSelection([]) canvasStore.currentGraph = null appMock.graph.nodes = [] appMock.graph.arrange.mockClear() @@ -713,9 +718,16 @@ function setupNodeSelectionCanvas() { const selectItems = vi.fn((items: LGraphNode[], add = false) => { if (!add) selectedItems.clear() for (const item of items) selectedItems.add(item) + syncFakeSelection() + }) + const deselect = vi.fn((node: LGraphNode) => { + selectedItems.delete(node) + syncFakeSelection() + }) + const deselectAll = vi.fn(() => { + selectedItems.clear() + syncFakeSelection() }) - const deselect = vi.fn((node: LGraphNode) => selectedItems.delete(node)) - const deselectAll = vi.fn(() => selectedItems.clear()) const graph = { nodes, getNodeById: (id: string | number) => @@ -826,7 +838,7 @@ async function startVueNodeSelection() { if (!state.canvas.multi_select) state.selectedItems.clear() if (state.selectedItems.has(node)) state.selectedItems.delete(node) else state.selectedItems.add(node) - canvasStore.updateSelectedItems() + syncFakeSelection() }) const panel = renderWithSelectedTarget() renderCanvasNodeButtons(state.nodes, selectClickedNode) @@ -5522,7 +5534,7 @@ describe('AgentPanelRoot workflow binding', () => { makeTab() const state = setupNodeSelectionCanvas() state.selectedItems.add(state.nodes[0]) - canvasStore.updateSelectedItems() + syncFakeSelection() renderWithSelectedTarget() useAgentPanelStore().isOpen = true @@ -5585,7 +5597,7 @@ describe('AgentPanelRoot workflow binding', () => { showRootGraph(state, [rootTwin]) state.selectedItems.add(rootTwin) - canvasStore.updateSelectedItems() + syncFakeSelection() await nextTick() await openMentionPicker() @@ -5632,7 +5644,7 @@ describe('AgentPanelRoot workflow binding', () => { state.selectedItems.clear() state.selectedItems.add(state.nodes[0]) - canvasStore.updateSelectedItems() + syncFakeSelection() await nextTick() expect(screen.getByText('KSampler')).toBeInTheDocument() @@ -5651,7 +5663,7 @@ describe('AgentPanelRoot workflow binding', () => { await userEvent.click(await screen.findByText('KSampler')) state.selectedItems.clear() state.selectedItems.add(state.nodes[0]) - canvasStore.updateSelectedItems() + syncFakeSelection() state.selectItems.mockClear() await enterNodeSelectionMode() @@ -5688,7 +5700,7 @@ describe('AgentPanelRoot workflow binding', () => { showRootGraph(state, [rootNode]) state.selectedItems.clear() state.selectedItems.add(rootNode) - canvasStore.updateSelectedItems() + syncFakeSelection() state.selectItems.mockClear() await nextTick() @@ -5822,7 +5834,7 @@ describe('AgentPanelRoot workflow binding', () => { nodeSelection.beginWorkflowLoad() nodeSelection.restoreNodeIds(['9']) state.selectedItems.add(state.nodes[0]) - canvasStore.updateSelectedItems() + syncFakeSelection() await nextTick() expect(nodeSelection.isLoadingWorkflow).toBe(false) expect( @@ -5888,9 +5900,11 @@ describe('AgentPanelRoot workflow binding', () => { ws.emit('agent_message_done', { message_id: 'm-1', thread_id: 'th-1' }) await screen.findByRole('button', { name: 'Send' }) - canvasStore.selectedItems = fromPartial([ - createMockLGraphNode({ isNodeFake: true, id: 7, title: 'KSampler' }) - ]) + setCanvasSelection( + fromPartial([ + createMockLGraphNode({ isNodeFake: true, id: 7, title: 'KSampler' }) + ]) + ) await nextTick() expect(screen.queryByText('KSampler')).not.toBeInTheDocument() await sendFromComposer('still no nodes') @@ -5898,9 +5912,11 @@ describe('AgentPanelRoot workflow binding', () => { ws.emit('agent_message_done', { message_id: 'm-2', thread_id: 'th-1' }) await screen.findByRole('button', { name: 'Send' }) - canvasStore.selectedItems = fromPartial([ - createMockLGraphNode({ isNodeFake: true, id: 8, title: 'VAEDecode' }) - ]) + setCanvasSelection( + fromPartial([ + createMockLGraphNode({ isNodeFake: true, id: 8, title: 'VAEDecode' }) + ]) + ) await nextTick() expect(screen.queryByText('VAEDecode')).not.toBeInTheDocument() await sendFromComposer('use the new selection') @@ -5950,7 +5966,7 @@ describe('AgentPanelRoot workflow binding', () => { const selectLegacyNode = (node: LGraphNode) => { if (!state.canvas.multi_select) state.selectedItems.clear() state.selectedItems.add(node) - canvasStore.updateSelectedItems() + syncFakeSelection() } renderWithSelectedTarget() renderCanvasNodeButtons(state.nodes, selectLegacyNode) @@ -5983,7 +5999,7 @@ describe('AgentPanelRoot workflow binding', () => { const toggleNode = (node: LGraphNode) => { if (state.selectedItems.has(node)) state.selectedItems.delete(node) else state.selectedItems.add(node) - canvasStore.updateSelectedItems() + syncFakeSelection() } renderWithSelectedTarget() renderCanvasNodeButtons(state.nodes, toggleNode) @@ -6014,12 +6030,12 @@ describe('AgentPanelRoot workflow binding', () => { await enterNodeSelectionMode() state.selectedItems.add(state.nodes[0]) - canvasStore.updateSelectedItems() + syncFakeSelection() state.selectItems.mockClear() state.selectedItems.clear() state.selectedItems.add(state.nodes[1]) - canvasStore.updateSelectedItems() + syncFakeSelection() await nextTick() expect([...state.selectedItems]).toEqual([state.nodes[1]]) @@ -6142,7 +6158,7 @@ describe('AgentPanelRoot workflow binding', () => { selection.selectedItems.clear() selection.selectedItems.add(secondNode) canvasStore.currentGraph = fromPartial(secondGraph) - canvasStore.updateSelectedItems() + syncFakeSelection() await nextTick() expect(nodeSelectionStore.isLoadingWorkflow).toBe(false) @@ -6158,7 +6174,7 @@ describe('AgentPanelRoot workflow binding', () => { nodeSelectionStore.beginWorkflowLoad() nodeSelectionStore.restoreNodeIds(['9']) state.selectedItems.add(state.nodes[0]) - canvasStore.updateSelectedItems() + syncFakeSelection() useAgentPanelStore().isOpen = true renderWithSelectedTarget() diff --git a/src/workbench/extensions/agent/AgentPanelRoot.vue b/src/workbench/extensions/agent/AgentPanelRoot.vue index 0ed7d403de1..9853b219407 100644 --- a/src/workbench/extensions/agent/AgentPanelRoot.vue +++ b/src/workbench/extensions/agent/AgentPanelRoot.vue @@ -851,7 +851,6 @@ function exitNodeSelectionMode(): void { if (agentNodeSelectionStore.isActive) agentNodeSelectionStore.exit() if (canvas) { canvas.deselectAll() - canvasStore.updateSelectedItems() } } @@ -900,7 +899,6 @@ function onSelectNodes(): void { } if (merged.size) { canvas.selectItems([...merged.values()]) - canvasStore.updateSelectedItems() } restoreAllowDragNodes = canvas.allow_dragnodes restoreSelectOnly = canvas.selectOnly From 9a3ef9d4a9dde31fced2e6d45c16dd2e2c0926e7 Mon Sep 17 00:00:00 2001 From: Amp Date: Sat, 5 Sep 2026 00:11:22 +0000 Subject: [PATCH 02/11] feat: align selection store with narrowed ADR (no toggle, root eviction) Amp-Thread-ID: https://ampcode.com/threads/T-01a06d2f-2dce-700c-925b-4453696769e4 --- src/core/selection/selectionState.test.ts | 21 ++++++----- src/core/selection/selectionState.ts | 13 +------ src/lib/litegraph/src/LGraph.ts | 2 ++ .../src/LGraphCanvas.selection.test.ts | 36 +++++++++++++++++++ .../core/canvas/selectionStore.test.ts | 28 +++++++++++++++ src/renderer/core/canvas/selectionStore.ts | 6 +++- .../layout/store/__mocks__/layoutStore.ts | 1 + 7 files changed, 86 insertions(+), 21 deletions(-) diff --git a/src/core/selection/selectionState.test.ts b/src/core/selection/selectionState.test.ts index 1f82c3aaf0a..60727bf2ba5 100644 --- a/src/core/selection/selectionState.test.ts +++ b/src/core/selection/selectionState.test.ts @@ -52,7 +52,7 @@ describe('reduceSelection', () => { status: 'no-op' }, { - name: 'replace dedupes and makes the last key primary', + name: 'replace dedupes and keeps command order', state: selection(a, b), command: { type: 'selection.replace', keys: [c, group, c] }, order: [c, group], @@ -65,13 +65,6 @@ describe('reduceSelection', () => { order: [a, b], status: 'no-op' }, - { - name: 'toggle removes present keys and appends absent ones', - state: selection(a, b), - command: { type: 'selection.toggle', keys: [b, c] }, - order: [a, c], - status: 'applied' - }, { name: 'clear empties the selection', state: selection(a, group), @@ -93,6 +86,18 @@ describe('reduceSelection', () => { if (status === 'no-op') expect(transition.state).toBe(state) }) + it.for([ + { type: 'selection.add', keys: [b, c] }, + { type: 'selection.remove', keys: [a] }, + { type: 'selection.replace', keys: [c, group] }, + { type: 'selection.clear' } + ])('$type applied twice is a no-op the second time', (command) => { + const once = reduceSelection(selection(a, b), command) + const twice = reduceSelection(once.state, command) + expect(twice.status).toBe('no-op') + expect(twice.state).toBe(once.state) + }) + it('does not mutate the previous state', () => { const state = selection(a) reduceSelection(state, { type: 'selection.add', keys: [b] }) diff --git a/src/core/selection/selectionState.ts b/src/core/selection/selectionState.ts index 02e9e4bc262..5546ea9db92 100644 --- a/src/core/selection/selectionState.ts +++ b/src/core/selection/selectionState.ts @@ -21,7 +21,7 @@ export function parseSelectableKey(key: SelectableKey): { } } -/** Insertion-ordered selection; the last key is the primary selection. */ +/** Insertion-ordered selection of one graph scope. */ export interface SelectionState { readonly order: readonly SelectableKey[] } @@ -38,10 +38,6 @@ export type SelectionCommand = readonly type: 'selection.remove' readonly keys: readonly SelectableKey[] } - | { - readonly type: 'selection.toggle' - readonly keys: readonly SelectableKey[] - } | { readonly type: 'selection.clear' } export interface SelectionTransition { @@ -74,13 +70,6 @@ function nextOrder( const removed = new Set(command.keys) return order.filter((key) => !removed.has(key)) } - case 'selection.toggle': { - const toggled = new Set(command.keys) - return [ - ...order.filter((key) => !toggled.has(key)), - ...unique(command.keys, new Set(order)) - ] - } } } diff --git a/src/lib/litegraph/src/LGraph.ts b/src/lib/litegraph/src/LGraph.ts index af289fc00f6..40f3243cd05 100644 --- a/src/lib/litegraph/src/LGraph.ts +++ b/src/lib/litegraph/src/LGraph.ts @@ -29,6 +29,7 @@ import { materializeRerouteLayout, releaseNodeLayoutAttachment } from '@/renderer/core/layout/operations/graphLayoutAttachment' +import { useSelectionStore } from '@/renderer/core/canvas/selectionStore' import { layoutStore } from '@/renderer/core/layout/store/layoutStore' import { nodesInRenderOrder } from '@/renderer/core/canvas/litegraph/arrangeForLegacyRender' import { useLinkPresentationStore } from '@/stores/linkPresentationStore' @@ -791,6 +792,7 @@ export class LGraph useLinkPresentationStore().clearGraph(toRootGraphId(graphId)) useRerouteStore().clearGraph(toRootGraphId(graphId)) useNodeDataStore().clearGraph(graphId) + useSelectionStore().clearRoot(toRootGraphId(graphId)) layoutStore.clearGraph(graphId) } else if (getRuntimeRootGraph(this)) { useExecutionOrderStore().clearGraph(graphScopeOf(this)) diff --git a/src/lib/litegraph/src/LGraphCanvas.selection.test.ts b/src/lib/litegraph/src/LGraphCanvas.selection.test.ts index 4f0dce9c164..a5239c39adb 100644 --- a/src/lib/litegraph/src/LGraphCanvas.selection.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.selection.test.ts @@ -9,6 +9,7 @@ import { LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' +import { createTestSubgraph } from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' import { selectableKeyOf } from '@/lib/litegraph/src/utils/selectableItems' import { useSelectionStore } from '@/renderer/core/canvas/selectionStore' import { graphScopeOf } from '@/types/graphScopeId' @@ -261,6 +262,41 @@ describe('LGraphCanvas selection', () => { expect(graph.nodes).toHaveLength(0) }) + it('records and removes every selectable kind', () => { + const group = addGroup(graph, 'G', [400, 200, 100, 100]) + const reroute = graph.setReroute({ pos: [500, 500], linkIds: [] })! + const subgraph = createTestSubgraph({ rootGraph: graph }) + + for (const item of [a, group, reroute]) canvas.select(item) + expect(canvas.selectedItems.size).toBe(3) + for (const item of [a, group, reroute]) canvas.deselect(item) + expect(canvas.selectedItems.size).toBe(0) + + canvas.setGraph(subgraph) + graph = subgraph + const ioNodes = [subgraph.inputNode, subgraph.outputNode] + for (const item of ioNodes) canvas.select(item) + expect(canvas.selectedItems.size).toBe(2) + for (const item of ioNodes) canvas.deselect(item) + expect(canvas.selectedItems.size).toBe(0) + }) + + it('graph.clear() evicts the selection of every scope in that root', () => { + const store = useSelectionStore() + const subgraph = createTestSubgraph({ rootGraph: graph }) + const scopes = [graphScopeOf(graph), graphScopeOf(subgraph)] + for (const scope of scopes) { + store.apply(scope, { + type: 'selection.add', + keys: [selectableKeyOf(a)] + }) + } + + graph.clear() + + for (const scope of scopes) expect(store.selectedKeys(scope)).toEqual([]) + }) + it('setGraph() clears the selection of the graph being left', () => { canvas.select(a) const scope = graphScopeOf(graph) diff --git a/src/renderer/core/canvas/selectionStore.test.ts b/src/renderer/core/canvas/selectionStore.test.ts index 77296b79213..7585a0345f0 100644 --- a/src/renderer/core/canvas/selectionStore.test.ts +++ b/src/renderer/core/canvas/selectionStore.test.ts @@ -15,6 +15,10 @@ const subgraphScope: GraphScope = { rootGraphId: root, owningGraphId: toOwningGraphId('sub') } +const otherRootScope: GraphScope = { + rootGraphId: toRootGraphId('other'), + owningGraphId: toOwningGraphId('other') +} const node = toSelectableKey('node', 1) const group = toSelectableKey('group', 2) @@ -30,6 +34,30 @@ describe('useSelectionStore', () => { expect(store.isSelected(rootScope, group)).toBe(false) }) + it('removing a key in one root leaves the same local id selected in another root', () => { + const store = useSelectionStore() + store.apply(rootScope, { type: 'selection.add', keys: [node] }) + store.apply(otherRootScope, { type: 'selection.add', keys: [node] }) + + store.apply(rootScope, { type: 'selection.remove', keys: [node] }) + + expect(store.selectedKeys(rootScope)).toEqual([]) + expect(store.selectedKeys(otherRootScope)).toEqual([node]) + }) + + it('clearRoot evicts every scope of that root only', () => { + const store = useSelectionStore() + store.apply(rootScope, { type: 'selection.add', keys: [node] }) + store.apply(subgraphScope, { type: 'selection.add', keys: [group] }) + store.apply(otherRootScope, { type: 'selection.add', keys: [node] }) + + store.clearRoot(root) + + expect(store.selectedKeys(rootScope)).toEqual([]) + expect(store.selectedKeys(subgraphScope)).toEqual([]) + expect(store.selectedKeys(otherRootScope)).toEqual([node]) + }) + it('reports the transition status and leaves no-ops unobservable', () => { const store = useSelectionStore() const keys = computed(() => store.selectedKeys(rootScope)) diff --git a/src/renderer/core/canvas/selectionStore.ts b/src/renderer/core/canvas/selectionStore.ts index d0955483864..ed0410f544e 100644 --- a/src/renderer/core/canvas/selectionStore.ts +++ b/src/renderer/core/canvas/selectionStore.ts @@ -54,6 +54,10 @@ export const useSelectionStore = defineStore('selection', () => { return created } + function clearRoot(rootGraphId: RootGraphId): void { + roots.delete(rootGraphId) + } + function selectedKeys(scope: GraphScope): readonly SelectableKey[] { return stateOf(scope).order } @@ -62,5 +66,5 @@ export const useSelectionStore = defineStore('selection', () => { return stateOf(scope).order.includes(key) } - return { apply, selectedKeys, isSelected } + return { apply, clearRoot, selectedKeys, isSelected } }) diff --git a/src/renderer/core/layout/store/__mocks__/layoutStore.ts b/src/renderer/core/layout/store/__mocks__/layoutStore.ts index 5f5023b501f..9d996625972 100644 --- a/src/renderer/core/layout/store/__mocks__/layoutStore.ts +++ b/src/renderer/core/layout/store/__mocks__/layoutStore.ts @@ -9,6 +9,7 @@ export const layoutStore = fromPartial({ applyOperation: vi.fn(() => 'applied'), applyOperations: vi.fn(() => 'applied'), batchUpdateNodeBounds: vi.fn(), + clearGraph: vi.fn(), clearViewGeometry: vi.fn(), geometryVersion: 0, getAllGroups: vi.fn(() => ({ value: new Map() })), From 6be6c5140eac74b33d48579aa324a081e8dccc1c Mon Sep 17 00:00:00 2001 From: Amp Date: Thu, 10 Sep 2026 00:43:00 +0000 Subject: [PATCH 03/11] fix: remove redundant graph check Part of FE-2040. Amp-Thread-ID: https://ampcode.com/threads/T-01a088c1-de37-715a-9355-38c226c8cef6 --- src/composables/graph/useGroupContextMenu.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/composables/graph/useGroupContextMenu.ts b/src/composables/graph/useGroupContextMenu.ts index 32eb9981ce9..4b9df072372 100644 --- a/src/composables/graph/useGroupContextMenu.ts +++ b/src/composables/graph/useGroupContextMenu.ts @@ -42,12 +42,10 @@ export function useGroupContextMenu() { group.recomputeInsideNodes() this.selectedItems.add(group) this.state.selectionChanged = true - if (this.graph) { - useSelectionStore().apply(graphScopeOf(this.graph), { - type: 'selection.add', - keys: [selectableKeyOf(group)] - }) - } + useSelectionStore().apply(graphScopeOf(this.graph), { + type: 'selection.add', + keys: [selectableKeyOf(group)] + }) } showNodeOptions(event) } From 508c7a2fdc8d51cf14fc73b6b603b166837a07b8 Mon Sep 17 00:00:00 2001 From: Amp Date: Thu, 10 Sep 2026 01:27:45 +0000 Subject: [PATCH 04/11] fix: refresh selection color after canvas changes Part of FE-2040. Amp-Thread-ID: https://ampcode.com/threads/T-01a088c1-de37-715a-9355-38c226c8cef6 --- .../graph/selectionToolbox/ColorPickerButton.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/components/graph/selectionToolbox/ColorPickerButton.vue b/src/components/graph/selectionToolbox/ColorPickerButton.vue index b7ae7bc65e8..760ead034c6 100644 --- a/src/components/graph/selectionToolbox/ColorPickerButton.vue +++ b/src/components/graph/selectionToolbox/ColorPickerButton.vue @@ -46,6 +46,7 @@