diff --git a/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx b/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx index 332c1befe18ba..65cccb033e1e8 100644 --- a/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx +++ b/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx @@ -3,7 +3,9 @@ import { useEffect } from "react"; import { BackHandler, Keyboard } from "react-native"; import { AppBar } from "../../../components/ui/AppBar"; import { appBarMenuItemsFromActions } from "../../../components/ui/menuActionItems"; +import { useHomeRouteVisible } from "../../home/home-route-visibility"; import { useHardwareKeyboardCommand } from "../../keyboard/hardwareKeyboardCommands"; +import { useWorkspacePaneState } from "../adaptive-workspace-context"; import { WorkspaceBrandTitle } from "./WorkspaceBrandTitle"; import { useWorkspaceTabs } from "./WorkspaceTabsContext"; import type { PullRequestFilterMenu } from "../../pull-requests/PullRequestListFilters"; @@ -19,7 +21,12 @@ export function PullRequestToolbar(props: { const workspace = useWorkspaceTabs()!; const { dispatch, getScrollOffset, recordScrollOffset, isTabActive } = workspace; const { onRequestVisibility } = props; + const { panes } = useWorkspacePaneState(); const tab = workspace.state.tabs.pullRequests; + const homeVisible = useHomeRouteVisible(); + // Compact Home uses route visibility; a split sidebar stays interactive while its detail is focused. + const listHostVisible = + onRequestVisibility !== undefined ? panes.primarySidebarVisible : homeVisible; const searching = tab.searchMode !== "resting"; const openSearch = () => { onRequestVisibility?.(); @@ -37,6 +44,20 @@ export function PullRequestToolbar(props: { recordScrollOffset("pullRequests", tab.searchEntryOffset); dispatch({ type: "cancel", tab: "pullRequests" }); }; + // An empty active search would still show when its host returns; cancel only once that host is covered. + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- cancels empty Android PR search when its list host is covered + useEffect(() => { + if (listHostVisible || tab.query !== "" || tab.searchMode === "resting") return; + recordScrollOffset("pullRequests", tab.searchEntryOffset); + dispatch({ type: "cancel", tab: "pullRequests" }); + }, [ + listHostVisible, + tab.query, + tab.searchMode, + tab.searchEntryOffset, + recordScrollOffset, + dispatch, + ]); // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- subscribes to BackHandler while searching to close the PR search on Android back useEffect(() => { if (!searching) return; diff --git a/apps/mobile/src/features/layout/workspace/WorkspaceListHeader.android.tsx b/apps/mobile/src/features/layout/workspace/WorkspaceListHeader.android.tsx index 5c6f793584151..9e39459543c40 100644 --- a/apps/mobile/src/features/layout/workspace/WorkspaceListHeader.android.tsx +++ b/apps/mobile/src/features/layout/workspace/WorkspaceListHeader.android.tsx @@ -4,6 +4,7 @@ import { BackHandler, Keyboard } from "react-native"; import { AppBar } from "../../../components/ui/AppBar"; import { useWorkspaceConnectionState } from "../../../state/workspace"; +import { useHomeRouteVisible } from "../../home/home-route-visibility"; import { useHardwareKeyboardCommand } from "../../keyboard/hardwareKeyboardCommands"; import { WorkspaceBrandTitle } from "./WorkspaceBrandTitle"; import { useWorkspaceTabs } from "./WorkspaceTabsContext"; @@ -17,12 +18,17 @@ export function WorkspaceListHeader(props: WorkspaceListHeaderProps) { const workspace = useWorkspaceTabs(); const isTabActive = workspace?.isTabActive; const homeFocused = useNavigationState((state) => state.routes[state.index]?.name === "Home"); + const homeVisible = useHomeRouteVisible(); const listFocused = homeFocused && (workspace === null || workspace.state.selectedTab === "threads"); const connectionState = useWorkspaceConnectionState(); const { search, sidebar } = props; const onSearchQueryChange = search.onChangeText; const [searchOpen, setSearchOpen] = useState(false); + // Compact Home uses route visibility; a split sidebar stays interactive while its detail is focused. + const listHostVisible = sidebar?.visible ?? homeVisible; + // Drop an empty open search only when its host is covered, so returning Home cannot reopen it. + if (!listHostVisible && searchOpen && search.value.length === 0) setSearchOpen(false); const searching = searchOpen || search.value.length > 0; const openSearch = () => { sidebar?.onRequestVisibility(); diff --git a/apps/mobile/src/features/layout/workspace/workspace-tabs-state.test.ts b/apps/mobile/src/features/layout/workspace/workspace-tabs-state.test.ts index 797da115a20eb..12b47f655faa9 100644 --- a/apps/mobile/src/features/layout/workspace/workspace-tabs-state.test.ts +++ b/apps/mobile/src/features/layout/workspace/workspace-tabs-state.test.ts @@ -146,15 +146,19 @@ describe("workspace root navigation", () => { expect(workspaceTabsReducer(state, { type: "select", tab: "pullRequests" })).toBe(state); }); - it("keeps an empty search closed after iOS closes it with only a blur", () => { + it("keeps an empty search closed after returning from a thread", () => { const opened = workspaceTabsReducer(initialWorkspaceTabsState(), { type: "search" }); const closed = workspaceTabsReducer(opened, { type: "expand" }); const filtered = workspaceTabsReducer(closed, { type: "query", query: "skia" }); + const typing = workspaceTabsReducer(opened, { type: "query", query: "skia" }); + // Still `active`: opening a thread often freezes Home before blur can expand. + expect(shouldRestoreNativeSearch(opened.tabs.threads, false)).toBe(false); + // iOS 27's X only blurs, leaving empty `expanded`. expect(shouldRestoreNativeSearch(closed.tabs.threads, false)).toBe(false); expect(shouldRestoreNativeSearch(closed.tabs.threads, true)).toBe(true); expect(shouldRestoreNativeSearch(filtered.tabs.threads, false)).toBe(true); - expect(shouldRestoreNativeSearch(opened.tabs.threads, false)).toBe(true); + expect(shouldRestoreNativeSearch(typing.tabs.threads, false)).toBe(true); expect(shouldRestoreNativeSearch(initialWorkspaceTabsState().tabs.threads, true)).toBe(false); }); diff --git a/apps/mobile/src/features/layout/workspace/workspace-tabs-state.ts b/apps/mobile/src/features/layout/workspace/workspace-tabs-state.ts index 3f6754c679c5a..bb7fedaf8cd0f 100644 --- a/apps/mobile/src/features/layout/workspace/workspace-tabs-state.ts +++ b/apps/mobile/src/features/layout/workspace/workspace-tabs-state.ts @@ -115,12 +115,14 @@ export function workspaceTabsReducer( } /** - * iOS 27's integrated search X closes the field with only a blur, leaving `expanded`. - * An empty one has nothing to restore, except where the caller keeps it open (the Duo). + * Integrated search collapses when its screen reappears. Restore only when a query + * still filters the list (or the Duo keeps an empty field open). An empty `active` + * search is left behind when a thread covers Home before blur can expand — leave it + * collapsed. iOS 27's X also only blurs, leaving empty `expanded`, which must stay closed. */ export function shouldRestoreNativeSearch(tab: WorkspaceTabState, keepsEmptySearchOpen: boolean) { if (tab.searchMode === "resting") return false; - return tab.searchMode === "active" || tab.query !== "" || keepsEmptySearchOpen; + return tab.query !== "" || keepsEmptySearchOpen; } export const WORKSPACE_TOOLBAR = { height: 48, expandedGap: 10, edge: 16, gap: 8 };