Skip to content

Commit 1cc3459

Browse files
refactor(mobile): the workspace shell lives in layout and draws the list header
The workspace shell (tabs, dock, toolbars, root screens) sat in features/workspace, so its legitimate platform branches looked like feature code. Home's thread list and the iPad sidebar each built the same brand, search and filter header from raw native options. - features/workspace moves to features/layout/workspace, with the Android pull request app bar. - WorkspaceListHeader draws the list header from typed data on both platforms; brand-title options, sidebar header items and the split empty detail move into the shell. Home and the sidebar share one filter menu definition. - docs/internals/mobile-layout.md describes route presets, the shell's location and the AppBar/inset contract. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 9a38e1f commit 1cc3459

115 files changed

Lines changed: 735 additions & 855 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/mobile/src/App.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ import {
8282
launchWorkspaceURL,
8383
recordWorkspaceSelections,
8484
settingsLinkPage,
85-
} from "./features/workspace/workspace-selection-store";
86-
import { workspaceDetailLinkAction } from "./features/workspace/workspace-detail-selection";
85+
} from "./features/layout/workspace/workspace-selection-store";
86+
import { workspaceDetailLinkAction } from "./features/layout/workspace/workspace-detail-selection";
8787
import { NativeLayoutMetricsProvider } from "./native/native-layout-metrics";
8888
import {
8989
attachRootNavigation,

‎apps/mobile/src/Stack.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ import { useResolveClassNames } from "uniwind";
1818

1919
import { AppText as Text } from "./components/ui/AppText";
2020
import { androidWorkspaceDestinationAnimation } from "./lib/android-workspace-navigation";
21-
import { getCompactBrandHeaderOptions } from "./components/CompactBrandTitle";
21+
import { getCompactBrandHeaderOptions } from "./features/layout/workspace/brand-header-options";
2222
import { WorkspaceConnectionStatusProvider } from "./features/home/WorkspaceConnectionTitle";
23-
import { WorkspaceRootScreen } from "./features/workspace/WorkspaceRootScreen";
23+
import { WorkspaceRootScreen } from "./features/layout/workspace/WorkspaceRootScreen";
2424
import {
2525
recordHomeFocus,
2626
recordHomeTransitionEnd,
2727
recordHomeTransitionStart,
2828
} from "./features/home/home-route-visibility";
29-
import { AndroidWorkspaceTabsProvider } from "./features/workspace/AndroidWorkspaceTabsProvider";
29+
import { AndroidWorkspaceTabsProvider } from "./features/layout/workspace/AndroidWorkspaceTabsProvider";
3030
import {
3131
PullRequestRouteScreen,
3232
PullRequestFileRouteScreen,
@@ -128,7 +128,7 @@ import { SettingsRouteScreen } from "./features/settings/SettingsRouteScreen";
128128
import { SettingsLabsRouteScreen } from "./features/settings/ThreadSettingsSections";
129129
import { SettingsEnvironmentFilterProvider } from "./features/settings/settings-environment-filter";
130130
import { openSettings, settingsOpenIn } from "./features/settings/settings-navigation";
131-
import { DEFAULT_SETTINGS_PAGE } from "./features/workspace/workspace-tab-navigation";
131+
import { DEFAULT_SETTINGS_PAGE } from "./features/layout/workspace/workspace-tab-navigation";
132132
import {
133133
isWorkspaceOverlayRoute,
134134
registerPresentedRoutes,
@@ -138,7 +138,7 @@ import { immersiveRoute, modalRoute, pageRoute, sheetRoute } from "./features/la
138138
import { deriveLayout } from "./lib/layout";
139139
import { useNativeLayoutMetrics } from "./native/native-layout-metrics";
140140
import { isPresentedRoute } from "./native/workspace-stack-projection";
141-
import { workspaceDetailRouter } from "./features/workspace/workspace-detail-selection";
141+
import { workspaceDetailRouter } from "./features/layout/workspace/workspace-detail-selection";
142142

143143
const settingsPage = (title: string) => pageRoute({ title, itemStyle: "standard" });
144144

‎apps/mobile/src/components/CompactBrandTitle.tsx‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { NATIVE_WORKSPACE_COLUMNS_SUPPORTED } from "../native/NativeWorkspaceColumns";
22
import Constants from "expo-constants";
3-
import type { NativeStackNavigationOptions } from "@react-navigation/native-stack";
43
import { useState } from "react";
54
import { Platform, View } from "react-native";
65

@@ -93,18 +92,3 @@ export function CompactBrandTitle(
9392
title
9493
);
9594
}
96-
97-
function renderCompactBrandTitle() {
98-
return <CompactBrandTitle allowFontScaling={Platform.OS === "ios"} />;
99-
}
100-
101-
export function getCompactBrandHeaderOptions(
102-
fallbackTitleStyle?: NativeStackNavigationOptions["headerTitleStyle"],
103-
): NativeStackNavigationOptions {
104-
return {
105-
headerTitle: renderCompactBrandTitle,
106-
headerTitleStyle: fallbackTitleStyle,
107-
title: "Threads",
108-
unstable_headerLeftItems: undefined,
109-
};
110-
}

‎apps/mobile/src/features/connection/ConnectionsNewRouteScreen.test.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ vi.mock("../settings/settings-navigation", () => ({
6060
leaveSettingsPage: vi.fn(),
6161
openSettings: vi.fn(),
6262
}));
63-
vi.mock("../workspace/workspace-selection-store", () => ({ workspaceHasColumns: () => false }));
63+
vi.mock("../layout/workspace/workspace-selection-store", () => ({
64+
workspaceHasColumns: () => false,
65+
}));
6466
vi.mock("../cloud/publicConfig", () => ({ hasCloudPublicConfig: () => false }));
6567
vi.mock("./CloudEnvironmentRows", () => ({ CloudEnvironmentRows: () => null }));
6668
vi.mock("./environmentSections", () => ({

‎apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { CloudEnvironmentRows } from "./CloudEnvironmentRows";
3030
import { autoConnectReport, devAutoConnectAttemptAtom } from "./devAutoConnect";
3131
import { splitEnvironmentSections } from "./environmentSections";
3232
import { leaveSettingsPage } from "../settings/settings-navigation";
33-
import { workspaceHasColumns } from "../workspace/workspace-selection-store";
33+
import { workspaceHasColumns } from "../layout/workspace/workspace-selection-store";
3434

3535
type ConnectionsNewRouteParams = {
3636
readonly mode?: string;

‎apps/mobile/src/features/connection/devAutoConnect.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ vi.mock("@react-navigation/native", () => ({
4444
vi.mock("../../state/use-remote-environment-registry", () => ({
4545
pairEnvironment: harness.pair,
4646
}));
47-
vi.mock("../workspace/workspace-selection-store", () => ({
47+
vi.mock("../layout/workspace/workspace-selection-store", () => ({
4848
workspaceHasColumns: () => harness.columns,
4949
}));
5050
vi.mock("../../lib/rootNavigation", () => ({

‎apps/mobile/src/features/connection/devAutoConnect.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { findLinkedRoute, updateLinkedRoute } from "../../lib/appLinking";
66
import { rootNavigationRef, whenRootNavigationReady } from "../../lib/rootNavigation";
77
import { appAtomRegistry } from "../../state/atom-registry";
88
import { leaveSettingsPage } from "../settings/settings-navigation";
9-
import { workspaceHasColumns } from "../workspace/workspace-selection-store";
9+
import { workspaceHasColumns } from "../layout/workspace/workspace-selection-store";
1010
import { pairEnvironment } from "../../state/use-remote-environment-registry";
1111

1212
export type DevAutoConnectAttempt =

‎apps/mobile/src/features/development/behavior-probe.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ function route() {
165165
require("../../lib/rootNavigation") as typeof import("../../lib/rootNavigation");
166166
if (!rootNavigationRef.isReady()) return null;
167167
const current = rootNavigationRef.getCurrentRoute();
168-
const { workspaceHasColumns } = require("../workspace/workspace-selection-store") as {
168+
const { workspaceHasColumns } = require("../layout/workspace/workspace-selection-store") as {
169169
workspaceHasColumns: () => boolean;
170170
};
171171
return {

‎apps/mobile/src/features/home/AndroidHomeFab.android.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import { useWorkspaceState } from "../../state/workspace";
1515
import { FabScrollContext } from "./FabScrollContext";
1616
import { updateFabScroll } from "./fab-scroll";
1717
import { useAndroidControlSizing } from "../../components/ui/useAndroidControlSizing";
18-
import { WorkspaceTabsContext, useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
19-
import { FLOATING_TABS, floatingTabsMetrics } from "../workspace/floating-workspace-tabs";
20-
import { useEnabledNavigationTabs } from "../workspace/navigation-tabs";
18+
import { WorkspaceTabsContext, useWorkspaceTabs } from "../layout/workspace/WorkspaceTabsContext";
19+
import { FLOATING_TABS, floatingTabsMetrics } from "../layout/workspace/floating-workspace-tabs";
20+
import { useEnabledNavigationTabs } from "../layout/workspace/navigation-tabs";
2121
import {
2222
useAppearancePreferences,
2323
useAndroidFloatingTabs,

‎apps/mobile/src/features/home/HomeHeader.android.tsx‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)