Skip to content

Commit 8a9a56b

Browse files
committed
fix(mobile): retain Home through split expansion
1 parent 7aee941 commit 8a9a56b

3 files changed

Lines changed: 26 additions & 7 deletions

File tree

‎apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { scopedThreadKey } from "../../lib/scopedEntities";
2929
import { WorkspaceTabsProvider, useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
3030
import { WorkspaceNativeTabs } from "../workspace/WorkspaceNativeTabs.ios";
3131
import { workspaceUsesColumns } from "../workspace/workspace-tabs-state";
32+
import { expandedWorkspaceTab } from "../workspace/workspace-tab-navigation";
3233
import { isSettingsRoute, settingsOpenIn } from "../settings/settings-navigation";
3334
import { workspaceRoutesOf } from "./workspace-overlay-routes";
3435
import { setNativelyPoppingWorkspaceRoute } from "../workspace/workspace-detail-selection";
@@ -321,13 +322,8 @@ function WorkspaceColumns(
321322
// router state. An expanded split has columns, so its tab gets a page beside the list.
322323
const live = props.navigation.getState();
323324
const { workspace } = workspaceRoutesOf(live.routes.slice(0, live.index + 1));
324-
if (workspace.some((route) => route.name !== "Home" && route.name !== "Settings")) return;
325-
const tab = workspace.some((route) => route.name === "Settings")
326-
? "settings"
327-
: (["threads", "pullRequests", "usage"] as const).find((candidate) =>
328-
workspaceTabs?.isTabActive(candidate),
329-
);
330-
openWorkspaceTab(tab ?? "threads", { columns: true });
325+
const tab = expandedWorkspaceTab(workspace, workspaceTabs?.isTabActive);
326+
if (tab) openWorkspaceTab(tab, { columns: true });
331327
}}
332328
preferredDisplayMode={
333329
sidebarByOrientation

‎apps/mobile/src/features/workspace/workspace-tab-navigation.test.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { describe, expect, it } from "vite-plus/test";
22

33
import { restoreSettingsLinkState } from "../settings/settings-navigation";
44
import {
5+
expandedWorkspaceTab,
56
workspaceSelectionsIn,
67
workspaceTabColumns,
78
workspaceTabNavigationState,
@@ -64,6 +65,17 @@ describe("workspace tab selections", () => {
6465
describe("opening a workspace tab", () => {
6566
const columns = { columns: true, check: available };
6667

68+
it("expanding an empty workspace preserves the live tab and leaves open pages alone", () => {
69+
for (const selected of ["home", "threads", "pullRequests", "usage"] as const) {
70+
const active = (tab: string) => tab === selected;
71+
expect(expandedWorkspaceTab([home], active)).toBe(selected);
72+
expect(expandedWorkspaceTab([home, settings], active)).toBe("settings");
73+
expect(expandedWorkspaceTab([home, homeAgent], active)).toBeUndefined();
74+
expect(expandedWorkspaceTab([home, thread], active)).toBeUndefined();
75+
}
76+
expect(expandedWorkspaceTab([home])).toBe("threads");
77+
});
78+
6779
it.each([false, true])("opens Home as one conversation independent of columns: %s", (columns) => {
6880
const state = { routes: [home, homeAgent, thread] };
6981
const current = workspaceTabNavigationState(

‎apps/mobile/src/features/workspace/workspace-tab-navigation.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
} from "../settings/components/settings-page-targets";
66
import { settingsNavigationState } from "../settings/settings-navigation";
77
import type { WorkspaceTab } from "./workspace-tabs-state";
8+
import { NAVIGATION_TAB_ORDER } from "./navigation-tab-order";
89

910
type RouteLike = {
1011
readonly name: string;
@@ -17,6 +18,16 @@ type PullRequestSelection = NonNullable<WorkspaceSelections["pullRequests"]>;
1718
/** Opened when Settings has columns and none of its pages has been opened yet. */
1819
export const DEFAULT_SETTINGS_PAGE = "SettingsEnvironments" satisfies SettingsPageTarget;
1920

21+
export function expandedWorkspaceTab(
22+
routes: readonly { readonly name: string }[],
23+
isTabActive?: (tab: WorkspaceTab) => boolean,
24+
) {
25+
if (routes.some((route) => route.name !== "Home" && route.name !== "Settings")) return;
26+
return routes.some((route) => route.name === "Settings")
27+
? "settings"
28+
: (NAVIGATION_TAB_ORDER.find((tab) => isTabActive?.(tab)) ?? "threads");
29+
}
30+
2031
export function workspaceTabColumns(
2132
platform: string,
2233
tab: WorkspaceTab | "settings",

0 commit comments

Comments
 (0)