@@ -11,6 +11,12 @@ import { NativeWorkspaceTabActivityContext } from "../../native/v5-workspace-con
1111import { useHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands" ;
1212import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout" ;
1313import { useWorkspaceTabs } from "./WorkspaceTabsContext" ;
14+ import { useSidebarWorkspaceTabs } from "./useSystemWorkspaceTabBar" ;
15+ import { useSelectWorkspaceTab } from "./useSelectWorkspaceTab" ;
16+ import { useMobileNavigationTheme } from "../../lib/useMobileNavigationTheme" ;
17+
18+ // Tabler's git-pull-request geometry, shared with the UIKit tab bar.
19+ const PULL_REQUEST_ICON = require ( "../../../assets/icons/pull-request.png" ) ;
1420
1521export function WorkspaceToolbar ( props : {
1622 readonly onNewTask : ( ) => void ;
@@ -19,8 +25,12 @@ export function WorkspaceToolbar(props: {
1925 const workspace = useWorkspaceTabs ( ) ! ;
2026 const navigation = useNavigation ( ) ;
2127 const metrics = useNativeLayoutMetrics ( ) ;
28+ const sidebarTabs = useSidebarWorkspaceTabs ( ) ;
29+ const selectTab = useSelectWorkspaceTab ( ) ;
30+ const selectedTint = useMobileNavigationTheme ( ) . colors . primary ;
2231 const nativeToolbarCompose =
23- Platform . OS === "ios" && ( Platform . isPad || ( metrics ?. verticalBarEdge ?? "none" ) !== "none" ) ;
32+ Platform . OS === "ios" &&
33+ ( Platform . isPad || sidebarTabs !== null || ( metrics ?. verticalBarEdge ?? "none" ) !== "none" ) ;
2434 const { isTabActive } = workspace ;
2535 const tabActive = use ( NativeWorkspaceTabActivityContext ) ?. active ?? true ;
2636 const { panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout ( ) ;
@@ -122,6 +132,24 @@ export function WorkspaceToolbar(props: {
122132 ) }
123133 </ Toolbar >
124134 < Toolbar placement = "bottom" >
135+ { sidebarTabs === "toolbar" ? (
136+ < Toolbar . Button
137+ identifier = "workspace-tab-threads"
138+ accessibilityLabel = "Threads"
139+ icon = { selectedTab === "threads" ? "text.bubble.fill" : "text.bubble" }
140+ tintColor = { selectedTab === "threads" ? selectedTint : undefined }
141+ onPress = { ( ) => selectTab ( "threads" ) }
142+ />
143+ ) : null }
144+ { sidebarTabs === "toolbar" ? (
145+ < Toolbar . Button
146+ identifier = "workspace-tab-pull-requests"
147+ accessibilityLabel = "Pull requests"
148+ icon = { { type : "image" , source : PULL_REQUEST_ICON , tinted : true } }
149+ tintColor = { selectedTab === "pullRequests" ? selectedTint : undefined }
150+ onPress = { ( ) => selectTab ( "pullRequests" ) }
151+ />
152+ ) : null }
125153 { nativeToolbarCompose ? < Toolbar . Spacer flexible /> : null }
126154 { nativeToolbarCompose ? (
127155 < Toolbar . Button
0 commit comments