Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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?.();
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
Expand Down
Loading