From af6fa7888c12a94a9cfacfc560fed520e076dffb Mon Sep 17 00:00:00 2001 From: Erwan Leboucher Date: Wed, 22 Jul 2026 17:10:26 +0200 Subject: [PATCH] fix: repair title bar toggle checks --- .changeset/optional-custom-titlebar.md | 5 +++++ src/app/features/settings/desktop/Desktop.test.tsx | 6 +++--- src/app/pages/client/SyncStatus.test.ts | 2 +- src/app/styles/edgeToEdgeInsets.test.ts | 10 ++++++++-- 4 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 .changeset/optional-custom-titlebar.md diff --git a/.changeset/optional-custom-titlebar.md b/.changeset/optional-custom-titlebar.md new file mode 100644 index 000000000..61dbc8afe --- /dev/null +++ b/.changeset/optional-custom-titlebar.md @@ -0,0 +1,5 @@ +--- +default: patch +--- + +Allow using native window chrome instead of the custom title bar. diff --git a/src/app/features/settings/desktop/Desktop.test.tsx b/src/app/features/settings/desktop/Desktop.test.tsx index 7aabb27a7..e4908564f 100644 --- a/src/app/features/settings/desktop/Desktop.test.tsx +++ b/src/app/features/settings/desktop/Desktop.test.tsx @@ -13,7 +13,7 @@ const { mockUseDesktopSettingsSyncing, mockSetUseCustomTitleBar, } = vi.hoisted(() => { - const mockSetUseCustomTitleBar = vi.fn<(value: boolean) => void>(); + const setUseCustomTitleBarMock = vi.fn<(value: boolean) => void>(); return { mockUseDesktopSetting: vi.fn< @@ -21,11 +21,11 @@ const { key: 'closeToBackgroundOnClose' | 'showSystemTrayIcon' | 'useCustomTitleBar' ) => readonly [boolean, (value: boolean) => void] >((key) => { - if (key === 'useCustomTitleBar') return [true, mockSetUseCustomTitleBar] as const; + if (key === 'useCustomTitleBar') return [true, setUseCustomTitleBarMock] as const; if (key === 'closeToBackgroundOnClose') return [true, vi.fn<() => void>()] as const; return [true, vi.fn<() => void>()] as const; }), - mockSetUseCustomTitleBar, + mockSetUseCustomTitleBar: setUseCustomTitleBarMock, mockUseDesktopSettingsReady: vi.fn<() => boolean>(() => true), mockUseDesktopSettingsSyncing: vi.fn<() => boolean>(() => false), mockUseDesktopRuntimeState: vi.fn<() => { trayAvailable: boolean }>(() => ({ diff --git a/src/app/pages/client/SyncStatus.test.ts b/src/app/pages/client/SyncStatus.test.ts index de3dc91df..b5332b716 100644 --- a/src/app/pages/client/SyncStatus.test.ts +++ b/src/app/pages/client/SyncStatus.test.ts @@ -19,7 +19,7 @@ vi.mock('$hooks/useSyncState', () => ({ })); vi.mock('$state/hooks/desktopSettings', () => ({ - useDesktopSetting: () => [false, vi.fn()] as const, + useDesktopSetting: () => [false, vi.fn<() => void>()] as const, })); import { SyncState } from '$types/matrix-sdk'; diff --git a/src/app/styles/edgeToEdgeInsets.test.ts b/src/app/styles/edgeToEdgeInsets.test.ts index 714283cd7..83627f466 100644 --- a/src/app/styles/edgeToEdgeInsets.test.ts +++ b/src/app/styles/edgeToEdgeInsets.test.ts @@ -40,7 +40,11 @@ describe('android edge-to-edge inset contract', () => { expect(appTsx).toContain('screenSize={screenSize}'); expect(appTsx).toContain('queryClient={queryClient}'); expect(appShell).toContain('const [portalContainer, setPortalContainer] = useState'); - expect(appShell).toContain(''); + expect(appShell).toContain('onPortalContainerChange={setPortalContainer}'); + expect(appShell).toContain('function AppShellFrame'); + expect(appShell).toContain( + '' + ); expect(systemBarShell).toContain('ref={onPortalContainerChange}'); }); @@ -49,7 +53,9 @@ describe('android edge-to-edge inset contract', () => { const systemBarShell = readWorkspaceFile('src/app/components/app-shell/SystemBarShell.tsx'); const mobileCapability = readWorkspaceFile('src-tauri/capabilities/mobile.json'); - expect(appShell).toContain('const contentHeight = hasCustomTitleBar'); + expect(appShell).toContain( + "const contentHeight = titlebarKind ? 'calc(100% - var(--tauri-titlebar-height))' : '100%';" + ); expect(appShell).toContain("height: '100%'"); expect(appShell).toContain('height: contentHeight'); expect(appShell).toContain('');