TypeScript
fix(mobile): iPad workspace tabs live in the sidebar and leave with it (#27229)
Julius Marmingee04464dd6861
diff --git a/apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx b/apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsxindex 4f96d1afe57..bede4e8a6c9 100644--- a/apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx+++ b/apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx@@ -19,7 +19,15 @@ import {type NativeStackNavigatorProps,type NativeStackTypeBag,} from "@react-navigation/native-stack";-import { Fragment, use, useEffect, useRef, useState, type ComponentProps } from "react";+import {+ Fragment,+ use,+ useEffect,+ useRef,+ useState,+ type ComponentProps,+ type ReactNode,+} from "react";import { StyleSheet, View } from "react-native";import { Split, type SplitHostCommands } from "react-native-screens";import { SafeAreaView } from "react-native-safe-area-context";@@ -27,7 +35,10 @@ import { GestureHandlerRootView } from "react-native-gesture-handler";import { EnvironmentId, ThreadId } from "@t3tools/contracts";import { scopedThreadKey } from "../../lib/scopedEntities";import { WorkspaceTabsProvider, useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";-import { WorkspaceNativeTabs } from "../workspace/WorkspaceNativeTabs.ios";+import {+ WorkspaceNativeTabs,+ WorkspaceSidebarTabsFooter,+} from "../workspace/WorkspaceNativeTabs.ios";import { workspaceUsesColumns } from "../workspace/workspace-tabs-state";import { isSettingsRoute, settingsOpenIn } from "../settings/settings-navigation";import { workspaceRoutesOf } from "./workspace-overlay-routes";@@ -91,6 +102,7 @@ function ColumnScreen(props: {readonly onAppearance: (type: "willAppear" | "didAppear" | "willDisappear", key: string) => void;readonly onCompose?: () => void;readonly navigation: ViewProps["navigation"];+ readonly footer?: ReactNode;}) {const { descriptor } = props;// Options a screen set inside this workspace tab slot, over its route's.@@ -159,6 +171,7 @@ function ColumnScreen(props: {<Fragment key={key}>{descriptor.render()}</Fragment></NativePrimaryColumnContext></ColumnContent>+ {props.footer}</NavigationRouteContext></NavigationContext></PaneContext>@@ -385,6 +398,16 @@ function WorkspaceColumns(<ColumnScreendescriptor={primary}primary+ footer={+ deviceType === "pad" ? (+ <View+ pointerEvents="box-none"+ style={{ position: "absolute", left: 0, right: 0, bottom: 0, height: 128 }}+ >+ <WorkspaceSidebarTabsFooter />+ </View>+ ) : undefined+ }selectedThreadKey={selectedThreadKey}selectedPullRequestKey={selectedPullRequestKey}onDismiss={handleNativeDismiss}@@ -471,6 +494,7 @@ function WorkspaceColumns(function WorkspaceStackView(props: ViewProps & { readonly nativeColumns: boolean }) {const { layout } = useAdaptiveWorkspaceLayout();+ const deviceType = useDeviceType();const workspace = useWorkspaceTabs()!;// Native dismiss commits the route pop after the transition. Restore the dock// when the primary screen starts appearing, including interactive back gestures.@@ -504,6 +528,7 @@ function WorkspaceStackView(props: ViewProps & { readonly nativeColumns: booleanoptions: { headerShown: false },render: () => (<WorkspaceNativeTabs+ tabsInSidebarColumn={props.nativeColumns && !workspacePage && deviceType === "pad"}hidden={!workspacePage &&projection.detail.length > 0 &&diff --git a/apps/mobile/src/features/workspace/WorkspaceNativeTabs.ios.tsx b/apps/mobile/src/features/workspace/WorkspaceNativeTabs.ios.tsxindex c294d22cc8e..fbf99fb155f 100644--- a/apps/mobile/src/features/workspace/WorkspaceNativeTabs.ios.tsx+++ b/apps/mobile/src/features/workspace/WorkspaceNativeTabs.ios.tsx@@ -73,6 +73,8 @@ function RetainedWorkspaceTab(props: {export function WorkspaceNativeTabs(props: {readonly children: ReactNode;readonly hidden: boolean;+ /** The sidebar column draws the tabs itself, so they leave with it. */+ readonly tabsInSidebarColumn?: boolean;}) {const workspace = useWorkspaceTabs()!;const order = useEnabledNavigationTabs();@@ -83,7 +85,13 @@ export function WorkspaceNativeTabs(props: {const systemTabBar = useSystemWorkspaceTabBar();const deviceType = useDeviceType();const compactTabs = useCompactWorkspaceTabs();- const { layout, startNewTask } = useAdaptiveWorkspaceLayout();+ const { layout, panes } = useAdaptiveWorkspaceLayout();+ // The tabs belong to the sidebar; over a page with the sidebar hidden they'd cover the composer.+ const hiddenWithSidebar =+ deviceType === "pad" &&+ layout.usesSplitView &&+ workspaceUsesColumns(workspace.state.selectedTab, workspace.settingsOpen) &&+ !panes.primarySidebarVisible;const floatingTabs = useFloatingWorkspaceTabs();const { width } = useWindowDimensions();const { colors } = useControlTheme();@@ -153,7 +161,9 @@ export function WorkspaceNativeTabs(props: {compactTabs ||(layout.variant === "medium" &&!workspaceUsesColumns(selectedTab, workspace.settingsOpen))) &&- !props.hidden ? (+ !props.hidden &&+ !props.tabsInSidebarColumn &&+ !hiddenWithSidebar ? (<ViewpointerEvents="box-none"style={{@@ -168,17 +178,27 @@ export function WorkspaceNativeTabs(props: {height: 128,}}>- <WorkspaceSidebarTabs- compact={floatingTabs}- reserveComposeSpace={floatingTabs}- onNewTask={- floatingTabs && !workspace.settingsOpen && selectedTab === "threads"- ? startNewTask- : undefined- }- />+ <WorkspaceSidebarTabsFooter /></View>) : null}</View>);}++/** The workspace tabs at the foot of the sidebar. */+export function WorkspaceSidebarTabsFooter() {+ const workspace = useWorkspaceTabs()!;+ const { startNewTask } = useAdaptiveWorkspaceLayout();+ const compact = useFloatingWorkspaceTabs();+ return (+ <WorkspaceSidebarTabs+ compact={compact}+ reserveComposeSpace={compact}+ onNewTask={+ compact && !workspace.settingsOpen && workspace.state.selectedTab === "threads"+ ? startNewTask+ : undefined+ }+ />+ );+}