From a56087a34771b1801d4e389017ee3cf467493624 Mon Sep 17 00:00:00 2001 From: shrimbly Date: Tue, 17 Nov 2026 05:15:46 +1300 Subject: [PATCH 01/12] feat(canvas): stack hidden link labels that have the same name (DES-1347) Hidden links on one socket now group by their trimmed label, so links that share a name draw as one counted pill, the same way unlabelled links already stack under their type. Each name gets its own stack, ordered after the unlabelled stack by the lowest link id in the group. --- .../tests/links/linkVisibility.spec.ts | 59 +++++++++- .../litegraph/src/canvas/linkBadges.test.ts | 102 +++++++++++++++++- src/lib/litegraph/src/canvas/linkBadges.ts | 32 ++++-- 3 files changed, 178 insertions(+), 15 deletions(-) diff --git a/browser_tests/tests/links/linkVisibility.spec.ts b/browser_tests/tests/links/linkVisibility.spec.ts index a7029df1a89..79446a82bc1 100644 --- a/browser_tests/tests/links/linkVisibility.spec.ts +++ b/browser_tests/tests/links/linkVisibility.spec.ts @@ -209,7 +209,7 @@ test.describe( ) }) - test('renaming an expanded label moves it out of the stack', async ({ + test('renaming links to the same name stacks them under that name', async ({ comfyPage, linkVisibility }) => { @@ -222,7 +222,7 @@ test.describe( 1 ) await expect(linkVisibility.promptInput).toHaveValue('') - await linkVisibility.promptInput.fill('Positive clip') + await linkVisibility.promptInput.fill('enc') await linkVisibility.promptInput.press('Enter') await expect(linkVisibility.promptInput).toBeHidden() await expect @@ -231,7 +231,7 @@ test.describe( (await comfyPage.workflow.getExportedWorkflow()).extra ?.linkPresentation?.[firstClipLinkId] ) - .toEqual({ hidden: true, label: 'Positive clip' }) + .toEqual({ hidden: true, label: 'enc' }) }) await test.step('The renamed label sits below the remaining link', async () => { @@ -241,7 +241,58 @@ test.describe( clipSlot, 1 ) - await expect(linkVisibility.promptInput).toHaveValue('Positive clip') + await expect(linkVisibility.promptInput).toHaveValue('enc') + await linkVisibility.promptInput.press('Escape') + await expect(linkVisibility.promptInput).toBeHidden() + }) + + await test.step('Give the remaining link the same name', async () => { + await linkVisibility.openRenamePromptAtOutputBadgeRow( + checkpointLoaderId, + clipSlot, + 0 + ) + await expect(linkVisibility.promptInput).toHaveValue('') + await linkVisibility.promptInput.fill('enc') + await linkVisibility.promptInput.press('Enter') + await expect(linkVisibility.promptInput).toBeHidden() + await expect + .poll(async () => + Object.values( + (await comfyPage.workflow.getExportedWorkflow()).extra + ?.linkPresentation ?? {} + ) + ) + .toEqual([ + { hidden: true, label: 'enc' }, + { hidden: true, label: 'enc' } + ]) + }) + + const region = await screenshotRegion(comfyPage.page, [ + await comfyPage.nodeOps.getNodeRefById(checkpointLoaderId), + ...(await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')) + ]) + + await test.step('Both links draw as one counted stack', async () => { + await linkVisibility.parkPointer() + await region.expectScreenshot('link-stack-same-name-collapsed.png') + }) + + await test.step('The stack expands and one label reveals one link', async () => { + await linkVisibility.clickOutputBadgeRow( + checkpointLoaderId, + clipSlot, + 0 + ) + await linkVisibility.hoverOutputBadgeRow( + checkpointLoaderId, + clipSlot, + 1 + ) + await region.expectScreenshot( + 'link-stack-same-name-expanded-hover-one.png' + ) }) }) } diff --git a/src/lib/litegraph/src/canvas/linkBadges.test.ts b/src/lib/litegraph/src/canvas/linkBadges.test.ts index 9d9596af3b0..343af87ae72 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.test.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.test.ts @@ -273,7 +273,7 @@ describe('link badge frame layout', () => { ctx, [1, 2].map((id) => ({ link: createLink(id), - presentation: { hidden: true, label: 'MODEL' }, + presentation: { hidden: true, label: id === 1 ? 'First' : 'MODEL' }, startPos: [400, 100], endPos: [100, 100], color: BADGE_COLOR @@ -535,6 +535,106 @@ describe('hidden link badge stacks', () => { expect(queryLinkBadgeAtPoint(host, 120, 125)).toBe(toLinkId(2)) }) + it.for([ + { + name: 'links sharing a name into one stack', + labels: ['render_size', 'render_size', 'render_size'], + rows: [{ y: 100, links: [1, 2, 3], stackKey: 'output:4:0=render_size' }] + }, + { + name: 'each name into its own stack, ordered by its first link', + labels: ['B', 'A', 'B', 'A'], + rows: [ + { y: 100, links: [1, 3], stackKey: 'output:4:0=B' }, + { y: 125, links: [2, 4], stackKey: 'output:4:0=A' } + ] + }, + { + name: 'the unlabelled stack above named stacks and single names', + labels: ['A', undefined, 'A', undefined, 'B'], + rows: [ + { y: 100, links: [2, 4], stackKey: 'output:4:0' }, + { y: 125, links: [1, 3], stackKey: 'output:4:0=A' }, + { y: 150, links: [5], stackKey: undefined } + ] + }, + { + name: 'a name equal to the type apart from the unlabelled stack', + labels: ['MODEL', 'MODEL', undefined, undefined], + rows: [ + { y: 100, links: [3, 4], stackKey: 'output:4:0' }, + { y: 125, links: [1, 2], stackKey: 'output:4:0=MODEL' } + ] + }, + { + name: 'names that match after trimming, without folding case', + labels: ['size', ' size ', 'Size'], + rows: [ + { y: 100, links: [1, 2], stackKey: 'output:4:0=size' }, + { y: 125, links: [3], stackKey: undefined } + ] + }, + { + name: 'a single named link as its own badge', + labels: ['Named'], + rows: [{ y: 100, links: [1], stackKey: undefined }] + } + ])('groups $name', ({ labels, rows }) => { + const host = {} + layoutFanOut(host, labels) + + for (const { y, links, stackKey } of rows) { + const hit = queryLinkBadgeHitAtPoint(host, 120, y) + expect(hit?.linkIds, `links at y ${y}`).toEqual(links.map(toLinkId)) + expect(hit?.stackKey, `stack at y ${y}`).toBe(stackKey) + } + const lastRowY = rows[rows.length - 1].y + expect(queryLinkBadgeHitAtPoint(host, 120, lastRowY + 25)).toBeUndefined() + }) + + it('draws a named stack as the name with a count over offset layers', () => { + const host = {} + const { ctx } = layoutFanOut(host, ['render_size', 'render_size', 'Other']) + + expect(ctx.fillText).toHaveBeenCalledWith('render_size ×2', 120, 104) + expect(ctx.fillText).not.toHaveBeenCalledWith('render_size', 120, 104) + expect(ctx.roundRect).toHaveBeenCalledWith(117, 94, 62, 18, [9]) + }) + + it('moves a renamed link to the stack for its new name, and back when cleared', () => { + const host = {} + const linksAt = (y: number) => + queryLinkBadgeHitAtPoint(host, 120, y)?.linkIds + + layoutFanOut(host, [undefined, undefined, undefined, 'A']) + expect(linksAt(100)).toEqual([1, 2, 3]) + expect(linksAt(128)).toEqual([4]) + + layoutFanOut(host, ['A', undefined, undefined, 'A']) + expect(linksAt(100)).toEqual([2, 3]) + expect(linksAt(125)).toEqual([1, 4]) + + layoutFanOut(host, [undefined, undefined, undefined, 'A']) + expect(linksAt(100)).toEqual([1, 2, 3]) + expect(linksAt(128)).toEqual([4]) + }) + + it('expands a named stack to its head and one label per link', () => { + const host = {} + toggleLinkBadgeStack(host, 'output:4:0=A') + const { ctx } = layoutFanOut(host, ['A', 'A', undefined]) + + expect(queryLinkBadgeAtPoint(host, 120, 100)).toBe(toLinkId(3)) + expect(queryLinkBadgeHitAtPoint(host, 120, 122)).toMatchObject({ + linkIds: [toLinkId(1), toLinkId(2)], + stackKey: 'output:4:0=A' + }) + expect(queryLinkBadgeAtPoint(host, 120, 144)).toBe(toLinkId(1)) + expect(queryLinkBadgeAtPoint(host, 120, 166)).toBe(toLinkId(2)) + expect(ctx.fillText).toHaveBeenCalledWith('A ×2', 120, 126) + expect(ctx.fillText).toHaveBeenCalledWith('A', 120, 148) + }) + it('expands to a head followed by one badge per link, and collapses back', () => { const host = {} toggleLinkBadgeStack(host, 'output:4:0') diff --git a/src/lib/litegraph/src/canvas/linkBadges.ts b/src/lib/litegraph/src/canvas/linkBadges.ts index 1de03381dbd..1ceefca0c45 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.ts @@ -47,7 +47,7 @@ interface LinkBadgePair { input: BadgeEndpoint } -const BADGE_RANK = { stackHead: 0, unlabelled: 1, labelled: 2 } as const +const BADGE_RANK = { unlabelled: 0, labelled: 1 } as const type BadgeRank = (typeof BADGE_RANK)[keyof typeof BADGE_RANK] @@ -56,6 +56,7 @@ interface BadgeEndpoint { slot: number side: BadgeSide rank: BadgeRank + groupOrder: number socket: Point badge: LGraphBadge color: string @@ -189,13 +190,15 @@ function socketOf(link: LLink, side: BadgeSide) { } function stackKeyOf( - link: LLink, + { link, presentation }: HiddenLinkBadge, side: BadgeSide, graphId: string | undefined ): string { const { nodeId, slot } = socketOf(link, side) + const label = presentation.label?.trim() const socketKey = `${side}:${nodeId}:${slot}` - return graphId ? `${graphId}/${socketKey}` : socketKey + const groupKey = label ? `${socketKey}=${label}` : socketKey + return graphId ? `${graphId}/${groupKey}` : groupKey } function isUnlabelled({ presentation }: HiddenLinkBadge): boolean { @@ -207,9 +210,9 @@ function groupStackedLinks( graphId: string | undefined ): Map { const groups = new Map() - for (const hidden of hiddenLinks.filter(isUnlabelled)) { + for (const hidden of hiddenLinks) { for (const side of ['output', 'input'] as const) { - const key = stackKeyOf(hidden.link, side, graphId) + const key = stackKeyOf(hidden, side, graphId) const group = groups.get(key) if (group) group.push(hidden.link.id) else groups.set(key, [hidden.link.id]) @@ -217,6 +220,7 @@ function groupStackedLinks( } for (const [key, linkIds] of groups) { if (linkIds.length < 2) groups.delete(key) + else linkIds.sort((first, second) => first - second) } return groups } @@ -225,6 +229,7 @@ interface EndpointSpec { link: LLink side: BadgeSide rank: BadgeRank + groupOrder: number socket: Point text: string color: string @@ -239,7 +244,7 @@ function createBadgeEndpoint( spec: EndpointSpec ): BadgeEndpoint { const { link, side, rank, socket, text, color, linkIds, stackKey } = spec - const { memberOfStack } = spec + const { groupOrder, memberOfStack } = spec const layers = spec.layers ?? 0 const badge = makeBadge(text, color) const width = badge.getWidth(ctx) @@ -252,6 +257,7 @@ function createBadgeEndpoint( ...socketOf(link, side), side, rank, + groupOrder, socket, badge, color, @@ -283,6 +289,8 @@ function compareBadgeEndpoints( first.socket[1] - second.socket[1] || first.slot - second.slot || first.rank - second.rank || + first.groupOrder - second.groupOrder || + Number(!first.hitArea.stackKey) - Number(!second.hitArea.stackKey) || first.hitArea.linkIds[0] - second.hitArea.linkIds[0] ) } @@ -310,14 +318,17 @@ export function layoutHiddenLinkBadges( endpoints.push(endpoint) return endpoint } + const stackText = (spec: EndpointSpec, linkIds: readonly LinkId[]) => + spec.rank === BADGE_RANK.labelled + ? spec.text + : stackTypeText(linkIds, typeTextByLinkId) const stackHead = (spec: EndpointSpec, stackKey: string) => { const existing = stackHeads.get(stackKey) if (existing) return existing const linkIds = stacks.get(stackKey) ?? [] const head = addEndpoint({ ...spec, - rank: BADGE_RANK.stackHead, - text: `${stackTypeText(linkIds, typeTextByLinkId)} ×${linkIds.length}`, + text: `${stackText(spec, linkIds)} ×${linkIds.length}`, linkIds, stackKey, layers: expanded?.has(stackKey) @@ -333,17 +344,18 @@ export function layoutHiddenLinkBadges( socket: Point ) => { const { link, presentation, color } = hidden + const stackKey = stackKeyOf(hidden, side, graphId) const spec: EndpointSpec = { link, side, socket, color, rank: isUnlabelled(hidden) ? BADGE_RANK.unlabelled : BADGE_RANK.labelled, + groupOrder: stacks.get(stackKey)?.[0] ?? link.id, text: linkBadgeText(link.type, presentation), linkIds: [link.id] } - const stackKey = stackKeyOf(link, side, graphId) - if (!isUnlabelled(hidden) || !stacks.has(stackKey)) return addEndpoint(spec) + if (!stacks.has(stackKey)) return addEndpoint(spec) const head = stackHead(spec, stackKey) return expanded?.has(stackKey) ? addEndpoint({ ...spec, memberOfStack: stackKey }) From d151e60c6631aa765e430c8e76383f85e44116d7 Mon Sep 17 00:00:00 2001 From: github-actions Date: Mon, 16 Nov 2026 16:30:46 +0000 Subject: [PATCH 02/12] [automated] Update screenshot expectations | snapshot | status | changed pixels | | --- | --- | --- | | `browser_tests/tests/links/linkVisibility.spec.ts-snapshots/link-stack-same-name-collapsed-chromium-linux.png` | new | n/a | | `browser_tests/tests/links/linkVisibility.spec.ts-snapshots/link-stack-same-name-expanded-hover-one-chromium-linux.png` | new | n/a | Screenshot capture is not bit-deterministic; small pixel deltas are usually text rasterization noise. Confirm each update corresponds to a test expected to change. --- ...stack-same-name-collapsed-chromium-linux.png | Bin 0 -> 36360 bytes ...e-name-expanded-hover-one-chromium-linux.png | Bin 0 -> 42544 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 browser_tests/tests/links/linkVisibility.spec.ts-snapshots/link-stack-same-name-collapsed-chromium-linux.png create mode 100644 browser_tests/tests/links/linkVisibility.spec.ts-snapshots/link-stack-same-name-expanded-hover-one-chromium-linux.png diff --git a/browser_tests/tests/links/linkVisibility.spec.ts-snapshots/link-stack-same-name-collapsed-chromium-linux.png b/browser_tests/tests/links/linkVisibility.spec.ts-snapshots/link-stack-same-name-collapsed-chromium-linux.png new file mode 100644 index 0000000000000000000000000000000000000000..925f9c63bd8c4b360e8bcfa715f93dfa84595c54 GIT binary patch literal 36360 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 z z+!c$SAnET~7^IJznFVQSPl{D&QAu6o&r)A1{XQ;NC`{fVp^Lwq^>)${4VF*r_~tyU zG~_;h=fTJ{8>o4eKKt_J-`)T6lPPQ2r)84YewVDm;QW{B!t|q+!H1#bRkGVI-?iuj zU!I|@21ck_37SFRjkv&VVDkePk(fQc#E0O^)bFC|3OxZ)au#dRGuV>$_>6y#!gCOX za2W`{wedbbYRkYvX;Rh0c%LbF{Gw>t$J1GDU%|=y2*mi8rNGH6Ese!pBVM?IQ9J2J zb^oTLM$(#S8U$gm_F>}%SAO}uFOPTAT_`bPBUKcZ9+}sgs7-V?uI`_ZZD3R3YWO&BZFH{? z!(F@XJ6FLC`&>v+aBbv?4VrYOBqGn|SMTfw+hCk;#OnV^Z6!@6fL2t~Mk}Y5YP$3To18hn4|AsBepmW73K)7FC zBkpO><-JaxHrsvmqrKgtFb?*GAQ_%*4L8%mMBKAyFs)j9!t6y3?M`OU946TCHsEgg zJmnY(8C(-@B7>9iusLb1E0jAL*zeHK^CQ|Hi3f!f4LZdJHZbe<*|h(MGz#(0hgU8J zy^pRpE|{bblsM8c4R0hD$*=p&Ee7$NM|`2gDR6aL>m1}1yzE2I(9hYMd_7mi^pC0*%GmnUr6Eo9hN8aXt&#qa zIoz}T5^IQOhO)XPNvx#0IL^5ILz1&niNnaV|1RiKDFKE8U@L@|RU!`syXN+(H_tfM zhlb=hEYqJEWMnchPiV*^zZK~wQdav%;sD(-HZGZiDrWU0(IoZ^Zk?(3L~6eeR|Fu; zd8dPjDuER*f-uSQ94*vNg|YjOK6<-LX+qf$$58*regH;3l2EnuQ^9;BTwrhy{NG~% zluaYVTOXE`v6Qmy_MAINXrPk;bO%Ai>ph)hj&^uf8B3UqMekht$v#6xEC8}_=$x5~ z)3OzvTJ_Z~@P%dDZohe9EvEl>q4mt(AT&~)Wg#(kBPABuQTzs-K+Oz}qp#V{Z-zti zJU9_wSN~Qkp$+4Fu}2M1m8##9Z2)~;vl10GH5vdKivt1!j|~b63%T6y>VOJj!VK98 zRHQ4*$$3$F&4>z*TFvw2)n(?l@$=C1^z;(2(5y41RjNW1SWNb9mnc^WvOVmkXFgy0!gE=&F6wR}0nV7dq=eu_080L&DWQ-!uV1!%VKB z{%T=X*4HVY)S&pwTpAihD>$$^?kz(jQ}0LO|J-gYLPHagq_^+s*ze%IdfVnHEjXmN z&dmaiNU;0+q1uMB_=Ewvs^8Kh!3OG!bjMKrTT@>*vM$i8lGBR-s5lz5&_5##4LYH zgFuWlVzX|3$Ol(!HiwT!rQXRoyc>Sw~D)sZee^wGsK={-4 zqSWJslT+r869=wJGph$7_wwQU%&EV%Orkjd7{?mtaS-k`Ycv(!;+*2!%j;m{VEUAu z&u;%5^hIHrVL5Aj4?UNJvJR7D?bQF;rzD~p))$VY5`XTbpQ@p(ZRF?6QUG2SD}T~L z{IfVvgb!F21mSJkfQ}OohP9bhztCcMGrOQBzgW#Bg3$M$-PWJ%2P_go1dSZV9Oj!U z<`;m}{skOYe=DG+woTcRiWj5!ouZ`IiYr*_B&ZYcieyw^F{LRmFu`Yf@5KQv`tKlM z%tSDod80!VMwjU==L1i*V)=M zR7vsXsL>maj~TM|y+=Iz+1lzxQxl(|(O-~C0g+5d?k?~xbvs-bmT_BgzoO{uJ=TyfOTs{UJ_$W@R1+SZkrao )Axm({F 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 literal 0 HcmV?d00001 From 9be0200cfe424c543ba6bfab761dbb6d436bb912 Mon Sep 17 00:00:00 2001 From: shrimbly Date: Tue, 17 Nov 2026 05:38:04 +1300 Subject: [PATCH 03/12] fix(canvas): keep named link stack keys unambiguous Quote the label in the stack key so a node id or label that holds the separator cannot make two sockets share one stack. --- .../litegraph/src/canvas/linkBadges.test.ts | 24 +++++++++---------- src/lib/litegraph/src/canvas/linkBadges.ts | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/litegraph/src/canvas/linkBadges.test.ts b/src/lib/litegraph/src/canvas/linkBadges.test.ts index 343af87ae72..538166ce361 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.test.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.test.ts @@ -539,14 +539,14 @@ describe('hidden link badge stacks', () => { { name: 'links sharing a name into one stack', labels: ['render_size', 'render_size', 'render_size'], - rows: [{ y: 100, links: [1, 2, 3], stackKey: 'output:4:0=render_size' }] + rows: [{ y: 100, links: [1, 2, 3], stackKey: 'output:4:0="render_size"' }] }, { name: 'each name into its own stack, ordered by its first link', labels: ['B', 'A', 'B', 'A'], rows: [ - { y: 100, links: [1, 3], stackKey: 'output:4:0=B' }, - { y: 125, links: [2, 4], stackKey: 'output:4:0=A' } + { y: 100, links: [1, 3], stackKey: 'output:4:0="B"' }, + { y: 125, links: [2, 4], stackKey: 'output:4:0="A"' } ] }, { @@ -554,7 +554,7 @@ describe('hidden link badge stacks', () => { labels: ['A', undefined, 'A', undefined, 'B'], rows: [ { y: 100, links: [2, 4], stackKey: 'output:4:0' }, - { y: 125, links: [1, 3], stackKey: 'output:4:0=A' }, + { y: 125, links: [1, 3], stackKey: 'output:4:0="A"' }, { y: 150, links: [5], stackKey: undefined } ] }, @@ -563,14 +563,14 @@ describe('hidden link badge stacks', () => { labels: ['MODEL', 'MODEL', undefined, undefined], rows: [ { y: 100, links: [3, 4], stackKey: 'output:4:0' }, - { y: 125, links: [1, 2], stackKey: 'output:4:0=MODEL' } + { y: 125, links: [1, 2], stackKey: 'output:4:0="MODEL"' } ] }, { name: 'names that match after trimming, without folding case', labels: ['size', ' size ', 'Size'], rows: [ - { y: 100, links: [1, 2], stackKey: 'output:4:0=size' }, + { y: 100, links: [1, 2], stackKey: 'output:4:0="size"' }, { y: 125, links: [3], stackKey: undefined } ] }, @@ -583,11 +583,11 @@ describe('hidden link badge stacks', () => { const host = {} layoutFanOut(host, labels) - for (const { y, links, stackKey } of rows) { + const hitRows = rows.map(({ y }) => { const hit = queryLinkBadgeHitAtPoint(host, 120, y) - expect(hit?.linkIds, `links at y ${y}`).toEqual(links.map(toLinkId)) - expect(hit?.stackKey, `stack at y ${y}`).toBe(stackKey) - } + return { y, links: hit?.linkIds, stackKey: hit?.stackKey } + }) + expect(hitRows).toEqual(rows) const lastRowY = rows[rows.length - 1].y expect(queryLinkBadgeHitAtPoint(host, 120, lastRowY + 25)).toBeUndefined() }) @@ -621,13 +621,13 @@ describe('hidden link badge stacks', () => { it('expands a named stack to its head and one label per link', () => { const host = {} - toggleLinkBadgeStack(host, 'output:4:0=A') + toggleLinkBadgeStack(host, 'output:4:0="A"') const { ctx } = layoutFanOut(host, ['A', 'A', undefined]) expect(queryLinkBadgeAtPoint(host, 120, 100)).toBe(toLinkId(3)) expect(queryLinkBadgeHitAtPoint(host, 120, 122)).toMatchObject({ linkIds: [toLinkId(1), toLinkId(2)], - stackKey: 'output:4:0=A' + stackKey: 'output:4:0="A"' }) expect(queryLinkBadgeAtPoint(host, 120, 144)).toBe(toLinkId(1)) expect(queryLinkBadgeAtPoint(host, 120, 166)).toBe(toLinkId(2)) diff --git a/src/lib/litegraph/src/canvas/linkBadges.ts b/src/lib/litegraph/src/canvas/linkBadges.ts index 1ceefca0c45..d19266b0061 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.ts @@ -197,7 +197,7 @@ function stackKeyOf( const { nodeId, slot } = socketOf(link, side) const label = presentation.label?.trim() const socketKey = `${side}:${nodeId}:${slot}` - const groupKey = label ? `${socketKey}=${label}` : socketKey + const groupKey = label ? `${socketKey}=${JSON.stringify(label)}` : socketKey return graphId ? `${graphId}/${groupKey}` : groupKey } From b44f46543fdd61af32b3356f860d4be29d4f37b5 Mon Sep 17 00:00:00 2001 From: shrimbly Date: Tue, 17 Nov 2026 09:39:31 +1300 Subject: [PATCH 04/12] feat(canvas): rename every link in a stacked label at once (DES-1348) Double-clicking a stacked label, collapsed or as the head pill, opens the rename prompt for the whole stack. The stack's context menu gets the same Rename item. Saving sets one name on every link in one change, so it is one undo step. The first click of a double-click still toggles the stack, so the double-click toggles it back before it opens the prompt. --- .../tests/links/linkVisibility.spec.ts | 51 ++++++ .../src/LGraphCanvas.linkVisibility.test.ts | 156 ++++++++++++++++-- src/lib/litegraph/src/LGraphCanvas.ts | 33 ++-- .../src/canvas/linkVisibility.test.ts | 53 +++++- .../litegraph/src/canvas/linkVisibility.ts | 28 ++-- .../src/canvas/resolvePointerTarget.ts | 4 +- 6 files changed, 277 insertions(+), 48 deletions(-) diff --git a/browser_tests/tests/links/linkVisibility.spec.ts b/browser_tests/tests/links/linkVisibility.spec.ts index 79446a82bc1..d1f80b9c6f9 100644 --- a/browser_tests/tests/links/linkVisibility.spec.ts +++ b/browser_tests/tests/links/linkVisibility.spec.ts @@ -295,6 +295,57 @@ test.describe( ) }) }) + + test('double-clicking a stack renames every link in it', async ({ + comfyPage, + linkVisibility + }) => { + const undoSizeBeforeRename = + (await comfyPage.workflow.getUndoQueueSize()) ?? 0 + const exportedLinkPresentations = async () => + Object.values( + (await comfyPage.workflow.getExportedWorkflow()).extra + ?.linkPresentation ?? {} + ) + + await test.step('Name the unlabelled stack', async () => { + await linkVisibility.openRenamePromptAtOutputBadgeRow( + checkpointLoaderId, + clipSlot, + 0 + ) + await expect(linkVisibility.promptInput).toHaveValue('') + await linkVisibility.promptInput.fill('enc') + await linkVisibility.promptInput.press('Enter') + await expect(linkVisibility.promptInput).toBeHidden() + await expect.poll(exportedLinkPresentations).toEqual([ + { hidden: true, label: 'enc' }, + { hidden: true, label: 'enc' } + ]) + }) + + await test.step('The links stay one collapsed stack with the new name', async () => { + await linkVisibility.parkPointer() + await expectRegionScreenshot( + comfyPage.page, + [ + await comfyPage.nodeOps.getNodeRefById(checkpointLoaderId), + ...(await comfyPage.nodeOps.getNodeRefsByType('CLIPTextEncode')) + ], + 'link-stack-same-name-collapsed.png' + ) + }) + + await test.step('One undo removes the name from every link', async () => { + await expect + .poll(() => comfyPage.workflow.getUndoQueueSize()) + .toBe(undoSizeBeforeRename + 1) + await comfyPage.keyboard.undo() + await expect + .poll(exportedLinkPresentations) + .toEqual([{ hidden: true }, { hidden: true }]) + }) + }) } ) diff --git a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts index f7373a54e61..825e26f6c62 100644 --- a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts @@ -10,7 +10,8 @@ import { LGraph, LGraphNode, LiteGraph } from '@/lib/litegraph/src/litegraph' import { drawHiddenLinkBadges, layoutHiddenLinkBadges, - queryLinkBadgeAtPoint + queryLinkBadgeAtPoint, + queryLinkBadgeHitAtPoint } from '@/lib/litegraph/src/canvas/linkBadges' import { LLink } from '@/lib/litegraph/src/LLink' import { LinkMarkerShape } from '@comfyorg/graph-model/globalEnums' @@ -502,25 +503,33 @@ describe('LGraphCanvas link visibility interactions', () => { }) describe('stacked hidden link badges', () => { - function createStackFixture() { + function createStackFixture( + labels: readonly (string | undefined)[] = [undefined, undefined] + ) { const { graph, canvas, link } = createFixture() const source = graph.getNodeById(link.origin_id) assert.exists(source) - const target = new LGraphNode('Second target') - target.addInput('in', 'MODEL') - graph.add(target) - const links = [link, createTestLink(graph, source, 0, target, 0)] + const links = labels.map((_, index) => { + if (index === 0) return link + const target = new LGraphNode(`Target ${index}`) + target.addInput('in', 'MODEL') + graph.add(target) + return createTestLink(graph, source, 0, target, 0) + }) const scope = graphScopeOf(graph) - for (const hidden of links) { - useLinkPresentationStore().patch(scope, hidden.id, { hidden: true }) - } + const store = useLinkPresentationStore() + links.forEach((hidden, index) => + store.patch(scope, hidden.id, { hidden: true, label: labels[index] }) + ) + const labelOf = (hidden: LLink) => + store.getPresentation(scope, hidden.id)?.label const relayout = () => layoutHiddenLinkBadges( canvas, canvas.ctx, links.map((hidden, index) => ({ link: hidden, - presentation: { hidden: true }, + presentation: { hidden: true, label: labelOf(hidden) }, startPos: [400, 300], endPos: [700, 300 + index * 100], color: '#89A' @@ -529,7 +538,14 @@ describe('LGraphCanvas link visibility interactions', () => { relayout() drawHiddenLinkBadges(canvas.ctx, canvas, [0, 0, 800, 600]) onTestFinished(() => canvas.pointer.reset()) - return { graph, canvas, links, relayout } + const prompt = vi + .spyOn(canvas, 'prompt') + .mockReturnValue(document.createElement('div')) + const submitPrompt = (value: string) => { + prompt.mock.calls[0][2](value) + relayout() + } + return { graph, canvas, links, relayout, prompt, submitPrompt, labelOf } } function clickAt(canvas: LGraphCanvas, clientX: number, clientY: number) { @@ -636,16 +652,126 @@ describe('LGraphCanvas link visibility interactions', () => { canvas.processMouseUp(up) } - it('expands a stack exactly once on a double click', () => { - const { canvas, links, relayout } = createStackFixture() + function doubleClickAt( + canvas: LGraphCanvas, + clientX: number, + clientY: number + ) { + pressAt(canvas, clientX, clientY, 100) + pressAt(canvas, clientX, clientY, 200) + } + + const stackedLinkIdsAt = (canvas: LGraphCanvas, x: number, y: number) => { + const hit = queryLinkBadgeHitAtPoint(canvas, x, y) + return hit?.stackKey ? hit.linkIds : undefined + } + + it('renames every link in a collapsed stack on a double click and keeps it collapsed', () => { + const { canvas, links, prompt, submitPrompt, labelOf } = + createStackFixture() + + doubleClickAt(canvas, 420, 300) + + expect(prompt).toHaveBeenCalledWith( + 'Rename', + '', + expect.any(Function), + expect.anything() + ) + submitPrompt('render_size') + + expect(links.map(labelOf)).toEqual(['render_size', 'render_size']) + expect(stackedLinkIdsAt(canvas, 420, 300)).toEqual( + links.map(({ id }) => id) + ) + expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBeUndefined() + }) + + it('keeps an expanded stack expanded while its head is double clicked', () => { + const { canvas, links, relayout, prompt } = createStackFixture() + clickAt(canvas, 420, 300) + relayout() - pressAt(canvas, 420, 300, 100) - pressAt(canvas, 420, 300, 200) + doubleClickAt(canvas, 420, 300) relayout() + expect(prompt).toHaveBeenCalledOnce() expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBe(links[0].id) }) + it('merges a renamed stack into the stack that already has that name', () => { + const { canvas, links, prompt, submitPrompt } = createStackFixture([ + undefined, + undefined, + 'batch', + 'batch' + ]) + + doubleClickAt(canvas, 420, 300) + expect(prompt.mock.calls[0][1]).toBe('') + submitPrompt('batch') + + expect(stackedLinkIdsAt(canvas, 420, 300)).toEqual( + links.map(({ id }) => id) + ) + }) + + it('returns every link to the unlabelled stack when a stack name is cleared', () => { + const { canvas, links, prompt, submitPrompt, labelOf } = + createStackFixture(['batch', 'batch', undefined]) + + doubleClickAt(canvas, 420, 322) + expect(prompt.mock.calls[0][1]).toBe('batch') + submitPrompt('') + + expect(links.map(labelOf)).toEqual([undefined, undefined, undefined]) + expect(stackedLinkIdsAt(canvas, 420, 300)).toEqual( + links.map(({ id }) => id) + ) + }) + + it('renames only one link when its expanded label is double clicked', () => { + const { canvas, links, relayout, submitPrompt, labelOf } = + createStackFixture() + clickAt(canvas, 420, 300) + relayout() + + doubleClickAt(canvas, 420, 322) + submitPrompt('solo') + + expect(links.map(labelOf)).toEqual(['solo', undefined]) + }) + + it('renames the whole stack from the Rename item of its context menu', () => { + const { canvas, links, prompt, submitPrompt, labelOf } = + createStackFixture() + const menu = vi + .spyOn(LiteGraph, 'ContextMenu') + .mockImplementation(fromPartial(class {})) + const rightClick = fromPartial({ + canvasX: 420, + canvasY: 300 + }) + + canvas.processContextMenu(undefined, rightClick) + + const [items, options] = menu.mock.calls[0] + expect(items).toEqual([ + { content: 'Rename', value: 'Rename' }, + { content: 'Show Links', value: 'Show Links' } + ]) + void options?.callback?.({ content: 'Rename', value: 'Rename' }) + expect(prompt).toHaveBeenCalledWith( + 'Rename', + '', + expect.any(Function), + rightClick + ) + submitPrompt('render_size') + + expect(links.map(labelOf)).toEqual(['render_size', 'render_size']) + }) + it('collapses an expanded stack when empty canvas is clicked', () => { const { canvas, relayout } = createStackFixture() diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index ec323edb590..9bbf0083635 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -538,8 +538,6 @@ function marqueeSelectsLinks( ) } -function toggleStackOnceOnDoubleClick(): void {} - interface SnappingLink { link: LLink snap: number @@ -2893,19 +2891,28 @@ export class LGraphCanvas implements CustomEventDispatcher case 'linkBadge': { const { link } = target pointer.onDoubleClick = () => - promptRenameLinkBadge(this, graphScopeOf(graph), link.id, e) + promptRenameLinkBadge(this, graphScopeOf(graph), [link.id], e) pointer.onDragStart = () => (this.dragging_canvas = true) pointer.finally = () => (this.dragging_canvas = false) return } case 'linkBadgeStack': { - const { stackKey } = target - pointer.onClick = () => { + const { stackKey, links } = target + const toggleStack = () => { toggleLinkBadgeStack(this, stackKey) this.dirty_bgcanvas = true } - pointer.onDoubleClick = toggleStackOnceOnDoubleClick + pointer.onClick = toggleStack + pointer.onDoubleClick = () => { + toggleStack() + promptRenameLinkBadge( + this, + graphScopeOf(graph), + links.map(({ id }) => id), + e + ) + } pointer.onDragStart = () => (this.dragging_canvas = true) pointer.finally = () => (this.dragging_canvas = false) return @@ -7019,7 +7026,7 @@ export class LGraphCanvas implements CustomEventDispatcher if (link) showLink(this, graphScope, link.id) break case 'Rename': - if (link) promptRenameLinkBadge(this, graphScope, link.id, e) + if (link) promptRenameLinkBadge(this, graphScope, [link.id], e) break default: } @@ -8905,14 +8912,14 @@ export class LGraphCanvas implements CustomEventDispatcher getCanvasContextMenuTarget(this, event.canvasX, event.canvasY) if (stackedLinks) { const graphScope = graphScopeOf(this.graph) + const stackedLinkIds = stackedLinks.map(({ id }) => id) new LiteGraph.ContextMenu(getLinkStackMenuOptions(), { event, - callback: () => - showLinks( - this, - graphScope, - stackedLinks.map(({ id }) => id) - ) + callback: (item) => { + if (typeof item !== 'string' && item?.value === 'Rename') + promptRenameLinkBadge(this, graphScope, stackedLinkIds, event) + else showLinks(this, graphScope, stackedLinkIds) + } }) return } diff --git a/src/lib/litegraph/src/canvas/linkVisibility.test.ts b/src/lib/litegraph/src/canvas/linkVisibility.test.ts index da9cf379219..919bf222c05 100644 --- a/src/lib/litegraph/src/canvas/linkVisibility.test.ts +++ b/src/lib/litegraph/src/canvas/linkVisibility.test.ts @@ -15,7 +15,7 @@ import { hideLink, hideLinks, promptRenameLinkBadge, - renameLink, + renameLinks, showLink } from './linkVisibility' @@ -60,17 +60,60 @@ describe('link visibility mutations', () => { const scope = graphScopeOf(new LGraph()) const host = createHost() - renameLink(host, scope, link.id, ' Backbone ') + renameLinks(host, scope, [link.id], ' Backbone ') expect( useLinkPresentationStore().getPresentation(scope, link.id)?.label ).toBe('Backbone') - renameLink(host, scope, link.id, ' ') + renameLinks(host, scope, [link.id], ' ') expect( useLinkPresentationStore().getPresentation(scope, link.id)?.label ).toBeUndefined() }) + it('renames every listed link in one undoable change', () => { + const scope = graphScopeOf(new LGraph()) + const events: string[] = [] + const host = createHost(events) + const linkIds = [toLinkId(21), toLinkId(22), toLinkId(23)] + const labels = () => + linkIds.map( + (linkId) => + useLinkPresentationStore().getPresentation(scope, linkId)?.label + ) + + renameLinks(host, scope, linkIds, ' render_size ') + + expect(labels()).toEqual(['render_size', 'render_size', 'render_size']) + expect(events).toEqual(['before', 'dirty:false:true', 'after']) + + renameLinks(host, scope, linkIds, '') + + expect(labels()).toEqual([undefined, undefined, undefined]) + }) + + it('seeds the prompt with the shared name and renames every listed link', () => { + const scope = graphScopeOf(new LGraph()) + const host = createHost() + const event = fromPartial({}) + const linkIds = [toLinkId(31), toLinkId(32)] + const store = useLinkPresentationStore() + for (const linkId of linkIds) store.patch(scope, linkId, { label: 'old' }) + + promptRenameLinkBadge(host, scope, linkIds, event) + + expect(host.prompt).toHaveBeenCalledWith( + 'Rename', + 'old', + expect.any(Function), + event + ) + host.prompt.mock.calls[0][2]('new') + expect( + linkIds.map((linkId) => store.getPresentation(scope, linkId)?.label) + ).toEqual(['new', 'new']) + }) + it('localizes and seeds the rename prompt', async () => { const link = createMockLLink({ type: 'MODEL' }) const scope = graphScopeOf(new LGraph()) @@ -84,7 +127,7 @@ describe('link visibility mutations', () => { useLinkPresentationStore().patch(scope, link.id, { label: 'Existing name' }) - promptRenameLinkBadge(host, scope, link.id, event) + promptRenameLinkBadge(host, scope, [link.id], event) expect(host.prompt).toHaveBeenCalledWith( 'Renommer', @@ -102,7 +145,7 @@ describe('link visibility mutations', () => { useLinkPresentationStore().patch(scope, link.id, { label: undefined }) host.prompt.mockClear() - promptRenameLinkBadge(host, scope, link.id, event) + promptRenameLinkBadge(host, scope, [link.id], event) expect(host.prompt).toHaveBeenCalledWith( 'Renommer', diff --git a/src/lib/litegraph/src/canvas/linkVisibility.ts b/src/lib/litegraph/src/canvas/linkVisibility.ts index 02afb0fc5fe..5279d5f48d6 100644 --- a/src/lib/litegraph/src/canvas/linkVisibility.ts +++ b/src/lib/litegraph/src/canvas/linkVisibility.ts @@ -100,9 +100,10 @@ export function deleteLinks( } export function getLinkStackMenuOptions(): IContextMenuValue[] { - return [ - { content: st('contextMenu.Show Links', 'Show Links'), value: 'Show Links' } - ] + return ['Rename', 'Show Links'].map((value) => ({ + content: st(`contextMenu.${value}`, value), + value + })) } export function getVisibleRerouteLink( @@ -129,29 +130,30 @@ export function showLink( }) } -export function renameLink( +export function renameLinks( host: LinkMutationHost, scope: GraphScope, - linkId: LinkId, + linkIds: Iterable, value: string ): void { - mutateLink(host, () => - useLinkPresentationStore().patch(scope, linkId, { - label: value.trim() || undefined - }) - ) + const label = value.trim() || undefined + mutateLink(host, () => { + const store = useLinkPresentationStore() + for (const linkId of linkIds) store.patch(scope, linkId, { label }) + }) } +/** Prompts for one name and gives it to every listed link, seeded with the first link's name. */ export function promptRenameLinkBadge( host: LinkRenameHost, scope: GraphScope, - linkId: LinkId, + linkIds: readonly LinkId[], event: CanvasPointerEvent ): void { host.prompt( t('contextMenu.Rename'), - useLinkPresentationStore().getPresentation(scope, linkId)?.label ?? '', - (value) => renameLink(host, scope, linkId, value), + useLinkPresentationStore().getPresentation(scope, linkIds[0])?.label ?? '', + (value) => renameLinks(host, scope, linkIds, value), event ) } diff --git a/src/lib/litegraph/src/canvas/resolvePointerTarget.ts b/src/lib/litegraph/src/canvas/resolvePointerTarget.ts index 2f9c8e8057e..e4e24f0ad5c 100644 --- a/src/lib/litegraph/src/canvas/resolvePointerTarget.ts +++ b/src/lib/litegraph/src/canvas/resolvePointerTarget.ts @@ -33,7 +33,7 @@ import { export type PointerTarget = | { kind: 'node'; node: LGraphNode } | { kind: 'linkBadge'; link: LLink } - | { kind: 'linkBadgeStack'; stackKey: string } + | { kind: 'linkBadgeStack'; stackKey: string; links: LLink[] } | { kind: 'subgraphIO'; ioNode: SubgraphInputNode | SubgraphOutputNode } | { kind: 'reroute'; reroute: Reroute; part: 'body' | 'input' | 'output' } | { kind: 'link'; segment: LinkSegment } @@ -55,7 +55,7 @@ export function resolvePointerTarget( const point: Point = [e.canvasX, e.canvasY] const stack = queryHiddenLinkStackAtPoint(canvas, graph, ...point) - if (stack) return { kind: 'linkBadgeStack', stackKey: stack.stackKey } + if (stack) return { kind: 'linkBadgeStack', ...stack } const badgeLink = queryHiddenLinkBadgeAtPoint( canvas, From 485f76c6a02793061317909bccc21a4ff36b2f23 Mon Sep 17 00:00:00 2001 From: shrimbly Date: Tue, 17 Nov 2026 09:58:57 +1300 Subject: [PATCH 05/12] fix(canvas): keep a renamed stack expanded and revert only its own toggle A stack's expanded state now follows its links to the key of their new name. A double-click toggles the stack back only when its first click toggled that stack. The stack menu acts only on its two named items. --- .../src/LGraphCanvas.linkVisibility.test.ts | 72 ++++++++++++++++++- src/lib/litegraph/src/LGraphCanvas.ts | 36 +++++++--- .../src/canvas/getCanvasContextMenuTarget.ts | 4 +- src/lib/litegraph/src/canvas/linkBadges.ts | 70 +++++++++++++++--- .../litegraph/src/canvas/linkVisibility.ts | 8 ++- 5 files changed, 167 insertions(+), 23 deletions(-) diff --git a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts index 825e26f6c62..003946a880c 100644 --- a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts @@ -687,8 +687,9 @@ describe('LGraphCanvas link visibility interactions', () => { expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBeUndefined() }) - it('keeps an expanded stack expanded while its head is double clicked', () => { - const { canvas, links, relayout, prompt } = createStackFixture() + it('keeps an expanded stack expanded through a double click and its rename', () => { + const { canvas, links, relayout, prompt, submitPrompt } = + createStackFixture() clickAt(canvas, 420, 300) relayout() @@ -697,6 +698,48 @@ describe('LGraphCanvas link visibility interactions', () => { expect(prompt).toHaveBeenCalledOnce() expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBe(links[0].id) + + submitPrompt('render_size') + + expect(stackedLinkIdsAt(canvas, 420, 300)).toEqual( + links.map(({ id }) => id) + ) + expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBe(links[0].id) + }) + + it('keeps an expanded stack expanded when its menu Rename clears the name', () => { + const { canvas, links, relayout, submitPrompt } = createStackFixture([ + 'batch', + 'batch' + ]) + const menu = vi + .spyOn(LiteGraph, 'ContextMenu') + .mockImplementation(fromPartial(class {})) + clickAt(canvas, 420, 300) + relayout() + + canvas.processContextMenu( + undefined, + fromPartial({ canvasX: 420, canvasY: 300 }) + ) + void menu.mock.calls[0][1]?.callback?.({ + content: 'Rename', + value: 'Rename' + }) + submitPrompt('') + + expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBe(links[0].id) + }) + + it('leaves a stack collapsed when the first click of a double click missed it', () => { + const { canvas, relayout, prompt } = createStackFixture() + + pressAt(canvas, 420, 280, 100) + pressAt(canvas, 420, 295, 200) + relayout() + + expect(prompt).toHaveBeenCalledOnce() + expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBeUndefined() }) it('merges a renamed stack into the stack that already has that name', () => { @@ -772,6 +815,31 @@ describe('LGraphCanvas link visibility interactions', () => { expect(links.map(labelOf)).toEqual(['render_size', 'render_size']) }) + it('shows every link in a stack from the Show Links item of its context menu', () => { + const { graph, canvas, links } = createStackFixture() + const menu = vi + .spyOn(LiteGraph, 'ContextMenu') + .mockImplementation(fromPartial(class {})) + const hiddenLinks = () => + links.filter( + ({ id }) => + useLinkPresentationStore().getPresentation(graphScopeOf(graph), id) + ?.hidden + ) + + canvas.processContextMenu( + undefined, + fromPartial({ canvasX: 420, canvasY: 300 }) + ) + const callback = menu.mock.calls[0][1]?.callback + + void callback?.(undefined) + expect(hiddenLinks()).toEqual(links) + + void callback?.({ content: 'Show Links', value: 'Show Links' }) + expect(hiddenLinks()).toEqual([]) + }) + it('collapses an expanded stack when empty canvas is clicked', () => { const { canvas, relayout } = createStackFixture() diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index 9bbf0083635..3092d1700d0 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -110,6 +110,8 @@ import { collapseLinkBadgeStacks, drawHiddenLinkBadges, queryLinkBadgeHitAtPoint, + relabelExpandedLinkBadgeStack, + revertLinkBadgeStackToggle, toggleLinkBadgeStack } from './canvas/linkBadges' import { layoutGraphLinkBadges } from './canvas/linkBadgeRenderer' @@ -2899,18 +2901,24 @@ export class LGraphCanvas implements CustomEventDispatcher case 'linkBadgeStack': { const { stackKey, links } = target - const toggleStack = () => { - toggleLinkBadgeStack(this, stackKey) + pointer.onClick = () => { + toggleLinkBadgeStack(this, stackKey, e.timeStamp) this.dirty_bgcanvas = true } - pointer.onClick = toggleStack pointer.onDoubleClick = () => { - toggleStack() + revertLinkBadgeStackToggle( + this, + stackKey, + e.timeStamp, + CanvasPointer.doubleClickTime + ) + this.dirty_bgcanvas = true promptRenameLinkBadge( this, graphScopeOf(graph), links.map(({ id }) => id), - e + e, + (name) => relabelExpandedLinkBadgeStack(this, stackKey, name) ) } pointer.onDragStart = () => (this.dragging_canvas = true) @@ -8908,17 +8916,25 @@ export class LGraphCanvas implements CustomEventDispatcher menu_info = this.getCanvasMenuOptions() if (!this.graph) throw new NullGraphError() - const { reroute, linkSegment, link, stackedLinks, group } = + const { reroute, linkSegment, link, stackedLinks, stackKey, group } = getCanvasContextMenuTarget(this, event.canvasX, event.canvasY) - if (stackedLinks) { + if (stackedLinks && stackKey) { const graphScope = graphScopeOf(this.graph) const stackedLinkIds = stackedLinks.map(({ id }) => id) new LiteGraph.ContextMenu(getLinkStackMenuOptions(), { event, callback: (item) => { - if (typeof item !== 'string' && item?.value === 'Rename') - promptRenameLinkBadge(this, graphScope, stackedLinkIds, event) - else showLinks(this, graphScope, stackedLinkIds) + const action = typeof item === 'string' ? item : item?.value + if (action === 'Rename') + promptRenameLinkBadge( + this, + graphScope, + stackedLinkIds, + event, + (name) => relabelExpandedLinkBadgeStack(this, stackKey, name) + ) + if (action === 'Show Links') + showLinks(this, graphScope, stackedLinkIds) } }) return diff --git a/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.ts b/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.ts index 4eff269fcaa..1a6c151e931 100644 --- a/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.ts +++ b/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.ts @@ -26,6 +26,7 @@ interface CanvasContextMenuTarget { linkSegment?: LinkSegment link?: LLink stackedLinks?: LLink[] + stackKey?: string group?: LGraphGroup } @@ -76,7 +77,8 @@ export function getCanvasContextMenuTarget( if (reroute) return { reroute, group } const stack = queryHiddenLinkStackAtPoint(canvas, graph, x, y) - if (stack) return { stackedLinks: stack.links, group } + if (stack) + return { stackedLinks: stack.links, stackKey: stack.stackKey, group } const badgeLink = queryHiddenLinkBadgeAtPoint(canvas, graph, x, y) if (badgeLink) return { link: badgeLink, group } diff --git a/src/lib/litegraph/src/canvas/linkBadges.ts b/src/lib/litegraph/src/canvas/linkBadges.ts index d19266b0061..10299b9d39a 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.ts @@ -62,6 +62,7 @@ interface BadgeEndpoint { color: string width: number layers: number + socketKey: string memberOfStack?: string hitArea: BadgeHitArea tip: Point @@ -70,6 +71,10 @@ interface BadgeEndpoint { const endpointsByHost = new WeakMap() const expandedStacksByHost = new WeakMap>() const drawnStackKeysByHost = new WeakMap>() +const lastStackToggleByHost = new WeakMap< + object, + { stackKey: string; timeStamp: number } +>() export function clearLinkBadgeHitAreas(host: object): void { endpointsByHost.delete(host) @@ -100,10 +105,43 @@ export function queryLinkBadgeAtPoint( return hit && !hit.stackKey ? hit.linkIds[0] : undefined } -export function toggleLinkBadgeStack(host: object, stackKey: string): void { +/** Expands or collapses a stack, remembering the press at `timeStamp` that did it. */ +export function toggleLinkBadgeStack( + host: object, + stackKey: string, + timeStamp = -Infinity +): void { const expanded = expandedStacksByHost.get(host) ?? new Set() if (!expanded.delete(stackKey)) expanded.add(stackKey) expandedStacksByHost.set(host, expanded) + lastStackToggleByHost.set(host, { stackKey, timeStamp }) +} + +/** Undoes the toggle of a stack when the press at `timeStamp` double-clicks the press that made it. */ +export function revertLinkBadgeStackToggle( + host: object, + stackKey: string, + timeStamp: number, + doubleClickTime: number +): void { + const last = lastStackToggleByHost.get(host) + if (last?.stackKey !== stackKey) return + if (timeStamp - last.timeStamp < doubleClickTime) + toggleLinkBadgeStack(host, stackKey) +} + +/** Keeps a stack expanded under the key its links get when they all take `label`. */ +export function relabelExpandedLinkBadgeStack( + host: object, + stackKey: string, + label: string +): void { + const expanded = expandedStacksByHost.get(host) + const head = endpointsByHost + .get(host) + ?.find(({ hitArea }) => hitArea.stackKey === stackKey) + if (!head || !expanded?.delete(stackKey)) return + expanded.add(labelledStackKey(head.socketKey, label.trim())) } /** Collapses every expanded stack on the host; returns whether one was on screen. */ @@ -189,16 +227,29 @@ function socketOf(link: LLink, side: BadgeSide) { : { nodeId: link.target_id, slot: link.target_slot } } -function stackKeyOf( - { link, presentation }: HiddenLinkBadge, +function socketKeyOf( + { link }: HiddenLinkBadge, side: BadgeSide, graphId: string | undefined ): string { const { nodeId, slot } = socketOf(link, side) - const label = presentation.label?.trim() const socketKey = `${side}:${nodeId}:${slot}` - const groupKey = label ? `${socketKey}=${JSON.stringify(label)}` : socketKey - return graphId ? `${graphId}/${groupKey}` : groupKey + return graphId ? `${graphId}/${socketKey}` : socketKey +} + +function labelledStackKey(socketKey: string, label: string | undefined) { + return label ? `${socketKey}=${JSON.stringify(label)}` : socketKey +} + +function stackKeyOf( + hidden: HiddenLinkBadge, + side: BadgeSide, + graphId: string | undefined +): string { + return labelledStackKey( + socketKeyOf(hidden, side, graphId), + hidden.presentation.label?.trim() + ) } function isUnlabelled({ presentation }: HiddenLinkBadge): boolean { @@ -234,6 +285,7 @@ interface EndpointSpec { text: string color: string linkIds: readonly LinkId[] + socketKey: string stackKey?: string memberOfStack?: string layers?: number @@ -244,7 +296,7 @@ function createBadgeEndpoint( spec: EndpointSpec ): BadgeEndpoint { const { link, side, rank, socket, text, color, linkIds, stackKey } = spec - const { groupOrder, memberOfStack } = spec + const { groupOrder, memberOfStack, socketKey } = spec const layers = spec.layers ?? 0 const badge = makeBadge(text, color) const width = badge.getWidth(ctx) @@ -263,6 +315,7 @@ function createBadgeEndpoint( color, width, layers, + socketKey, memberOfStack, hitArea: { linkIds, @@ -353,7 +406,8 @@ export function layoutHiddenLinkBadges( rank: isUnlabelled(hidden) ? BADGE_RANK.unlabelled : BADGE_RANK.labelled, groupOrder: stacks.get(stackKey)?.[0] ?? link.id, text: linkBadgeText(link.type, presentation), - linkIds: [link.id] + linkIds: [link.id], + socketKey: socketKeyOf(hidden, side, graphId) } if (!stacks.has(stackKey)) return addEndpoint(spec) const head = stackHead(spec, stackKey) diff --git a/src/lib/litegraph/src/canvas/linkVisibility.ts b/src/lib/litegraph/src/canvas/linkVisibility.ts index 5279d5f48d6..53a5176d39c 100644 --- a/src/lib/litegraph/src/canvas/linkVisibility.ts +++ b/src/lib/litegraph/src/canvas/linkVisibility.ts @@ -148,12 +148,16 @@ export function promptRenameLinkBadge( host: LinkRenameHost, scope: GraphScope, linkIds: readonly LinkId[], - event: CanvasPointerEvent + event: CanvasPointerEvent, + onRename?: (value: string) => void ): void { host.prompt( t('contextMenu.Rename'), useLinkPresentationStore().getPresentation(scope, linkIds[0])?.label ?? '', - (value) => renameLinks(host, scope, linkIds, value), + (value) => { + renameLinks(host, scope, linkIds, value) + onRename?.(value) + }, event ) } From db9fae518da679861ec13d47a812a3591f95f695 Mon Sep 17 00:00:00 2001 From: shrimbly Date: Tue, 17 Nov 2026 10:13:25 +1300 Subject: [PATCH 06/12] fix(canvas): forget a stack toggle once it is collapsed, and open the stack menu inside a group A stack collapsed by Escape or a click away no longer toggles back on the next fast click. In Nodes 2.0, a right-click on a stack inside a group now opens the stack menu, as it does for a single hidden label. --- .../graph/useGroupContextMenu.test.ts | 20 ++++++++++++++++++- src/composables/graph/useGroupContextMenu.ts | 4 ++-- .../src/LGraphCanvas.linkVisibility.test.ts | 12 +++++++++++ src/lib/litegraph/src/canvas/linkBadges.ts | 6 ++++-- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/composables/graph/useGroupContextMenu.test.ts b/src/composables/graph/useGroupContextMenu.test.ts index a9bc7bdb6f0..005a67c6a9d 100644 --- a/src/composables/graph/useGroupContextMenu.test.ts +++ b/src/composables/graph/useGroupContextMenu.test.ts @@ -23,7 +23,12 @@ const { mockShowNodeOptions, mockGetCanvasContextMenuTarget } = vi.hoisted( () => ({ mockShowNodeOptions: vi.fn(), mockGetCanvasContextMenuTarget: vi.fn< - () => { reroute?: unknown; link?: unknown; group?: unknown } + () => { + reroute?: unknown + link?: unknown + stackedLinks?: unknown[] + group?: unknown + } >(() => ({})) }) ) @@ -252,6 +257,19 @@ describe('useGroupContextMenu', () => { expect(stubCanvas.selectedItems.size).toBe(0) }) + it('falls through to the legacy menu when the cursor is on a stack of hidden links', () => { + mockGetCanvasContextMenuTarget.mockReturnValue({ + stackedLinks: [{ id: 5 }, { id: 6 }], + group + }) + + invoke(undefined) + + expect(legacyMenuMock).toHaveBeenCalledOnce() + expect(mockShowNodeOptions).not.toHaveBeenCalled() + expect(stubCanvas.selectedItems.size).toBe(0) + }) + it('falls through to the legacy menu when the cursor is on a link', () => { mockGetCanvasContextMenuTarget.mockReturnValue({ link: { id: 5 }, diff --git a/src/composables/graph/useGroupContextMenu.ts b/src/composables/graph/useGroupContextMenu.ts index 57161431d1a..01c15b7d5fd 100644 --- a/src/composables/graph/useGroupContextMenu.ts +++ b/src/composables/graph/useGroupContextMenu.ts @@ -31,12 +31,12 @@ export function useGroupContextMenu() { return } - const { reroute, link, group } = getCanvasContextMenuTarget( + const { reroute, link, stackedLinks, group } = getCanvasContextMenuTarget( this, event.canvasX, event.canvasY ) - if (reroute || link || !group) { + if (reroute || link || stackedLinks || !group) { original.apply(this, args) return } diff --git a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts index 003946a880c..f8e999da738 100644 --- a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts @@ -742,6 +742,18 @@ describe('LGraphCanvas link visibility interactions', () => { expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBeUndefined() }) + it('leaves a stack collapsed when Escape collapsed it between two fast clicks', () => { + const { canvas, relayout, prompt } = createStackFixture() + + pressAt(canvas, 420, 300, 100) + canvas.processKey(new KeyboardEvent('keydown', { key: 'Escape' })) + pressAt(canvas, 420, 300, 200) + relayout() + + expect(prompt).toHaveBeenCalledOnce() + expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBeUndefined() + }) + it('merges a renamed stack into the stack that already has that name', () => { const { canvas, links, prompt, submitPrompt } = createStackFixture([ undefined, diff --git a/src/lib/litegraph/src/canvas/linkBadges.ts b/src/lib/litegraph/src/canvas/linkBadges.ts index 10299b9d39a..998d82e8b46 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.ts @@ -125,9 +125,10 @@ export function revertLinkBadgeStackToggle( doubleClickTime: number ): void { const last = lastStackToggleByHost.get(host) + lastStackToggleByHost.delete(host) if (last?.stackKey !== stackKey) return - if (timeStamp - last.timeStamp < doubleClickTime) - toggleLinkBadgeStack(host, stackKey) + const gap = timeStamp - last.timeStamp + if (gap > 0 && gap < doubleClickTime) toggleLinkBadgeStack(host, stackKey) } /** Keeps a stack expanded under the key its links get when they all take `label`. */ @@ -148,6 +149,7 @@ export function relabelExpandedLinkBadgeStack( export function collapseLinkBadgeStacks(host: object): boolean { const expanded = expandedStacksByHost.get(host) expandedStacksByHost.delete(host) + lastStackToggleByHost.delete(host) const drawn = drawnStackKeysByHost.get(host) return [...(expanded ?? [])].some((stackKey) => drawn?.has(stackKey)) } From 1ff29fe93122e169618f3650d6d8f735019b3f82 Mon Sep 17 00:00:00 2001 From: shrimbly Date: Tue, 17 Nov 2026 10:25:44 +1300 Subject: [PATCH 07/12] refactor(canvas): name the group menu's target check Keeps processContextMenuWithVueGroupMenu under the complexity limit after it learned about link stacks. --- src/composables/graph/useGroupContextMenu.ts | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/composables/graph/useGroupContextMenu.ts b/src/composables/graph/useGroupContextMenu.ts index 01c15b7d5fd..9ebcc3c5da7 100644 --- a/src/composables/graph/useGroupContextMenu.ts +++ b/src/composables/graph/useGroupContextMenu.ts @@ -13,6 +13,15 @@ function shouldUseLegacyContextMenu( return Boolean(node) || !LiteGraph.vueNodesMode || !canvas.graph } +function groupUnderBareCursor(canvas: LGraphCanvas, x: number, y: number) { + const { reroute, link, stackedLinks, group } = getCanvasContextMenuTarget( + canvas, + x, + y + ) + return reroute || link || stackedLinks ? undefined : group +} + /** * Routes Nodes 2.0 group right-clicks to Vue while nodes, reroutes, * background, and legacy mode stay on litegraph. @@ -31,12 +40,8 @@ export function useGroupContextMenu() { return } - const { reroute, link, stackedLinks, group } = getCanvasContextMenuTarget( - this, - event.canvasX, - event.canvasY - ) - if (reroute || link || stackedLinks || !group) { + const group = groupUnderBareCursor(this, event.canvasX, event.canvasY) + if (!group) { original.apply(this, args) return } From 33e4f7171fc51381e66a34b48b725404081f9ca5 Mon Sep 17 00:00:00 2001 From: shrimbly Date: Tue, 17 Nov 2026 12:19:38 +1300 Subject: [PATCH 08/12] fix(canvas): send a double-click to the stack its first click toggled The press that pairs with a click that toggled a stack now targets that stack, wherever its pill is after the toggle. A double-click on the layer edge of a collapsed stack renames the whole stack, not its first link, and a double-click toggles back only the toggle of the click it pairs with. The pointer exposes the paired click, which replaces the separate time check. Tests: the stack rename case now has an unrelated named link, and the group menu test types its target mock from the real function. --- .../graph/useGroupContextMenu.test.ts | 28 ++++++++------- src/lib/litegraph/src/CanvasPointer.ts | 11 +++++- .../src/LGraphCanvas.linkVisibility.test.ts | 36 +++++++++++++++++-- src/lib/litegraph/src/LGraphCanvas.ts | 14 +++----- .../litegraph/src/canvas/linkBadgeRenderer.ts | 32 +++++++++++++---- src/lib/litegraph/src/canvas/linkBadges.ts | 18 +++++----- .../src/canvas/linkVisibility.test.ts | 3 +- src/lib/litegraph/src/canvas/reduceGesture.ts | 9 +++++ .../src/canvas/resolvePointerTarget.ts | 29 +++++++++++++-- 9 files changed, 133 insertions(+), 47 deletions(-) diff --git a/src/composables/graph/useGroupContextMenu.test.ts b/src/composables/graph/useGroupContextMenu.test.ts index 005a67c6a9d..7833b85348c 100644 --- a/src/composables/graph/useGroupContextMenu.test.ts +++ b/src/composables/graph/useGroupContextMenu.test.ts @@ -3,7 +3,8 @@ import { beforeEach, describe, expect, it, onTestFinished, vi } from 'vitest' import { useSelectedLiteGraphItems } from '@/composables/canvas/useSelectedLiteGraphItems' import { useGroupContextMenu } from '@/composables/graph/useGroupContextMenu' -import type { CanvasPointerEvent } from '@/lib/litegraph/src/litegraph' +import type { getCanvasContextMenuTarget } from '@/lib/litegraph/src/canvas/getCanvasContextMenuTarget' +import type { CanvasPointerEvent, Reroute } from '@/lib/litegraph/src/litegraph' import { LGraph, LGraphCanvas, @@ -18,18 +19,16 @@ import { createMockCanvasRenderingContext2D, createTestCanvas } from '@/utils/__tests__/canvasTestUtils' +import { createMockLLink } from '@/utils/__tests__/litegraphTestUtils' +import { toLinkId } from '@comfyorg/graph-model/linkId' +import { toRerouteId } from '@comfyorg/graph-model/rerouteId' const { mockShowNodeOptions, mockGetCanvasContextMenuTarget } = vi.hoisted( () => ({ mockShowNodeOptions: vi.fn(), - mockGetCanvasContextMenuTarget: vi.fn< - () => { - reroute?: unknown - link?: unknown - stackedLinks?: unknown[] - group?: unknown - } - >(() => ({})) + mockGetCanvasContextMenuTarget: vi.fn( + () => ({}) + ) }) ) @@ -37,7 +36,7 @@ vi.mock(import('@/composables/graph/useMoreOptionsMenu'), () => ({ showNodeOptions: mockShowNodeOptions })) -vi.mock( +vi.mock( import('@/lib/litegraph/src/canvas/getCanvasContextMenuTarget'), () => ({ getCanvasContextMenuTarget: mockGetCanvasContextMenuTarget @@ -246,7 +245,7 @@ describe('useGroupContextMenu', () => { it('falls through to the legacy menu when the cursor is on a reroute', () => { mockGetCanvasContextMenuTarget.mockReturnValue({ - reroute: { id: 5 }, + reroute: fromPartial({ id: toRerouteId(5) }), group }) @@ -259,7 +258,10 @@ describe('useGroupContextMenu', () => { it('falls through to the legacy menu when the cursor is on a stack of hidden links', () => { mockGetCanvasContextMenuTarget.mockReturnValue({ - stackedLinks: [{ id: 5 }, { id: 6 }], + stackedLinks: [ + createMockLLink({ id: toLinkId(5) }), + createMockLLink({ id: toLinkId(6) }) + ], group }) @@ -272,7 +274,7 @@ describe('useGroupContextMenu', () => { it('falls through to the legacy menu when the cursor is on a link', () => { mockGetCanvasContextMenuTarget.mockReturnValue({ - link: { id: 5 }, + link: createMockLLink({ id: toLinkId(5) }), group }) diff --git a/src/lib/litegraph/src/CanvasPointer.ts b/src/lib/litegraph/src/CanvasPointer.ts index e7e5337115d..84f6f60e8b9 100644 --- a/src/lib/litegraph/src/CanvasPointer.ts +++ b/src/lib/litegraph/src/CanvasPointer.ts @@ -6,7 +6,11 @@ import type { GesturePolicy, GestureState } from './canvas/reduceGesture' -import { idleGesture, reduceGesture } from './canvas/reduceGesture' +import { + doubleClickedClick, + idleGesture, + reduceGesture +} from './canvas/reduceGesture' import type { CompassCorners } from '@comfyorg/shared-frontend-utils/geometry' import type { CanvasPointerEvent } from '@comfyorg/graph-model/events' @@ -67,6 +71,11 @@ export class CanvasPointer { return this.state.phase === 'dragging' } + /** The `timeStamp` of the press that the current press double-clicks, if any. */ + get doubleClickedTimeStamp(): number | undefined { + return doubleClickedClick(this.state)?.timeStamp + } + private state: GestureState = idleGesture private releaseCapture?: () => void diff --git a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts index f8e999da738..150a4db9033 100644 --- a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts @@ -668,7 +668,7 @@ describe('LGraphCanvas link visibility interactions', () => { it('renames every link in a collapsed stack on a double click and keeps it collapsed', () => { const { canvas, links, prompt, submitPrompt, labelOf } = - createStackFixture() + createStackFixture([undefined, undefined, 'untouched']) doubleClickAt(canvas, 420, 300) @@ -680,13 +680,43 @@ describe('LGraphCanvas link visibility interactions', () => { ) submitPrompt('render_size') - expect(links.map(labelOf)).toEqual(['render_size', 'render_size']) + expect(links.map(labelOf)).toEqual([ + 'render_size', + 'render_size', + 'untouched' + ]) expect(stackedLinkIdsAt(canvas, 420, 300)).toEqual( - links.map(({ id }) => id) + links.slice(0, 2).map(({ id }) => id) ) + expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBe(links[2].id) + }) + + it('renames the whole stack when the double click lands on its layer edge', () => { + const { canvas, links, relayout, submitPrompt, labelOf } = + createStackFixture([undefined, undefined, undefined]) + + pressAt(canvas, 420, 313, 100) + relayout() + pressAt(canvas, 420, 313, 200) + submitPrompt('edge') + + expect(links.map(labelOf)).toEqual(['edge', 'edge', 'edge']) expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBeUndefined() }) + it('keeps a stack expanded when a member click sits between two head clicks', () => { + const { canvas, links, relayout, prompt } = createStackFixture() + + pressAt(canvas, 420, 300, 100) + relayout() + pressAt(canvas, 420, 322, 220) + pressAt(canvas, 420, 309, 340) + relayout() + + expect(prompt).toHaveBeenCalledOnce() + expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBe(links[0].id) + }) + it('keeps an expanded stack expanded through a double click and its rename', () => { const { canvas, links, relayout, prompt, submitPrompt } = createStackFixture() diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index 3092d1700d0..781a7321e6f 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -111,7 +111,6 @@ import { drawHiddenLinkBadges, queryLinkBadgeHitAtPoint, relabelExpandedLinkBadgeStack, - revertLinkBadgeStackToggle, toggleLinkBadgeStack } from './canvas/linkBadges' import { layoutGraphLinkBadges } from './canvas/linkBadgeRenderer' @@ -2900,19 +2899,16 @@ export class LGraphCanvas implements CustomEventDispatcher } case 'linkBadgeStack': { - const { stackKey, links } = target + const { stackKey, links, toggledByDoubleClickedPress } = target pointer.onClick = () => { toggleLinkBadgeStack(this, stackKey, e.timeStamp) this.dirty_bgcanvas = true } pointer.onDoubleClick = () => { - revertLinkBadgeStackToggle( - this, - stackKey, - e.timeStamp, - CanvasPointer.doubleClickTime - ) - this.dirty_bgcanvas = true + if (toggledByDoubleClickedPress) { + toggleLinkBadgeStack(this, stackKey) + this.dirty_bgcanvas = true + } promptRenameLinkBadge( this, graphScopeOf(graph), diff --git a/src/lib/litegraph/src/canvas/linkBadgeRenderer.ts b/src/lib/litegraph/src/canvas/linkBadgeRenderer.ts index 8ce801ca267..78fbb4c774a 100644 --- a/src/lib/litegraph/src/canvas/linkBadgeRenderer.ts +++ b/src/lib/litegraph/src/canvas/linkBadgeRenderer.ts @@ -6,7 +6,8 @@ import { useLinkPresentationStore } from '@/stores/linkPresentationStore' import { layoutHiddenLinkBadges, queryLinkBadgeAtPoint, - queryLinkBadgeHitAtPoint + queryLinkBadgeHitAtPoint, + queryLinkBadgeStackToggledAt } from './linkBadges' import { getLinkEndpointPositions } from './linkGeometry' import { slotTypeKey } from '@/lib/litegraph/src/utils/type' @@ -29,14 +30,12 @@ export function queryHiddenLinkBadgeAtPoint( } } -/** The stack of hidden links whose pill is under a canvas point. */ -export function queryHiddenLinkStackAtPoint( - host: object, +type LinkBadgeHit = ReturnType + +function hiddenLinkStackOf( graph: LGraph, - x: number, - y: number + hit: LinkBadgeHit ): { stackKey: string; links: LLink[] } | undefined { - const hit = queryLinkBadgeHitAtPoint(host, x, y) if (!hit?.stackKey) return const scope = graphScopeOf(graph) const presentationStore = useLinkPresentationStore() @@ -49,6 +48,25 @@ export function queryHiddenLinkStackAtPoint( if (links.length) return { stackKey: hit.stackKey, links } } +/** The stack of hidden links whose pill is under a canvas point. */ +export function queryHiddenLinkStackAtPoint( + host: object, + graph: LGraph, + x: number, + y: number +): { stackKey: string; links: LLink[] } | undefined { + return hiddenLinkStackOf(graph, queryLinkBadgeHitAtPoint(host, x, y)) +} + +/** The stack of hidden links that the press at `timeStamp` expanded or collapsed. */ +export function queryHiddenLinkStackToggledAt( + host: object, + graph: LGraph, + timeStamp: number | undefined +): { stackKey: string; links: LLink[] } | undefined { + return hiddenLinkStackOf(graph, queryLinkBadgeStackToggledAt(host, timeStamp)) +} + export function layoutGraphLinkBadges( host: object, ctx: CanvasRenderingContext2D, diff --git a/src/lib/litegraph/src/canvas/linkBadges.ts b/src/lib/litegraph/src/canvas/linkBadges.ts index 998d82e8b46..1fbf406729d 100644 --- a/src/lib/litegraph/src/canvas/linkBadges.ts +++ b/src/lib/litegraph/src/canvas/linkBadges.ts @@ -117,18 +117,16 @@ export function toggleLinkBadgeStack( lastStackToggleByHost.set(host, { stackKey, timeStamp }) } -/** Undoes the toggle of a stack when the press at `timeStamp` double-clicks the press that made it. */ -export function revertLinkBadgeStackToggle( +/** The hit area of the stack that the press at `timeStamp` expanded or collapsed. */ +export function queryLinkBadgeStackToggledAt( host: object, - stackKey: string, - timeStamp: number, - doubleClickTime: number -): void { + timeStamp: number | undefined +): Readonly | undefined { const last = lastStackToggleByHost.get(host) - lastStackToggleByHost.delete(host) - if (last?.stackKey !== stackKey) return - const gap = timeStamp - last.timeStamp - if (gap > 0 && gap < doubleClickTime) toggleLinkBadgeStack(host, stackKey) + if (timeStamp === undefined || last?.timeStamp !== timeStamp) return + return endpointsByHost + .get(host) + ?.find(({ hitArea }) => hitArea.stackKey === last.stackKey)?.hitArea } /** Keeps a stack expanded under the key its links get when they all take `label`. */ diff --git a/src/lib/litegraph/src/canvas/linkVisibility.test.ts b/src/lib/litegraph/src/canvas/linkVisibility.test.ts index 919bf222c05..46fe00f23a0 100644 --- a/src/lib/litegraph/src/canvas/linkVisibility.test.ts +++ b/src/lib/litegraph/src/canvas/linkVisibility.test.ts @@ -98,7 +98,8 @@ describe('link visibility mutations', () => { const event = fromPartial({}) const linkIds = [toLinkId(31), toLinkId(32)] const store = useLinkPresentationStore() - for (const linkId of linkIds) store.patch(scope, linkId, { label: 'old' }) + store.patch(scope, linkIds[0], { label: 'old' }) + store.patch(scope, linkIds[1], { label: 'old' }) promptRenameLinkBadge(host, scope, linkIds, event) diff --git a/src/lib/litegraph/src/canvas/reduceGesture.ts b/src/lib/litegraph/src/canvas/reduceGesture.ts index f3161539e2f..3f1cbbc9f3e 100644 --- a/src/lib/litegraph/src/canvas/reduceGesture.ts +++ b/src/lib/litegraph/src/canvas/reduceGesture.ts @@ -70,6 +70,15 @@ function isDoubleClick( ) } +/** The earlier click that the current press double-clicks if it ends as a click. */ +export function doubleClickedClick( + state: GestureState +): ClickRecord | undefined { + return state.phase === 'pressed' && isDoubleClick(state) + ? state.lastClick + : undefined +} + function unchanged(state: GestureState): GestureResult { return { state, effects: [] } } diff --git a/src/lib/litegraph/src/canvas/resolvePointerTarget.ts b/src/lib/litegraph/src/canvas/resolvePointerTarget.ts index e4e24f0ad5c..2b961a3cbc3 100644 --- a/src/lib/litegraph/src/canvas/resolvePointerTarget.ts +++ b/src/lib/litegraph/src/canvas/resolvePointerTarget.ts @@ -27,13 +27,19 @@ import { } from './hitTesting' import { queryHiddenLinkBadgeAtPoint, - queryHiddenLinkStackAtPoint + queryHiddenLinkStackAtPoint, + queryHiddenLinkStackToggledAt } from './linkBadgeRenderer' export type PointerTarget = | { kind: 'node'; node: LGraphNode } | { kind: 'linkBadge'; link: LLink } - | { kind: 'linkBadgeStack'; stackKey: string; links: LLink[] } + | { + kind: 'linkBadgeStack' + stackKey: string + links: LLink[] + toggledByDoubleClickedPress: boolean + } | { kind: 'subgraphIO'; ioNode: SubgraphInputNode | SubgraphOutputNode } | { kind: 'reroute'; reroute: Reroute; part: 'body' | 'input' | 'output' } | { kind: 'link'; segment: LinkSegment } @@ -54,8 +60,25 @@ export function resolvePointerTarget( const point: Point = [e.canvasX, e.canvasY] + const toggledStack = queryHiddenLinkStackToggledAt( + canvas, + graph, + canvas.pointer.doubleClickedTimeStamp + ) + if (toggledStack) + return { + kind: 'linkBadgeStack', + ...toggledStack, + toggledByDoubleClickedPress: true + } + const stack = queryHiddenLinkStackAtPoint(canvas, graph, ...point) - if (stack) return { kind: 'linkBadgeStack', ...stack } + if (stack) + return { + kind: 'linkBadgeStack', + ...stack, + toggledByDoubleClickedPress: false + } const badgeLink = queryHiddenLinkBadgeAtPoint( canvas, From 2451d1a74089e2c720f22d9568da3d2b7db7b27a Mon Sep 17 00:00:00 2001 From: shrimbly Date: Tue, 17 Nov 2026 13:16:50 +1300 Subject: [PATCH 09/12] fix(canvas): replace only the double-click action for a toggled stack The press after a click that toggled a stack keeps the handlers of what it really hit, so a drag from beside the stack still selects. Only its double-click action goes to the stack. The toggle record is read again at release, so Escape during the press keeps its collapse, and the click-away cleanup no longer collapses the stack the double-click restored. --- .../src/LGraphCanvas.linkVisibility.test.ts | 93 +++++++++++++++++++ src/lib/litegraph/src/LGraphCanvas.ts | 80 +++++++++++----- .../src/canvas/resolvePointerTarget.ts | 29 +----- 3 files changed, 153 insertions(+), 49 deletions(-) diff --git a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts index 150a4db9033..478521b6484 100644 --- a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts @@ -704,6 +704,99 @@ describe('LGraphCanvas link visibility interactions', () => { expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBeUndefined() }) + it('keeps an expanded stack expanded when the second click of its rename lands beside the pill', () => { + const { canvas, links, relayout, prompt } = createStackFixture([ + undefined, + undefined, + undefined + ]) + pressAt(canvas, 420, 300, 100) + relayout() + + pressAt(canvas, 420, 300, 500) + relayout() + pressAt(canvas, 420, 284, 600) + relayout() + + expect(prompt).toHaveBeenCalledOnce() + expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBe(links[0].id) + }) + + it('leaves a stack collapsed when Escape is pressed during the second press', () => { + const { canvas, relayout, prompt } = createStackFixture() + const init = { isPrimary: true, pointerId: 1, clientX: 420, clientY: 300 } + const down = new PointerEvent('pointerdown', { + ...init, + button: 0, + buttons: 1 + }) + const up = new PointerEvent('pointerup', { + ...init, + button: 0, + buttons: 0 + }) + vi.spyOn(down, 'timeStamp', 'get').mockReturnValue(200) + vi.spyOn(up, 'timeStamp', 'get').mockReturnValue(220) + + pressAt(canvas, 420, 300, 100) + relayout() + canvas.processMouseDown(down) + canvas.processKey(new KeyboardEvent('keydown', { key: 'Escape' })) + canvas.processMouseUp(up) + relayout() + + expect(prompt).toHaveBeenCalledOnce() + expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBeUndefined() + }) + + function dragFromBesideStackAfterClickingIt(gap: number) { + const previousBehavior = LiteGraph.leftMouseClickBehavior + LiteGraph.leftMouseClickBehavior = 'select' + onTestFinished(() => { + LiteGraph.leftMouseClickBehavior = previousBehavior + }) + const { canvas, relayout } = createStackFixture() + pressAt(canvas, 420, 300, 100) + relayout() + + const init = { isPrimary: true, pointerId: 1, button: 0 } + const down = new PointerEvent('pointerdown', { + ...init, + buttons: 1, + clientX: 420, + clientY: 284 + }) + vi.spyOn(down, 'timeStamp', 'get').mockReturnValue(100 + gap) + canvas.processMouseDown(down) + canvas.processMouseMove( + new PointerEvent('pointermove', { + ...init, + buttons: 1, + clientX: 460, + clientY: 244 + }) + ) + const draggingCanvas = canvas.dragging_canvas + canvas.processMouseUp( + new PointerEvent('pointerup', { + ...init, + buttons: 0, + clientX: 460, + clientY: 244 + }) + ) + return { draggingCanvas, offset: [...canvas.ds.offset] } + } + + it('selects, not pans, when dragging from beside a just-clicked stack', () => { + const outsideDoubleClickWindow = dragFromBesideStackAfterClickingIt(1000) + + expect(outsideDoubleClickWindow.draggingCanvas).toBe(false) + expect(dragFromBesideStackAfterClickingIt(100)).toEqual( + outsideDoubleClickWindow + ) + }) + it('keeps a stack expanded when a member click sits between two head clicks', () => { const { canvas, links, relayout, prompt } = createStackFixture() diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index 781a7321e6f..fefe74a5e39 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -110,10 +110,14 @@ import { collapseLinkBadgeStacks, drawHiddenLinkBadges, queryLinkBadgeHitAtPoint, + queryLinkBadgeStackToggledAt, relabelExpandedLinkBadgeStack, toggleLinkBadgeStack } from './canvas/linkBadges' -import { layoutGraphLinkBadges } from './canvas/linkBadgeRenderer' +import { + layoutGraphLinkBadges, + queryHiddenLinkStackToggledAt +} from './canvas/linkBadgeRenderer' import { getLinkMenuOptions, getLinkStackMenuOptions, @@ -539,6 +543,45 @@ function marqueeSelectsLinks( ) } +interface HiddenLinkStack { + stackKey: string + links: LLink[] +} + +function promptRenameLinkStack( + canvas: LGraphCanvas, + graph: LGraph, + { stackKey, links }: HiddenLinkStack, + event: CanvasPointerEvent +): void { + promptRenameLinkBadge( + canvas, + graphScopeOf(graph), + links.map(({ id }) => id), + event, + (name) => relabelExpandedLinkBadgeStack(canvas, stackKey, name) + ) +} + +function renameToggledLinkStackOnDoubleClick( + canvas: LGraphCanvas, + graph: LGraph, + event: CanvasPointerEvent +): void { + const { pointer } = canvas + const toggledAt = pointer.doubleClickedTimeStamp + if (!queryHiddenLinkStackToggledAt(canvas, graph, toggledAt)) return + + const onDoubleClickOfPressedTarget = pointer.onDoubleClick + pointer.onDoubleClick = (upEvent) => { + const stack = queryHiddenLinkStackToggledAt(canvas, graph, toggledAt) + if (!stack) return onDoubleClickOfPressedTarget?.call(pointer, upEvent) + toggleLinkBadgeStack(canvas, stack.stackKey) + canvas.dirty_bgcanvas = true + promptRenameLinkStack(canvas, graph, stack, event) + } +} + interface SnappingLink { link: LLink snap: number @@ -2743,6 +2786,7 @@ export class LGraphCanvas implements CustomEventDispatcher // left button mouse / single finger if (e.button === 0 && !pointer.isDouble) { this._processPrimaryButton(e, node) + if (!node) renameToggledLinkStackOnDoubleClick(this, graph, e) } else if (isMiddleButtonEvent(e)) { this._processMiddleButton(e, node) } else if ( @@ -2899,24 +2943,12 @@ export class LGraphCanvas implements CustomEventDispatcher } case 'linkBadgeStack': { - const { stackKey, links, toggledByDoubleClickedPress } = target pointer.onClick = () => { - toggleLinkBadgeStack(this, stackKey, e.timeStamp) + toggleLinkBadgeStack(this, target.stackKey, e.timeStamp) this.dirty_bgcanvas = true } - pointer.onDoubleClick = () => { - if (toggledByDoubleClickedPress) { - toggleLinkBadgeStack(this, stackKey) - this.dirty_bgcanvas = true - } - promptRenameLinkBadge( - this, - graphScopeOf(graph), - links.map(({ id }) => id), - e, - (name) => relabelExpandedLinkBadgeStack(this, stackKey, name) - ) - } + pointer.onDoubleClick = () => + promptRenameLinkStack(this, graph, target, e) pointer.onDragStart = () => (this.dragging_canvas = true) pointer.finally = () => (this.dragging_canvas = false) return @@ -4214,7 +4246,9 @@ export class LGraphCanvas implements CustomEventDispatcher const { eDown } = pointer const pressedBadge = - eDown && queryLinkBadgeHitAtPoint(this, eDown.canvasX, eDown.canvasY) + eDown && + (queryLinkBadgeHitAtPoint(this, eDown.canvasX, eDown.canvasY) ?? + queryLinkBadgeStackToggledAt(this, pointer.doubleClickedTimeStamp)) const wasConnecting = this.linkConnector.isConnecting const isClick = pointer.up(e) if (e.button === 0 && !wasConnecting) { @@ -8915,19 +8949,19 @@ export class LGraphCanvas implements CustomEventDispatcher const { reroute, linkSegment, link, stackedLinks, stackKey, group } = getCanvasContextMenuTarget(this, event.canvasX, event.canvasY) if (stackedLinks && stackKey) { - const graphScope = graphScopeOf(this.graph) + const { graph } = this + const graphScope = graphScopeOf(graph) const stackedLinkIds = stackedLinks.map(({ id }) => id) new LiteGraph.ContextMenu(getLinkStackMenuOptions(), { event, callback: (item) => { const action = typeof item === 'string' ? item : item?.value if (action === 'Rename') - promptRenameLinkBadge( + promptRenameLinkStack( this, - graphScope, - stackedLinkIds, - event, - (name) => relabelExpandedLinkBadgeStack(this, stackKey, name) + graph, + { stackKey, links: stackedLinks }, + event ) if (action === 'Show Links') showLinks(this, graphScope, stackedLinkIds) diff --git a/src/lib/litegraph/src/canvas/resolvePointerTarget.ts b/src/lib/litegraph/src/canvas/resolvePointerTarget.ts index 2b961a3cbc3..e4e24f0ad5c 100644 --- a/src/lib/litegraph/src/canvas/resolvePointerTarget.ts +++ b/src/lib/litegraph/src/canvas/resolvePointerTarget.ts @@ -27,19 +27,13 @@ import { } from './hitTesting' import { queryHiddenLinkBadgeAtPoint, - queryHiddenLinkStackAtPoint, - queryHiddenLinkStackToggledAt + queryHiddenLinkStackAtPoint } from './linkBadgeRenderer' export type PointerTarget = | { kind: 'node'; node: LGraphNode } | { kind: 'linkBadge'; link: LLink } - | { - kind: 'linkBadgeStack' - stackKey: string - links: LLink[] - toggledByDoubleClickedPress: boolean - } + | { kind: 'linkBadgeStack'; stackKey: string; links: LLink[] } | { kind: 'subgraphIO'; ioNode: SubgraphInputNode | SubgraphOutputNode } | { kind: 'reroute'; reroute: Reroute; part: 'body' | 'input' | 'output' } | { kind: 'link'; segment: LinkSegment } @@ -60,25 +54,8 @@ export function resolvePointerTarget( const point: Point = [e.canvasX, e.canvasY] - const toggledStack = queryHiddenLinkStackToggledAt( - canvas, - graph, - canvas.pointer.doubleClickedTimeStamp - ) - if (toggledStack) - return { - kind: 'linkBadgeStack', - ...toggledStack, - toggledByDoubleClickedPress: true - } - const stack = queryHiddenLinkStackAtPoint(canvas, graph, ...point) - if (stack) - return { - kind: 'linkBadgeStack', - ...stack, - toggledByDoubleClickedPress: false - } + if (stack) return { kind: 'linkBadgeStack', ...stack } const badgeLink = queryHiddenLinkBadgeAtPoint( canvas, From caa6fed50ae254161401c62e968b2e886ba0e5f1 Mon Sep 17 00:00:00 2001 From: shrimbly Date: Tue, 17 Nov 2026 13:26:45 +1300 Subject: [PATCH 10/12] fix(canvas): keep the stack rename double-click behind the read-only guard --- .../litegraph/src/LGraphCanvas.linkVisibility.test.ts | 11 +++++++++++ src/lib/litegraph/src/LGraphCanvas.ts | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts index 478521b6484..5bf4732b442 100644 --- a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts @@ -722,6 +722,17 @@ describe('LGraphCanvas link visibility interactions', () => { expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBe(links[0].id) }) + it('opens no rename prompt when the canvas turns read-only between the two clicks', () => { + const { canvas, relayout, prompt } = createStackFixture() + + pressAt(canvas, 420, 300, 100) + relayout() + canvas.read_only = true + pressAt(canvas, 420, 300, 200) + + expect(prompt).not.toHaveBeenCalled() + }) + it('leaves a stack collapsed when Escape is pressed during the second press', () => { const { canvas, relayout, prompt } = createStackFixture() const init = { isPrimary: true, pointerId: 1, clientX: 420, clientY: 300 } diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index fefe74a5e39..1f2e71916d9 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -570,11 +570,15 @@ function renameToggledLinkStackOnDoubleClick( ): void { const { pointer } = canvas const toggledAt = pointer.doubleClickedTimeStamp - if (!queryHiddenLinkStackToggledAt(canvas, graph, toggledAt)) return + const editableToggledStack = () => + canvas.read_only || canvas.selectOnly + ? undefined + : queryHiddenLinkStackToggledAt(canvas, graph, toggledAt) + if (!editableToggledStack()) return const onDoubleClickOfPressedTarget = pointer.onDoubleClick pointer.onDoubleClick = (upEvent) => { - const stack = queryHiddenLinkStackToggledAt(canvas, graph, toggledAt) + const stack = editableToggledStack() if (!stack) return onDoubleClickOfPressedTarget?.call(pointer, upEvent) toggleLinkBadgeStack(canvas, stack.stackKey) canvas.dirty_bgcanvas = true From fba651360819cb5cd4b15780ff237035bba59384 Mon Sep 17 00:00:00 2001 From: shrimbly Date: Tue, 17 Nov 2026 13:36:07 +1300 Subject: [PATCH 11/12] fix(canvas): check the read-only guard first when the stack double-click is released --- .../src/LGraphCanvas.linkVisibility.test.ts | 25 +++++++++++++++++++ src/lib/litegraph/src/LGraphCanvas.ts | 12 ++++----- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts index 5bf4732b442..a086a019c83 100644 --- a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts @@ -733,6 +733,31 @@ describe('LGraphCanvas link visibility interactions', () => { expect(prompt).not.toHaveBeenCalled() }) + it('opens no rename prompt when the canvas turns read-only during the second press', () => { + const { canvas, relayout, prompt } = createStackFixture() + const init = { isPrimary: true, pointerId: 1, clientX: 420, clientY: 300 } + const down = new PointerEvent('pointerdown', { + ...init, + button: 0, + buttons: 1 + }) + const up = new PointerEvent('pointerup', { + ...init, + button: 0, + buttons: 0 + }) + vi.spyOn(down, 'timeStamp', 'get').mockReturnValue(200) + vi.spyOn(up, 'timeStamp', 'get').mockReturnValue(220) + + pressAt(canvas, 420, 300, 100) + relayout() + canvas.processMouseDown(down) + canvas.read_only = true + canvas.processMouseUp(up) + + expect(prompt).not.toHaveBeenCalled() + }) + it('leaves a stack collapsed when Escape is pressed during the second press', () => { const { canvas, relayout, prompt } = createStackFixture() const init = { isPrimary: true, pointerId: 1, clientX: 420, clientY: 300 } diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index 1f2e71916d9..f733585715f 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -570,15 +570,15 @@ function renameToggledLinkStackOnDoubleClick( ): void { const { pointer } = canvas const toggledAt = pointer.doubleClickedTimeStamp - const editableToggledStack = () => - canvas.read_only || canvas.selectOnly - ? undefined - : queryHiddenLinkStackToggledAt(canvas, graph, toggledAt) - if (!editableToggledStack()) return + const isLocked = () => canvas.read_only || canvas.selectOnly + const toggledStack = () => + queryHiddenLinkStackToggledAt(canvas, graph, toggledAt) + if (isLocked() || !toggledStack()) return const onDoubleClickOfPressedTarget = pointer.onDoubleClick pointer.onDoubleClick = (upEvent) => { - const stack = editableToggledStack() + if (isLocked()) return + const stack = toggledStack() if (!stack) return onDoubleClickOfPressedTarget?.call(pointer, upEvent) toggleLinkBadgeStack(canvas, stack.stackKey) canvas.dirty_bgcanvas = true From d5ced21ecd6716c7d663a6703add2b8c3e38daf5 Mon Sep 17 00:00:00 2001 From: shrimbly Date: Tue, 17 Nov 2026 14:14:28 +1300 Subject: [PATCH 12/12] fix(canvas): a stack double-click renames the stack or does nothing Once a press pairs with the click that toggled a stack, its double-click no longer falls back to what the pointer is over, so Escape during the press cancels the rename and cannot rename one link. The stack's own double-click checks read-only and select-only at release. The context menu target carries the stack as one value. --- .../graph/useGroupContextMenu.test.ts | 11 ++- src/composables/graph/useGroupContextMenu.ts | 4 +- .../src/LGraphCanvas.linkVisibility.test.ts | 73 +++++++++++++------ src/lib/litegraph/src/LGraphCanvas.ts | 23 +++--- .../canvas/getCanvasContextMenuTarget.test.ts | 2 +- .../src/canvas/getCanvasContextMenuTarget.ts | 6 +- 6 files changed, 70 insertions(+), 49 deletions(-) diff --git a/src/composables/graph/useGroupContextMenu.test.ts b/src/composables/graph/useGroupContextMenu.test.ts index 7833b85348c..6b19a94b1f1 100644 --- a/src/composables/graph/useGroupContextMenu.test.ts +++ b/src/composables/graph/useGroupContextMenu.test.ts @@ -258,10 +258,13 @@ describe('useGroupContextMenu', () => { it('falls through to the legacy menu when the cursor is on a stack of hidden links', () => { mockGetCanvasContextMenuTarget.mockReturnValue({ - stackedLinks: [ - createMockLLink({ id: toLinkId(5) }), - createMockLLink({ id: toLinkId(6) }) - ], + stack: { + stackKey: 'output:1:0', + links: [ + createMockLLink({ id: toLinkId(5) }), + createMockLLink({ id: toLinkId(6) }) + ] + }, group }) diff --git a/src/composables/graph/useGroupContextMenu.ts b/src/composables/graph/useGroupContextMenu.ts index 9ebcc3c5da7..2dfa7c17168 100644 --- a/src/composables/graph/useGroupContextMenu.ts +++ b/src/composables/graph/useGroupContextMenu.ts @@ -14,12 +14,12 @@ function shouldUseLegacyContextMenu( } function groupUnderBareCursor(canvas: LGraphCanvas, x: number, y: number) { - const { reroute, link, stackedLinks, group } = getCanvasContextMenuTarget( + const { reroute, link, stack, group } = getCanvasContextMenuTarget( canvas, x, y ) - return reroute || link || stackedLinks ? undefined : group + return reroute || link || stack ? undefined : group } /** diff --git a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts index a086a019c83..bf087326738 100644 --- a/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts +++ b/src/lib/litegraph/src/LGraphCanvas.linkVisibility.test.ts @@ -733,9 +733,13 @@ describe('LGraphCanvas link visibility interactions', () => { expect(prompt).not.toHaveBeenCalled() }) - it('opens no rename prompt when the canvas turns read-only during the second press', () => { - const { canvas, relayout, prompt } = createStackFixture() - const init = { isPrimary: true, pointerId: 1, clientX: 420, clientY: 300 } + function holdPressAt( + canvas: LGraphCanvas, + clientX: number, + clientY: number, + timeStamp: number + ) { + const init = { isPrimary: true, pointerId: 1, clientX, clientY } const down = new PointerEvent('pointerdown', { ...init, button: 0, @@ -746,45 +750,65 @@ describe('LGraphCanvas link visibility interactions', () => { button: 0, buttons: 0 }) - vi.spyOn(down, 'timeStamp', 'get').mockReturnValue(200) - vi.spyOn(up, 'timeStamp', 'get').mockReturnValue(220) + vi.spyOn(down, 'timeStamp', 'get').mockReturnValue(timeStamp) + vi.spyOn(up, 'timeStamp', 'get').mockReturnValue(timeStamp + 20) + canvas.processMouseDown(down) + return () => canvas.processMouseUp(up) + } + + it('opens no rename prompt when the canvas turns read-only during the second press', () => { + const { canvas, relayout, prompt } = createStackFixture() pressAt(canvas, 420, 300, 100) relayout() - canvas.processMouseDown(down) + const release = holdPressAt(canvas, 420, 300, 200) canvas.read_only = true - canvas.processMouseUp(up) + release() + + expect(prompt).not.toHaveBeenCalled() + }) + + it('opens no rename prompt when the canvas turns read-only during a double click whose first click missed', () => { + const { canvas, prompt } = createStackFixture() + + pressAt(canvas, 420, 280, 100) + const release = holdPressAt(canvas, 420, 295, 200) + canvas.read_only = true + release() expect(prompt).not.toHaveBeenCalled() }) - it('leaves a stack collapsed when Escape is pressed during the second press', () => { + it('cancels the rename and keeps the collapse when Escape is pressed during the second press', () => { const { canvas, relayout, prompt } = createStackFixture() - const init = { isPrimary: true, pointerId: 1, clientX: 420, clientY: 300 } - const down = new PointerEvent('pointerdown', { - ...init, - button: 0, - buttons: 1 - }) - const up = new PointerEvent('pointerup', { - ...init, - button: 0, - buttons: 0 - }) - vi.spyOn(down, 'timeStamp', 'get').mockReturnValue(200) - vi.spyOn(up, 'timeStamp', 'get').mockReturnValue(220) pressAt(canvas, 420, 300, 100) relayout() - canvas.processMouseDown(down) + const release = holdPressAt(canvas, 420, 300, 200) canvas.processKey(new KeyboardEvent('keydown', { key: 'Escape' })) - canvas.processMouseUp(up) + release() relayout() - expect(prompt).toHaveBeenCalledOnce() + expect(prompt).not.toHaveBeenCalled() expect(queryLinkBadgeAtPoint(canvas, 420, 322)).toBeUndefined() }) + it('renames no single link when Escape is pressed during a second press on the layer edge', () => { + const { canvas, relayout, prompt } = createStackFixture([ + undefined, + undefined, + undefined + ]) + + pressAt(canvas, 420, 313, 100) + relayout() + const release = holdPressAt(canvas, 420, 313, 200) + canvas.processKey(new KeyboardEvent('keydown', { key: 'Escape' })) + release() + + expect(prompt).not.toHaveBeenCalled() + }) + function dragFromBesideStackAfterClickingIt(gap: number) { const previousBehavior = LiteGraph.leftMouseClickBehavior LiteGraph.leftMouseClickBehavior = 'select' @@ -812,6 +836,7 @@ describe('LGraphCanvas link visibility interactions', () => { clientY: 244 }) ) + expect(canvas.dragging_rectangle).not.toBeNull() const draggingCanvas = canvas.dragging_canvas canvas.processMouseUp( new PointerEvent('pointerup', { diff --git a/src/lib/litegraph/src/LGraphCanvas.ts b/src/lib/litegraph/src/LGraphCanvas.ts index f733585715f..c281dc36b00 100644 --- a/src/lib/litegraph/src/LGraphCanvas.ts +++ b/src/lib/litegraph/src/LGraphCanvas.ts @@ -575,11 +575,9 @@ function renameToggledLinkStackOnDoubleClick( queryHiddenLinkStackToggledAt(canvas, graph, toggledAt) if (isLocked() || !toggledStack()) return - const onDoubleClickOfPressedTarget = pointer.onDoubleClick - pointer.onDoubleClick = (upEvent) => { - if (isLocked()) return + pointer.onDoubleClick = () => { const stack = toggledStack() - if (!stack) return onDoubleClickOfPressedTarget?.call(pointer, upEvent) + if (isLocked() || !stack) return toggleLinkBadgeStack(canvas, stack.stackKey) canvas.dirty_bgcanvas = true promptRenameLinkStack(canvas, graph, stack, event) @@ -2951,8 +2949,10 @@ export class LGraphCanvas implements CustomEventDispatcher toggleLinkBadgeStack(this, target.stackKey, e.timeStamp) this.dirty_bgcanvas = true } - pointer.onDoubleClick = () => + pointer.onDoubleClick = () => { + if (this.read_only || this.selectOnly) return promptRenameLinkStack(this, graph, target, e) + } pointer.onDragStart = () => (this.dragging_canvas = true) pointer.finally = () => (this.dragging_canvas = false) return @@ -8950,23 +8950,18 @@ export class LGraphCanvas implements CustomEventDispatcher menu_info = this.getCanvasMenuOptions() if (!this.graph) throw new NullGraphError() - const { reroute, linkSegment, link, stackedLinks, stackKey, group } = + const { reroute, linkSegment, link, stack, group } = getCanvasContextMenuTarget(this, event.canvasX, event.canvasY) - if (stackedLinks && stackKey) { + if (stack) { const { graph } = this const graphScope = graphScopeOf(graph) - const stackedLinkIds = stackedLinks.map(({ id }) => id) + const stackedLinkIds = stack.links.map(({ id }) => id) new LiteGraph.ContextMenu(getLinkStackMenuOptions(), { event, callback: (item) => { const action = typeof item === 'string' ? item : item?.value if (action === 'Rename') - promptRenameLinkStack( - this, - graph, - { stackKey, links: stackedLinks }, - event - ) + promptRenameLinkStack(this, graph, stack, event) if (action === 'Show Links') showLinks(this, graphScope, stackedLinkIds) } diff --git a/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.test.ts b/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.test.ts index f42ca309b7e..81e21a29a8b 100644 --- a/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.test.ts +++ b/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.test.ts @@ -198,7 +198,7 @@ describe('getCanvasContextMenuTarget', () => { const target = resolve() - expect(target.stackedLinks).toEqual([links[0], links[1]]) + expect(target.stack?.links).toEqual([links[0], links[1]]) expect(target.link).toBeUndefined() }) diff --git a/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.ts b/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.ts index 1a6c151e931..7b8e6306d85 100644 --- a/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.ts +++ b/src/lib/litegraph/src/canvas/getCanvasContextMenuTarget.ts @@ -25,8 +25,7 @@ interface CanvasContextMenuTarget { reroute?: Reroute linkSegment?: LinkSegment link?: LLink - stackedLinks?: LLink[] - stackKey?: string + stack?: ReturnType group?: LGraphGroup } @@ -77,8 +76,7 @@ export function getCanvasContextMenuTarget( if (reroute) return { reroute, group } const stack = queryHiddenLinkStackAtPoint(canvas, graph, x, y) - if (stack) - return { stackedLinks: stack.links, stackKey: stack.stackKey, group } + if (stack) return { stack, group } const badgeLink = queryHiddenLinkBadgeAtPoint(canvas, graph, x, y) if (badgeLink) return { link: badgeLink, group }