diff --git a/browser_tests/fixtures/ComfyPage.ts b/browser_tests/fixtures/ComfyPage.ts index 0bf9eab3c7c..3a9c82b2e17 100644 --- a/browser_tests/fixtures/ComfyPage.ts +++ b/browser_tests/fixtures/ComfyPage.ts @@ -553,6 +553,8 @@ export const comfyPageFixture = base.extend<{ // Disable errors tab to prevent missing model detection from // rendering error indicators on nodes during unrelated tests. 'Comfy.RightSidePanel.ShowErrorsTab': false, + 'Comfy.VueNodes.CompactCollapsedNodes': false, + 'Comfy.VueNodes.HideStatusBadges': false, ...(isVueNodes && { 'Comfy.VueNodes.Enabled': true }), ...initialSettings }) diff --git a/browser_tests/tests/creditHelpers.spec.ts b/browser_tests/tests/creditHelpers.spec.ts index 29fc67bc0f6..5453b401dc6 100644 --- a/browser_tests/tests/creditHelpers.spec.ts +++ b/browser_tests/tests/creditHelpers.spec.ts @@ -1,6 +1,7 @@ import { expect } from '@playwright/test' import { comfyPageFixture as test } from '@e2e/fixtures/ComfyPage' +import { LGraphEventMode } from '@/lib/litegraph/src/types/globalEnums' import type { ComfyNodeDef } from '@/schemas/nodeDefSchema' function buildMockApiNode( @@ -211,5 +212,175 @@ testWithMockedObjectInfo.describe( .toContain('4.2/10.6') } ) + + for (const { compact, hideStatus } of [ + { compact: false, hideStatus: false }, + { compact: false, hideStatus: true }, + { compact: true, hideStatus: false }, + { compact: true, hideStatus: true } + ] as const) { + testWithMockedObjectInfo( + `keeps collapsed badges independent with compact=${compact} and hideStatus=${hideStatus}`, + async ({ comfyPage }) => { + await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true) + await comfyPage.settings.setSetting( + 'Comfy.NodeBadge.ShowApiPricing', + true + ) + await comfyPage.settings.setSetting( + 'Comfy.VueNodes.CompactCollapsedNodes', + compact + ) + await comfyPage.settings.setSetting( + 'Comfy.VueNodes.HideStatusBadges', + hideStatus + ) + await comfyPage.nodeOps.clearGraph() + + const nodeId = await comfyPage.page.evaluate((mode) => { + const node = window.LiteGraph!.createNode('TestCreditApiNodeUsd')! + node.mode = mode + node.title = 'API' + node.setPos(100, 100) + node.setSize([400, node.size[1]]) + window.app!.graph.add(node) + return node.id + }, LGraphEventMode.BYPASS) + + await comfyPage.vueNodes.waitForNodes(1) + const vueNode = comfyPage.vueNodes.getNodeLocator(String(nodeId)) + const header = vueNode.locator( + `[data-testid="node-header-${nodeId}"]` + ) + const collapseButton = vueNode.getByTestId('node-collapse-button') + const pricing = header.getByText('10.6', { exact: true }) + const status = header.getByText('Bypassed', { exact: true }) + + await expect(pricing).toContainText('10.6') + await expect(status).toHaveCount(hideStatus ? 0 : 1) + const expandedBox = await vueNode.boundingBox() + if (!expandedBox) throw new Error('Expanded node has no bounds') + + await collapseButton.press('Enter') + await expect(vueNode).toHaveAttribute('data-collapsed', 'true') + await expect(pricing).toHaveCount(compact ? 0 : 1) + await expect(status).toHaveCount(compact || hideStatus ? 0 : 1) + + if (compact) { + await expect + .poll(async () => (await vueNode.boundingBox())?.width) + .toBeLessThan(expandedBox.width) + } else { + await expect + .poll(() => + vueNode.evaluate((element) => + Number.parseFloat(getComputedStyle(element).width) + ) + ) + .toBeGreaterThanOrEqual(225) + } + + await collapseButton.press('Enter') + await expect(pricing).toHaveCount(1) + await expect(status).toHaveCount(hideStatus ? 0 : 1) + await expect + .poll(async () => (await vueNode.boundingBox())?.width) + .toBeCloseTo(expandedBox.width, 0) + } + ) + } + + testWithMockedObjectInfo( + 'updates compact and status settings while a node is mounted', + async ({ comfyPage }) => { + await comfyPage.settings.setSetting('Comfy.VueNodes.Enabled', true) + await comfyPage.settings.setSetting( + 'Comfy.NodeBadge.ShowApiPricing', + true + ) + await comfyPage.settings.setSetting( + 'Comfy.VueNodes.CompactCollapsedNodes', + false + ) + await comfyPage.settings.setSetting( + 'Comfy.VueNodes.HideStatusBadges', + false + ) + await comfyPage.nodeOps.clearGraph() + + const nodeId = await comfyPage.page.evaluate((mode) => { + const node = window.LiteGraph!.createNode('TestCreditApiNodeUsd')! + node.mode = mode + node.title = 'API' + node.setPos(100, 100) + node.setSize([400, node.size[1]]) + window.app!.graph.add(node) + return node.id + }, LGraphEventMode.NEVER) + + await comfyPage.vueNodes.waitForNodes(1) + const nodeFixture = await comfyPage.vueNodes.getFixtureByTitle('API') + const vueNode = comfyPage.vueNodes.getNodeLocator(String(nodeId)) + const header = vueNode.locator(`[data-testid="node-header-${nodeId}"]`) + const pricing = header.getByText('10.6', { exact: true }) + const status = header.getByText('Muted', { exact: true }) + + await expect(pricing).toContainText('10.6') + await nodeFixture.collapseButton.press('Enter') + await expect(pricing).toHaveCount(1) + await expect(status).toHaveCount(1) + const normalCollapsedBox = await vueNode.boundingBox() + if (!normalCollapsedBox) throw new Error('Collapsed node has no bounds') + + await comfyPage.settings.setSetting( + 'Comfy.VueNodes.CompactCollapsedNodes', + true + ) + await expect(pricing).toHaveCount(0) + await expect(status).toHaveCount(0) + await expect + .poll(async () => (await vueNode.boundingBox())?.width) + .toBeLessThan(normalCollapsedBox.width) + + await comfyPage.settings.setSetting( + 'Comfy.VueNodes.CompactCollapsedNodes', + false + ) + await expect(pricing).toHaveCount(1) + await expect(status).toHaveCount(1) + + await comfyPage.settings.setSetting( + 'Comfy.VueNodes.HideStatusBadges', + true + ) + await expect(status).toHaveCount(0) + await expect(pricing).toHaveCount(1) + + await nodeFixture.collapseButton.press('Enter') + await expect(status).toHaveCount(0) + await expect(pricing).toHaveCount(1) + + await comfyPage.settings.setSetting( + 'Comfy.VueNodes.HideStatusBadges', + false + ) + await expect(status).toHaveCount(1) + + await comfyPage.settings.setSetting( + 'Comfy.VueNodes.CompactCollapsedNodes', + true + ) + await nodeFixture.setTitle( + 'A deliberately long API node title that must remain width capped' + ) + const expandedBox = await vueNode.boundingBox() + if (!expandedBox) throw new Error('Expanded node has no bounds') + + await nodeFixture.collapseButton.press('Enter') + await expect + .poll(async () => (await vueNode.boundingBox())?.width) + .toBeLessThanOrEqual(expandedBox.width) + } + ) } ) diff --git a/src/locales/en/settings.json b/src/locales/en/settings.json index 98766d4c87d..a65a3bfa438 100644 --- a/src/locales/en/settings.json +++ b/src/locales/en/settings.json @@ -426,10 +426,18 @@ "Comfy_Validation_Workflows": { "name": "Validate workflows" }, + "Comfy_VueNodes_CompactCollapsedNodes": { + "name": "Compact collapsed nodes", + "tooltip": "Size collapsed nodes to their titles and hide header badges while collapsed." + }, "Comfy_VueNodes_Enabled": { "name": "Modern Node Design (Nodes 2.0)", "tooltip": "Modern: DOM-based rendering with enhanced interactivity, native browser features, and updated visual design. Classic: Traditional canvas rendering." }, + "Comfy_VueNodes_HideStatusBadges": { + "name": "Hide node status badges", + "tooltip": "Hide Muted and Bypassed badges on Nodes 2.0." + }, "Comfy_WidgetControlMode": { "name": "Widget control mode", "tooltip": "Controls when widget values are updated (randomize/increment/decrement), either before the prompt is queued or after.", diff --git a/src/platform/settings/constants/coreSettings.ts b/src/platform/settings/constants/coreSettings.ts index 04f2c78d50a..ef7a4fb6cfd 100644 --- a/src/platform/settings/constants/coreSettings.ts +++ b/src/platform/settings/constants/coreSettings.ts @@ -1209,6 +1209,29 @@ export const CORE_SETTINGS: SettingParams[] = [ experimental: true, versionAdded: '1.27.1' }, + { + id: 'Comfy.VueNodes.CompactCollapsedNodes', + category: ['Comfy', 'Nodes 2.0', 'CompactCollapsedNodes'], + name: 'Compact collapsed nodes', + type: 'boolean', + tooltip: + 'Size collapsed nodes to their titles and hide header badges while collapsed.', + defaultValue: false, + sortOrder: 85, + experimental: true, + versionAdded: '1.49.0' + }, + { + id: 'Comfy.VueNodes.HideStatusBadges', + category: ['Comfy', 'Nodes 2.0', 'HideStatusBadges'], + name: 'Hide node status badges', + type: 'boolean', + tooltip: 'Hide Muted and Bypassed badges on Nodes 2.0.', + defaultValue: false, + sortOrder: 80, + experimental: true, + versionAdded: '1.49.0' + }, { id: 'Comfy.AppBuilder.VueNodeSwitchDismissed', name: 'App Builder Vue Node switch dismissed', diff --git a/src/renderer/extensions/vueNodes/components/LGraphNode.vue b/src/renderer/extensions/vueNodes/components/LGraphNode.vue index dea82798334..786e4855be2 100644 --- a/src/renderer/extensions/vueNodes/components/LGraphNode.vue +++ b/src/renderer/extensions/vueNodes/components/LGraphNode.vue @@ -18,7 +18,10 @@ : 'drop-shadow-xl drop-shadow-black/40', isRerouteNode ? 'h-(--node-height)' - : 'min-h-(--node-height) min-w-(--min-node-width)', + : cn( + 'min-h-(--node-height)', + !compactCollapsed && 'min-w-(--min-node-width)' + ), cursorClass, isSelected && 'outline-node-component-outline', executing && 'outline-node-stroke-executing', @@ -73,7 +76,10 @@ cn( 'flex flex-1 flex-col bg-node-component-header-surface', 'w-(--node-width)', - !isRerouteNode && 'min-w-(--min-node-width)', + !isRerouteNode && + (compactCollapsed + ? 'max-w-(--node-width-x)' + : 'min-w-(--min-node-width)'), shapeClass, hasAnyError && 'ring-4 ring-destructive-background', bypassed && bypassOverlayClass, @@ -106,7 +112,9 @@ @@ -391,6 +399,16 @@ const displayHeader = computed(() => nodeData.titleMode !== TitleMode.NO_TITLE) const isRerouteNode = computed(() => nodeData.type === 'Reroute') const isCollapsed = computed(() => nodeData.flags?.collapsed ?? false) +const compactCollapsed = computed( + () => + isCollapsed.value && + settingStore.get('Comfy.VueNodes.CompactCollapsedNodes') +) +const showStatusBadge = computed( + () => + !compactCollapsed.value && + !settingStore.get('Comfy.VueNodes.HideStatusBadges') +) const bypassed = computed( (): boolean => nodeData.mode === LGraphEventMode.BYPASS ) @@ -430,6 +448,9 @@ const { pointerHandlers } = useNodePointerInteractions(() => nodeData.id) const { onPointerdown, ...remainingPointerHandlers } = pointerHandlers const { startDrag } = useNodeDrag() const badges = usePartitionedBadges(nodeData) +const headerPricingBadges = computed(() => + compactCollapsed.value ? undefined : badges.value.pricing +) async function nodeOnPointerdown(event: PointerEvent) { if (event.altKey && lgraphNode.value) { diff --git a/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts b/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts index 825b7fb6f3d..c9e997b0aeb 100644 --- a/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts +++ b/src/renderer/extensions/vueNodes/components/NodeHeader.test.ts @@ -11,6 +11,7 @@ import type { ComponentProps } from 'vue-component-type-helpers' import { createI18n } from 'vue-i18n' import type { VueNodeData } from '@/composables/graph/useGraphNodeManager' +import { LGraphEventMode } from '@/lib/litegraph/src/litegraph' import enMessages from '@/locales/en/main.json' import { useSettingStore } from '@/platform/settings/settingStore' import type { Settings } from '@/schemas/apiSchema' @@ -205,6 +206,45 @@ describe('NodeHeader.vue', () => { expect(collapsedIcon.classList).toContain('-rotate-90') }) + it.for([ + { mode: LGraphEventMode.NEVER, label: 'Muted' }, + { mode: LGraphEventMode.BYPASS, label: 'Bypassed' } + ])( + 'controls the $label status badge independently', + async ({ mode, label }) => { + const { rerender } = renderHeader({ + nodeData: makeNodeData({ mode }), + priceBadges: [{ required: '10.6', rest: 'credits' }] + }) + + expect(screen.getByText(label)).toBeInTheDocument() + expect(screen.getByText('10.6')).toBeInTheDocument() + + await rerender({ + nodeData: makeNodeData({ mode }), + collapsed: false, + priceBadges: [{ required: '10.6', rest: 'credits' }], + showStatusBadge: false + }) + + expect(screen.queryByText(label)).not.toBeInTheDocument() + expect(screen.getByText('10.6')).toBeInTheDocument() + } + ) + + it('keeps the pin indicator when status badges are hidden', () => { + renderHeader({ + nodeData: makeNodeData({ + mode: LGraphEventMode.BYPASS, + flags: { pinned: true } + }), + showStatusBadge: false + }) + + expect(screen.queryByText('Bypassed')).not.toBeInTheDocument() + expect(screen.getByTestId('node-pin-indicator')).toBeInTheDocument() + }) + describe('Tooltips', () => { it('applies tooltip directive to node title with correct configuration', () => { const { tooltipDirective } = renderHeader({ diff --git a/src/renderer/extensions/vueNodes/components/NodeHeader.vue b/src/renderer/extensions/vueNodes/components/NodeHeader.vue index 2253260297f..a17c8a57b6f 100644 --- a/src/renderer/extensions/vueNodes/components/NodeHeader.vue +++ b/src/renderer/extensions/vueNodes/components/NodeHeader.vue @@ -6,8 +6,9 @@ v-else :class=" cn( - 'lg-node-header w-full min-w-0 p-1 text-xs', + 'lg-node-header w-full min-w-0 py-1 pl-1 text-xs', 'text-node-component-slot-text', + compact ? 'pr-2' : 'pr-1', headerShapeClass ) " @@ -61,7 +62,7 @@ :text="badge.required" :rest="badge.rest" /> - + () +const { + nodeData, + collapsed, + compact, + showStatusBadge = true +} = defineProps() const emit = defineEmits<{ collapse: [] diff --git a/src/schemas/apiSchema.ts b/src/schemas/apiSchema.ts index 13c15939675..7e69b5f8df4 100644 --- a/src/schemas/apiSchema.ts +++ b/src/schemas/apiSchema.ts @@ -427,6 +427,8 @@ const zSettings = z.object({ 'Comfy.Canvas.LeftMouseClickBehavior': z.string(), 'Comfy.Canvas.MouseWheelScroll': z.string(), 'Comfy.VueNodes.Enabled': z.boolean(), + 'Comfy.VueNodes.CompactCollapsedNodes': z.boolean(), + 'Comfy.VueNodes.HideStatusBadges': z.boolean(), 'Comfy.AppBuilder.VueNodeSwitchDismissed': z.boolean(), 'Comfy.Assets.UseAssetAPI': z.boolean(), 'Comfy.ModelLibrary.UseAssetBrowser': z.boolean(),