Skip to content

Commit 2a69fce

Browse files
refactor(mobile): add a device type flag for iPad and iPhone Duo UI
Derive "phone" | "duo-folded" | "duo-unfolded" | "pad" once in NativeLayoutMetricsProvider and expose it through useDeviceType(), so iPad- and Duo-specific chrome has one condition to read instead of hand-mixing Platform.isPad, hasHinge and native-column checks. Move the existing call sites onto it with no behavior change. Co-authored-by: Cursor <[email protected]>
1 parent 67bca6c commit 2a69fce

14 files changed

Lines changed: 155 additions & 51 deletions

‎apps/mobile/src/components/ui/AppBar.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ import { Toolbar } from "./Toolbar";
22
import { AppActivityIndicator } from "./AppActivityIndicator";
33
import type { HeaderBarButtonMailSearchToolbarItem } from "react-native-screens";
44
import { useId } from "react";
5-
import { Platform, View } from "react-native";
5+
import { View } from "react-native";
66
import { createNativeHeaderMenu } from "./nativeHeaderMenu.ios";
77
import { ScreenHeaderButton } from "./ScreenHeaderButton";
88
import { NativeStackScreenOptions } from "../../native/StackHeader";
99
import { useNativeWorkspaceColumnsSupported } from "../../native/NativeWorkspaceColumns";
10+
import { useDeviceType } from "../../native/native-layout-metrics";
1011
import { useAdaptiveWorkspaceLayout } from "../../features/layout/AdaptiveWorkspaceLayout";
1112
import {
1213
createNativeMailSearchToolbarItem,
@@ -38,6 +39,7 @@ function mailMenuItems(items: ReadonlyArray<AppBarMenuItem>): MailMenu["items"]
3839

3940
export function AppBar(props: AppBarProps) {
4041
const usesNativeWorkspaceColumns = useNativeWorkspaceColumnsSupported();
42+
const deviceType = useDeviceType();
4143
const headerId = useId();
4244
const { layout, panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
4345
const { themeVariables } = useAppearancePreferences();
@@ -123,9 +125,7 @@ export function AppBar(props: AppBarProps) {
123125
/>
124126
) : null}
125127
{props.sidebar !== false &&
126-
(!usesNativeWorkspaceColumns ||
127-
(Platform.OS === "ios" && Platform.isPad) ||
128-
!panes.primarySidebarVisible) ? (
128+
(!usesNativeWorkspaceColumns || deviceType === "pad" || !panes.primarySidebarVisible) ? (
129129
<ScreenHeaderButton
130130
axisBehavior={usesNativeWorkspaceColumns ? "horizontalOnly" : undefined}
131131
accessibilityLabel={

‎apps/mobile/src/features/home/HomeHeader.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands
1111
import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
1212
import { createNativeMailSearchToolbarItem } from "../layout/native-mail-search-toolbar";
1313
import { useNativeMailSearchToolbar } from "../../native/use-native-mail-search-toolbar";
14+
import { useDeviceType } from "../../native/native-layout-metrics";
1415
import { buildHomeListFilterMenu } from "./home-list-filter-menu";
1516
import { createSidebarHeaderItems } from "../threads/sidebar-native-header-items";
1617
import type { HomeHeaderProps } from "./HomeHeader.types";
@@ -22,12 +23,13 @@ export function HomeHeader(props: HomeHeaderProps) {
2223
const navigation = useNavigation<NativeStackNavigationProp<ParamListBase>>();
2324
const { layout, panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
2425
const usesNativeMailSearchToolbar = useNativeMailSearchToolbar();
26+
const deviceType = useDeviceType();
2527
const primaryColumn = use(NativePrimaryColumnContext);
2628
const sidebarHeader =
2729
Platform.OS === "ios" &&
2830
primaryColumn !== null &&
29-
(Platform.isPad || !usesNativeMailSearchToolbar);
30-
const showsCompactCompose = Platform.OS === "ios" && Platform.isPad && !layout.usesSplitView;
31+
(deviceType === "pad" || !usesNativeMailSearchToolbar);
32+
const showsCompactCompose = deviceType === "pad" && !layout.usesSplitView;
3133
const searchBarRef = useRef<SearchBarCommands>(null);
3234
const focusAfterReveal = useRef(false);
3335
useEffect(

‎apps/mobile/src/features/home/HomeRouteScreen.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { usePendingNewTasks } from "../../state/use-pending-new-tasks";
1717
import { useWorkspaceState } from "../../state/workspace";
1818
import { useSavedRemoteConnections } from "../../state/use-remote-environment-registry";
1919
import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
20-
import { useNativeColumnLayoutMetrics } from "../../native/native-layout-metrics";
20+
import { useDeviceType, useNativeColumnLayoutMetrics } from "../../native/native-layout-metrics";
2121
import { WorkspaceEmptyDetail } from "../layout/WorkspaceEmptyDetail";
2222
import { AndroidScreenHeader } from "../../components/ui/AndroidScreenHeader";
2323
import { checkForAppUpdateOnLaunch, startAppUpdateForegroundRecheck } from "../updates/app-updates";
@@ -37,6 +37,7 @@ export function HomeRouteScreen() {
3737
const { width: windowWidth } = useWindowDimensions();
3838
const nativePrimaryColumn = use(NativePrimaryColumnContext);
3939
const columnMetrics = useNativeColumnLayoutMetrics();
40+
const deviceType = useDeviceType();
4041
const headerWidth = nativePrimaryColumn ? (columnMetrics?.width ?? windowWidth) : windowWidth;
4142
const { layout, panes, primarySidebarSearchQuery, setPrimarySidebarSearchQuery } =
4243
useAdaptiveWorkspaceLayout();
@@ -214,8 +215,7 @@ export function HomeRouteScreen() {
214215
options={{
215216
...getConnectionAwareBrandHeaderOptions({
216217
headerWidth,
217-
trailingItemCount:
218-
nativePrimaryColumn && Platform.OS === "ios" && Platform.isPad ? 2 : 1,
218+
trailingItemCount: nativePrimaryColumn && deviceType === "pad" ? 2 : 1,
219219
onOpenEnvironments: () =>
220220
navigation.navigate("SettingsSheet", {
221221
screen: "SettingsContent",

‎apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ import {
2020
type NativeStackTypeBag,
2121
} from "@react-navigation/native-stack";
2222
import { use, useCallback, useEffect, useMemo, useRef, useState, type ComponentProps } from "react";
23-
import { Platform, View } from "react-native";
23+
import { View } from "react-native";
2424
import { Split, type SplitHostCommands } from "react-native-screens";
2525
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
26+
import { isDuoDevice } from "../../lib/device-type";
2627
import { scopedThreadKey } from "../../lib/scopedEntities";
2728
import { WorkspaceTabsProvider } from "../workspace/WorkspaceTabsContext";
2829
import { WorkspaceNativeTabs } from "../workspace/WorkspaceNativeTabs.ios";
29-
import { useNativeLayoutMetrics } from "../../native/native-layout-metrics";
30+
import { useDeviceType, useNativeLayoutMetrics } from "../../native/native-layout-metrics";
3031

3132
import { useAdaptiveWorkspaceLayout } from "./AdaptiveWorkspaceLayout";
3233
import { WorkspaceEmptyDetail } from "./WorkspaceEmptyDetail";
@@ -124,6 +125,7 @@ function WorkspaceColumns(
124125
props: ViewProps & { readonly primary: Route; readonly detail: Route[] },
125126
) {
126127
const { layout, panes, togglePrimarySidebar, toggleAuxiliaryPane } = useAdaptiveWorkspaceLayout();
128+
const deviceType = useDeviceType();
127129
const inspector = use(NativeWorkspaceInspectorContext);
128130
const hostRef = useRef<SplitHostCommands>(null);
129131
const activeDetailKey = props.detail.at(-1)?.key;
@@ -221,10 +223,7 @@ function WorkspaceColumns(
221223
headerShown: true,
222224
title: "",
223225
unstable_headerRightItems: () =>
224-
Platform.OS === "ios" &&
225-
!Platform.isPad &&
226-
layout.usesSplitView &&
227-
!panes.primarySidebarVisible
226+
isDuoDevice(deviceType) && layout.usesSplitView && !panes.primarySidebarVisible
228227
? [
229228
{
230229
type: "button",

‎apps/mobile/src/features/threads/ThreadFeed.tsx‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ import { SymbolView, type AppSymbolName } from "../../components/ui/AppSymbol";
6666
import { HeaderHeightContext } from "@react-navigation/elements";
6767
import { useFocusEffect, useNavigation } from "@react-navigation/native";
6868
import { useNativeWorkspaceColumnsSupported } from "../../native/NativeWorkspaceColumns";
69+
import { useDeviceType } from "../../native/native-layout-metrics";
70+
import { isDuoDevice } from "../../lib/device-type";
6971
import {
7072
createContext,
7173
memo,
@@ -998,7 +1000,7 @@ function renderFeedEntry(
9981000
readonly reviewCommentColors: ReviewCommentColors;
9991001
readonly reviewCommentBubbleWidth: number;
10001002
readonly themeAppearance: "light" | "dark";
1001-
readonly usesNativeWorkspaceColumns: boolean;
1003+
readonly duoColumns: boolean;
10021004
readonly userBubbleMaxWidth: number;
10031005
readonly markdownContentWidth: number;
10041006
readonly contentWidth: number;
@@ -1189,19 +1191,11 @@ function renderFeedEntry(
11891191
className="min-w-0 gap-2 rounded-[20px] px-3.5 py-2.5"
11901192
style={{
11911193
backgroundColor: userBubbleColor,
1192-
maxWidth:
1193-
props.usesNativeWorkspaceColumns && Platform.OS === "ios" && !Platform.isPad
1194-
? "85%"
1195-
: props.userBubbleMaxWidth,
1194+
maxWidth: props.duoColumns ? "85%" : props.userBubbleMaxWidth,
11961195
...(hasReviewCommentContext
11971196
? { width: props.reviewCommentBubbleWidth }
11981197
: hasWideBlock
1199-
? {
1200-
width:
1201-
props.usesNativeWorkspaceColumns && Platform.OS === "ios" && !Platform.isPad
1202-
? "85%"
1203-
: props.userBubbleMaxWidth,
1204-
}
1198+
? { width: props.duoColumns ? "85%" : props.userBubbleMaxWidth }
12051199
: null),
12061200
}}
12071201
>
@@ -1667,7 +1661,8 @@ function ThreadFeedPlaceholder(props: {
16671661
}
16681662

16691663
export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
1670-
const usesNativeWorkspaceColumns = useNativeWorkspaceColumnsSupported();
1664+
const deviceType = useDeviceType();
1665+
const duoColumns = useNativeWorkspaceColumnsSupported() && isDuoDevice(deviceType);
16711666
const openPullRequest = useOpenPullRequest();
16721667
const navigation = useNavigation();
16731668
const { themeAppearance } = useAppearancePreferences();
@@ -2474,7 +2469,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
24742469
reviewCommentColors,
24752470
reviewCommentBubbleWidth,
24762471
themeAppearance,
2477-
usesNativeWorkspaceColumns,
2472+
duoColumns,
24782473
userBubbleMaxWidth,
24792474
markdownContentWidth,
24802475
contentWidth,
@@ -2513,7 +2508,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
25132508
reviewCommentColors,
25142509
reviewCommentBubbleWidth,
25152510
themeAppearance,
2516-
usesNativeWorkspaceColumns,
2511+
duoColumns,
25172512
userBubbleMaxWidth,
25182513
markdownContentWidth,
25192514
contentWidth,
@@ -2568,10 +2563,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
25682563
// Horizontal Duo reservations are already included in the row padding.
25692564
contentInsetAdjustmentBehavior={
25702565
usesNativeAutomaticInsets
2571-
? usesNativeWorkspaceColumns &&
2572-
Platform.OS === "ios" &&
2573-
!Platform.isPad &&
2574-
props.layoutVariant === "split"
2566+
? duoColumns && props.layoutVariant === "split"
25752567
? "scrollableAxes"
25762568
: "automatic"
25772569
: "never"

‎apps/mobile/src/features/threads/useThreadHeaderOptions.tsx‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { StackActions, useNavigation } from "@react-navigation/native";
22
import { useMemo } from "react";
3-
import { Platform } from "react-native";
3+
import { isDuoDevice } from "../../lib/device-type";
44
import type { AppNativeStackNavigationOptions } from "../../native/StackHeader";
5+
import { useDeviceType } from "../../native/native-layout-metrics";
56
import { useNativeWorkspaceColumnsSupported } from "../../native/NativeWorkspaceColumns";
67
import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
78
import { withNativeGlassHeaderItem } from "../layout/native-glass-header-items";
@@ -23,7 +24,8 @@ export function useThreadHeaderOptions(props: {
2324
readonly onReturnToThread?: () => void;
2425
}) {
2526
const usesNativeWorkspaceColumns = useNativeWorkspaceColumnsSupported();
26-
const usesDuoHeader = usesNativeWorkspaceColumns && Platform.OS === "ios" && !Platform.isPad;
27+
const deviceType = useDeviceType();
28+
const usesDuoHeader = usesNativeWorkspaceColumns && isDuoDevice(deviceType);
2729
const navigation = useNavigation();
2830
const { layout, panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
2931
const threadCenterHeaderItems = useThreadGitCenterHeaderItems(props.gitControls);
@@ -103,10 +105,7 @@ export function useThreadHeaderOptions(props: {
103105
() => [
104106
...threadCenterHeaderItems,
105107
{ type: "spacing", spacing: 8 },
106-
...(layout.usesSplitView &&
107-
Platform.OS === "ios" &&
108-
!Platform.isPad &&
109-
!panes.primarySidebarVisible
108+
...(layout.usesSplitView && !panes.primarySidebarVisible
110109
? [
111110
withNativeGlassHeaderItem({
112111
type: "button" as const,

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useNativeLayoutMetrics } from "../../native/native-layout-metrics";
1+
import { useDeviceType, useNativeLayoutMetrics } from "../../native/native-layout-metrics";
22
import { useCallback, useMemo, useState, type ReactNode } from "react";
33
import { Keyboard, Platform, View, type NativeSyntheticEvent } from "react-native";
44
import {
@@ -52,8 +52,11 @@ export function WorkspaceNativeTabs(props: {
5252
}) {
5353
const workspace = useWorkspaceTabs()!;
5454
const metrics = useNativeLayoutMetrics();
55+
const deviceType = useDeviceType();
5556
const phoneBar =
56-
Platform.OS === "ios" && !Platform.isPad && (metrics?.verticalBarEdge ?? "none") === "none";
57+
Platform.OS === "ios" &&
58+
deviceType !== "pad" &&
59+
(metrics?.verticalBarEdge ?? "none") === "none";
5760
const [provenance, setProvenance] = useState(0);
5861
const systemTabBar = useSystemWorkspaceTabBar();
5962
const selectedTab = workspace.state.selectedTab;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { AndroidScreenHeader } from "../../components/ui/AndroidScreenHeader";
99
import { NativeStackScreenOptions } from "../../native/StackHeader";
1010
import { NativePrimaryColumnContext } from "../../native/v5-workspace-context";
1111
import {
12+
useDeviceType,
1213
useNativeColumnLayoutMetrics,
1314
useNativeLayoutMetrics,
1415
} from "../../native/native-layout-metrics";
@@ -57,13 +58,14 @@ function WorkspaceRootContent() {
5758
const primaryColumn = use(NativePrimaryColumnContext);
5859
const columnMetrics = useNativeColumnLayoutMetrics();
5960
const nativeMetrics = useNativeLayoutMetrics();
61+
const deviceType = useDeviceType();
6062
const systemTabBar = useSystemWorkspaceTabBar();
6163
const sidebarTabs = useSidebarWorkspaceTabs();
6264
const sidebarPicker = sidebarTabs === "picker";
6365
const sidebarNavigation =
6466
primaryColumn !== null &&
6567
(layout.usesSplitView ||
66-
(Platform.OS === "ios" && Platform.isPad) ||
68+
deviceType === "pad" ||
6769
(nativeMetrics !== null && nativeMetrics.verticalBarEdge !== "none"));
6870
const width = columnMetrics?.width ?? windowWidth;
6971
const insets = useSafeAreaInsets();

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Toolbar } from "../../components/ui/Toolbar";
22
import { useFocusEffect, useNavigation } from "@react-navigation/native";
33
import { use, useCallback, useEffect, useRef } from "react";
44
import { Platform } from "react-native";
5-
import { useNativeLayoutMetrics } from "../../native/native-layout-metrics";
5+
import { useDeviceType, useNativeLayoutMetrics } from "../../native/native-layout-metrics";
66
import type { SearchBarCommands } from "react-native-screens";
77

88
import { NATIVE_LIQUID_GLASS_SUPPORTED } from "../../native/native-glass";
@@ -25,12 +25,15 @@ export function WorkspaceToolbar(props: {
2525
const workspace = useWorkspaceTabs()!;
2626
const navigation = useNavigation();
2727
const metrics = useNativeLayoutMetrics();
28+
const deviceType = useDeviceType();
2829
const sidebarTabs = useSidebarWorkspaceTabs();
2930
const selectTab = useSelectWorkspaceTab();
3031
const selectedTint = useMobileNavigationTheme().colors.primary;
3132
const nativeToolbarCompose =
3233
Platform.OS === "ios" &&
33-
(Platform.isPad || sidebarTabs !== null || (metrics?.verticalBarEdge ?? "none") !== "none");
34+
(deviceType === "pad" ||
35+
sidebarTabs !== null ||
36+
(metrics?.verticalBarEdge ?? "none") !== "none");
3437
const { isTabActive } = workspace;
3538
const tabActive = use(NativeWorkspaceTabActivityContext)?.active ?? true;
3639
const { panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();

‎apps/mobile/src/features/workspace/useSystemWorkspaceTabBar.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
import { Platform } from "react-native";
22
import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
3-
import { useNativeLayoutMetrics } from "../../native/native-layout-metrics";
3+
import { useDeviceType, useNativeLayoutMetrics } from "../../native/native-layout-metrics";
44

55
/** Where an iOS split window shows the workspace tabs instead of UIKit's tab bar. */
66
export function useSidebarWorkspaceTabs(): "picker" | "toolbar" | null {
77
const { layout } = useAdaptiveWorkspaceLayout();
8+
const deviceType = useDeviceType();
89
const metrics = useNativeLayoutMetrics();
910
if (Platform.OS !== "ios" || !layout.usesSplitView) return null;
10-
if (Platform.isPad) return "picker";
11+
if (deviceType === "pad") return "picker";
1112
// The Duo's side rail carries UIKit's tabs. Unfolded in portrait it has no
1213
// rail, so the tabs sit in the thread list's own toolbar.
1314
return (metrics?.verticalBarEdge ?? "none") === "none" ? "toolbar" : null;

0 commit comments

Comments
 (0)