Skip to content

feat(mobile): search Settings, and keep its sidebar header clean #24766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 5 commits into from
Oct 25, 2026
Merged

feat(mobile): search Settings, and keep its sidebar header clean #24766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e72e7a
feat(mobile): search the Settings list
juliusmarminge Oct 25, 2026
bd08182
fix(mobile): Settings sidebar keeps the brand and drops the maximize …
juliusmarminge Oct 25, 2026
c22d891
fix(mobile): Settings keeps its scope filter on every iOS, and Androi…
juliusmarminge Oct 25, 2026
37760c6
fix(mobile): hidden Settings toolbars ignore the search shortcut
juliusmarminge Oct 25, 2026
d4459a6
fix(mobile): Android Settings never mounts the underlying tab's searc…
juliusmarminge Oct 25, 2026
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
15 changes: 1 addition & 14 deletions apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ import { workspaceUsesColumns } from "../workspace/workspace-tabs-state";
import { isSettingsRoute, settingsOpenIn } from "../settings/settings-navigation";
import { workspaceRoutesOf } from "./workspace-overlay-routes";
import { setNativelyPoppingWorkspaceRoute } from "../workspace/workspace-detail-selection";
import { useWorkspaceSidebarHeaderItem } from "./useWorkspaceSidebarHeaderItem";
import { useDeviceType, useNativeLayoutMetrics } from "../../native/native-layout-metrics";

import { useAdaptiveWorkspaceLayout } from "./AdaptiveWorkspaceLayout";
Expand Down Expand Up @@ -94,26 +93,15 @@ function ColumnScreen(props: {
readonly onDismiss: (routeKey: string, native: boolean) => void;
readonly onAppearance: (type: "willAppear" | "didAppear" | "willDisappear", key: string) => void;
readonly onCompose?: () => void;
/** Settings pages don't draw their own sidebar toggle, unlike threads and pull requests. */
readonly sidebarToggle?: boolean;
readonly navigation: ViewProps["navigation"];
}) {
const { descriptor } = props;
// Options a screen set inside this workspace tab slot, over its route's.
const slotOptions = slotScreenOptions(
const options = slotScreenOptions(
use(WorkspaceSlotOptionsContext),
descriptor.route.key,
descriptor.options,
);
const sidebarItem = useWorkspaceSidebarHeaderItem();
// Swapping header components would unmount the native header config, which hides the bar.
const options =
props.sidebarToggle && !slotOptions.unstable_headerLeftItems
? ({
...slotOptions,
unstable_headerLeftItems: () => [sidebarItem],
} as AppNativeStackNavigationOptions as typeof slotOptions)
: slotOptions;
const [presented, setPresented] = useState(false);
const primaryColumn = useMemo(
() =>
Expand Down Expand Up @@ -420,7 +408,6 @@ function WorkspaceColumns(
key={screenKey}
screenKey={screenKey}
descriptor={descriptor}
sidebarToggle={inSettingsSlot}
attached={props.detail.some((current) => current.key === route.key)}
onDismiss={handleNativeDismiss}
onAppearance={followCollapsedSplit}
Expand Down
Loading
Loading