From 4e79e3e27ff721992d2e5e4a8fc575f83359f90d Mon Sep 17 00:00:00 2001 From: wSedlacek Date: Fri, 6 Nov 2026 08:43:46 -0800 Subject: [PATCH 1/3] fix(mobile): keep empty searches closed when reopening Home --- .../layout/workspace/PullRequestToolbar.android.tsx | 9 +++++++++ .../layout/workspace/WorkspaceListHeader.android.tsx | 4 ++++ .../layout/workspace/workspace-tabs-state.test.ts | 8 ++++++-- .../features/layout/workspace/workspace-tabs-state.ts | 8 +++++--- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx b/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx index 332c1befe18b..fa89cb528a5a 100644 --- a/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx +++ b/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx @@ -3,6 +3,7 @@ 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 { WorkspaceBrandTitle } from "./WorkspaceBrandTitle"; import { useWorkspaceTabs } from "./WorkspaceTabsContext"; @@ -20,6 +21,7 @@ export function PullRequestToolbar(props: { const { dispatch, getScrollOffset, recordScrollOffset, isTabActive } = workspace; const { onRequestVisibility } = props; const tab = workspace.state.tabs.pullRequests; + const homeVisible = useHomeRouteVisible(); const searching = tab.searchMode !== "resting"; const openSearch = () => { onRequestVisibility?.(); @@ -37,6 +39,13 @@ export function PullRequestToolbar(props: { recordScrollOffset("pullRequests", tab.searchEntryOffset); dispatch({ type: "cancel", tab: "pullRequests" }); }; + // Home stays mounted under a thread; an empty active search would still show on return. + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- cancels empty Android PR search when a detail covers Home + useEffect(() => { + if (homeVisible || tab.query !== "" || tab.searchMode === "resting") return; + recordScrollOffset("pullRequests", tab.searchEntryOffset); + dispatch({ type: "cancel", tab: "pullRequests" }); + }, [homeVisible, 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 5c6f79358415..4b8e89790a45 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,15 @@ 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); + // Home stays mounted under a thread; drop an empty open search before it can return still open. + if (!homeVisible && 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 f1c839630eb3..03038e928b72 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 @@ -144,15 +144,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 3598894115dc..0b610951641a 100644 --- a/apps/mobile/src/features/layout/workspace/workspace-tabs-state.ts +++ b/apps/mobile/src/features/layout/workspace/workspace-tabs-state.ts @@ -108,12 +108,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 }; From f85222bb247707e3224a9acaaefad9070a893af7 Mon Sep 17 00:00:00 2001 From: wSedlacek Date: Fri, 6 Nov 2026 18:03:46 -0800 Subject: [PATCH 2/3] fix(mobile): keep split-view sidebar search open while typing Empty Android search only closes when its list host is covered, and iOS empty search still autofocuses on first open. Co-authored-by: Cursor --- .../workspace/PullRequestToolbar.android.tsx | 20 +++++++++++++++---- .../workspace/WorkspaceListHeader.android.tsx | 6 ++++-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx b/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx index fa89cb528a5a..e13dc14074d6 100644 --- a/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx +++ b/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx @@ -5,6 +5,7 @@ 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 { useAdaptiveWorkspaceLayout } from "../adaptive-workspace-context"; import { WorkspaceBrandTitle } from "./WorkspaceBrandTitle"; import { useWorkspaceTabs } from "./WorkspaceTabsContext"; import type { PullRequestFilterMenu } from "../../pull-requests/PullRequestListFilters"; @@ -20,8 +21,12 @@ export function PullRequestToolbar(props: { const workspace = useWorkspaceTabs()!; const { dispatch, getScrollOffset, recordScrollOffset, isTabActive } = workspace; const { onRequestVisibility } = props; + const { panes } = useAdaptiveWorkspaceLayout(); 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?.(); @@ -39,13 +44,20 @@ export function PullRequestToolbar(props: { recordScrollOffset("pullRequests", tab.searchEntryOffset); dispatch({ type: "cancel", tab: "pullRequests" }); }; - // Home stays mounted under a thread; an empty active search would still show on return. - // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- cancels empty Android PR search when a detail covers Home + // 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 (homeVisible || tab.query !== "" || tab.searchMode === "resting") return; + if (listHostVisible || tab.query !== "" || tab.searchMode === "resting") return; recordScrollOffset("pullRequests", tab.searchEntryOffset); dispatch({ type: "cancel", tab: "pullRequests" }); - }, [homeVisible, tab.query, tab.searchMode, tab.searchEntryOffset, recordScrollOffset, dispatch]); + }, [ + 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 4b8e89790a45..9e39459543c4 100644 --- a/apps/mobile/src/features/layout/workspace/WorkspaceListHeader.android.tsx +++ b/apps/mobile/src/features/layout/workspace/WorkspaceListHeader.android.tsx @@ -25,8 +25,10 @@ export function WorkspaceListHeader(props: WorkspaceListHeaderProps) { const { search, sidebar } = props; const onSearchQueryChange = search.onChangeText; const [searchOpen, setSearchOpen] = useState(false); - // Home stays mounted under a thread; drop an empty open search before it can return still open. - if (!homeVisible && searchOpen && search.value.length === 0) setSearchOpen(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(); From cc19381f6a5cdb4a7095b1b9be6a6a62ec076c05 Mon Sep 17 00:00:00 2001 From: maria-rcks Date: Tue, 10 Nov 2026 06:14:53 +0000 Subject: [PATCH 3/3] fix(mobile): read sidebar visibility from workspace pane state --- .../features/layout/workspace/PullRequestToolbar.android.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx b/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx index e13dc14074d6..65cccb033e1e 100644 --- a/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx +++ b/apps/mobile/src/features/layout/workspace/PullRequestToolbar.android.tsx @@ -5,7 +5,7 @@ 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 { useAdaptiveWorkspaceLayout } from "../adaptive-workspace-context"; +import { useWorkspacePaneState } from "../adaptive-workspace-context"; import { WorkspaceBrandTitle } from "./WorkspaceBrandTitle"; import { useWorkspaceTabs } from "./WorkspaceTabsContext"; import type { PullRequestFilterMenu } from "../../pull-requests/PullRequestListFilters"; @@ -21,7 +21,7 @@ export function PullRequestToolbar(props: { const workspace = useWorkspaceTabs()!; const { dispatch, getScrollOffset, recordScrollOffset, isTabActive } = workspace; const { onRequestVisibility } = props; - const { panes } = useAdaptiveWorkspaceLayout(); + 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.