Skip to content

Commit e8c70f5

Browse files
camchisclaude
andauthored
fix(mobile): a closed empty search stays closed after returning (#27184)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent d64888f commit e8c70f5

3 files changed

Lines changed: 25 additions & 1 deletion

File tree

‎apps/mobile/src/features/workspace/WorkspaceToolbar.ios.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands";
1717
import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
1818
import { useWorkspaceTabs } from "./WorkspaceTabsContext";
19+
import { shouldRestoreNativeSearch } from "./workspace-tabs-state";
1920
import { useFloatingWorkspaceTabs, useSidebarWorkspaceTabs } from "./useSystemWorkspaceTabBar";
2021
import { WorkspaceTabToolbarButtons } from "./WorkspaceSectionToolbar";
2122

@@ -93,7 +94,7 @@ export function WorkspaceToolbar(props: {
9394
searchHostVisible &&
9495
searchVisible &&
9596
isTabActive(selectedTab) &&
96-
tab.searchMode !== "resting"
97+
shouldRestoreNativeSearch(tab, duoSearch)
9798
) {
9899
searchRef.current?.setText(tab.query);
99100
// Integrated search collapses to its button when its screen reappears,

‎apps/mobile/src/features/workspace/workspace-tabs-state.test.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { WorkspaceRootScreen } from "./WorkspaceRootScreen.android";
55
import {
66
initialWorkspaceTabsState,
77
workspaceTabsReducer,
8+
shouldRestoreNativeSearch,
89
workspaceTabForNativeSlot,
910
resolveWorkspaceTabOrder,
1011
workspaceSearchBottomClearance,
@@ -142,6 +143,19 @@ describe("workspace root navigation", () => {
142143
expect(state.tabs.pullRequests.searchMode).toBe("resting");
143144
expect(workspaceTabsReducer(state, { type: "select", tab: "pullRequests" })).toBe(state);
144145
});
146+
147+
it("keeps an empty search closed after iOS closes it with only a blur", () => {
148+
const opened = workspaceTabsReducer(initialWorkspaceTabsState(), { type: "search" });
149+
const closed = workspaceTabsReducer(opened, { type: "expand" });
150+
const filtered = workspaceTabsReducer(closed, { type: "query", query: "skia" });
151+
152+
expect(shouldRestoreNativeSearch(closed.tabs.threads, false)).toBe(false);
153+
expect(shouldRestoreNativeSearch(closed.tabs.threads, true)).toBe(true);
154+
expect(shouldRestoreNativeSearch(filtered.tabs.threads, false)).toBe(true);
155+
expect(shouldRestoreNativeSearch(opened.tabs.threads, false)).toBe(true);
156+
expect(shouldRestoreNativeSearch(initialWorkspaceTabsState().tabs.threads, true)).toBe(false);
157+
});
158+
145159
it("returns from Usage without losing list state", () => {
146160
let state = workspaceTabsReducer(initialWorkspaceTabsState(), {
147161
type: "query",

‎apps/mobile/src/features/workspace/workspace-tabs-state.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,15 @@ export function workspaceTabsReducer(
107107
return { ...state, tabs: { ...state.tabs, [tab]: next } };
108108
}
109109

110+
/**
111+
* iOS 27's integrated search X closes the field with only a blur, leaving `expanded`.
112+
* An empty one has nothing to restore, except where the caller keeps it open (the Duo).
113+
*/
114+
export function shouldRestoreNativeSearch(tab: WorkspaceTabState, keepsEmptySearchOpen: boolean) {
115+
if (tab.searchMode === "resting") return false;
116+
return tab.searchMode === "active" || tab.query !== "" || keepsEmptySearchOpen;
117+
}
118+
110119
export const WORKSPACE_TOOLBAR = { height: 48, expandedGap: 10, edge: 16, gap: 8 };
111120
export const WORKSPACE_DOCK = { height: 48, tabsWidth: 176, gap: 12, bottomGap: 6 };
112121

0 commit comments

Comments
 (0)