Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

PRD-7805 Make the desktop editor header draggable (#3214)

Dimitri POSTOLOVf1e6b74df0f3
diff --git a/.changeset/editor-tab-drag-region.md b/.changeset/editor-tab-drag-region.md
new file mode 100644
index 000000000..63311c295
--- /dev/null
+++ b/.changeset/editor-tab-drag-region.md
@@ -0,0 +1,6 @@
+---
+"@inkeep/open-knowledge": patch
+---
+
+Make the empty editor tab-strip area drag the desktop window again while keeping
+tabs, tab-reorder gaps, and the new-tab button interactive.
diff --git a/packages/app/src/components/EditorHeader.dom.test.tsx b/packages/app/src/components/EditorHeader.dom.test.tsx
index 25d84f40a..e15b5a62b 100644
--- a/packages/app/src/components/EditorHeader.dom.test.tsx
+++ b/packages/app/src/components/EditorHeader.dom.test.tsx
@@ -210,6 +210,12 @@ describe('EditorHeader runtime behavior', () => {
expect(header.getAttribute('data-electron-drag')).toBe('');
expectVisualClassTokens(header.className, ['[-webkit-app-region:drag]']);
+ const tabHost = header.querySelector('[data-editor-header-tabs]') as HTMLElement;
+ expect(tabHost.getAttribute('data-electron-drag')).toBe('');
+ expectVisualClassTokens(tabHost.className, ['[-webkit-app-region:drag]']);
+ expectVisualClassTokensAbsent(tabHost.className, ['[-webkit-app-region:no-drag]']);
+ expect(leadingZone.getAttribute('data-electron-drag')).toBe('');
+ expectVisualClassTokens(leadingZone.className, ['[-webkit-app-region:drag]']);
expectVisualClassTokens(leadingZone.className, ['left-[var(--ok-titlebar-reserve-left,1rem)]']);
expectVisualClassTokensAbsent(leadingZone.className, ['motion-safe:transition-[left]']);
expectVisualClassTokens(screen.getByTestId('sidebar-trigger').className, [
@@ -231,9 +237,21 @@ describe('EditorHeader runtime behavior', () => {
expect(
navigation.compareDocumentPosition(separator) & Node.DOCUMENT_POSITION_FOLLOWING,
).toBeTruthy();
- expectVisualClassTokens(navigation.className, ['[-webkit-app-region:no-drag]']);
+ expectVisualClassTokensAbsent(navigation.className, ['[-webkit-app-region:no-drag]']);
const rightZone = header.querySelector('[data-editor-header-actions]') as HTMLElement;
- expectVisualClassTokens(rightZone.className, ['*:[-webkit-app-region:no-drag]']);
+ expect(rightZone.getAttribute('data-electron-drag')).toBe('');
+ expectVisualClassTokens(rightZone.className, [
+ '[-webkit-app-region:drag]',
+ '[&_button]:[-webkit-app-region:no-drag]',
+ '[&_a]:[-webkit-app-region:no-drag]',
+ ]);
+ expectVisualClassTokensAbsent(rightZone.className, ['*:[-webkit-app-region:no-drag]']);
+ expect(
+ tabHost.compareDocumentPosition(leadingZone) & Node.DOCUMENT_POSITION_FOLLOWING,
+ ).toBeTruthy();
+ expect(
+ tabHost.compareDocumentPosition(rightZone) & Node.DOCUMENT_POSITION_FOLLOWING,
+ ).toBeTruthy();
});
test('Electron expanded sidebar keeps drag region but does not reserve traffic-light space', async () => {
diff --git a/packages/app/src/components/EditorHeader.tsx b/packages/app/src/components/EditorHeader.tsx
index 4e77ade5e..36d849de1 100644
--- a/packages/app/src/components/EditorHeader.tsx
+++ b/packages/app/src/components/EditorHeader.tsx
@@ -189,13 +189,32 @@ export function EditorHeader({
isElectronHost && '[-webkit-app-region:drag]',
)}
>
+ {/* Paint the full-width tab canvas before the foreground controls.
+ Chromium folds app regions in DOM order, so the later button
+ opt-outs carve precise holes without erasing the draggable header
+ background around them. */}
+ <div
+ ref={tabsHostRef}
+ data-electron-drag={isElectronHost ? '' : undefined}
+ data-editor-header-tabs=""
+ className={cn(
+ 'absolute inset-y-0 left-0 z-10 flex min-w-0 w-[var(--editor-header-tabs-width,100%)] overflow-hidden',
+ !chromeMeasured && 'invisible',
+ isElectronHost && '[-webkit-app-region:drag]',
+ )}
+ >
+ {children}
+ </div>
+
{/* The left zone (files toggle and search) is project chrome —
empty in single-file mode. */}
<div
ref={leadingActionsRef}
+ data-electron-drag={isElectronHost ? '' : undefined}
data-editor-header-leading-actions=""
className={cn(
'absolute inset-y-0 left-0 z-20 flex items-center gap-1 px-3',
+ isElectronHost && '[-webkit-app-region:drag]',
isElectronHost && isCollapsed && 'left-[var(--ok-titlebar-reserve-left,1rem)]',
)}
>
@@ -207,10 +226,7 @@ export function EditorHeader({
<>
<ButtonGroup
aria-label={t`Workspace navigation`}
- className={cn(
- '-ml-1 shrink-0 has-[>[data-slot=button-group]]:gap-0',
- isElectronHost && '[-webkit-app-region:no-drag]',
- )}
+ className="-ml-1 shrink-0 has-[>[data-slot=button-group]]:gap-0"
>
<Tooltip>
<TooltipTrigger asChild>
@@ -262,30 +278,18 @@ export function EditorHeader({
)}
</div>
- <div
- ref={tabsHostRef}
- data-editor-header-tabs=""
- className={cn(
- 'absolute inset-y-0 left-0 z-10 flex min-w-0 w-[var(--editor-header-tabs-width,100%)] overflow-hidden',
- !chromeMeasured && 'invisible',
- isElectronHost && '[-webkit-app-region:no-drag]',
- )}
- >
- {children}
- </div>
-
<div
ref={trailingActionsRef}
+ data-electron-drag={isElectronHost ? '' : undefined}
data-editor-header-actions=""
className={cn(
'absolute inset-y-0 right-0 z-20 flex items-center justify-end gap-2 px-3',
- // Child-combinator opt-out: every direct DOM child of the right zone
- // gets `app-region: no-drag` so clicks on Save / OpenInAgentMenu /
- // SyncStatusBadge / PresenceBar / BetaBadge / SettingsButton /
- // HelpPopover (and the visual Separator) fire their handlers instead
- // of initiating a window drag. Each consumer uses Radix asChild so
- // the rendered DOM root is a single direct child of this zone.
- isElectronHost && '*:[-webkit-app-region:no-drag]',
+ // Keep the whole rail draggable and subtract only real controls.
+ // Descendant selectors cover Radix asChild triggers and interactive
+ // presence avatars without turning their surrounding flex space
+ // into a dead strip.
+ isElectronHost &&
+ '[-webkit-app-region:drag] [&_button]:[-webkit-app-region:no-drag] [&_a]:[-webkit-app-region:no-drag]',
// Windows/Linux: the OS window controls float over the top-right
// of this row (titleBarOverlay). --ok-titlebar-reserve-right is
// non-zero only under electron-platform-win32/linux (see
diff --git a/packages/app/src/components/EditorTabs.dom.test.tsx b/packages/app/src/components/EditorTabs.dom.test.tsx
index 097976024..fd7b2ea3f 100644
--- a/packages/app/src/components/EditorTabs.dom.test.tsx
+++ b/packages/app/src/components/EditorTabs.dom.test.tsx
@@ -723,7 +723,7 @@ describe('EditorTabs runtime behavior', () => {
expect(screen.queryByRole('menuitem', { name: `Rename skill file ${filePath}` })).toBeNull();
});
- test('Electron host keeps the pane-local strip and controls interactive', async () => {
+ test('Electron host makes tab-strip backgrounds draggable while controls opt out', async () => {
Object.defineProperty(window, 'okDesktop', {
configurable: true,
value: {},
@@ -731,18 +731,30 @@ describe('EditorTabs runtime behavior', () => {
const { container } = await renderEditorTabs();
const root = container.firstElementChild as HTMLElement;
- const wrapper = root.firstElementChild as HTMLElement;
+ const overflowRoot = root.firstElementChild as HTMLElement;
+ const scrollViewport = container.querySelector<HTMLElement>(
+ '[data-editor-tab-scroll]',
+ )?.parentElement;
+ const newTabButton = screen.getByTestId('editor-new-tab-button');
expect(root.getAttribute('data-editor-pane-tabs')).toBe('pane-a');
- expect(root.getAttribute('data-electron-drag')).toBeNull();
- expectVisualClassTokens(root.className, ['[-webkit-app-region:no-drag]']);
- expectVisualClassTokens(wrapper.className, [
- '[-webkit-app-region:no-drag]',
+ expect(root.getAttribute('data-electron-drag')).toBe('');
+ expectVisualClassTokens(root.className, ['[-webkit-app-region:drag]']);
+ expectVisualClassTokensAbsent(root.className, ['[-webkit-app-region:no-drag]']);
+ expect(overflowRoot.getAttribute('data-electron-drag')).toBe('');
+ expectVisualClassTokens(overflowRoot.className, [
'flex',
'items-end',
'gap-px',
+ 'min-w-0',
+ 'flex-1',
+ 'self-stretch',
+ '[-webkit-app-region:drag]',
]);
- expectVisualClassTokens(wrapper.className, ['min-w-0', 'flex-1']);
+ expectVisualClassTokensAbsent(overflowRoot.className, ['[-webkit-app-region:no-drag]']);
+ expect(scrollViewport).toBeTruthy();
+ expectVisualClassTokens(scrollViewport?.className, ['[-webkit-app-region:no-drag]']);
+ expectVisualClassTokens(newTabButton.className, ['[-webkit-app-region:no-drag]']);
});
test('keeps restored-tab chrome alignment immediate', async () => {
@@ -768,6 +780,7 @@ describe('EditorTabs runtime behavior', () => {
const sortableTabs = [...container.querySelectorAll<HTMLElement>('[data-editor-tab-sortable]')];
expect(root.getAttribute('data-editor-pane-tabs')).toBe('pane-a');
+ expect(container.querySelector('[data-electron-drag]')).toBeNull();
expectVisualClassTokens(root.className, ['overflow-hidden']);
expect(scrollStrip).toBeTruthy();
expectVisualClassTokens(scrollStrip?.className, [
diff --git a/packages/app/src/components/EditorTabs.tsx b/packages/app/src/components/EditorTabs.tsx
index c6fb31bc3..5929b1ea0 100644
--- a/packages/app/src/components/EditorTabs.tsx
+++ b/packages/app/src/components/EditorTabs.tsx
@@ -792,8 +792,9 @@ export function EditorTabs({
};
}, []);
- // Pane-local strips live below the global window chrome. Keep the entire
- // strip interactive in Electron so blank strip space can accept tab drops.
+ // Make the tab canvas draggable, then carve out the scroll viewport and New
+ // tab button below. EditorHeader paints its foreground controls after this
+ // canvas so their no-drag regions remain clickable.
const isElectronHost = typeof window !== 'undefined' && window.okDesktop != null;
const newTabIdSet = new Set(newTabIds);
@@ -968,20 +969,22 @@ export function EditorTabs({
return (
<div
data-editor-pane-tabs={resolvedPaneId}
+ data-electron-drag={isElectronHost ? '' : undefined}
className={cn(
'flex h-12 w-full min-w-0 touch-manipulation items-end overflow-hidden',
reserveLeadingChrome
? 'pl-[calc(var(--editor-header-leading-offset,0px)+var(--editor-header-leading-width,0px)+0.5rem)]'
: 'pl-2',
reserveTrailingChrome && 'pr-[var(--editor-header-trailing-width,0px)]',
- isElectronHost && '[-webkit-app-region:no-drag]',
+ isElectronHost && '[-webkit-app-region:drag]',
)}
>
<div
data-editor-tab-overflow-root=""
+ data-electron-drag={isElectronHost ? '' : undefined}
className={cn(
- 'group/tab-overflow relative flex min-w-0 flex-1 items-end gap-px overflow-hidden',
- isElectronHost && '[-webkit-app-region:no-drag]',
+ 'group/tab-overflow relative flex min-w-0 flex-1 self-stretch items-end gap-px overflow-hidden',
+ isElectronHost && '[-webkit-app-region:drag]',
)}
>
<span
@@ -993,7 +996,12 @@ export function EditorTabs({
<span key={splitAnnouncement.id}>{splitAnnouncement.text}</span>
</span>
<SortableContext items={[...visibleTabIds]} strategy={horizontalListSortingStrategy}>
- <div className="relative h-10 w-fit max-w-[calc(100%-1.75rem)] min-w-0 flex-none self-end">
+ <div
+ className={cn(
+ 'relative h-10 w-fit max-w-[calc(100%-1.75rem)] min-w-0 flex-none self-end',
+ isElectronHost && '[-webkit-app-region:no-drag]',
+ )}
+ >
<div
ref={tabScrollRef}
data-editor-tab-scroll=""
@@ -1380,7 +1388,10 @@ export function EditorTabs({
variant="ghost"
aria-label={t`New tab`}
data-testid="editor-new-tab-button"
- className="first:mb-3 mb-1.5 shrink-0"
+ className={cn(
+ 'first:mb-3 mb-1.5 shrink-0',
+ isElectronHost && '[-webkit-app-region:no-drag]',
+ )}
onClick={openNewTab}
>
<PlusIcon aria-hidden="true" />
diff --git a/packages/app/src/components/NavigationHistoryControls.dom.test.tsx b/packages/app/src/components/NavigationHistoryControls.dom.test.tsx
index 869fe9d4e..1b1046d97 100644
--- a/packages/app/src/components/NavigationHistoryControls.dom.test.tsx
+++ b/packages/app/src/components/NavigationHistoryControls.dom.test.tsx
@@ -94,7 +94,7 @@ describe('NavigationHistoryControls', () => {
);
});
- test('emits navigation actions and keeps the controls out of the drag region', async () => {
+ test('emits navigation actions and keeps only the buttons out of the drag region', async () => {
const actions: string[] = [];
const unsubscribe = subscribeLocalMenuAction((action) => actions.push(action));
await renderControls();
@@ -102,8 +102,9 @@ describe('NavigationHistoryControls', () => {
const root = screen.getByTestId('navigation-history-controls');
const back = screen.getByRole('button', { name: 'Back' });
const forward = screen.getByRole('button', { name: 'Forward' });
- expectVisualClassTokens(root.className, ['[-webkit-app-region:no-drag]']);
- expectVisualClassTokensAbsent(root.className, ['[-webkit-app-region:drag]']);
+ expectVisualClassTokensAbsent(root.className, ['[-webkit-app-region:no-drag]']);
+ expectVisualClassTokens(back.className, ['[-webkit-app-region:no-drag]']);
+ expectVisualClassTokens(forward.className, ['[-webkit-app-region:no-drag]']);
fireEvent.click(back);
fireEvent.click(forward);
diff --git a/packages/app/src/components/NavigationHistoryControls.tsx b/packages/app/src/components/NavigationHistoryControls.tsx
index 212890c6b..2c7f3e4b2 100644
--- a/packages/app/src/components/NavigationHistoryControls.tsx
+++ b/packages/app/src/components/NavigationHistoryControls.tsx
@@ -52,13 +52,14 @@ export function NavigationHistoryControls() {
return (
<ButtonGroup
aria-label={t`Navigation history`}
- className="shrink-0 [-webkit-app-region:no-drag]"
+ className="shrink-0"
data-testid="navigation-history-controls"
>
<Tooltip>
<TooltipTrigger asChild>
<Button
aria-label={t`Back`}
+ className="[-webkit-app-region:no-drag]"
disabled={!canGoBack}
onClick={() => emitLocalMenuAction('navigate-back')}
size="icon-sm"
@@ -75,6 +76,7 @@ export function NavigationHistoryControls() {
<TooltipTrigger asChild>
<Button
aria-label={t`Forward`}
+ className="[-webkit-app-region:no-drag]"
disabled={!canGoForward}
onClick={() => emitLocalMenuAction('navigate-forward')}
size="icon-sm"
diff --git a/packages/app/src/globals.test.ts b/packages/app/src/globals.test.ts
index a2d770549..5b4af0582 100644
--- a/packages/app/src/globals.test.ts
+++ b/packages/app/src/globals.test.ts
@@ -7,9 +7,9 @@
* DOM never sees pointerdown there. Radix Popover / DropdownMenu /
* ContextMenu rely on document-level pointerdown for outside-click dismissal
* (they render no overlay, unlike Dialog with its `DialogOverlay`). The rule
- * targets a stable `data-electron-drag` attribute applied at five drag-region
- * sites (`App.tsx`, `EditorHeader.tsx`, `EditorTabs.tsx`, `FileSidebar.tsx`,
- * `NavigatorApp.tsx`).
+ * targets a stable `data-electron-drag` attribute applied to every drag-region
+ * element in `App.tsx`, `EditorHeader.tsx`, `EditorTabs.tsx`, `FileSidebar.tsx`,
+ * `NavigatorApp.tsx`, `GraphPanel.tsx`, and `TerminalTabStrip.tsx`.
*
* CSS behavior cannot be exercised in jsdom (no `:has()` evaluation against
* `-webkit-app-region` cascade), so a source-grep guard is the available
diff --git a/packages/desktop/tests/smoke/window-chrome.e2e.ts b/packages/desktop/tests/smoke/window-chrome.e2e.ts
index 4a01e1110..45bf4d34a 100644
--- a/packages/desktop/tests/smoke/window-chrome.e2e.ts
+++ b/packages/desktop/tests/smoke/window-chrome.e2e.ts
@@ -179,3 +179,108 @@ test.describe('Windows/Linux window chrome smoke', () => {
}
});
});
+
+test.describe('Editor header drag-region smoke', () => {
+ test.skip(!SMOKE_ENABLED, 'Set OK_DESKTOP_E2E_SMOKE=1 to run Electron smoke tests.');
+ test.skip(!PLATFORM_SUPPORTED, PLATFORM_SKIP_REASON);
+ test.skip(!TARGET.exists, TARGET.missingReason);
+
+ test('keeps the full header canvas draggable and its controls clickable', async ({
+ captureStderrFor,
+ }) => {
+ const { tmpHome, projectDir } = seedHomeWithLastOpenedProject();
+ const app = await launchApp(tmpHome);
+ captureStderrFor(app, { cleanupDirs: [tmpHome, projectDir] });
+
+ const editor = await findEditorWindow(app);
+ const filesToggle = editor
+ .locator('[data-editor-header-leading-actions]')
+ .locator('[data-sidebar="trigger"]');
+ await expect(filesToggle).toBeVisible();
+ await filesToggle.click();
+ await expect
+ .poll(() =>
+ editor.evaluate(() =>
+ document.querySelector('[data-slot="sidebar"]')?.getAttribute('data-state'),
+ ),
+ )
+ .toBe('collapsed');
+
+ const appRegions = await editor.evaluate(() => {
+ const requireElement = (selector: string): HTMLElement => {
+ const element = document.querySelector<HTMLElement>(selector);
+ if (!element) throw new Error(`Missing drag-region fixture: ${selector}`);
+ return element;
+ };
+ const appRegion = (element: HTMLElement) =>
+ getComputedStyle(element).getPropertyValue('-webkit-app-region');
+ const appRegionFor = (selector: string) => appRegion(requireElement(selector));
+ const precedes = (element: HTMLElement, sibling: HTMLElement) =>
+ Boolean(element.compareDocumentPosition(sibling) & Node.DOCUMENT_POSITION_FOLLOWING);
+
+ const tabsHost = requireElement('[data-editor-header-tabs]');
+ const paneTabs = requireElement('[data-editor-pane-tabs]');
+ const overflowRoot = requireElement('[data-editor-tab-overflow-root]');
+ const scrollStrip = requireElement('[data-editor-tab-scroll]');
+ const scrollViewport = scrollStrip.parentElement;
+ if (!scrollViewport) throw new Error('Missing editor tab scroll viewport');
+
+ const leadingActions = requireElement('[data-editor-header-leading-actions]');
+ const shareButton = requireElement('[data-testid="share-button"]');
+ const trailingActions = requireElement('[data-editor-header-actions]');
+ const leadingActionsRect = leadingActions.getBoundingClientRect();
+ const overflowRootRect = overflowRoot.getBoundingClientRect();
+ const shareButtonRect = shareButton.getBoundingClientRect();
+ const trailingActionsRect = trailingActions.getBoundingClientRect();
+
+ return {
+ filesButton: appRegionFor('[data-editor-header-leading-actions] [data-sidebar="trigger"]'),
+ headerCanvas: appRegionFor('header[data-electron-drag]'),
+ leadingGapIsDraggable:
+ overflowRootRect.left > leadingActionsRect.right && appRegion(paneTabs) === 'drag',
+ leadingActions: appRegion(leadingActions),
+ newTabButton: appRegionFor('[data-testid="editor-new-tab-button"]'),
+ overflowRoot: appRegion(overflowRoot),
+ paneTabs: appRegion(paneTabs),
+ resourcesButton: appRegionFor('[data-editor-header-actions] button:last-of-type'),
+ scrollViewport: appRegion(scrollViewport),
+ shareButton: appRegion(shareButton),
+ shareHasDraggableVerticalGutter:
+ shareButtonRect.top > trailingActionsRect.top &&
+ shareButtonRect.bottom < trailingActionsRect.bottom &&
+ appRegion(trailingActions) === 'drag',
+ tabsHost: appRegion(tabsHost),
+ tabsPaintBeforeControls:
+ precedes(tabsHost, leadingActions) && precedes(tabsHost, trailingActions),
+ trailingActions: appRegion(trailingActions),
+ };
+ });
+
+ expect(appRegions).toEqual({
+ filesButton: 'no-drag',
+ headerCanvas: 'drag',
+ leadingGapIsDraggable: true,
+ leadingActions: 'drag',
+ newTabButton: 'no-drag',
+ overflowRoot: 'drag',
+ paneTabs: 'drag',
+ resourcesButton: 'no-drag',
+ scrollViewport: 'no-drag',
+ shareButton: 'no-drag',
+ shareHasDraggableVerticalGutter: true,
+ tabsHost: 'drag',
+ tabsPaintBeforeControls: true,
+ trailingActions: 'drag',
+ });
+
+ const newTabButton = editor.getByTestId('editor-new-tab-button');
+ const newTabPlaceholders = editor.getByTestId('editor-new-tab-placeholder-button');
+ const placeholderCountBefore = await newTabPlaceholders.count();
+ await newTabButton.click();
+ await expect(newTabPlaceholders).toHaveCount(placeholderCountBefore + 1);
+
+ const resourcesButton = editor.getByRole('button', { name: 'Resources' });
+ await resourcesButton.click();
+ await expect(editor.getByRole('link', { name: 'Docs' })).toBeVisible();
+ });
+});