From 3cc5ad9d72786a7293fdf186ef030c15df633544 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Tue, 4 Aug 2026 11:47:07 +0900 Subject: [PATCH 1/7] test: add failing coverage for promoted advanced widgets --- .../tests/subgraph/subgraphPromotion.spec.ts | 49 +++++++++++++++ .../composables/useProcessedWidgets.test.ts | 61 +++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/browser_tests/tests/subgraph/subgraphPromotion.spec.ts b/browser_tests/tests/subgraph/subgraphPromotion.spec.ts index b7ebc8fea3d..74230749ba7 100644 --- a/browser_tests/tests/subgraph/subgraphPromotion.spec.ts +++ b/browser_tests/tests/subgraph/subgraphPromotion.spec.ts @@ -94,6 +94,55 @@ test.describe( 'Promoted Widget Visibility in Vue Mode', { tag: ['@vue-nodes'] }, () => { + test( + 'Promoted advanced widget remains visible when global advanced widgets are disabled', + { tag: ['@node'] }, + async ({ comfyPage }) => { + await comfyPage.settings.setSetting( + 'Comfy.Node.AlwaysShowAdvancedWidgets', + false + ) + const modelSamplingNode = await comfyPage.nodeOps.addNode( + 'ModelSamplingFlux', + {}, + { x: 500, y: 200 } + ) + await comfyPage.nextFrame() + await expect( + comfyPage.vueNodes.getNodeLocator(String(modelSamplingNode.id)) + ).toBeVisible() + + await modelSamplingNode.click('title') + const subgraphNode = await modelSamplingNode.convertToSubgraph() + const subgraphNodeId = String(subgraphNode.id) + + await comfyPage.vueNodes.enterSubgraph(subgraphNodeId) + const interiorNode = + comfyPage.vueNodes.getNodeByTitle('ModelSamplingFlux') + await expect(interiorNode).toBeVisible() + await interiorNode + .getByText('Show advanced inputs', { exact: true }) + .click() + await expect( + interiorNode.getByLabel('max_shift', { exact: true }) + ).toBeVisible() + await comfyPage.subgraph.promoteWidget(interiorNode, 'max_shift') + await comfyPage.subgraph.exitViaBreadcrumb() + + await expectPromotedWidgetNamesToContain( + comfyPage, + subgraphNodeId, + 'max_shift' + ) + + await expect( + comfyPage.vueNodes + .getNodeLocator(subgraphNodeId) + .getByLabel('max_shift', { exact: true }) + ).toBeVisible() + } + ) + test('Promoted text widget renders and enters the subgraph in Vue mode', async ({ comfyPage }) => { diff --git a/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.test.ts b/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.test.ts index 9658abe7ad8..08efa0390d7 100644 --- a/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.test.ts +++ b/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.test.ts @@ -9,14 +9,22 @@ import { toNodeId } from '@/types/nodeId' import type * as GraphTraversalUtil from '@/utils/graphTraversalUtil' import type { SafeWidgetData } from '@/composables/graph/useGraphNodeManager' +import { extractVueNodeData } from '@/composables/graph/useGraphNodeManager' +import { promoteValueWidgetViaSubgraphInput } from '@/core/graph/subgraph/promotionUtils' import { computeProcessedWidgets, getWidgetIdentity, hasWidgetError, isWidgetVisible } from '@/renderer/extensions/vueNodes/composables/useProcessedWidgets' +import { LGraphNode } from '@/lib/litegraph/src/litegraph' +import { + createTestSubgraph, + createTestSubgraphNode +} from '@/lib/litegraph/src/subgraph/__fixtures__/subgraphHelpers' import { useExecutionErrorStore } from '@/stores/executionErrorStore' import { useMissingModelStore } from '@/platform/missingModel/missingModelStore' +import { app } from '@/scripts/app' import { useWidgetValueStore } from '@/stores/widgetValueStore' import { createNodeExecutionId, @@ -310,6 +318,59 @@ const noopUi = { handleNodeRightClick: () => {} } +describe('computeProcessedWidgets visibility', () => { + beforeEach(() => { + setActivePinia(createTestingPinia({ stubActions: false })) + }) + + it('keeps a promoted advanced widget visible when advanced widgets are hidden', () => { + const subgraph = createTestSubgraph() + const subgraphNode = createTestSubgraphNode(subgraph) + subgraph.rootGraph.add(subgraphNode) + + const interiorNode = new LGraphNode('ModelSamplingFlux') + const interiorInput = interiorNode.addInput('max_shift', 'FLOAT') + const interiorWidget = interiorNode.addWidget( + 'number', + 'max_shift', + 1, + () => {}, + { advanced: true } + ) + interiorInput.widget = { name: interiorWidget.name } + subgraph.add(interiorNode) + + const promotion = promoteValueWidgetViaSubgraphInput( + subgraphNode, + interiorNode, + interiorWidget + ) + expect(promotion.ok).toBe(true) + + const rootGraphSpy = vi + .spyOn(app, 'rootGraph', 'get') + .mockReturnValue(subgraph.rootGraph) + try { + const processedWidgets = computeProcessedWidgets({ + nodeData: extractVueNodeData(subgraphNode), + graphId: subgraph.rootGraph.id, + showAdvanced: false, + isGraphReady: false, + rootGraph: null, + ui: noopUi + }) + const promotedWidget = processedWidgets.find( + (widget) => widget.name === 'max_shift' + ) + + expect(promotedWidget).toBeDefined() + expect(promotedWidget?.visible).toBe(true) + } finally { + rootGraphSpy.mockRestore() + } + }) +}) + describe('computeProcessedWidgets borderStyle', () => { beforeEach(() => { setActivePinia(createTestingPinia({ stubActions: false })) From 736f2d8b3200a89eb689b9c7b9eceb08961813f9 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Tue, 4 Aug 2026 12:49:52 +0900 Subject: [PATCH 2/7] fix: show promoted advanced widgets on subgraph nodes --- .../extensions/vueNodes/composables/useProcessedWidgets.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.ts b/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.ts index e7e5549d590..00ab523ccc0 100644 --- a/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.ts +++ b/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.ts @@ -210,11 +210,11 @@ function getWidgetNodeLocatorId( export function isWidgetVisible( options: IWidgetOptions, showAdvanced: boolean, - linked = false + ignoreAdvanced = false ): boolean { const hidden = options.hidden ?? false const advanced = options.advanced ?? false - return !hidden && (!advanced || showAdvanced || linked) + return !hidden && (!advanced || showAdvanced || ignoreAdvanced) } export function computeProcessedWidgets({ @@ -268,10 +268,11 @@ export function computeProcessedWidgets({ ...(widget.options ?? {}), ...(widgetState?.options ?? {}) } + const isPromotedWidget = widget.sourceWidgetName !== undefined const visible = isWidgetVisible( mergedOptions, showAdvanced, - widget.slotMetadata?.linked + widget.slotMetadata?.linked || isPromotedWidget ) if (!identity.dedupeIdentity) { uniqueWidgets.push({ From 0c9529e999c83c19e0e112d6afe5f0a907d07d7e Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Tue, 4 Aug 2026 14:16:34 +0900 Subject: [PATCH 3/7] fix: identify promoted widgets at the host boundary --- src/composables/graph/useGraphNodeManager.ts | 2 ++ .../vueNodes/composables/useProcessedWidgets.test.ts | 12 ++++++++++-- .../vueNodes/composables/useProcessedWidgets.ts | 3 +-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/composables/graph/useGraphNodeManager.ts b/src/composables/graph/useGraphNodeManager.ts index 60e41bbed8e..d0ae72cbb82 100644 --- a/src/composables/graph/useGraphNodeManager.ts +++ b/src/composables/graph/useGraphNodeManager.ts @@ -48,6 +48,7 @@ export interface WidgetSlotMetadata { linked: boolean originNodeId?: NodeId originOutputName?: string + promoted: boolean type: string } @@ -352,6 +353,7 @@ function buildSlotMetadata( linked: input.link != null, originNodeId, originOutputName, + promoted: input.widgetId !== undefined, type: String(input.type) } if (input.name) metadata.set(input.name, slotInfo) diff --git a/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.test.ts b/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.test.ts index 08efa0390d7..319996f9d19 100644 --- a/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.test.ts +++ b/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.test.ts @@ -323,7 +323,7 @@ describe('computeProcessedWidgets visibility', () => { setActivePinia(createTestingPinia({ stubActions: false })) }) - it('keeps a promoted advanced widget visible when advanced widgets are hidden', () => { + it('keeps a promoted advanced widget visible without source metadata', () => { const subgraph = createTestSubgraph() const subgraphNode = createTestSubgraphNode(subgraph) subgraph.rootGraph.add(subgraphNode) @@ -351,8 +351,16 @@ describe('computeProcessedWidgets visibility', () => { .spyOn(app, 'rootGraph', 'get') .mockReturnValue(subgraph.rootGraph) try { + const nodeData = extractVueNodeData(subgraphNode) const processedWidgets = computeProcessedWidgets({ - nodeData: extractVueNodeData(subgraphNode), + nodeData: { + ...nodeData, + widgets: nodeData.widgets?.map((widget) => ({ + ...widget, + sourceExecutionId: undefined, + sourceWidgetName: undefined + })) + }, graphId: subgraph.rootGraph.id, showAdvanced: false, isGraphReady: false, diff --git a/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.ts b/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.ts index 00ab523ccc0..48b303f0a74 100644 --- a/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.ts +++ b/src/renderer/extensions/vueNodes/composables/useProcessedWidgets.ts @@ -268,11 +268,10 @@ export function computeProcessedWidgets({ ...(widget.options ?? {}), ...(widgetState?.options ?? {}) } - const isPromotedWidget = widget.sourceWidgetName !== undefined const visible = isWidgetVisible( mergedOptions, showAdvanced, - widget.slotMetadata?.linked || isPromotedWidget + widget.slotMetadata?.linked || widget.slotMetadata?.promoted ) if (!identity.dedupeIdentity) { uniqueWidgets.push({ From 60f98bda246239b9835ef111dd00b2ff00634cd9 Mon Sep 17 00:00:00 2001 From: jaeone94 <89377375+jaeone94@users.noreply.github.com> Date: Fri, 7 Aug 2026 22:00:29 +0900 Subject: [PATCH 4/7] fix: address promoted widget review feedback - keep selected advanced widgets visible in app mode - pin promoted slot metadata at its producer boundary - simplify and clarify promoted visibility coverage --- .../builder/AppModeWidgetList.test.ts | 154 ++++++++++++++++++ src/components/builder/AppModeWidgetList.vue | 1 + .../graph/useGraphNodeManager.test.ts | 4 +- .../composables/useProcessedWidgets.test.ts | 78 ++------- 4 files changed, 176 insertions(+), 61 deletions(-) create mode 100644 src/components/builder/AppModeWidgetList.test.ts diff --git a/src/components/builder/AppModeWidgetList.test.ts b/src/components/builder/AppModeWidgetList.test.ts new file mode 100644 index 00000000000..2c9c15c895b --- /dev/null +++ b/src/components/builder/AppModeWidgetList.test.ts @@ -0,0 +1,154 @@ +import { createTestingPinia } from '@pinia/testing' +import { render, screen } from '@testing-library/vue' +import { fromAny } from '@total-typescript/shoehorn' +import { setActivePinia } from 'pinia' +import { createI18n } from 'vue-i18n' +import { beforeEach, describe, expect, it, vi } from 'vitest' + +import type { VueNodeData } from '@/composables/graph/useGraphNodeManager' +import type { LGraphNode } from '@/lib/litegraph/src/LGraphNode' +import { LGraphEventMode } from '@/lib/litegraph/src/types/globalEnums' +import type { IBaseWidget } from '@/lib/litegraph/src/types/widgets' +import { toNodeId } from '@/types/nodeId' +import type { WidgetId } from '@/types/widgetId' + +import AppModeWidgetList from './AppModeWidgetList.vue' + +const mocks = vi.hoisted(() => ({ + extractVueNodeData: vi.fn(), + resolvedInputs: { value: [] as unknown[] } +})) + +vi.mock('@/components/builder/useResolvedSelectedInputs', () => ({ + useResolvedSelectedInputs: () => mocks.resolvedInputs +})) + +vi.mock('@/composables/graph/useGraphNodeManager', () => ({ + extractVueNodeData: mocks.extractVueNodeData +})) + +vi.mock('@/composables/maskeditor/useMaskEditor', () => ({ + useMaskEditor: () => ({ openMaskEditor: vi.fn() }) +})) + +vi.mock('@/renderer/core/canvas/canvasStore', () => ({ + useCanvasStore: () => ({ + canvas: { graph: { rootGraph: { id: 'graph-test' } } } + }) +})) + +vi.mock( + '@/renderer/extensions/vueNodes/composables/useNodeEventHandlers', + () => ({ + useNodeEventHandlers: () => ({ handleNodeRightClick: vi.fn() }) + }) +) + +vi.mock('@/renderer/extensions/vueNodes/composables/useNodeTooltips', () => ({ + useNodeTooltips: () => ({ + createTooltipConfig: () => ({}), + getWidgetTooltip: () => '' + }) +})) + +vi.mock( + '@/renderer/extensions/vueNodes/widgets/registry/widgetRegistry', + () => ({ + getComponent: () => ({ + props: ['widget'], + template: '
' + }), + shouldExpand: () => false, + shouldRenderAsVue: () => true + }) +) + +vi.mock('@/scripts/app', () => ({ + app: { + isGraphReady: false, + rootGraph: { id: 'graph-test' } + } +})) + +const i18n = createI18n({ + legacy: false, + locale: 'en', + messages: { + en: { + g: { remove: 'Remove', rename: 'Rename' } + } + } +}) + +describe('AppModeWidgetList', () => { + beforeEach(() => { + const widgetId = 'graph-test:1:max_shift' as WidgetId + const widget = fromAny