@devries-cameron20 / t3code Mirror · read-only / commits / b5c0ee56fa
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 17:15 UTC

fix(mobile): Android Back from Pulls or Usage returns to Threads (#36224)

Julius Marminge committed Nov 13, 2026 at 09:01 UTC b5c0ee56fa1134332503639a29b0bc1efa5add7c
2 files changed +60 -3
apps/mobile/src/features/layout/workspace/WorkspaceRootScreen.android.tsx
+14
@@ -24,6 +24,8 @@ import { WorkspaceAppBarScope } from "../../../components/ui/WorkspaceAppBar.and
24 import { usePaneRole } from "../../../components/ui/Pane";
25 import { AndroidWorkspaceSidebar } from "./AndroidWorkspaceSidebar.android";
26 import type { WorkspaceTab } from "./workspace-tabs-state";
27 +import { useSelectWorkspaceTab } from "./useSelectWorkspaceTab";
28 +import { useHardwareBack } from "../../../lib/backHandler";
29
30 const TABS: readonly WorkspaceTab[] = NAVIGATION_TAB_ORDER;
31
@@ -49,6 +51,18 @@ function WorkspaceRoot() {
51 : 16,
52 };
53 const tab = workspace.state.selectedTab;
54 + const selectTab = useSelectWorkspaceTab();
55 + // Tabs are panes of Home, not routes, so Back has nothing to pop and would leave the app.
56 + // An open search keeps Back for itself.
57 + useHardwareBack(
58 + tab !== "threads" &&
59 + enabled.includes("threads") &&
60 + workspace.state.tabs[tab].searchMode === "resting",
61 + () => {
62 + selectTab("threads");
63 + return true;
64 + },
65 + );
66
67 return (
68 <WorkspaceTabsContext value={context}>
apps/mobile/src/features/layout/workspace/workspace-tabs-state.test.ts
+46 -3
@@ -11,6 +11,8 @@ import {
11 workspaceSearchBottomClearance,
12 workspaceDockBottomClearance,
13 workspaceUsesColumns,
14 + type WorkspaceTab,
15 + type WorkspaceTabsState,
16 } from "./workspace-tabs-state";
17
18 describe("compact list clearance", () => {
@@ -179,12 +181,25 @@ describe("workspace root navigation", () => {
181 });
182 });
183
182 -const mocks = vi.hoisted(() => ({ split: false, floating: false }));
184 +const mocks = vi.hoisted(() => ({
185 + split: false,
186 + floating: false,
187 + state: undefined as WorkspaceTabsState | undefined,
188 + openWorkspaceTab: (_tab: string) => {},
189 + backListeners: new Set<() => boolean>(),
190 +}));
191
192 vi.mock("../../settings/appearance/AppearancePreferencesProvider", () => ({
193 useAndroidFloatingTabs: () => mocks.floating,
194 }));
195 vi.mock("react-native", () => ({
196 + BackHandler: {
197 + addEventListener: (_event: string, listener: () => boolean) => {
198 + mocks.backListeners.add(listener);
199 + return { remove: () => mocks.backListeners.delete(listener) };
200 + },
201 + },
202 + Keyboard: { dismiss: () => undefined },
203 useWindowDimensions: () => ({ width: 400, height: 800 }),
204 View: ({ children }: { children: ReactNode }) => createElement("div", null, children),
205 }));
@@ -198,12 +213,16 @@ vi.mock("../AdaptiveWorkspaceLayout", () => ({
213 startNewTask: () => undefined,
214 }),
215 }));
216 +vi.mock("@react-navigation/native", () => ({ useIsFocused: () => true }));
217 +vi.mock("../adaptive-workspace-context", () => ({
218 + useAdaptiveWorkspaceLayout: () => ({ openWorkspaceTab: mocks.openWorkspaceTab }),
219 +}));
220 vi.mock("./navigation-tabs", () => ({
221 useEnabledNavigationTabs: () => ["threads", "pullRequests", "usage"],
222 }));
223 vi.mock("./WorkspaceTabsContext", () => ({
224 WorkspaceTabsContext: createContext(null),
206 - useWorkspaceTabs: () => ({ state: { selectedTab: "usage" } }),
225 + useWorkspaceTabs: () => ({ state: mocks.state, dispatch: () => undefined }),
226 }));
227 vi.mock("./WorkspaceExtraTab", () => ({
228 WorkspaceExtraTab: function UsageProbe() {
@@ -238,13 +257,37 @@ vi.mock("../../../components/ui/WorkspaceAppBar.android", () => ({
257 WorkspaceAppBarScope: ({ children }: { children: ReactNode }) => children,
258 }));
259
241 -function setup(split: boolean, floating: boolean) {
260 +function setup(split: boolean, floating: boolean, state = selected("usage")) {
261 mocks.split = split;
262 mocks.floating = floating;
263 + mocks.state = state;
264 + mocks.openWorkspaceTab = () => undefined;
265 + mocks.backListeners.clear();
266 vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
267 return { [Symbol.dispose]: () => vi.unstubAllGlobals() };
268 }
269
270 +function selected(tab: WorkspaceTab) {
271 + return workspaceTabsReducer(initialWorkspaceTabsState(), { type: "select", tab });
272 +}
273 +
274 +/** Android calls the newest listener first and stops at the first that handles Back. */
275 +function pressBack() {
276 + return [...mocks.backListeners].reverse().some((listener) => listener());
277 +}
278 +
279 +it("Back from the Pulls tab returns to Threads instead of leaving the app", async () => {
280 + using _actEnvironment = setup(false, false, selected("pullRequests"));
281 + const opened: string[] = [];
282 + mocks.openWorkspaceTab = (tab) => opened.push(tab);
283 + const root = createRoot(document.createElement("div"));
284 + using _root = { [Symbol.dispose]: () => act(() => root.unmount()) };
285 + await act(async () => root.render(createElement(WorkspaceRootScreen)));
286 +
287 + expect(pressBack()).toBe(true);
288 + expect(opened).toEqual(["threads"]);
289 +});
290 +
291 it.each([
292 [false, false],
293 [true, false],