@@ -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" ;
715import { View , useWindowDimensions , type NativeSyntheticEvent } from "react-native" ;
816import { Tabs , type TabSelectedEvent , type TabSelectionRejectedEvent } from "react-native-screens" ;
917
@@ -16,6 +24,7 @@ import {
1624} from "./workspace-tabs-state" ;
1725import {
1826 NativeWorkspaceTabActivityContext ,
27+ NativeWorkspaceModeContext ,
1928 WorkspaceSlotOptionsContext ,
2029} from "../../native/v5-workspace-context" ;
2130import { 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 ) ) ) &&
0 commit comments