diff --git a/browser_tests/tests/groupColorPicker.spec.ts b/browser_tests/tests/groupColorPicker.spec.ts index de8bce0e09a..6debdc9236b 100644 --- a/browser_tests/tests/groupColorPicker.spec.ts +++ b/browser_tests/tests/groupColorPicker.spec.ts @@ -12,6 +12,7 @@ import { getGroupTitlePosition } from '@e2e/fixtures/utils/groupHelpers' // setColorOption, producing a visibly different shade from the toolbar // circle-swatch picker for the same color choice. const RED_GROUP_COLOR = '#A88' +const RED_NODE_COLOR = 'rgb(85, 51, 51)' test.describe( 'Group Color - right-click menu matches toolbar swatch', @@ -118,5 +119,50 @@ test.describe( 'group-color-right-click-matches-toolbar-swatch.png' ) }) + + test('refreshes the selected group toolbar swatch after menu color change', async ({ + comfyPage + }) => { + const groupPos = await getGroupTitlePosition( + comfyPage, + 'Right-Click Menu Group' + ) + + await test.step('Select the group and show its toolbar', async () => { + await comfyPage.page.mouse.click(groupPos.x, groupPos.y) + await comfyPage.nextFrame() + await expect(comfyPage.selectionToolbox).toBeVisible() + }) + + await test.step('Change the group color through its context menu', async () => { + await comfyPage.page.mouse.click(groupPos.x, groupPos.y, { + button: 'right' + }) + await expect(comfyPage.contextMenu.primeVueMenu).toBeVisible() + await comfyPage.page.getByText('Color', { exact: true }).click() + const redSwatch = comfyPage.page.getByTitle('Red').first() + await expect(redSwatch).toBeVisible() + await redSwatch.click() + }) + + await test.step('Refresh the toolbar swatch without reselecting the group', async () => { + await expect(comfyPage.selectionToolbox).toBeVisible() + await expect( + comfyPage.page.getByTestId( + TestIds.selectionToolbox.colorPickerCurrentColor + ) + ).toHaveCSS('color', RED_NODE_COLOR) + await expect + .poll(() => + comfyPage.page.evaluate( + () => + window.app!.graph.groups.find( + (group) => group.title === 'Right-Click Menu Group' + )?.color + ) + ) + .toBe(RED_GROUP_COLOR) + }) + }) } ) diff --git a/browser_tests/tests/vueNodes/interactions/canvas/selection.spec.ts b/browser_tests/tests/vueNodes/interactions/canvas/selection.spec.ts index b9adf6f04de..e55d9f96743 100644 --- a/browser_tests/tests/vueNodes/interactions/canvas/selection.spec.ts +++ b/browser_tests/tests/vueNodes/interactions/canvas/selection.spec.ts @@ -92,6 +92,21 @@ test.describe( await expect(comfyPage.selectionToolbox).toBeHidden() }) + test('selectItems with an empty array clears selection and hides the toolbox', async ({ + comfyPage + }) => { + const a = await comfyPage.vueNodes.getFixtureByTitle('Node A') + await a.title.click() + await expect(a.root).toHaveClass(/outline-node-component-outline/) + await expect(comfyPage.selectionToolbox).toBeVisible() + + await comfyPage.page.evaluate(() => window.app!.canvas.selectItems([])) + + await expect(comfyPage.vueNodes.selectedNodes).toHaveCount(0) + await expect(a.root).not.toHaveClass(/outline-node-component-outline/) + await expect(comfyPage.selectionToolbox).toBeHidden() + }) + test('marquee selects enclosed nodes and replaces the previous selection', async ({ comfyPage }) => { diff --git a/docs/adr/CANVAS-SELECTION-0031-ordered-set-storage.md b/docs/adr/CANVAS-SELECTION-0031-ordered-set-storage.md new file mode 100644 index 00000000000..5f6c40f781b --- /dev/null +++ b/docs/adr/CANVAS-SELECTION-0031-ordered-set-storage.md @@ -0,0 +1,40 @@ +# ADR-CANVAS-SELECTION-0031: Ordered Set Storage for Selection + +Date: 2026-09-15 + +## Status + +Proposed + +## Context + +[ADR-CANVAS-SELECTION-0028](CANVAS-SELECTION-0028-single-selection-store.md) +requires ordered, graph-scoped session selection with synchronous legacy hooks. +An immutable array reducer copies existing membership for every selected item. +Selecting 200 nodes reconstructs 19,900 existing keys before producing the final +selection. Hooks can read selection between individual additions. + +## Decision + +Use a reactive native Set in each store bucket. Preserve insertion order and +publish each command synchronously. Return array snapshots to readers. +Selection has no undo history, so retaining prior internal states has no caller. + +Reject deferred bulk publication: it changes what synchronous hooks observe. +An immutable collection library would preserve snapshots with cheaper writes, +but selection does not need that dependency or its API. + +## Consequences + +### Positive + +- Add and remove no longer copy existing membership. +- Native Set operations preserve order, uniqueness, and no-op reactivity. + +### Negative + +- Snapshot reads and ordered replacement still take linear work. A synchronous + consumer that reads a full snapshot after every addition can still cause + quadratic work. +- The store owns mutable collections. Callers must use commands rather than + retain references to those collections. diff --git a/docs/adr/README.md b/docs/adr/README.md index ae264aae749..3d90a1471f7 100644 --- a/docs/adr/README.md +++ b/docs/adr/README.md @@ -23,6 +23,7 @@ An Architecture Decision Record captures an important architectural decision mad | [BILLING-WEB-0031](BILLING-WEB-0031-static-spa-boundary.md) | Static SPA Boundary for Hosted Billing | Proposed | 2026-09-10 | | [CANVAS-GESTURE-0029](CANVAS-GESTURE-0029-pointer-gesture-state-machine.md) | Pointer Gesture State Machine | Proposed | 2026-09-06 | | [CANVAS-SELECTION-0028](CANVAS-SELECTION-0028-single-selection-store.md) | Single Selection Store | Proposed | 2026-09-04 | +| [CANVAS-SELECTION-0031](CANVAS-SELECTION-0031-ordered-set-storage.md) | Ordered Set Storage for Selection | Proposed | 2026-09-15 | | [CRDT-AUTHORITY-0035](CRDT-AUTHORITY-0035-human-canvas-authority-and-draft-reconciliation.md) | Human Canvas Authority and Draft Reconciliation | Proposed | 2026-09-19 | | [CRDT-FOLLOWER-0025](CRDT-FOLLOWER-0025-in-app-agent-crdt-follower-and-distribution-resolved-boundaries.md) | In-App Agent CRDT Follower and Distribution-Resolved Boundaries | Proposed | 2026-08-21 | | [CRDT-FOLLOWER-0035](CRDT-FOLLOWER-0035-bounded-ack-timeout-retry-for-unacknowledged-doc-subscribe.md) | Bounded Ack-Timeout Retry for Unacknowledged CRDT Doc Subscribe | Proposed | 2026-09-19 | diff --git a/src/components/graph/GraphCanvas.vue b/src/components/graph/GraphCanvas.vue index 00e07321090..537c11f17af 100644 --- a/src/components/graph/GraphCanvas.vue +++ b/src/components/graph/GraphCanvas.vue @@ -159,7 +159,6 @@ import { useAgentDockMount } from '@/workbench/extensions/agent/composables/useA import NodeSearchboxPopover from '@/components/searchbox/NodeSearchBoxPopover.vue' import SideToolbar from '@/components/sidebar/SideToolbar.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' @@ -591,11 +590,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 bd472d3fbe4..34292144ddf 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 { createMockCanvas } from '@/utils/__tests__/litegraphTestUtils' @@ -202,21 +203,21 @@ describe('SelectionToolbox', () => { it('should show info button only for single selections', () => { // Single node selection - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() expect(container.querySelector('.info-button')).toBeTruthy() // Multiple node selection - render in separate test scope - canvasStore.selectedItems = [ + setCanvasSelection([ new LGraphNode('Test Node'), new LGraphNode('Test Node') - ] + ]) const { container: container2 } = renderComponent() expect(container2.querySelector('.info-button')).toBeFalsy() }) it('should not show info button when node definition is not found', () => { - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) vi.mocked(useNodeDefStore().fromLGraphNode).mockReturnValue(null) const { container } = renderComponent() expect(container.querySelector('.info-button')).toBeFalsy() @@ -227,7 +228,7 @@ describe('SelectionToolbox', () => { 'Comfy.UseNewMenu': 'Disabled', 'Comfy.NodeLibrary.NewDesign': true }) - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() @@ -239,7 +240,7 @@ describe('SelectionToolbox', () => { 'Comfy.UseNewMenu': 'Disabled', 'Comfy.NodeLibrary.NewDesign': false }) - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() @@ -251,7 +252,7 @@ describe('SelectionToolbox', () => { 'Comfy.UseNewMenu': 'Top', 'Comfy.NodeLibrary.NewDesign': false }) - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() @@ -260,17 +261,17 @@ describe('SelectionToolbox', () => { it('should show color picker for all selections', () => { // Single node selection - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() expect( container.querySelector('[data-testid="color-picker-button"]') ).toBeTruthy() // Multiple node selection - canvasStore.selectedItems = [ + setCanvasSelection([ new LGraphNode('Test Node'), new LGraphNode('Test Node') - ] + ]) const { container: container2 } = renderComponent() expect( container2.querySelector('[data-testid="color-picker-button"]') @@ -279,32 +280,32 @@ describe('SelectionToolbox', () => { it('should show frame nodes only for multiple selections', () => { // Single node selection - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() expect(container.querySelector('.frame-nodes')).toBeFalsy() // Multiple node selection - canvasStore.selectedItems = [ + setCanvasSelection([ new LGraphNode('Test Node'), new LGraphNode('Test Node') - ] + ]) const { container: container2 } = renderComponent() expect(container2.querySelector('.frame-nodes')).toBeTruthy() }) it('should show bypass button for appropriate selections', () => { // Single node selection - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() expect( container.querySelector('[data-testid="bypass-button"]') ).toBeTruthy() // Multiple node selection - canvasStore.selectedItems = [ + setCanvasSelection([ new LGraphNode('Test Node'), new LGraphNode('Test Node') - ] + ]) const { container: container2 } = renderComponent() expect( container2.querySelector('[data-testid="bypass-button"]') @@ -312,7 +313,7 @@ describe('SelectionToolbox', () => { }) it('should show common buttons for all selections', () => { - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() expect( @@ -331,24 +332,24 @@ describe('SelectionToolbox', () => { imageNode.previewMediaType = 'image' // Single image node - canvasStore.selectedItems = [imageNode] + setCanvasSelection([imageNode]) const { container } = renderComponent() expect(container.querySelector('.mask-editor-button')).toBeTruthy() // Single non-image node - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container: container2 } = renderComponent() expect(container2.querySelector('.mask-editor-button')).toBeFalsy() }) it('should show Color picker button only for single Load3D nodes', () => { // Single Load3D node - canvasStore.selectedItems = [new LGraphNode('Test Node', 'Load3D')] + setCanvasSelection([new LGraphNode('Test Node', 'Load3D')]) const { container } = renderComponent() expect(container.querySelector('.load-3d-viewer-button')).toBeTruthy() // Single non-Load3D node - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container: container2 } = renderComponent() expect(container2.querySelector('.load-3d-viewer-button')).toBeFalsy() }) @@ -362,19 +363,19 @@ describe('SelectionToolbox', () => { filterOutputNodesSpy.mockReturnValue([ { type: 'SaveImage' } ] as LGraphNode[]) - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() expect(container.querySelector('.execute-button')).toBeTruthy() // Without output node selected isOutputNodeSpy.mockReturnValue(false) filterOutputNodesSpy.mockReturnValue([]) - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) 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() }) @@ -383,7 +384,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 = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() const dividers = container.querySelectorAll('.vertical-divider') @@ -392,7 +393,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( @@ -421,7 +422,7 @@ describe('SelectionToolbox', () => { invokeExtensionsAsync: vi.fn() } as ReturnType) - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() expect(container.querySelector('.extension-command-button')).toBeTruthy() @@ -431,7 +432,7 @@ describe('SelectionToolbox', () => { const mockExtensionService = vi.mocked(useExtensionService) mockExtensionService.mockReturnValue(createMockExtensionService()) - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() expect(container.querySelector('.extension-command-button')).toBeFalsy() @@ -456,7 +457,7 @@ describe('SelectionToolbox', () => { const mockExtensionService = vi.mocked(useExtensionService) mockExtensionService.mockReturnValue(createMockExtensionService()) - canvasStore.selectedItems = [new LGraphNode('Test Node')] + setCanvasSelection([new LGraphNode('Test Node')]) const { container } = renderComponent() const panel = container.querySelector('[data-testid="selection-toolbox"]') @@ -474,7 +475,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..c843535503d 100644 --- a/src/components/graph/selectionToolbox/ColorPickerButton.test.ts +++ b/src/components/graph/selectionToolbox/ColorPickerButton.test.ts @@ -3,13 +3,27 @@ import { render, screen } from '@testing-library/vue' import userEvent from '@testing-library/user-event' import PrimeVue from 'primevue/config' import Tooltip from 'primevue/tooltip' -import { describe, expect, it, vi } from 'vitest' +import { describe, expect, it, onTestFinished, vi } from 'vitest' +import { nextTick } from 'vue' import { createI18n } from 'vue-i18n' import ColorPickerButton from '@/components/graph/selectionToolbox/ColorPickerButton.vue' import type { Positionable } from '@/lib/litegraph/src/litegraph' +import { + LGraph, + LGraphCanvas, + LGraphGroup +} from '@/lib/litegraph/src/litegraph' +import type { CanvasEventDetail } from '@/lib/litegraph/src/types/events' import { useCanvasStore } from '@/renderer/core/canvas/canvasStore' +import { useSelectionStore } from '@/renderer/core/canvas/selectionStore' +import { graphScopeOf } from '@/types/graphScopeId' import { toGroupId } from '@/types/groupId' +import { setCanvasSelection } from '@/utils/__tests__/canvasSelectionTestUtils' +import { + createMockCanvasRenderingContext2D, + createTestCanvas +} from '@/utils/__tests__/litegraphTestUtils' function createMockPositionable(): Positionable { return fromPartial({ id: toGroupId(1), pos: [0, 0] }) @@ -49,13 +63,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') @@ -70,4 +84,56 @@ describe('ColorPickerButton', () => { await user.click(button) expect(screen.queryByTestId('noColor')).not.toBeInTheDocument() }) + + it.for([ + { subType: 'after-change', color: '#533' }, + { subType: 'before-change', color: '#335' } + ] as const)( + 'shows $color after $subType without reselection', + async ({ subType, color }) => { + const graph = new LGraph() + const group = new LGraphGroup() + group.color = LGraphCanvas.node_colors.blue.groupcolor + graph.add(group) + const canvas = createTestCanvas( + graph, + createMockCanvasRenderingContext2D() + ) + document.body.append(canvas.canvas) + onTestFinished(() => { + canvas.unbindEvents() + canvas.canvas.remove() + }) + const store = useCanvasStore() + store.canvas = canvas + await nextTick() + canvas.select(group) + canvas.onSelectionChange = vi.fn() + renderComponent() + + group.color = LGraphCanvas.node_colors.red.groupcolor + document.dispatchEvent( + new CustomEvent('litegraph:canvas', { + detail: { subType } + }) + ) + await nextTick() + + expect(screen.getByTestId('color-picker-current-color')).toHaveStyle({ + color + }) + expect({ + keys: useSelectionStore().selectedKeys(graphScopeOf(graph)), + legacyItems: [...canvas.selectedItems], + vueItems: store.selectedItems, + selected: group.selected + }).toEqual({ + keys: [`group:${group.id}`], + legacyItems: [group], + vueItems: [group], + selected: true + }) + expect(canvas.onSelectionChange).not.toHaveBeenCalled() + } + ) }) 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 @@