diff --git a/e2e/beta-activation-notice-lockdown.test.ts b/e2e/beta-activation-notice-lockdown.test.ts index f4b1e5551..91f5e741e 100644 --- a/e2e/beta-activation-notice-lockdown.test.ts +++ b/e2e/beta-activation-notice-lockdown.test.ts @@ -56,10 +56,8 @@ 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' - ) - return !bell && !pill + const homeTab = await titleBar.exists('[data-testid="title-home-tab"]') + return !bell && !homeTab } const UNREACHABLE_POSTHOG_HOST = 'http://127.0.0.1:1' diff --git a/e2e/chooser.test.ts b/e2e/chooser.test.ts index 468f9567b..bf727e9f9 100644 --- a/e2e/chooser.test.ts +++ b/e2e/chooser.test.ts @@ -33,9 +33,11 @@ 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 only the Home 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.exists('[data-testid="title-build-tab"]')).toBe(false) }) 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..01bd8edbc 100644 --- a/e2e/support/chooserHelpers.ts +++ b/e2e/support/chooserHelpers.ts @@ -99,12 +99,7 @@ export async function openManageViaDashboard( return popup } -const INSTALL_PILL = '.title-install-pill.is-interactive' -const BUILD_TAB = '[data-testid="title-build-tab"]' - -function hasBuildTab(titleBar: WebContentsPage): Promise { - return titleBar.exists(BUILD_TAB) -} +const HOME_TAB = '[data-testid="title-home-tab"]' export async function openPickerViaTitlePill( app: ElectronApplication, @@ -113,20 +108,16 @@ export async function openPickerViaTitlePill( ): Promise { if (await isPopupVisible(app, 'comfyTitlePopup.html')) { throw new Error( - 'openPickerViaTitlePill: picker popup is already open - close it before re-entering via the pill' + 'openPickerViaTitlePill: picker popup is already open - close it before opening it again' ) } await expect - .poll(async () => (await hasBuildTab(titleBar)) || titleBar.exists(INSTALL_PILL), { + .poll(() => titleBar.exists(HOME_TAB), { timeout: 15_000, intervals: [100, 250] }) .toBe(true) - if (await hasBuildTab(titleBar)) { - await titleBar.evaluate('window.api.openInstancePicker()') - } else { - expect(await titleBar.click(INSTALL_PILL), 'title-bar install pill clicked').toBe(true) - } + await titleBar.evaluate('window.api.openInstancePicker()') await waitForWebContents(app, 'comfyTitlePopup.html') await expect .poll(() => isPopupVisible(app, 'comfyTitlePopup.html'), { diff --git a/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts b/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts index 74a662cd1..f91823767 100644 --- a/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts +++ b/src/renderer/src/comfyTitleBar/TitleBarApp.test.ts @@ -382,19 +382,50 @@ describe('TitleBarApp', () => { wrapper.unmount() }) - it('renders the install-less pill as an interactive opener for the instance picker', async () => { + it('shows only the Home tab, selected and in the build-window tab style, with no build', async () => { bridgeState = installMockBridge({ installationId: null }) vi.resetModules() const { default: TitleBarApp } = await import('./TitleBarApp.vue') - const wrapper = mount(TitleBarApp, { attachTo: document.body }) + const wrapper = mount(TitleBarApp) 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) - wrapper.unmount() + + const nav = wrapper.get('nav') + expect(nav.findAll('button').length).toBe(1) + const home = wrapper.get('[data-testid="title-home-tab"]') + expect(home.attributes('aria-current')).toBe('page') + expect(home.classes()).toEqual(expect.arrayContaining(['h-7', 'rounded-control', 'bg-accent'])) + expect(wrapper.find('[data-testid="title-build-tab"]').exists()).toBe(false) + expect(wrapper.find('.title-install-pill').exists()).toBe(false) + }) + + 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('adds 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-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 () => { @@ -425,34 +456,27 @@ describe('TitleBarApp', () => { expect(wrapper.findAll('.title-nav-button').length).toBe(0) }) - it('applies the is-mac class when running on macOS', async () => { - bridgeState = installMockBridge({ isMac: true }) - vi.resetModules() - const { default: TitleBarApp } = await import('./TitleBarApp.vue') - const wrapper = mount(TitleBarApp) - await flushPromises() - 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 () => { + it('shows the fallback label pushed by main in the lockdown pill when there is no build', 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) + bridgeState.firstUseModeChangedCallbacks.forEach((cb) => cb('consent-lockdown')) + bridgeState.titleChangedCallbacks.forEach((cb) => cb('Comfy Desktop')) + await flushPromises() + + expect(wrapper.find('nav').exists()).toBe(false) + expect(wrapper.get('.title-install-pill .title-install-name').text()).toBe('Comfy Desktop') }) - it('accepts the install-less fallback label pushed by main', async () => { - bridgeState = installMockBridge({ installationId: null }) + it('applies the is-mac class when running on macOS', async () => { + bridgeState = installMockBridge({ isMac: true }) 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') + expect(wrapper.find('header').classes()).toContain('is-mac') }) it('suppresses menu re-open immediately after a menu close (click-to-toggle dismiss)', async () => { diff --git a/src/renderer/src/comfyTitleBar/TitleBarApp.vue b/src/renderer/src/comfyTitleBar/TitleBarApp.vue index 0a8711784..8c9eba349 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 = @@ -235,6 +224,7 @@ const fileBtnRef = useTemplateRef('fileBtn') const downloadsBtnRef = useTemplateRef('downloadsBtn') const announcementBtnRef = useTemplateRef('announcementBtn') const installPillRef = useTemplateRef('installPill') +const titleClusterRef = useTemplateRef('titleCluster') const titleTrailingRef = useTemplateRef('titleTrailing') const trailingWidthPx = ref(0) @@ -264,16 +254,13 @@ interface FitMeasurement { function measureFit(): FitMeasurement { const bar = titleBarRef.value const trailing = titleTrailingRef.value - const pill = installPillRef.value - if (!bar || !trailing || !pill) return { gap: Infinity, trailingWidth: NaN } + const cluster = titleClusterRef.value + if (!bar || !trailing || !cluster) return { gap: Infinity, trailingWidth: NaN } const barRect = bar.getBoundingClientRect() if (barRect.width === 0) return { gap: Infinity, trailingWidth: NaN } const trailingRect = trailing.getBoundingClientRect() const leadingRight = Math.max( - pill.getBoundingClientRect().right, - ...Array.from(pill.closest('.title-cluster')?.children ?? []).map( - (child) => child.getBoundingClientRect().right - ) + ...Array.from(cluster.children).map((child) => child.getBoundingClientRect().right) ) return { gap: trailingRect.left - leadingRight, trailingWidth: trailingRect.width } } @@ -396,9 +383,8 @@ 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(() => 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 +406,8 @@ function titleTabClose(active: boolean): string { } function showHomeTab(): void { - bridge?.setPanel('home') + const homePanel: ComfyPanelKey = isInstallLess.value ? 'comfy' : 'home' + if (activePanel.value !== homePanel) bridge?.setPanel(homePanel) } function closeBuildTab(): void { @@ -611,10 +598,11 @@ onUnmounted(() => { }" >