Skip to content

Commit 9852a23

Browse files
committed
fix(ios): move iPad tabs with the primary column
1 parent d070f73 commit 9852a23

2 files changed

Lines changed: 30 additions & 4 deletions

File tree

‎apps/mobile/src/features/workspace/WorkspaceNativeTabs.ios.tsx‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@ import {
33
NAVIGATION_TAB_ICONS,
44
useEnabledNavigationTabs,
55
} from "./navigation-tabs";
6-
import { useCallback, useLayoutEffect, useMemo, useRef, useState, type ReactNode } from "react";
6+
import {
7+
use,
8+
useCallback,
9+
useLayoutEffect,
10+
useMemo,
11+
useRef,
12+
useState,
13+
type ReactNode,
14+
} from "react";
715
import { View, useWindowDimensions, type NativeSyntheticEvent } from "react-native";
816
import { Tabs, type TabSelectedEvent, type TabSelectionRejectedEvent } from "react-native-screens";
917

@@ -16,6 +24,7 @@ import {
1624
} from "./workspace-tabs-state";
1725
import {
1826
NativeWorkspaceTabActivityContext,
27+
NativeWorkspaceModeContext,
1928
WorkspaceSlotOptionsContext,
2029
} from "../../native/v5-workspace-context";
2130
import { useCompactWorkspaceTabs, useSystemWorkspaceTabBar } from "./useSystemWorkspaceTabBar";
@@ -86,12 +95,18 @@ export function WorkspaceNativeTabs(props: {
8695
const [provenance, setProvenance] = useState(0);
8796
const systemTabBar = useSystemWorkspaceTabBar();
8897
const deviceType = useDeviceType();
98+
const nativeColumns = use(NativeWorkspaceModeContext);
8999
const compactTabs = useCompactWorkspaceTabs();
90100
const { layout, startNewTask } = useAdaptiveWorkspaceLayout();
91101
const compactSidebarTabs = deviceType === "phone" || !layout.usesSplitView;
92102
const { width } = useWindowDimensions();
93103
const { colors } = useControlTheme();
94104
const selectedTab = workspace.state.selectedTab;
105+
// The primary screen carries its picker through UIKit collapse and Back transitions.
106+
const primaryColumnTabs =
107+
deviceType === "pad" &&
108+
nativeColumns &&
109+
workspaceUsesColumns(selectedTab, workspace.settingsOpen);
95110
const selectedSlot = workspace.settingsOpen ? -1 : primaryTabs.indexOf(selectedTab);
96111
const request = useMemo(
97112
() => ({
@@ -157,7 +172,8 @@ export function WorkspaceNativeTabs(props: {
157172
);
158173
})}
159174
</Tabs.Host>
160-
{(deviceType === "pad" ||
175+
{!primaryColumnTabs &&
176+
(deviceType === "pad" ||
161177
compactTabs ||
162178
(layout.primarySidebarOverlaysContent &&
163179
!workspaceUsesColumns(selectedTab, workspace.settingsOpen))) &&

‎apps/mobile/src/features/workspace/WorkspaceRootScreen.tsx‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ function WorkspaceRootContent() {
8787
const enabled = useEnabledNavigationTabs();
8888
const sidebarTabs = useSidebarWorkspaceTabs();
8989
const sidebarPicker = sidebarTabs === "picker" || (deviceType === "pad" && layout.usesSplitView);
90+
const primaryColumnTabs = deviceType === "pad" && primaryColumn !== null;
91+
const compactPrimaryTabs = primaryColumnTabs && !layout.usesSplitView;
9092
const sidebarNavigation =
9193
primaryColumn !== null &&
9294
(layout.usesSplitView ||
@@ -215,8 +217,16 @@ function WorkspaceRootContent() {
215217
<WorkspaceExtraTab tab={state.selectedTab} />
216218
)}
217219
</SafeAreaInsetsContext>
218-
{deviceType !== "pad" && deviceType !== "phone" && sidebarPicker ? (
219-
<WorkspaceSidebarTabs />
220+
{primaryColumnTabs || (deviceType !== "pad" && deviceType !== "phone" && sidebarPicker) ? (
221+
<WorkspaceSidebarTabs
222+
compact={compactPrimaryTabs}
223+
reserveComposeSpace={compactPrimaryTabs}
224+
onNewTask={
225+
compactPrimaryTabs && !settingsOpen && state.selectedTab === "threads"
226+
? startNewTask
227+
: undefined
228+
}
229+
/>
220230
) : null}
221231
{/* Android's Settings list carries its own search in its app bar. */}
222232
{enabled.length === 0 && !settingsOpen ? null : (

0 commit comments

Comments
 (0)