@@ -12,8 +12,10 @@ import { CompactBrandTitle } from "../../components/CompactBrandTitle";
1212import { AndroidScreenHeader } from "../../components/ui/AndroidScreenHeader" ;
1313import { NativeStackScreenOptions } from "../../native/StackHeader" ;
1414import { NativePrimaryColumnContext } from "../../native/v5-workspace-context" ;
15+ import { isDuoDevice } from "../../lib/device-type" ;
1516import {
1617 useDeviceType ,
18+ useDuoBottomBarInset ,
1719 useNativeColumnLayoutMetrics ,
1820 useNativeLayoutMetrics ,
1921} from "../../native/native-layout-metrics" ;
@@ -28,7 +30,11 @@ import {
2830 useWorkspaceTabs ,
2931} from "./WorkspaceTabsContext" ;
3032import { WorkspaceToolbar } from "./WorkspaceToolbar" ;
31- import { WORKSPACE_DOCK , workspaceToolbarHeight } from "./workspace-tabs-state" ;
33+ import {
34+ WORKSPACE_DOCK ,
35+ workspaceSearchBottomClearance ,
36+ workspaceToolbarHeight ,
37+ } from "./workspace-tabs-state" ;
3238import { WorkspaceSidebarTabs } from "./WorkspaceSidebarTabs" ;
3339import {
3440 useCompactWorkspaceTabs ,
@@ -79,6 +85,7 @@ function WorkspaceRootContent() {
7985 ( nativeMetrics !== null && nativeMetrics . verticalBarEdge !== "none" ) ) ;
8086 const width = columnMetrics ?. width ?? windowWidth ;
8187 const insets = useSafeAreaInsets ( ) ;
88+ const bottomBarInset = useDuoBottomBarInset ( ) ;
8289 const keyboardHeight = useKeyboardState ( ( keyboard ) => keyboard . height ) ;
8390 const workspace = useWorkspaceTabs ( ) ! ;
8491 const { state } = workspace ;
@@ -97,18 +104,25 @@ function WorkspaceRootContent() {
97104 [ width , navigation ] ,
98105 ) ;
99106 const tab = state . tabs [ state . selectedTab ] ;
100- const bottomClearance = compactTabs
101- ? 64 + insets . bottom + 16
102- : Platform . OS === "ios"
103- ? Math . max ( insets . bottom , keyboardHeight ) +
104- ( systemTabBar || sidebarTabs || tab . searchMode !== "resting"
105- ? sidebarPicker
106- ? 80
107- : 16
108- : WORKSPACE_DOCK . height + WORKSPACE_DOCK . bottomGap + 16 )
109- : keyboardHeight > 0 && tab . searchMode !== "resting"
110- ? keyboardHeight + 64
111- : Math . max ( insets . bottom , 12 ) + workspaceToolbarHeight ( tab . searchMode ) + 16 ;
107+ const bottomClearance =
108+ Platform . OS === "ios" && isDuoDevice ( deviceType )
109+ ? workspaceSearchBottomClearance ( {
110+ bottomInset : insets . bottom ,
111+ bottomBarInset,
112+ keyboardHeight,
113+ } )
114+ : compactTabs
115+ ? 64 + insets . bottom + 16
116+ : Platform . OS === "ios"
117+ ? Math . max ( insets . bottom , keyboardHeight ) +
118+ ( systemTabBar || sidebarTabs || tab . searchMode !== "resting"
119+ ? sidebarPicker
120+ ? 80
121+ : 16
122+ : WORKSPACE_DOCK . height + WORKSPACE_DOCK . bottomGap + 16 )
123+ : keyboardHeight > 0 && tab . searchMode !== "resting"
124+ ? keyboardHeight + 64
125+ : Math . max ( insets . bottom , 12 ) + workspaceToolbarHeight ( tab . searchMode ) + 16 ;
112126 const context = useMemo ( ( ) => ( { ...workspace , bottomClearance } ) , [ workspace , bottomClearance ] ) ;
113127
114128 return (
0 commit comments