@@ -16,7 +16,7 @@ import {
1616import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands" ;
1717import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout" ;
1818import { useWorkspaceTabs } from "./WorkspaceTabsContext" ;
19- import { useCompactWorkspaceTabs , useSidebarWorkspaceTabs } from "./useSystemWorkspaceTabBar" ;
19+ import { useFloatingWorkspaceTabs , useSidebarWorkspaceTabs } from "./useSystemWorkspaceTabBar" ;
2020import { WorkspaceTabToolbarButtons } from "./WorkspaceSectionToolbar" ;
2121
2222const SEARCH_LABELS = {
@@ -33,7 +33,7 @@ export function WorkspaceToolbar(props: {
3333 const activeNewTask = useActiveNewTask ( ) ;
3434 const deviceType = useDeviceType ( ) ;
3535 const sidebarTabs = useSidebarWorkspaceTabs ( ) ;
36- const compactTabs = useCompactWorkspaceTabs ( ) ;
36+ const floatingTabs = useFloatingWorkspaceTabs ( ) ;
3737 const duoSearch = NATIVE_LIQUID_GLASS_SUPPORTED && isDuoDevice ( deviceType ) ;
3838 const bottomSearch = duoSearch && sidebarTabs !== "picker" ;
3939 // On the Duo, compose belongs to the threads tab, in the detail column's bar when unfolded.
@@ -45,7 +45,7 @@ export function WorkspaceToolbar(props: {
4545 activeNewTask === null ;
4646 const tabActive = use ( NativeWorkspaceTabActivityContext ) ?. active ?? true ;
4747 const focused = useIsFocused ( ) ;
48- const { panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout ( ) ;
48+ const { layout , panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout ( ) ;
4949 const searchRef = useRef < SearchBarCommands > ( null ) ;
5050 // The Settings list takes the selected tab's place, so search follows it.
5151 const selectedTab = workspace . settingsOpen ? "settings" : workspace . state . selectedTab ;
@@ -189,9 +189,9 @@ export function WorkspaceToolbar(props: {
189189 { composeButton }
190190 { selectedTab !== "threads" ||
191191 isDuoDevice ( deviceType ) ||
192- deviceType === "pad" ||
192+ ( deviceType === "pad" && layout . usesSplitView ) ||
193193 sidebarTabs === "picker" ||
194- compactTabs ? null : (
194+ floatingTabs ? null : (
195195 < Toolbar . Button
196196 accessibilityLabel = "New chat"
197197 icon = "square.and.pencil"
0 commit comments