@@ -11,6 +11,8 @@ import {
1111 workspaceSearchBottomClearance ,
1212 workspaceDockBottomClearance ,
1313 workspaceUsesColumns ,
14+ type WorkspaceTab ,
15+ type WorkspaceTabsState ,
1416} from "./workspace-tabs-state" ;
1517
1618describe ( "compact list clearance" , ( ) => {
@@ -179,12 +181,25 @@ describe("workspace root navigation", () => {
179181 } ) ;
180182} ) ;
181183
182- const mocks = vi . hoisted ( ( ) => ( { split : false , floating : false } ) ) ;
184+ const mocks = vi . hoisted ( ( ) => ( {
185+ split : false ,
186+ floating : false ,
187+ state : undefined as WorkspaceTabsState | undefined ,
188+ openWorkspaceTab : ( _tab : string ) => { } ,
189+ backListeners : new Set < ( ) => boolean > ( ) ,
190+ } ) ) ;
183191
184192vi . mock ( "../../settings/appearance/AppearancePreferencesProvider" , ( ) => ( {
185193 useAndroidFloatingTabs : ( ) => mocks . floating ,
186194} ) ) ;
187195vi . mock ( "react-native" , ( ) => ( {
196+ BackHandler : {
197+ addEventListener : ( _event : string , listener : ( ) => boolean ) => {
198+ mocks . backListeners . add ( listener ) ;
199+ return { remove : ( ) => mocks . backListeners . delete ( listener ) } ;
200+ } ,
201+ } ,
202+ Keyboard : { dismiss : ( ) => undefined } ,
188203 useWindowDimensions : ( ) => ( { width : 400 , height : 800 } ) ,
189204 View : ( { children } : { children : ReactNode } ) => createElement ( "div" , null , children ) ,
190205} ) ) ;
@@ -198,12 +213,16 @@ vi.mock("../AdaptiveWorkspaceLayout", () => ({
198213 startNewTask : ( ) => undefined ,
199214 } ) ,
200215} ) ) ;
216+ vi . mock ( "@react-navigation/native" , ( ) => ( { useIsFocused : ( ) => true } ) ) ;
217+ vi . mock ( "../adaptive-workspace-context" , ( ) => ( {
218+ useAdaptiveWorkspaceLayout : ( ) => ( { openWorkspaceTab : mocks . openWorkspaceTab } ) ,
219+ } ) ) ;
201220vi . mock ( "./navigation-tabs" , ( ) => ( {
202221 useEnabledNavigationTabs : ( ) => [ "threads" , "pullRequests" , "usage" ] ,
203222} ) ) ;
204223vi . mock ( "./WorkspaceTabsContext" , ( ) => ( {
205224 WorkspaceTabsContext : createContext ( null ) ,
206- useWorkspaceTabs : ( ) => ( { state : { selectedTab : "usage" } } ) ,
225+ useWorkspaceTabs : ( ) => ( { state : mocks . state , dispatch : ( ) => undefined } ) ,
207226} ) ) ;
208227vi . mock ( "./WorkspaceExtraTab" , ( ) => ( {
209228 WorkspaceExtraTab : function UsageProbe ( ) {
@@ -238,13 +257,37 @@ vi.mock("../../../components/ui/WorkspaceAppBar.android", () => ({
238257 WorkspaceAppBarScope : ( { children } : { children : ReactNode } ) => children ,
239258} ) ) ;
240259
241- function setup ( split : boolean , floating : boolean ) {
260+ function setup ( split : boolean , floating : boolean , state = selected ( "usage" ) ) {
242261 mocks . split = split ;
243262 mocks . floating = floating ;
263+ mocks . state = state ;
264+ mocks . openWorkspaceTab = ( ) => undefined ;
265+ mocks . backListeners . clear ( ) ;
244266 vi . stubGlobal ( "IS_REACT_ACT_ENVIRONMENT" , true ) ;
245267 return { [ Symbol . dispose ] : ( ) => vi . unstubAllGlobals ( ) } ;
246268}
247269
270+ function selected ( tab : WorkspaceTab ) {
271+ return workspaceTabsReducer ( initialWorkspaceTabsState ( ) , { type : "select" , tab } ) ;
272+ }
273+
274+ /** Android calls the newest listener first and stops at the first that handles Back. */
275+ function pressBack ( ) {
276+ return [ ...mocks . backListeners ] . reverse ( ) . some ( ( listener ) => listener ( ) ) ;
277+ }
278+
279+ it ( "Back from the Pulls tab returns to Threads instead of leaving the app" , async ( ) => {
280+ using _actEnvironment = setup ( false , false , selected ( "pullRequests" ) ) ;
281+ const opened : string [ ] = [ ] ;
282+ mocks . openWorkspaceTab = ( tab ) => opened . push ( tab ) ;
283+ const root = createRoot ( document . createElement ( "div" ) ) ;
284+ using _root = { [ Symbol . dispose ] : ( ) => act ( ( ) => root . unmount ( ) ) } ;
285+ await act ( async ( ) => root . render ( createElement ( WorkspaceRootScreen ) ) ) ;
286+
287+ expect ( pressBack ( ) ) . toBe ( true ) ;
288+ expect ( opened ) . toEqual ( [ "threads" ] ) ;
289+ } ) ;
290+
248291it . each ( [
249292 [ false , false ] ,
250293 [ true , false ] ,
0 commit comments