@@ -24,10 +24,12 @@ import { NativeWorkspaceTabActivityContext } from "../../native/v5-workspace-con
2424import { useCompactWorkspaceTabs , useSystemWorkspaceTabBar } from "./useSystemWorkspaceTabBar" ;
2525import { useControlTheme } from "../../components/ui/useControlTheme" ;
2626import { useDeviceType } from "../../native/native-layout-metrics" ;
27+ import { dispatchHardwareKeyboardCommand } from "../keyboard/hardwareKeyboardCommands" ;
2728import { WorkspaceSidebarTabs } from "./WorkspaceSidebarTabs" ;
2829import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout" ;
2930
3031const PULL_REQUEST_ICON = require ( "../../../assets/icons/pull-request.png" ) ;
32+ const SEARCH_SLOT = "search" ;
3133
3234/** Retain each native controller tree; removing its root can leave RNS's stack empty. */
3335function RetainedWorkspaceTab ( props : {
@@ -76,6 +78,15 @@ export function WorkspaceNativeTabs(props: {
7678 const { width } = useWindowDimensions ( ) ;
7779 const { colors } = useControlTheme ( ) ;
7880 const selectedTab = workspace . state . selectedTab ;
81+ const searchTab = deviceType === "duo-folded" ;
82+ const openSearch = ( ) => {
83+ if ( workspace . settingsOpen ) navigation . goBack ( ) ;
84+ if ( workspace . settingsOpen || ! workspaceUsesColumns ( selectedTab ) ) {
85+ props . onSelect ( ) ;
86+ workspace . dispatch ( { type : "select" , tab : "threads" } ) ;
87+ requestAnimationFrame ( ( ) => dispatchHardwareKeyboardCommand ( "focusSearch" ) ) ;
88+ } else dispatchHardwareKeyboardCommand ( "focusSearch" ) ;
89+ } ;
7990 const selectedSlot = workspace . settingsOpen ? - 1 : primaryTabs . indexOf ( selectedTab ) ;
8091 const request = useMemo (
8192 ( ) => ( {
@@ -98,6 +109,10 @@ export function WorkspaceNativeTabs(props: {
98109 onTabSelectionPrevented = { ( {
99110 nativeEvent,
100111 } : NativeSyntheticEvent < TabSelectionPreventedEvent > ) => {
112+ if ( nativeEvent . preventedScreenKey === SEARCH_SLOT ) {
113+ openSearch ( ) ;
114+ return ;
115+ }
101116 if ( nativeEvent . preventedScreenKey === "settings" ) {
102117 navigation . navigate ( "SettingsSheet" , {
103118 screen : "SettingsContent" ,
@@ -113,6 +128,10 @@ export function WorkspaceNativeTabs(props: {
113128 onTabSelected = { ( { nativeEvent } : NativeSyntheticEvent < TabSelectedEvent > ) => {
114129 setProvenance ( nativeEvent . provenance ) ;
115130 if ( nativeEvent . actionOrigin === "programmatic-js" ) return ;
131+ if ( nativeEvent . selectedScreenKey === SEARCH_SLOT ) {
132+ openSearch ( ) ;
133+ return ;
134+ }
116135 const tab = workspaceTabForNativeSlot ( primaryTabs , nativeEvent . selectedScreenKey ) ;
117136 // UIKit sends reselects here even when preventNativeSelection is enabled.
118137 if ( tab === "settings" ) {
@@ -162,6 +181,24 @@ export function WorkspaceNativeTabs(props: {
162181 </ Tabs . Screen >
163182 ) ;
164183 } ) }
184+ { searchTab ? (
185+ // UIKit sets a search tab apart below the others, like Photos. It never becomes
186+ // selected: pressing it opens the current list's own search.
187+ < Tabs . Screen
188+ key = { SEARCH_SLOT }
189+ screenKey = { SEARCH_SLOT }
190+ title = ""
191+ tabBarItemAccessibilityLabel = "Search"
192+ preventNativeSelection
193+ ios = { {
194+ role : "search" ,
195+ systemItem : "search" ,
196+ automaticallyActivatesSearch : true ,
197+ } }
198+ >
199+ < View />
200+ </ Tabs . Screen >
201+ ) : null }
165202 </ Tabs . Host >
166203 { ( deviceType === "pad" ||
167204 compactTabs ||
0 commit comments