From e1902b7921add8f1b8bb9cbd4acdb1022aeee4e3 Mon Sep 17 00:00:00 2001 From: PabloWiedemann Date: Thu, 12 Nov 2026 12:29:53 -0800 Subject: [PATCH 1/4] feat(ui): show the Home tab in the title bar when no build is running The dashboard window used a different component in the title bar: a "Comfy Desktop" pill. It now uses the same tabs as a build window. Home is selected, and a "Choose a build" tab opens the same full picker that the pill opened. First-use lockdown keeps its pill. Follows #2027. --- e2e/beta-activation-notice-lockdown.test.ts | 2 +- e2e/chooser.test.ts | 10 +- e2e/lifecycle-cloud.test.ts | 2 +- e2e/support/chooserHelpers.ts | 2 +- .../src/comfyTitleBar/TitleBarApp.test.ts | 77 ++++++++++------ .../src/comfyTitleBar/TitleBarApp.vue | 91 +++++-------------- 6 files changed, 82 insertions(+), 102 deletions(-) diff --git a/e2e/beta-activation-notice-lockdown.test.ts b/e2e/beta-activation-notice-lockdown.test.ts index f4b1e5551..586c1a818 100644 --- a/e2e/beta-activation-notice-lockdown.test.ts +++ b/e2e/beta-activation-notice-lockdown.test.ts @@ -57,7 +57,7 @@ async function popupVisible(app: ElectronApplication): Promise { const bell = await titleBar.exists('.title-announcement-button') const pill = await titleBar.exists( - '[data-testid="title-build-tab"], .title-install-pill.is-interactive' + '[data-testid="title-build-tab"], [data-testid="title-choose-build-tab"]' ) return !bell && !pill } diff --git a/e2e/chooser.test.ts b/e2e/chooser.test.ts index 468f9567b..8315f9214 100644 --- a/e2e/chooser.test.ts +++ b/e2e/chooser.test.ts @@ -33,9 +33,13 @@ test('chooser body renders on cold start @windows @macos @linux', async () => { expect(await ctx.panel.exists('[data-testid="devplatform-account-signin"]')).toBe(true) }) -test('title bar shows install-less pill on chooser host @windows @macos @linux', async () => { - expect(await ctx.titleBar.exists('.title-install-pill.is-install-less')).toBe(true) - expect(await ctx.titleBar.textOf('.title-install-name')).toMatch(/Comfy Desktop/i) +test('title bar shows Home and the choose-a-build tab on chooser host @windows @macos @linux', async () => { + expect(await ctx.titleBar.exists('[data-testid="title-home-tab"][aria-current="page"]')).toBe( + true + ) + expect(await ctx.titleBar.textOf('[data-testid="title-choose-build-tab"]')).toMatch( + /Choose a build/i + ) }) test('clicking New Install tile opens the new-install takeover @windows @macos @linux', async () => { diff --git a/e2e/lifecycle-cloud.test.ts b/e2e/lifecycle-cloud.test.ts index 306170dd2..0f3b61b33 100644 --- a/e2e/lifecycle-cloud.test.ts +++ b/e2e/lifecycle-cloud.test.ts @@ -35,7 +35,7 @@ test('accept ToS + pick cloud auto-launches the seeded Cloud install @lifecycle' expect(await ctx.panel.click('[data-testid="first-use-continue"]')).toBe(true) await expect - .poll(() => ctx.titleBar.exists('.title-install-pill:not(.is-install-less)'), { + .poll(() => ctx.titleBar.exists('[data-testid="title-build-tab"]'), { timeout: 30_000, intervals: [100, 200, 500] }) diff --git a/e2e/support/chooserHelpers.ts b/e2e/support/chooserHelpers.ts index b35f1b733..0fc7b1485 100644 --- a/e2e/support/chooserHelpers.ts +++ b/e2e/support/chooserHelpers.ts @@ -99,7 +99,7 @@ export async function openManageViaDashboard( return popup } -const INSTALL_PILL = '.title-install-pill.is-interactive' +const INSTALL_PILL = '[data-testid="title-choose-build-tab"]' const BUILD_TAB = '[data-testid="title-build-tab"]' function hasBuildTab(titleBar: WebContentsPage): Promise { diff --git a/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts b/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts index 74a662cd1..aed1e7f3a 100644 --- a/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts +++ b/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts @@ -382,21 +382,63 @@ describe('TitleBarApp', () => { wrapper.unmount() }) - it('renders the install-less pill as an interactive opener for the instance picker', async () => { + it('shows the same tabs with no build: Home selected and a tab that opens the full build picker', async () => { bridgeState = installMockBridge({ installationId: null }) vi.resetModules() const { default: TitleBarApp } = await import('./TitleBarApp.vue') const wrapper = mount(TitleBarApp, { attachTo: document.body }) await flushPromises() - const pill = wrapper.find('.title-install-pill') - expect(pill.exists()).toBe(true) - expect(pill.element.tagName).toBe('DIV') - expect(pill.attributes('role')).toBe('button') - expect(pill.classes()).toContain('is-install-less') - expect(wrapper.find('.title-install-caret').exists()).toBe(true) + + const home = wrapper.get('[data-testid="title-home-tab"]') + expect(home.attributes('aria-current')).toBe('page') + expect(wrapper.find('[data-testid="title-build-tab"]').exists()).toBe(false) + expect(wrapper.find('[data-testid="title-close-build-tab"]').exists()).toBe(false) + + const chooseTab = wrapper.get('[data-testid="title-choose-build-tab"]') + expect(chooseTab.element.tagName).toBe('BUTTON') + expect(chooseTab.text()).toBe('Choose a build') + expect(chooseTab.attributes('aria-current')).toBeUndefined() + expect(chooseTab.attributes('aria-haspopup')).toBe('dialog') + expect(home.classes()).toEqual(expect.arrayContaining(['h-7', 'rounded-control', 'bg-accent'])) + expect(chooseTab.classes()).toEqual(expect.arrayContaining(['h-7', 'rounded-control'])) + + await chooseTab.trigger('click') + expect(bridgeState.installPillClicks.length).toBe(1) + expect(bridgeState.setPanelCalls).toEqual([]) wrapper.unmount() }) + it('keeps the dashboard in place from the Home tab with no build, and returns to it from a Home tool', async () => { + bridgeState = installMockBridge({ installationId: null }) + vi.resetModules() + const { default: TitleBarApp } = await import('./TitleBarApp.vue') + const wrapper = mount(TitleBarApp) + await flushPromises() + + await wrapper.get('[data-testid="title-home-tab"]').trigger('click') + expect(bridgeState.setPanelCalls).toEqual([]) + + bridgeState.panelChangedCallbacks.forEach((cb) => cb('benchmarks')) + await flushPromises() + await wrapper.get('[data-testid="title-home-tab"]').trigger('click') + expect(bridgeState.setPanelCalls).toEqual(['comfy']) + }) + + it('swaps the choose tab for the build tab when the window gets a build', async () => { + bridgeState = installMockBridge({ installationId: null }) + vi.resetModules() + const { default: TitleBarApp } = await import('./TitleBarApp.vue') + const wrapper = mount(TitleBarApp) + await flushPromises() + + bridgeState.installationIdChangedCallbacks.forEach((cb) => cb('inst-1')) + await flushPromises() + + expect(wrapper.find('[data-testid="title-choose-build-tab"]').exists()).toBe(false) + expect(wrapper.find('[data-testid="title-build-tab"]').exists()).toBe(true) + expect(wrapper.get('[data-testid="title-home-tab"]').attributes('aria-current')).toBeUndefined() + }) + it('updates the install pill label when main pushes a title', async () => { const { default: TitleBarApp } = await import('./TitleBarApp.vue') const wrapper = mount(TitleBarApp) @@ -434,27 +476,6 @@ describe('TitleBarApp', () => { expect(wrapper.find('header').classes()).toContain('is-mac') }) - it('shows the dropdown caret on install-less host windows so the picker opener reads as actionable', async () => { - bridgeState = installMockBridge({ installationId: null }) - vi.resetModules() - const { default: TitleBarApp } = await import('./TitleBarApp.vue') - const wrapper = mount(TitleBarApp) - await flushPromises() - expect(wrapper.find('.title-install-name').exists()).toBe(true) - expect(wrapper.find('.title-install-caret').exists()).toBe(true) - }) - - it('accepts the install-less fallback label pushed by main', async () => { - bridgeState = installMockBridge({ installationId: null }) - vi.resetModules() - const { default: TitleBarApp } = await import('./TitleBarApp.vue') - const wrapper = mount(TitleBarApp) - await flushPromises() - bridgeState.titleChangedCallbacks.forEach((cb) => cb('Comfy Desktop')) - await flushPromises() - expect(wrapper.find('.title-install-name').text()).toBe('Comfy Desktop') - }) - it('suppresses menu re-open immediately after a menu close (click-to-toggle dismiss)', async () => { const { default: TitleBarApp } = await import('./TitleBarApp.vue') const wrapper = mount(TitleBarApp, { attachTo: document.body }) diff --git a/src/renderer/src/comfyTitleBar/TitleBarApp.vue b/src/renderer/src/comfyTitleBar/TitleBarApp.vue index 0a8711784..856b815c4 100644 --- a/src/renderer/src/comfyTitleBar/TitleBarApp.vue +++ b/src/renderer/src/comfyTitleBar/TitleBarApp.vue @@ -127,19 +127,8 @@ const titleMenuButtonClass = const titleInstallPillClass = [ '[-webkit-app-region:no-drag] inline-flex h-7 items-center gap-2 [inline-size:fit-content] [min-inline-size:200px] [max-inline-size:clamp(200px,22cqi,360px)] rounded-[999px] border border-solid border-transparent bg-[var(--chooser-surface-bg)] py-[5px] pr-2.5 pl-3 [font-family:inherit] text-[12px] leading-[inherit] font-normal text-neutral-100 cursor-default transition-[background-color,border-color,color] duration-[120ms] ease-[ease]', - '[&.is-interactive]:cursor-pointer', - '[&.is-interactive:focus-visible]:outline-none [&.is-interactive:focus-visible]:outline-current', - '[&.is-install-less]:opacity-85', - '[.title-bar.is-hover-active_&.is-interactive:hover:not(.is-open)]:bg-[var(--chooser-surface-bg-hover)] [.title-bar.is-hover-active_&.is-interactive:hover:not(.is-open)]:border-[color-mix(in_srgb,var(--neutral-50)_35%,transparent)] [.title-bar.is-hover-active_&.is-interactive:hover:not(.is-open)]:text-[color-mix(in_srgb,var(--neutral-50)_70%,var(--neutral-100))]', - '[&.is-interactive:focus-visible:not(.is-open)]:bg-[var(--chooser-surface-bg-hover)] [&.is-interactive:focus-visible:not(.is-open)]:border-[color-mix(in_srgb,var(--neutral-50)_35%,transparent)] [&.is-interactive:focus-visible:not(.is-open)]:text-[color-mix(in_srgb,var(--neutral-50)_70%,var(--neutral-100))]', - '[&.is-interactive.is-open]:border-neutral-50 [&.is-interactive.is-open]:text-neutral-50', '[.title-bar.is-light_&]:bg-[rgba(0,0,0,0.04)] [.title-bar.is-light_&]:text-neutral-700', - '[.title-bar:not(.is-light)_&]:border-border [.title-bar:not(.is-light)_&]:bg-[oklch(1_0_0/0.04)] [.title-bar:not(.is-light)_&]:text-text-muted', - '[.title-bar.is-light.is-hover-active_&.is-interactive:hover:not(.is-open)]:bg-[rgba(0,0,0,0.07)] [.title-bar.is-light.is-hover-active_&.is-interactive:hover:not(.is-open)]:border-[color-mix(in_srgb,var(--neutral-700)_35%,transparent)] [.title-bar.is-light.is-hover-active_&.is-interactive:hover:not(.is-open)]:text-neutral-700', - '[.title-bar.is-light_&.is-interactive:focus-visible:not(.is-open)]:bg-[rgba(0,0,0,0.07)] [.title-bar.is-light_&.is-interactive:focus-visible:not(.is-open)]:border-[color-mix(in_srgb,var(--neutral-700)_35%,transparent)] [.title-bar.is-light_&.is-interactive:focus-visible:not(.is-open)]:text-neutral-700', - '[.title-bar.is-hover-active:not(.is-light)_&.is-interactive:hover:not(.is-open)]:border-[oklch(1_0_0/0.12)] [.title-bar.is-hover-active:not(.is-light)_&.is-interactive:hover:not(.is-open)]:bg-[oklch(1_0_0/0.07)] [.title-bar.is-hover-active:not(.is-light)_&.is-interactive:hover:not(.is-open)]:text-text', - '[.title-bar:not(.is-light)_&.is-interactive.is-open]:border-[oklch(1_0_0/0.3)] [.title-bar:not(.is-light)_&.is-interactive.is-open]:bg-[oklch(1_0_0/0.07)] [.title-bar:not(.is-light)_&.is-interactive.is-open]:text-text', - '[.title-bar.is-light_&.is-interactive.is-open]:border-[color-mix(in_srgb,var(--neutral-700)_55%,transparent)] [.title-bar.is-light_&.is-interactive.is-open]:text-neutral-700' + '[.title-bar:not(.is-light)_&]:border-border [.title-bar:not(.is-light)_&]:bg-[oklch(1_0_0/0.04)] [.title-bar:not(.is-light)_&]:text-text-muted' ].join(' ') const titleDownloadsBadgeClass = @@ -396,9 +385,10 @@ const betaNotice = useBetaActivationNotice({ } }) -const buildTabsShown = computed(() => !isInstallLess.value && !isFirstUseLockdown.value) const HOME_PANELS: ReadonlySet = new Set(['home', 'performance-test', 'benchmarks']) -const homeTabActive = computed(() => buildTabsShown.value && HOME_PANELS.has(activePanel.value)) +const homeTabActive = computed( + () => !isFirstUseLockdown.value && (isInstallLess.value || HOME_PANELS.has(activePanel.value)) +) const titleTabBase = '[-webkit-app-region:no-drag] group flex h-7 min-w-0 shrink items-center gap-2 rounded-control text-ui outline-none focus-visible:ring-2 focus-visible:ring-ring' @@ -420,7 +410,8 @@ function titleTabClose(active: boolean): string { } function showHomeTab(): void { - bridge?.setPanel('home') + if (!isInstallLess.value) bridge?.setPanel('home') + else if (activePanel.value !== 'comfy') bridge?.setPanel('comfy') } function closeBuildTab(): void { @@ -428,7 +419,7 @@ function closeBuildTab(): void { } function handleInstallPillWithCoachmark(): void { - if (homeTabActive.value) { + if (homeTabActive.value && !isInstallLess.value) { bridge?.setPanel('comfy') return } @@ -614,7 +605,7 @@ onUnmounted(() => { class="title-cluster flex min-w-[var(--title-trailing-width,0px)] items-center gap-1 [.title-bar:not(.is-mac)_&]:min-w-[calc(var(--title-trailing-width,0px)_+_128px)]" > -
-
- - -
-
- {{ installLabel }} -
-
-
-
+ {{ t('chooser.title') }} +