Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(split-layout): show no close button on a lone split (#9185)

Jacob Beckerman478eae6d5786
diff --git a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
index 9cff99a5b8..e37f3a7866 100644
--- a/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitHeader.tsx
@@ -23,7 +23,6 @@ import ExpandIcon from '@icon/system/regular/arrows-out.svg';
import CaretDown from '@icon/system/regular/caret-down.svg';
import CaretLeft from '@icon/system/regular/caret-left.svg';
import CaretUp from '@icon/system/regular/caret-up.svg';
-import CloseIcon from '@icon/system/regular/x.svg';
import { mergeRefs } from '@solid-primitives/refs';
import { createDroppable, useDragDropContext } from '@thisbeyond/solid-dnd';
import { Button, ButtonGroup, cn } from '@ui';
@@ -40,10 +39,6 @@ import { match, P } from 'ts-pattern';
import { runSplitBack } from '../back-interceptor';
import { SplitLayoutContext, SplitPanelContext } from '../context';
import type { SplitContent } from '../layoutManager';
-import {
- closeSplitOrReturnToList,
- shouldShowSplitCloseButton,
-} from '../layoutUtils';
import { canSpotlight } from '../utils/canSpotlight';
import { HeaderIsland } from './HeaderIsland';
import {
@@ -189,40 +184,6 @@ function _SplitSpotlightButton() {
);
}
-function SplitCloseButton() {
- const context = useContext(SplitPanelContext);
- const layout = useContext(SplitLayoutContext);
- if (!context || !layout) return null;
-
- const label = createMemo(() => {
- const isOnlySplit = !shouldShowSplitCloseButton(layout.manager);
- const isNotUnifiedList = !isListViewID(context.handle.content().id);
- return isOnlySplit && isNotUnifiedList
- ? t('splitMenu.returnToList')
- : t('splitMenu.close');
- });
-
- return (
- <Show
- when={
- (isTouchDevice() && shouldShowSplitCloseButton(layout.manager)) ||
- (!shouldShowSplitCloseButton(layout.manager) &&
- !isListViewID(context.handle.content().id))
- }
- >
- <Button
- aria-label={label()}
- tooltip={{ content: label(), hotkey: TOKENS.split.close }}
- variant="ghost"
- size="icon-sm"
- onClick={() => closeSplitOrReturnToList(layout.manager, context.handle)}
- >
- <CloseIcon class="size-3.5" />
- </Button>
- </Show>
- );
-}
-
function SplitDriveReturnButton() {
const panel = useContext(SplitPanelContext);
const layout = useContext(SplitLayoutContext);
@@ -483,8 +444,6 @@ export function SplitHeader(props: {
</Portal>
)}
</Show>
- {/* pl-1 + the close wrapper's pl-2 insets the 24px close button 12px
- from the left, matching its inset from the top of the 48px header. */}
<div
class="absolute inset-0 flex justify-start items-center not-touch:pl-1 touch:px-(--mobile-chrome-gutter) touch:gap-2"
ref={props.collapseController.setRow}
@@ -493,7 +452,6 @@ export function SplitHeader(props: {
when={isTouchDevice()}
fallback={
<div class="relative flex items-center pl-2 h-full">
- <SplitCloseButton />
<SplitDriveReturnButton />
</div>
}
diff --git a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx b/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
index b994bb7224..7eaec72b51 100644
--- a/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
+++ b/apps/web/src/components/app/split-layout/components/SplitPanel.tsx
@@ -3,6 +3,7 @@ import { AccessRequestVisitProvider } from '@app/features/access-requests/contex
import { createSoupState } from '@app/features/next-soup/create-soup-state';
import { SoupContextProvider } from '@app/features/next-soup/soup-context';
import { SoupViewContextProvider } from '@app/features/next-soup/soup-view/soup-view-context';
+import { t } from '@app/lib/i18n';
import { type PaneId, SplitRouter } from '@app/lib/split-router';
import { globalSplitManager } from '@app/signal/splitLayout';
import { MobileTopEdgeFade } from '@components/app/mobile/MobileEdgeFade';
@@ -383,9 +384,9 @@ export function SplitPanel(props: SplitPanelProps) {
<Button
variant="ghost"
size="icon-xs"
- aria-label="Close split"
+ aria-label={t('splitMenu.closeSplit')}
tooltip={{
- content: 'Close split',
+ content: t('splitMenu.closeSplit'),
hotkey: TOKENS.split.close,
}}
class={cn(
diff --git a/apps/web/src/components/app/split-layout/layoutUtils.ts b/apps/web/src/components/app/split-layout/layoutUtils.ts
index b099e0aae5..bd3c70b2be 100644
--- a/apps/web/src/components/app/split-layout/layoutUtils.ts
+++ b/apps/web/src/components/app/split-layout/layoutUtils.ts
@@ -1,4 +1,4 @@
-import { isListViewID, LIST_VIEW_ID } from '@app/constants/list-views';
+import { isListViewID } from '@app/constants/list-views';
import { globalSplitManager } from '@app/signal/splitLayout';
import { createCallback } from '@solid-primitives/rootless';
import {
@@ -114,29 +114,6 @@ export function shouldShowSplitCloseButton(manager: SplitManager) {
return manager.getVisibleSplitCount() > 1;
}
-/** Close a visible panel, or return the last one to its most recent list. */
-export function closeSplitOrReturnToList(
- manager: SplitManager,
- handle: SplitHandle
-) {
- if (shouldShowSplitCloseButton(manager)) {
- handle.close();
- return;
- }
- const content = handle.content();
- if (content.type === 'component' && isListViewID(content.id)) return;
- if (
- handle.goBackTo(
- (entry) => entry.type === 'component' && isListViewID(entry.id)
- )
- )
- return;
- handle.replace({
- next: { type: 'component', id: LIST_VIEW_ID.home },
- mergeHistory: true,
- });
-}
-
/** Inline previews stay passive until the user focuses them. */
export function useCanAutofocusSplitContent() {
return !useSplitPanel()?.isInlinePreview;
diff --git a/apps/web/src/components/app/split-layout/tests/SplitPanel-frame-close.test.tsx b/apps/web/src/components/app/split-layout/tests/SplitPanel-frame-close.test.tsx
new file mode 100644
index 0000000000..c92ba0f3c0
--- /dev/null
+++ b/apps/web/src/components/app/split-layout/tests/SplitPanel-frame-close.test.tsx
@@ -0,0 +1,194 @@
+import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';
+import { createSignal, type ParentProps } from 'solid-js';
+import { afterEach, expect, it, vi } from 'vitest';
+import { SplitPanel } from '../components/SplitPanel';
+import type { SplitHandle, SplitId, SplitState } from '../layoutManager';
+
+// Keep the production panel, header, and frame close button on desktop.
+// Collection data, routing, and unrelated chrome are outside this test.
+vi.mock('@app/features/access-requests/context/visit', () => ({
+ AccessRequestVisitProvider: (props: ParentProps) => props.children,
+}));
+vi.mock('@app/features/next-soup/create-soup-state', () => ({
+ createSoupState: () => ({}),
+}));
+vi.mock('@app/features/next-soup/soup-context', () => ({
+ SoupContextProvider: (props: ParentProps) => props.children,
+ useSoup: () => ({ rows: () => [], focus: { index: () => 0 } }),
+}));
+vi.mock('@app/features/next-soup/soup-view/soup-view-context', () => ({
+ SoupViewContextProvider: (props: ParentProps) => props.children,
+}));
+vi.mock('@app/features/next-soup/utils', () => ({
+ openEntityInSplitFromUnifiedList: vi.fn(),
+}));
+vi.mock('@app/lib/split-router', () => ({
+ SplitRouter: {
+ Outlet: (props: { fallback: ParentProps['children'] }) => props.fallback,
+ },
+}));
+const [visibleSplits, setVisibleSplits] = createSignal(1);
+vi.mock('@app/signal/splitLayout', () => ({
+ globalSplitManager: () => ({ getVisibleSplitCount: visibleSplits }),
+}));
+vi.mock('@components/app/GlobalAppState', () => ({
+ useGlobalNotificationSource: () => undefined,
+}));
+vi.mock('@components/app/mobile/MobileEdgeFade', () => ({
+ MobileTopEdgeFade: () => null,
+}));
+vi.mock('@components/app/mobile/MobilePageActionRow', () => ({
+ MobilePageActionRow: () => null,
+}));
+vi.mock('@components/app/split-panel', () => ({
+ SplitPanelControllerProvider: (props: ParentProps) => props.children,
+}));
+vi.mock('@core/hotkey/hotkeys', () => ({
+ useHotkeyDOMScope: () => [() => {}, 'test-split'],
+}));
+vi.mock('@core/constant/allBlocks', () => ({
+ fileTypeToBlockName: () => 'md',
+}));
+vi.mock('@core/mobile/isTouchDevice', () => ({ isTouchDevice: () => false }));
+vi.mock('@core/mobile/isMobile', () => ({ isMobile: () => false }));
+vi.mock('@core/mobile/isNativeMobilePlatform', () => ({
+ isNativeMobilePlatform: () => false,
+}));
+vi.mock('@core/mobile/safeAreaInsets', () => ({ getSafeAreaInset: () => 0 }));
+vi.mock('@thisbeyond/solid-dnd', () => ({
+ createDroppable: () => () => {},
+ useDragDropContext: () => undefined,
+}));
+vi.mock('@entity', () => ({ isEntityDragEvent: () => false }));
+vi.mock('@app/components/view-shell', () => ({ ViewBreadcrumbs: {} }));
+vi.mock('@ui', () => {
+ const Container = (props: ParentProps) => <div>{props.children}</div>;
+ const Button = (
+ props: ParentProps<{
+ 'aria-label'?: string;
+ label?: string;
+ onClick?: (event: MouseEvent) => void;
+ }>
+ ) => (
+ <button
+ type="button"
+ aria-label={props['aria-label'] ?? props.label}
+ onClick={(event) => props.onClick?.(event)}
+ >
+ {props.children}
+ </button>
+ );
+ return {
+ Panel: Object.assign(Container, {
+ Header: Container,
+ Toolbar: Container,
+ Body: Container,
+ }),
+ Button,
+ ButtonGroup: Object.assign(Container, { Button }),
+ Layer: Container,
+ cn: () => '',
+ };
+});
+vi.mock('../layout', () => ({
+ useSplitLayout: () => ({ getSplitCount: () => 1, insertSplit: vi.fn() }),
+}));
+vi.mock('../registerSplitHotkeys', () => ({ registerSplitHotkeys: () => {} }));
+vi.mock('../utils/createSplitAutofocus', () => ({
+ createSplitAutofocus: () => {},
+}));
+vi.mock('../components/SplitHeaderContextMenu', () => ({
+ SplitHeaderContextMenu: (props: ParentProps) => props.children,
+}));
+
+afterEach(() => {
+ cleanup();
+ setVisibleSplits(1);
+ vi.unstubAllGlobals();
+});
+
+function renderDetailSplit() {
+ vi.stubGlobal(
+ 'ResizeObserver',
+ class {
+ observe() {}
+ unobserve() {}
+ disconnect() {}
+ }
+ );
+ const id = 'frame-close-test' as SplitId;
+ const content = { type: 'md', id: 'doc-1' } as const;
+ const split: SplitState = {
+ id,
+ content,
+ referredFrom: null,
+ lastNavigationCause: 'fresh',
+ mount: {
+ kind: 'component',
+ name: 'md',
+ meta: {},
+ updateMeta: () => {},
+ element: () => <p>Document</p>,
+ },
+ };
+ const close = vi.fn();
+ const handle: SplitHandle = {
+ id,
+ content: () => content,
+ unregisterContentChangeListener: () => {},
+ registerContentChangeListener: () => {},
+ replace: () => {},
+ adoptContentId: () => {},
+ removeFromHistory: () => {},
+ toggleSpotlight: () => {},
+ setDisplayName: () => {},
+ canGoForward: () => false,
+ isSpotLight: () => false,
+ isPopover: () => false,
+ displayName: () => 'Document',
+ canGoBack: () => false,
+ isActive: () => true,
+ isFirst: () => true,
+ goForward: () => {},
+ isLast: () => true,
+ activate: () => {},
+ goBack: () => {},
+ goBackTo: () => false,
+ close,
+ reset: () => {},
+ previousContent: () => null,
+ history: () => [content],
+ meta: () => undefined,
+ updateMeta: () => {},
+ referredFrom: () => null,
+ lastNavigationCause: () => 'fresh',
+ registerEntryStateCaptor: () => () => {},
+ captureEntryState: () => {},
+ currentEntryState: () => undefined,
+ updateCurrentEntry: () => {},
+ };
+ const result = render(() => (
+ <SplitPanel
+ setPanelRef={() => {}}
+ handle={handle}
+ split={split}
+ active
+ index={0}
+ />
+ ));
+ return { ...result, close };
+}
+
+it('shows no close button on a lone detail split', () => {
+ renderDetailSplit();
+ expect(screen.queryByRole('button', { name: 'Close split' })).toBeNull();
+ expect(screen.queryByRole('button', { name: 'Return to list' })).toBeNull();
+});
+
+it('closes the split from the frame corner when several splits are open', () => {
+ setVisibleSplits(2);
+ const { close } = renderDetailSplit();
+
+ fireEvent.click(screen.getByRole('button', { name: 'Close split' }));
+ expect(close).toHaveBeenCalledOnce();
+});
diff --git a/apps/web/src/lib/i18n/locales/da.ts b/apps/web/src/lib/i18n/locales/da.ts
index 6c13509e8d..589c671133 100644
--- a/apps/web/src/lib/i18n/locales/da.ts
+++ b/apps/web/src/lib/i18n/locales/da.ts
@@ -809,7 +809,6 @@ export default {
goForward: 'Gå frem',
createNewSplit: 'Opret nyt panel',
close: 'Luk',
- returnToList: 'Tilbage til listen',
previousItem: 'Forrige element',
nextItem: 'Næste element',
itemNavigation: 'Elementnavigation',
diff --git a/apps/web/src/lib/i18n/locales/de.ts b/apps/web/src/lib/i18n/locales/de.ts
index 3b773fab68..60ef4e8f42 100644
--- a/apps/web/src/lib/i18n/locales/de.ts
+++ b/apps/web/src/lib/i18n/locales/de.ts
@@ -820,7 +820,6 @@ export default {
goForward: 'Vorwärts',
createNewSplit: 'Neuen Bereich erstellen',
close: 'Schließen',
- returnToList: 'Zurück zur Liste',
previousItem: 'Vorheriges Element',
nextItem: 'Nächstes Element',
itemNavigation: 'Elementnavigation',
diff --git a/apps/web/src/lib/i18n/locales/en/split-menu.ts b/apps/web/src/lib/i18n/locales/en/split-menu.ts
index be55714f82..f79ccdd19e 100644
--- a/apps/web/src/lib/i18n/locales/en/split-menu.ts
+++ b/apps/web/src/lib/i18n/locales/en/split-menu.ts
@@ -19,7 +19,6 @@ export default {
goForward: 'Go Forward',
createNewSplit: 'Create new split',
close: 'Close',
- returnToList: 'Return to list',
previousItem: 'Previous item',
nextItem: 'Next item',
itemNavigation: 'Item navigation',
diff --git a/apps/web/src/lib/i18n/locales/es.ts b/apps/web/src/lib/i18n/locales/es.ts
index d9a2f0efbb..69bf1bb69e 100644
--- a/apps/web/src/lib/i18n/locales/es.ts
+++ b/apps/web/src/lib/i18n/locales/es.ts
@@ -840,7 +840,6 @@ export default {
goForward: 'Adelante',
createNewSplit: 'Crear panel nuevo',
close: 'Cerrar',
- returnToList: 'Volver a la lista',
previousItem: 'Elemento anterior',
nextItem: 'Elemento siguiente',
itemNavigation: 'Navegación entre elementos',
diff --git a/apps/web/src/lib/i18n/locales/fi.ts b/apps/web/src/lib/i18n/locales/fi.ts
index 04eb688e1e..3fd2bb6f00 100644
--- a/apps/web/src/lib/i18n/locales/fi.ts
+++ b/apps/web/src/lib/i18n/locales/fi.ts
@@ -810,7 +810,6 @@ export default {
goForward: 'Siirry eteenpäin',
createNewSplit: 'Luo uusi ruutu',
close: 'Sulje',
- returnToList: 'Palaa luetteloon',
previousItem: 'Edellinen kohde',
nextItem: 'Seuraava kohde',
itemNavigation: 'Kohteiden selaus',
diff --git a/apps/web/src/lib/i18n/locales/fr.ts b/apps/web/src/lib/i18n/locales/fr.ts
index d915ca464a..7a4c26ad1e 100644
--- a/apps/web/src/lib/i18n/locales/fr.ts
+++ b/apps/web/src/lib/i18n/locales/fr.ts
@@ -843,7 +843,6 @@ export default {
goForward: 'Suivant',
createNewSplit: 'Créer un volet',
close: 'Fermer',
- returnToList: 'Retour à la liste',
previousItem: 'Élément précédent',
nextItem: 'Élément suivant',
itemNavigation: 'Navigation entre les éléments',
diff --git a/apps/web/src/lib/i18n/locales/hi.ts b/apps/web/src/lib/i18n/locales/hi.ts
index eec0261190..f0cad88424 100644
--- a/apps/web/src/lib/i18n/locales/hi.ts
+++ b/apps/web/src/lib/i18n/locales/hi.ts
@@ -796,7 +796,6 @@ export default {
goForward: 'आगे जाएं',
createNewSplit: 'नया स्प्लिट बनाएं',
close: 'बंद करें',
- returnToList: 'सूची पर वापस जाएं',
previousItem: 'पिछला आइटम',
nextItem: 'अगला आइटम',
itemNavigation: 'आइटम नेविगेशन',
diff --git a/apps/web/src/lib/i18n/locales/id.ts b/apps/web/src/lib/i18n/locales/id.ts
index f99151c32c..e4b7faac93 100644
--- a/apps/web/src/lib/i18n/locales/id.ts
+++ b/apps/web/src/lib/i18n/locales/id.ts
@@ -786,7 +786,6 @@ export default {
goForward: 'Maju',
createNewSplit: 'Buat panel baru',
close: 'Tutup',
- returnToList: 'Kembali ke daftar',
previousItem: 'Item sebelumnya',
nextItem: 'Item berikutnya',
itemNavigation: 'Navigasi item',
diff --git a/apps/web/src/lib/i18n/locales/it.ts b/apps/web/src/lib/i18n/locales/it.ts
index 6fe7a3b21d..0415cf6052 100644
--- a/apps/web/src/lib/i18n/locales/it.ts
+++ b/apps/web/src/lib/i18n/locales/it.ts
@@ -837,7 +837,6 @@ export default {
goForward: 'Avanti',
createNewSplit: 'Crea nuovo riquadro',
close: 'Chiudi',
- returnToList: 'Torna all’elenco',
previousItem: 'Elemento precedente',
nextItem: 'Elemento successivo',
itemNavigation: 'Navigazione tra elementi',
diff --git a/apps/web/src/lib/i18n/locales/ja.ts b/apps/web/src/lib/i18n/locales/ja.ts
index 7427a689f8..0d684f138c 100644
--- a/apps/web/src/lib/i18n/locales/ja.ts
+++ b/apps/web/src/lib/i18n/locales/ja.ts
@@ -781,7 +781,6 @@ export default {
goForward: '進む',
createNewSplit: '新しい分割画面を作成',
close: '閉じる',
- returnToList: 'リストに戻る',
previousItem: '前の項目',
nextItem: '次の項目',
itemNavigation: '項目のナビゲーション',
diff --git a/apps/web/src/lib/i18n/locales/ko.ts b/apps/web/src/lib/i18n/locales/ko.ts
index 5d9f8143ce..2ac1e23b33 100644
--- a/apps/web/src/lib/i18n/locales/ko.ts
+++ b/apps/web/src/lib/i18n/locales/ko.ts
@@ -777,7 +777,6 @@ export default {
goForward: '앞으로 가기',
createNewSplit: '새 분할 화면 만들기',
close: '닫기',
- returnToList: '목록으로 돌아가기',
previousItem: '이전 항목',
nextItem: '다음 항목',
itemNavigation: '항목 탐색',
diff --git a/apps/web/src/lib/i18n/locales/nb.ts b/apps/web/src/lib/i18n/locales/nb.ts
index a499fc51c4..595a5a5ade 100644
--- a/apps/web/src/lib/i18n/locales/nb.ts
+++ b/apps/web/src/lib/i18n/locales/nb.ts
@@ -807,7 +807,6 @@ export default {
goForward: 'Gå fremover',
createNewSplit: 'Opprett ny rute',
close: 'Lukk',
- returnToList: 'Tilbake til listen',
previousItem: 'Forrige element',
nextItem: 'Neste element',
itemNavigation: 'Elementnavigasjon',
diff --git a/apps/web/src/lib/i18n/locales/nl.ts b/apps/web/src/lib/i18n/locales/nl.ts
index a999325ecd..1c3bcf8a57 100644
--- a/apps/web/src/lib/i18n/locales/nl.ts
+++ b/apps/web/src/lib/i18n/locales/nl.ts
@@ -810,7 +810,6 @@ export default {
goForward: 'Vooruitgaan',
createNewSplit: 'Nieuw paneel maken',
close: 'Sluiten',
- returnToList: 'Terug naar lijst',
previousItem: 'Vorig item',
nextItem: 'Volgend item',
itemNavigation: 'Itemnavigatie',
diff --git a/apps/web/src/lib/i18n/locales/pl.ts b/apps/web/src/lib/i18n/locales/pl.ts
index 9214fb0dcb..f3aa9cc679 100644
--- a/apps/web/src/lib/i18n/locales/pl.ts
+++ b/apps/web/src/lib/i18n/locales/pl.ts
@@ -860,7 +860,6 @@ export default {
goForward: 'Dalej',
createNewSplit: 'Utwórz nowy panel',
close: 'Zamknij',
- returnToList: 'Wróć do listy',
previousItem: 'Poprzedni element',
nextItem: 'Następny element',
itemNavigation: 'Nawigacja między elementami',
diff --git a/apps/web/src/lib/i18n/locales/pt-PT.ts b/apps/web/src/lib/i18n/locales/pt-PT.ts
index 2eefb02910..5af672b4ea 100644
--- a/apps/web/src/lib/i18n/locales/pt-PT.ts
+++ b/apps/web/src/lib/i18n/locales/pt-PT.ts
@@ -843,7 +843,6 @@ export default {
goForward: 'Avançar',
createNewSplit: 'Criar novo painel',
close: 'Fechar',
- returnToList: 'Voltar à lista',
previousItem: 'Item anterior',
nextItem: 'Item seguinte',
itemNavigation: 'Navegação entre itens',
diff --git a/apps/web/src/lib/i18n/locales/ru.ts b/apps/web/src/lib/i18n/locales/ru.ts
index ddc1c8277c..6b0a469660 100644
--- a/apps/web/src/lib/i18n/locales/ru.ts
+++ b/apps/web/src/lib/i18n/locales/ru.ts
@@ -865,7 +865,6 @@ export default {
goForward: 'Вперёд',
createNewSplit: 'Создать панель',
close: 'Закрыть',
- returnToList: 'Вернуться к списку',
previousItem: 'Предыдущий элемент',
nextItem: 'Следующий элемент',
itemNavigation: 'Навигация по элементам',
diff --git a/apps/web/src/lib/i18n/locales/sv.ts b/apps/web/src/lib/i18n/locales/sv.ts
index 6fed87f710..d2ee151bf3 100644
--- a/apps/web/src/lib/i18n/locales/sv.ts
+++ b/apps/web/src/lib/i18n/locales/sv.ts
@@ -810,7 +810,6 @@ export default {
goForward: 'Gå framåt',
createNewSplit: 'Skapa ny panel',
close: 'Stäng',
- returnToList: 'Tillbaka till listan',
previousItem: 'Föregående objekt',
nextItem: 'Nästa objekt',
itemNavigation: 'Objektnavigering',
diff --git a/apps/web/src/lib/i18n/locales/th.ts b/apps/web/src/lib/i18n/locales/th.ts
index c2f4286125..c4f97028da 100644
--- a/apps/web/src/lib/i18n/locales/th.ts
+++ b/apps/web/src/lib/i18n/locales/th.ts
@@ -770,7 +770,6 @@ export default {
goForward: 'ไปข้างหน้า',
createNewSplit: 'สร้างแผงใหม่',
close: 'ปิด',
- returnToList: 'กลับไปที่รายการ',
previousItem: 'รายการก่อนหน้า',
nextItem: 'รายการถัดไป',
itemNavigation: 'การนำทางรายการ',
diff --git a/apps/web/src/lib/i18n/locales/translated-from.json b/apps/web/src/lib/i18n/locales/translated-from.json
index 5dd7ad2fa5..60a8e1cd7b 100644
--- a/apps/web/src/lib/i18n/locales/translated-from.json
+++ b/apps/web/src/lib/i18n/locales/translated-from.json
@@ -672,7 +672,6 @@
"splitMenu.openInThisSplit": "8bfa337dee",
"splitMenu.previousItem": "81b35f1b43",
"splitMenu.resetSizes": "9a0f6b247e",
- "splitMenu.returnToList": "fa4d1c46d3",
"splitMenu.spotlightSplit": "11aeb415d9",
"splitMenu.swapSplitLeft": "0252790d17",
"splitMenu.swapSplitRight": "fc5e4336c5",
diff --git a/apps/web/src/lib/i18n/locales/vi.ts b/apps/web/src/lib/i18n/locales/vi.ts
index bcf0a521b3..0d6adcbb61 100644
--- a/apps/web/src/lib/i18n/locales/vi.ts
+++ b/apps/web/src/lib/i18n/locales/vi.ts
@@ -782,7 +782,6 @@ export default {
goForward: 'Tiến tới',
createNewSplit: 'Tạo khung mới',
close: 'Đóng',
- returnToList: 'Quay lại danh sách',
previousItem: 'Mục trước',
nextItem: 'Mục tiếp theo',
itemNavigation: 'Điều hướng mục',
diff --git a/apps/web/src/lib/i18n/locales/zh-Hans.ts b/apps/web/src/lib/i18n/locales/zh-Hans.ts
index e5157f44b5..2e39bd3ef9 100644
--- a/apps/web/src/lib/i18n/locales/zh-Hans.ts
+++ b/apps/web/src/lib/i18n/locales/zh-Hans.ts
@@ -757,7 +757,6 @@ export default {
goForward: '前进',
createNewSplit: '新建分屏',
close: '关闭',
- returnToList: '返回列表',
previousItem: '上一项',
nextItem: '下一项',
itemNavigation: '条目导航',
diff --git a/apps/web/src/lib/i18n/locales/zh-Hant.ts b/apps/web/src/lib/i18n/locales/zh-Hant.ts
index 27f3775763..6733376581 100644
--- a/apps/web/src/lib/i18n/locales/zh-Hant.ts
+++ b/apps/web/src/lib/i18n/locales/zh-Hant.ts
@@ -764,7 +764,6 @@ export default {
goForward: '下一頁',
createNewSplit: '建立新分割畫面',
close: '關閉',
- returnToList: '返回清單',
previousItem: '上一個項目',
nextItem: '下一個項目',
itemNavigation: '項目導覽',
diff --git a/docs/agent-guide/navigation.md b/docs/agent-guide/navigation.md
index f3ccd80c67..b7bd7c0add 100644
--- a/docs/agent-guide/navigation.md
+++ b/docs/agent-guide/navigation.md
@@ -620,10 +620,10 @@ when the sidebar is an overlay in a narrow split. Verify with three splits:
open **Show navigation**, then use the sidebar's **Close** button without first
hiding navigation; only its owning split closes. The last logical split has no
sidebar close button; mobile chrome is unchanged.
-A lone non-list content split still shows a header X labeled **Return to list**,
-which returns that split to the most recent list in its history, preserving
-that list’s state. If there is no prior list, it replaces the current entry with
-Home. Excluded background panels do not count toward close eligibility.
+A lone desktop split shows no X, in its header or its frame corner. On a
+non-list content split, `Cmd+Esc` (or `Opt+Esc`) returns it to the most recent
+list in its history, preserving that list’s state; if there is no prior list, it
+opens Home. Excluded background panels do not count toward close eligibility.
These buttons and Home items activate on primary-button
press; keyboard activation remains supported. Home, Chat, Email,
Tasks, and other views using the shared inner
diff --git a/docs/agent-guide/ui-conventions.md b/docs/agent-guide/ui-conventions.md
index b0e1670bdf..6d21b353f2 100644
--- a/docs/agent-guide/ui-conventions.md
+++ b/docs/agent-guide/ui-conventions.md
@@ -283,4 +283,4 @@ independent of glyph geometry. See the [icon guide](../../apps/web/src/component
![Joined desktop view tabs](images/joined-view-tabs.png)
-On desktop, multiple splits have a small close button nested into each frame’s top-left corner, outside the topbar. A lone detail view keeps its Return to list action, and touch layouts keep header controls.
+On desktop, multiple splits have a small close button nested into each frame’s top-left corner, outside the topbar. A lone split has no close button; touch layouts keep header controls.