Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
Show the pane buttons as one switcher in narrow windows (#7295)
Abraham78fdc7f64e0d
diff --git a/.changeset/narrow-pane-switcher.md b/.changeset/narrow-pane-switcher.mdnew file mode 100644index 000000000..c90dbdd43--- /dev/null+++ b/.changeset/narrow-pane-switcher.md@@ -0,0 +1,5 @@+---+'@inkeep/open-knowledge': patch+---++In narrow windows, the Editor, Agents and Terminal buttons in the header now look like one switcher, with the panel you see raised.diff --git a/docs/content/features/editor.mdx b/docs/content/features/editor.mdxindex 4af8426d2..734d884d3 100644--- a/docs/content/features/editor.mdx+++ b/docs/content/features/editor.mdx@@ -240,7 +240,7 @@ When the editor, the Agents panel and the terminal are all hidden, the main area## Narrow windows-When a project or single-file window is narrower than 48rem (768px at the default text size), it shows one of Editor, Agents and Terminal at a time instead of side by side. The **Editor**, **Agents** and **Terminal** buttons in the header select which one you see; pressing the one already shown does nothing. The others keep running while hidden: chats keep streaming, shells keep their output, and drafts, tabs, scroll positions and undo history are kept for when you switch back.+When a project or single-file window is narrower than 48rem (768px at the default text size), it shows one of Editor, Agents and Terminal at a time instead of side by side. The **Editor**, **Agents** and **Terminal** buttons in the header join into one switcher that selects which one you see, with the shown one raised; pressing the one already shown does nothing. The others keep running while hidden: chats keep streaming, shells keep their output, and drafts, tabs, scroll positions and undo history are kept for when you switch back.- The component you used last is selected when the window narrows. Opening a document from search, history, a link, the terminal or a chat selects Editor with that document.- **Hide Agents** or **Hide Terminal** (from the View menu, the command palette or `Cmd+L` for Agents) returns to Editor. **Hide Editor** shows an Agents or Terminal session that is already open, or **Nothing open** if none is.diff --git a/knip.config.ts b/knip.config.tsindex 36a395261..03ef8d4a4 100644--- a/knip.config.ts+++ b/knip.config.ts@@ -155,11 +155,15 @@ export default {'src/shadow-fixture-launch.test-helper.mjs',],project: 'src/**',- ignoreDependencies: ['@types/shell-quote'],+ ignoreDependencies: [+ '@types/shell-quote',+ ],},'packages/cli': {entry: ['src/**/*.test.ts', 'scripts/*.ts', 'tests/**/*.ts', 'src/parse-worker.ts'],- ignoreDependencies: ['yjs'],+ ignoreDependencies: [+ 'yjs',+ ],},'packages/desktop': {entry: [diff --git a/packages/app/src/components/HeaderPaneButtons.dom.test.tsx b/packages/app/src/components/HeaderPaneButtons.dom.test.tsxindex 73a3f637d..3efad3812 100644--- a/packages/app/src/components/HeaderPaneButtons.dom.test.tsx+++ b/packages/app/src/components/HeaderPaneButtons.dom.test.tsx@@ -33,6 +33,8 @@ const HIGH_CONTRAST_OUTLINE = ['contrast-more:outline-solid','contrast-more:outline-2',];+const SWITCHER_TRACK = ['bg-foreground/5', 'p-0.5', 'rounded-[10px]'];+const RAISED_SEGMENT = ['bg-background', 'shadow-sm'];const ORIGINAL_PLATFORM = globalThis.navigator.platform;@@ -326,6 +328,35 @@ describe('HeaderPaneButtons', () => {]);});+ test('with one pane shown at a time the buttons sit on one track with the shown pane raised, and a press on it asks for nothing', async () => {+ const user = userEvent.setup();+ paneVisibilityStore.publish({ editor: SHOWN, agents: HIDDEN, terminal: null }, true);+ const requests = recordRequests();+ renderButtons();++ const group = screen.getByRole('group', { name: 'Panels' });+ const shown = screen.getByRole('button', { name: 'Editor' });+ const idle = screen.getByRole('button', { name: 'Agents' });+ expectVisualClassTokens(group.className, SWITCHER_TRACK);+ expect(shown.getAttribute('aria-pressed')).toBe('true');+ expect(idle.getAttribute('aria-pressed')).toBe('false');+ expectVisualClassTokens(shown.className, [...RAISED_SEGMENT, ...HIGH_CONTRAST_OUTLINE]);+ expectVisualClassTokensAbsent(shown.className, PRESSED_LOOK);+ expectVisualClassTokensAbsent(idle.className, [...RAISED_SEGMENT, ...PRESSED_LOOK]);++ await user.click(shown);+ expect(requests).toEqual([]);+ await user.click(idle);+ expect(requests).toEqual([{ pane: 'agents', open: true, reason: 'user' }]);++ act(() => {+ paneVisibilityStore.publish({ editor: SHOWN, agents: HIDDEN, terminal: null }, false);+ });+ expectVisualClassTokensAbsent(group.className, SWITCHER_TRACK);+ expectVisualClassTokens(shown.className, PRESSED_LOOK);+ expectVisualClassTokensAbsent(shown.className, RAISED_SEGMENT);+ });+test('useHeaderPaneButtonSet lists the panes to render in header order', () => {render(<Providers setting={TERMINAL_SETTING_UNSET}>diff --git a/packages/app/src/components/HeaderPaneButtons.tsx b/packages/app/src/components/HeaderPaneButtons.tsxindex 6a82ac2b2..7c47ec1ce 100644--- a/packages/app/src/components/HeaderPaneButtons.tsx+++ b/packages/app/src/components/HeaderPaneButtons.tsx@@ -33,8 +33,20 @@ const PANE_SHORTCUT = {terminal: 'toggle-terminal-panel',} as const satisfies Record<PaneId, KeyboardShortcutId | null>;-const PRESSED_CLASSES =- 'bg-primary/10 text-primary hover:bg-primary/15 hover:text-primary outline-current -outline-offset-2 forced-colors:outline-solid forced-colors:outline-2 contrast-more:outline-solid contrast-more:outline-2';+const HIGH_CONTRAST_OUTLINE_CLASSES =+ 'outline-current -outline-offset-2 forced-colors:outline-solid forced-colors:outline-2 contrast-more:outline-solid contrast-more:outline-2';++const PRESSED_CLASSES = cn(+ 'bg-primary/10 text-primary hover:bg-primary/15 hover:text-primary',+ HIGH_CONTRAST_OUTLINE_CLASSES,+);++const SWITCHER_TRACK_CLASSES = '-m-0.5 rounded-[10px] bg-foreground/5 p-0.5';++const SWITCHER_SHOWN_CLASSES = cn(+ 'bg-background text-foreground shadow-sm hover:bg-background hover:text-foreground dark:bg-foreground/15',+ HIGH_CONTRAST_OUTLINE_CLASSES,+);function useTerminalTurnedOff(): boolean {const { enabled, synced } = useTerminalConsentState();@@ -64,7 +76,24 @@ export function useHeaderPaneButtonSet(): readonly PaneId[] {return useHeaderPaneButtonStates().map(({ pane }) => pane);}-function HeaderPaneButton({ pane, pressed }: HeaderPaneButtonState) {+function useOnePaneAtATime(): boolean {+ return useSyncExternalStore(+ paneVisibilityStore.subscribe,+ paneVisibilityStore.isExclusive,+ paneVisibilityStore.isExclusive,+ );+}++function pressedLook(pressed: boolean, switcher: boolean): string | false {+ if (switcher) return pressed && SWITCHER_SHOWN_CLASSES;+ return pressed && PRESSED_CLASSES;+}++function HeaderPaneButton({+ pane,+ pressed,+ switcher,+}: HeaderPaneButtonState & { readonly switcher: boolean }) {const { t } = useLingui();const name = t(PANE_LABEL[pane]);const Icon = PANE_ICON[pane];@@ -86,7 +115,7 @@ function HeaderPaneButton({ pane, pressed }: HeaderPaneButtonState) {paneVisibilityStore.request(pane, !pressed, 'user');if (pressed) queueMicrotask(() => button.focus());}}- className={cn('text-muted-foreground', pressed && PRESSED_CLASSES)}+ className={cn('text-muted-foreground', pressedLook(pressed, switcher))}><Icon aria-hidden="true" className="size-4" /></Button>@@ -107,6 +136,7 @@ function HeaderPaneButton({ pane, pressed }: HeaderPaneButtonState) {export function HeaderPaneButtons() {const { t } = useLingui();const buttons = useHeaderPaneButtonStates();+ const switcher = useOnePaneAtATime();if (buttons.length === 0) return null;return (@@ -117,9 +147,14 @@ export function HeaderPaneButtons() {className="mx-1 h-4 data-vertical:self-center forced-colors:border-l"/>{/* biome-ignore lint/a11y/useSemanticElements: a cluster of pane toggles is not a form-control set; <fieldset> would impose form chrome, and ButtonGroup squares the pressed tint. */}- <div role="group" aria-label={t`Panels`} className="flex items-center gap-0.5">+ <div+ role="group"+ aria-label={t`Panels`}+ data-pane-switcher={switcher ? '' : undefined}+ className={cn('flex items-center gap-0.5', switcher && SWITCHER_TRACK_CLASSES)}+ >{buttons.map(({ pane, pressed }) => (- <HeaderPaneButton key={pane} pane={pane} pressed={pressed} />+ <HeaderPaneButton key={pane} pane={pane} pressed={pressed} switcher={switcher} />))}</div></div>diff --git a/packages/app/src/globals.css b/packages/app/src/globals.cssindex 9223150c4..ae7f15679 100644--- a/packages/app/src/globals.css+++ b/packages/app/src/globals.css@@ -3699,6 +3699,21 @@ html.dark [data-app-header] button[data-variant="ghost"]:is(:hover, [data-state=background-color: oklch(from var(--desk) calc(l + 0.04) c h);}+@media (hover: hover) {+ [data-app-header]+ [data-pane-switcher]+ button[data-variant="ghost"]:not([aria-pressed="true"]):hover {+ background-color: oklch(from var(--foreground) l c h / 0.1);+ }+}++html.dark+ [data-app-header]+ [data-pane-switcher]+ button[data-variant="ghost"][aria-pressed="true"]:is(:hover, [data-state="open"]) {+ background-color: oklch(from var(--foreground) l c h / 0.15);+}+/*Electron-mode outer-canvas alpha-aware retrofit.diff --git a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts b/packages/app/tests/integration/bug3-source-mode-writeback.test.tsindex a50b00123..4549c74b3 100644--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts@@ -1,3 +1,4 @@+import { readFileSync } from 'node:fs';import { join } from 'node:path';import { setTimeout as wait } from 'node:timers/promises';diff --git a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts b/packages/app/tests/integration/indented-jsx-byte-sacred.test.tsindex 6fcdc23f2..4fc2c11f9 100644--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts@@ -1,3 +1,4 @@+import { setTimeout as wait } from 'node:timers/promises';import { normalizeBridge } from '@inkeep/open-knowledge-core';import { updateYFragment } from '@tiptap/y-tiptap';diff --git a/packages/app/tests/integration/interior-edit-freshness.test.ts b/packages/app/tests/integration/interior-edit-freshness.test.tsindex 40b5cdfd6..9f2f6feb6 100644--- a/packages/app/tests/integration/interior-edit-freshness.test.ts+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts@@ -1,3 +1,4 @@+import { setTimeout as wait } from 'node:timers/promises';import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';import { afterAll, beforeAll, describe, expect, test } from 'vitest';diff --git a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts b/packages/app/tests/integration/keystroke-cadence-danger-space.test.tsindex 93666af70..2a085742b 100644--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts@@ -1,3 +1,4 @@+import { setTimeout as wait } from 'node:timers/promises';import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';import { afterAll, beforeAll, describe, expect, test } from 'vitest';diff --git a/packages/app/tests/integration/producer-guard-wiring.test.ts b/packages/app/tests/integration/producer-guard-wiring.test.tsindex 867598d34..878d5196b 100644--- a/packages/app/tests/integration/producer-guard-wiring.test.ts+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts@@ -1,3 +1,4 @@+import { setTimeout as wait } from 'node:timers/promises';import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';import { afterAll, beforeAll, describe, expect, test } from 'vitest';diff --git a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.tsindex 0970ac12f..4ada3cf26 100644--- a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts+++ b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts@@ -1,3 +1,4 @@+import { randomUUID } from 'node:crypto';import { afterEach, describe, expect, test } from 'vitest';import { agentWriteMd, createTestServer, type TestServer } from './test-harness';diff --git a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts b/packages/app/tests/integration/qa-045-restore-after-gc.test.tsindex b632185e1..cbe2b705f 100644--- a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts+++ b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts@@ -1,3 +1,4 @@+import { execFileSync } from 'node:child_process';import { randomUUID } from 'node:crypto';import { join } from 'node:path';diff --git a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.tsindex c530ce4ba..89bc9b4d9 100644--- a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts+++ b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts@@ -1,3 +1,4 @@+import { randomUUID } from 'node:crypto';import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';import type * as Y from 'yjs';diff --git a/packages/app/tests/integration/undo-after-rollback.test.ts b/packages/app/tests/integration/undo-after-rollback.test.tsindex d3767adc9..a78aeb0e4 100644--- a/packages/app/tests/integration/undo-after-rollback.test.ts+++ b/packages/app/tests/integration/undo-after-rollback.test.ts@@ -1,3 +1,4 @@+import { ROLLBACK_ORIGIN } from '@inkeep/open-knowledge-server';import { afterAll, beforeAll, describe, expect, test } from 'vitest';import * as Y from 'yjs';diff --git a/packages/app/tests/integration/undo-recycle-reset.test.ts b/packages/app/tests/integration/undo-recycle-reset.test.tsindex b076f955c..e7cc69c3f 100644--- a/packages/app/tests/integration/undo-recycle-reset.test.ts+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts@@ -1,3 +1,4 @@+import { writeFileSync } from 'node:fs';import { join } from 'node:path';import { setTimeout as wait } from 'node:timers/promises';diff --git a/packages/app/tests/integration/undo-rederive-survival.test.ts b/packages/app/tests/integration/undo-rederive-survival.test.tsindex 7935e35f8..9ddcd0730 100644--- a/packages/app/tests/integration/undo-rederive-survival.test.ts+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts@@ -1,3 +1,4 @@+import { prependFrontmatter } from '@inkeep/open-knowledge-core';import { Plugin, PluginKey } from '@tiptap/pm/state';import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';diff --git a/packages/app/tests/stress/header-pane-buttons.e2e.ts b/packages/app/tests/stress/header-pane-buttons.e2e.tsindex 6f2bbb7dc..06565b86e 100644--- a/packages/app/tests/stress/header-pane-buttons.e2e.ts+++ b/packages/app/tests/stress/header-pane-buttons.e2e.ts@@ -1046,6 +1046,101 @@ test.describe('the pane buttons for keyboard, screen-reader and high-contrast us});}+ for (const theme of ['light', 'dark'] as const) {+ test(`below 48rem the pane buttons sit on one track with the shown pane raised in the ${theme} theme, and widening brings back the separate toggles`, async ({+ page,+ api,+ }) => {+ await page.emulateMedia({ colorScheme: theme });+ await page.addInitScript((value) => window.localStorage.setItem('ok-theme-v1', value), theme);+ await openWeb(page, api, `switcher-${theme}`);+ await expect(page.locator('html')).toHaveClass(new RegExp(`\\b${theme}\\b`));+ const group = page.getByRole('group', { name: 'Panels', exact: true });+ const editor = headerPaneButton(page, 'editor');+ const agents = headerPaneButton(page, 'agents');+ await movePointerOffHeader(page);+ const wideIdle = await readToggleLook(agents);+ await expect(group).not.toHaveAttribute('data-pane-switcher');++ await page.setViewportSize({ width: 767, height: 800 });+ await expect(group).toHaveAttribute('data-pane-switcher', '');+ await expect(editor).toHaveAttribute('aria-pressed', 'true');+ await expect(agents).toHaveAttribute('aria-pressed', 'false');+ await movePointerOffHeader(page);+ const shown = await readToggleLook(editor);+ const idle = await readToggleLook(agents);+ await agents.hover();+ const hoveredIdle = await readToggleLook(agents);+ await editor.hover();+ const hoveredShown = await readToggleLook(editor);++ expect(+ contrastRatio(idle.background, wideIdle.background),+ 'the track against the header',+ ).toBeGreaterThanOrEqual(1.03);+ expect(+ contrastRatio(shown.background, idle.background),+ 'the shown pane against the track',+ ).toBeGreaterThanOrEqual(1.03);+ expect(shown.boxShadow, 'the shown pane is raised').not.toBe('none');+ expect(idle.boxShadow).toBe('none');+ expect(+ contrastRatio(hoveredIdle.background, idle.background),+ 'a hovered pane against the track',+ ).toBeGreaterThanOrEqual(1.03);+ expect(hoveredIdle.background).not.toEqual(shown.background);+ const lightness = (color: readonly number[]) =>+ color.reduce((sum, channel) => sum + channel, 0);+ if (theme === 'light') {+ expect(lightness(hoveredIdle.background), 'a hovered pane darkens the track').toBeLessThan(+ lightness(idle.background),+ );+ } else {+ expect(+ lightness(hoveredIdle.background),+ 'a hovered pane lightens the track',+ ).toBeGreaterThan(lightness(idle.background));+ }+ expect(hoveredShown.background, 'the shown pane stays raised under the pointer').toEqual(+ shown.background,+ );++ await page.setViewportSize({ width: 1600, height: 900 });+ await expect(group).not.toHaveAttribute('data-pane-switcher');+ await movePointerOffHeader(page);+ expect((await readToggleLook(agents)).background).toEqual(wideIdle.background);+ });+ }++ test('below 48rem forced colors and increased contrast outline only the shown pane on the track', async ({+ page,+ api,+ }) => {+ await openWeb(page, api, 'switcher-high-contrast');+ await page.setViewportSize({ width: 767, height: 800 });+ await expect(page.getByRole('group', { name: 'Panels', exact: true })).toHaveAttribute(+ 'data-pane-switcher',+ '',+ );+ const editor = headerPaneButton(page, 'editor');+ const agents = headerPaneButton(page, 'agents');+ await expect(editor).toHaveAttribute('aria-pressed', 'true');++ for (const { media, query } of [+ { media: { forcedColors: 'active' }, query: '(forced-colors: active)' },+ { media: { contrast: 'more' }, query: '(prefers-contrast: more)' },+ ] as const) {+ await page.emulateMedia({ forcedColors: 'none', contrast: 'no-preference', ...media });+ expect(await page.evaluate((mediaQuery) => matchMedia(mediaQuery).matches, query)).toBe(true);+ await movePointerOffHeader(page);+ const shown = await readToggleLook(editor);+ expect(shown.outlineStyle, query).toBe('solid');+ expect(shown.outlineWidthPx, query).toBeGreaterThanOrEqual(1);+ expect(contrastRatio(shown.outlineColor, shown.background), query).toBeGreaterThanOrEqual(3);+ expect((await readToggleLook(agents)).outlineStyle, query).toBe('none');+ }+ });+test('forced colors and increased contrast outline the on button and leave the off button bare', async ({page,api,diff --git a/packages/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.tsindex f4cc8a286..2a597ec3d 100644--- a/packages/core/src/bridge/compose.ts+++ b/packages/core/src/bridge/compose.ts@@ -1,3 +1,4 @@+import { prependFrontmatter, stripFrontmatter } from '../extensions/frontmatter.ts';export type ComposeAdjustment = 'none' | 'body' | 'frontmatter' | 'unresolved';diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.tsindex e7e63f43d..ffd8fce06 100644--- a/packages/core/src/bridge/doc-boundary-space.ts+++ b/packages/core/src/bridge/doc-boundary-space.ts@@ -1,3 +1,4 @@+import { FRONTMATTER_RE, stripFrontmatter } from '../extensions/frontmatter.ts';import { carriedEdgeEmpties, type DocEdgeEmpties } from '../markdown/doc-edge-blank-runs.ts';diff --git a/packages/core/src/markdown/comment-promoter.ts b/packages/core/src/markdown/comment-promoter.tsindex fc267cbea..fb0ba5a7c 100644--- a/packages/core/src/markdown/comment-promoter.ts+++ b/packages/core/src/markdown/comment-promoter.ts@@ -1,3 +1,4 @@+import type { Nodes, Paragraph, PhrasingContent, Root, RootContent, Text } from 'mdast';import { SKIP, visit } from 'unist-util-visit';import type { VFile } from 'vfile';diff --git a/packages/core/src/markdown/merged-walker.ts b/packages/core/src/markdown/merged-walker.tsindex 861003fb4..ae8cb390b 100644--- a/packages/core/src/markdown/merged-walker.ts+++ b/packages/core/src/markdown/merged-walker.ts@@ -1,3 +1,4 @@+import type { Nodes, Parent, Root } from 'mdast';import { SKIP, visit } from 'unist-util-visit';import type { VFile } from 'vfile';diff --git a/packages/core/src/markdown/safe-url.ts b/packages/core/src/markdown/safe-url.tsindex 4d3250d3a..8be632ba4 100644--- a/packages/core/src/markdown/safe-url.ts+++ b/packages/core/src/markdown/safe-url.ts@@ -1,3 +1,4 @@+export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');