Skip to content
Open
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
2 changes: 1 addition & 1 deletion apps/mobile/src/components/ui/AppBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { NativeStackScreenOptions, useScreenOptionsWriter } from "../../native/S
import { useNativeWorkspaceColumnsSupported } from "../../native/NativeWorkspaceColumns";
import { useDeviceType } from "../../native/native-layout-metrics";
import { isDuoDevice } from "../../lib/device-type";
import { useAdaptiveWorkspaceLayout } from "../../features/layout/AdaptiveWorkspaceLayout";
import { useAdaptiveWorkspaceLayout } from "../../features/layout/adaptive-workspace-context";
import { useSidebarToggle } from "../../features/layout/useSidebarToggle";
import { InspectorCloseContext } from "../../features/layout/inspector-bar-store";
import {
Expand Down
32 changes: 26 additions & 6 deletions apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,15 @@ import {
workspaceTabColumns,
workspaceTabNavigationState,
} from "./workspace/workspace-tab-navigation";
import { workspaceTabOf, type WorkspaceTab } from "./workspace/workspace-tabs-state";
import {
workspaceTabOf,
workspaceUsesColumns,
type WorkspaceTab,
} from "./workspace/workspace-tabs-state";
import { workspaceRoutesOf } from "./workspace-overlay-routes";
import { SettingsWorkspaceLayout } from "../settings/SettingsWorkspaceLayout";
import { WorkspaceThreadSidebar } from "./workspace/WorkspaceThreadSidebar";
import { WorkspaceSettingsSidebar } from "../settings/WorkspaceSettingsSidebar";

export { useAdaptiveWorkspaceLayout, useWorkspacePaneState };

Expand Down Expand Up @@ -268,11 +273,9 @@ function AdaptiveWorkspaceLayoutContent(
const { width: viewportWidth, height } = nativeMetrics ?? windowDimensions;
const pathname = props.pathname;
const workspace = useWorkspaceTabs();
// Settings and Usage occupy the workspace rather than a list/detail pair.
// Settings and Usage fill Android's workspace; the legacy iPad split keeps its sidebar for them.
const androidSettingsOpen = useAndroidWorkspaceRoot()?.settingsOpen ?? false;
const safeAreaInsets = useSafeAreaInsets();
const workspacePage =
Platform.OS === "android" && (androidSettingsOpen || workspace?.state.selectedTab === "usage");
const navigation = useNavigation();
const [primarySidebarPreferredVisible, setPrimarySidebarPreferredVisible] = useState(true);
const [fileInspectorPreferredVisible, setFileInspectorPreferredVisible] = useState(true);
Expand All @@ -295,6 +298,18 @@ function AdaptiveWorkspaceLayoutContent(
() => deriveLayout({ width: viewportWidth, height, nativeMetrics, nativeWorkspace }),
[height, viewportWidth, nativeMetrics, nativeWorkspace],
);
const workspacePage =
(Platform.OS === "android" &&
(androidSettingsOpen || workspace?.state.selectedTab === "usage")) ||
(Platform.OS === "ios" &&
!nativeWorkspace &&
workspace !== null &&
!workspaceUsesColumns(
workspace.state.selectedTab,
workspace.settingsOpen,
false,
baseLayout.usesSplitView,
));
// The overlay sidebar closes when a page opens from it, and stays open on a list or on the
// page a tab switch opened (`keepOpenFor`, set by that switch).
const [overlaySidebar, setOverlaySidebar] = useState({
Expand Down Expand Up @@ -1038,8 +1053,13 @@ function AdaptiveWorkspaceLayoutContent(
/>
)}
>
{/* Without a sidebar route (iPadOS before 26) the columns draw the thread list. */}
{sidebar ?? <WorkspaceThreadSidebar />}
{/* Without a sidebar route (iPadOS before 26) the columns draw the active tab's list. */}
{sidebar ??
(Platform.OS === "ios" && workspace?.settingsOpen ? (
<WorkspaceSettingsSidebar width={layout.listPaneWidth} />
) : (
<WorkspaceThreadSidebar />
))}
</RenderErrorBoundary>
</PaneContext>
{/* Keep the pill under the content throughout the sidebar's clipping animation. */}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,12 @@ function WorkspaceStackView(props: ViewProps & { readonly nativeColumns: boolean
const descriptors = props.descriptors;
const baseRoute = { key: `${props.state.key}:workspace`, name: "Workspace" };
const visibleRoute = projection.detail.at(-1) ?? primaryRoute;
const workspacePage = !workspaceUsesColumns(workspace.state.selectedTab, workspace.settingsOpen);
const workspacePage = !workspaceUsesColumns(
workspace.state.selectedTab,
workspace.settingsOpen,
props.nativeColumns,
layout.usesSplitView,
);
const baseDescriptor: Descriptor = {
...primaryDescriptor,
navigation: props.descriptors[visibleRoute.key]!.navigation,
Expand Down Expand Up @@ -698,8 +703,9 @@ function WorkspaceStackNavigator({
);
return (
<NativeWorkspaceModeContext value={usesNativeWorkspaceColumns}>
<NavigationContent>
<WorkspaceTabsProvider settingsOpen={settingsOpen}>
{/* Before iOS 26 NavigationContent's layout draws the sidebar outside its children. */}
<WorkspaceTabsProvider settingsOpen={settingsOpen}>
<NavigationContent>
<WorkspaceStackView
nativeColumns={usesNativeWorkspaceColumns}
{...rest}
Expand All @@ -708,8 +714,8 @@ function WorkspaceStackNavigator({
descriptors={descriptors}
navigation={navigation}
/>
</WorkspaceTabsProvider>
</NavigationContent>
</NavigationContent>
</WorkspaceTabsProvider>
</NativeWorkspaceModeContext>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
useEnabledNavigationTabs,
} from "./navigation-tabs";
import {
use,
useEffect,
useLayoutEffect,
useRef,
Expand All @@ -25,6 +26,7 @@ import {
} from "./workspace-tabs-state";
import {
NativeWorkspaceTabActivityContext,
NativeWorkspaceModeContext,
WorkspaceColumnMetricsContext,
WorkspaceSlotOptionsContext,
} from "../../../native/v5-workspace-context";
Expand Down Expand Up @@ -157,6 +159,7 @@ export function WorkspaceNativeTabs(props: {
const selectTab = useSelectWorkspaceTab();
const [provenance, setProvenance] = useState(0);
const systemTabBar = useSystemWorkspaceTabBar();
const nativeColumns = use(NativeWorkspaceModeContext);
const deviceType = useDeviceType();
const compactTabs = useCompactWorkspaceTabs();
const { layout } = useAdaptiveWorkspaceLayout();
Expand All @@ -165,7 +168,12 @@ export function WorkspaceNativeTabs(props: {
const hiddenWithSidebar =
deviceType === "pad" &&
layout.usesSplitView &&
workspaceUsesColumns(workspace.state.selectedTab, workspace.settingsOpen) &&
workspaceUsesColumns(
workspace.state.selectedTab,
workspace.settingsOpen,
nativeColumns,
layout.usesSplitView,
) &&
!panes.primarySidebarVisible;
const floatingTabs = useFloatingWorkspaceTabs();
const { width } = useWindowDimensions();
Expand Down Expand Up @@ -274,9 +282,18 @@ export function WorkspaceNativeTabs(props: {
{(deviceType === "pad" ||
compactTabs ||
(layout.variant === "medium" &&
!workspaceUsesColumns(selectedTab, workspace.settingsOpen))) &&
!workspaceUsesColumns(
selectedTab,
workspace.settingsOpen,
nativeColumns,
layout.usesSplitView,
))) &&
!props.hidden &&
!props.tabsInSidebarColumn &&
// The legacy iPad sidebar now owns the tabs so they hide with it.
//
// 旧版 iPad 的标签栏由侧栏承载,从而与侧栏一起隐藏。
!(deviceType === "pad" && !nativeColumns && layout.usesSplitView) &&
!hiddenWithSidebar ? (
<View
pointerEvents="box-none"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@ import { StyleSheet, View } from "react-native";

import { StandaloneStack } from "../nested-stacks";
import { pageRoute } from "../route-options";
import { useDeviceType } from "../../../native/native-layout-metrics";
import { useWorkspaceTabs } from "./WorkspaceTabsContext";
import { WorkspaceSidebarTabs } from "./WorkspaceSidebarTabs";
import { getCompactBrandHeaderOptions } from "./brand-header-options";

/** The iOS sidebar column hosts its own stack so it gets a native bar with the brand title. */
export function WorkspaceSidebarColumn(props: {
readonly width: number;
readonly children: ReactNode;
}) {
const deviceType = useDeviceType();
const workspace = useWorkspaceTabs();
const m = useMessages();
const options = {
...pageRoute(),
Expand All @@ -25,6 +30,7 @@ export function WorkspaceSidebarColumn(props: {
<StandaloneStack surface="sidebar" options={options}>
{props.children}
</StandaloneStack>
{deviceType === "pad" && workspace !== null ? <WorkspaceSidebarTabs /> : null}
</View>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,16 @@ describe("Duo list clearance", () => {
});

describe("workspace root navigation", () => {
it("pairs Settings, chats and pull requests with a detail column, and keeps Usage one page", () => {
it("pairs Settings, chats, pull requests and issues with a detail column, and keeps Usage one page", () => {
expect(workspaceUsesColumns("usage")).toBe(false);
expect(workspaceUsesColumns("usage", true)).toBe(true);
expect(workspaceUsesColumns("threads")).toBe(true);
expect(workspaceUsesColumns("pullRequests")).toBe(true);
expect(workspaceUsesColumns("issues")).toBe(true);
// Before iOS 26 the split keeps its sidebar, which holds the tabs; a narrow window does not.
expect(workspaceUsesColumns("usage", false, false)).toBe(true);
expect(workspaceUsesColumns("usage", false, false, false)).toBe(false);
expect(workspaceUsesColumns("threads", true, false, false)).toBe(false);
});

it("keeps the registered defaults while customization is unavailable", () => {
Expand Down
18 changes: 15 additions & 3 deletions apps/mobile/src/features/layout/workspace/workspace-tabs-state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,21 @@ export type WorkspaceTab = NavigationTab;
export type WorkspaceSearchTab = WorkspaceTab | "settings";
export type WorkspaceSearchMode = "resting" | "active" | "expanded";

/** Settings, Chats, pull requests and issues pair a list with a detail column; Usage is one page. */
export function workspaceUsesColumns(tab: WorkspaceTab, settingsOpen = false) {
return settingsOpen || tab !== "usage";
/**
* Settings, Chats, pull requests and issues pair a list with a detail column; Usage is one page. The
* pre-iOS 26 split previously hid the sidebar on Usage, taking its tabs with it.
*
* 旧版 iPad 的 Usage 侧栏曾随页面切换消失,导致标签栏丢失。
*/
export function workspaceUsesColumns(
tab: WorkspaceTab,
settingsOpen = false,
nativeColumns = true,
splitView = true,
) {
return settingsOpen
? nativeColumns || splitView
: (!nativeColumns && splitView) || tab !== "usage";
}

export interface WorkspaceTabState {
Expand Down
7 changes: 4 additions & 3 deletions apps/mobile/src/features/settings/SettingsRouteScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScroll
import { EmptyState } from "../../components/ui/EmptyState";
import { useAuth, useUser } from "@clerk/expo";
import { useNavigation, useNavigationState } from "@react-navigation/native";
import { use, type ComponentProps } from "react";
import { use, type ComponentProps, type ReactNode } from "react";
import { Platform, View } from "react-native";
import { useNativeColumnLayoutMetrics } from "../../native/native-layout-metrics";
import { deriveProjectGroupLabel } from "@t3tools/client-runtime/state/project-grouping";
Expand Down Expand Up @@ -66,13 +66,14 @@ function useSettingsListPlacement() {
return { sidebar, selected };
}

function SettingsListContent() {
export function SettingsListContent() {
return hasCloudPublicConfig() ? <ConfiguredSettingsRouteScreen /> : <LocalSettingsRouteScreen />;
}

export function SettingsListScreen(props: {
readonly sidebar: boolean;
readonly selected: string | null;
readonly children?: ReactNode;
}) {
const gt = useGT();
const workspace = useWorkspaceTabs();
Expand All @@ -95,7 +96,7 @@ export function SettingsListScreen(props: {
: undefined
}
>
<SettingsListContent />
{props.children ?? <SettingsListContent />}
</SettingsScreen>
</View>
</SettingsSidebarContext>
Expand Down
Loading
Loading