@@ -233,6 +233,24 @@ function AdaptiveWorkspaceLayoutContent(
233233 ( ) => deriveLayout ( { width : viewportWidth , height, nativeMetrics, nativeWorkspace } ) ,
234234 [ height , viewportWidth , nativeMetrics , nativeWorkspace ] ,
235235 ) ;
236+ const [ overlaySidebar , setOverlaySidebar ] = useState ( {
237+ active : baseLayout . primarySidebarOverlaysContent ,
238+ pathname,
239+ visible : pathname === "/" ,
240+ } ) ;
241+ if (
242+ overlaySidebar . active !== baseLayout . primarySidebarOverlaysContent ||
243+ ( overlaySidebar . active && overlaySidebar . pathname !== pathname )
244+ ) {
245+ setOverlaySidebar ( {
246+ active : baseLayout . primarySidebarOverlaysContent ,
247+ pathname,
248+ visible : pathname === "/" ,
249+ } ) ;
250+ }
251+ const preferredSidebarVisible = baseLayout . primarySidebarOverlaysContent
252+ ? overlaySidebar . visible
253+ : primarySidebarPreferredVisible ;
236254 const primarySidebarPinned = isPrimarySidebarPinned ( {
237255 pathname,
238256 nativeWorkspace,
@@ -250,7 +268,7 @@ function AdaptiveWorkspaceLayoutContent(
250268 ) ;
251269 const showPrimarySidebar =
252270 ! workspacePage &&
253- ( primarySidebarPinned || ( primarySidebarPreferredVisible && ! composerKeyboardActive ) ) ;
271+ ( primarySidebarPinned || ( preferredSidebarVisible && ! composerKeyboardActive ) ) ;
254272 const shouldRenderNavigationRail = Platform . OS === "android" && baseLayout . usesSplitView ;
255273 const navigationRailWidth =
256274 shouldRenderNavigationRail && ( showPrimarySidebar || workspacePage )
@@ -282,7 +300,7 @@ function AdaptiveWorkspaceLayoutContent(
282300 viewportWidth : width ,
283301 preferredWidth : fileInspectorPreferredWidth ?? undefined ,
284302 reservedLeadingWidth :
285- shouldRenderPrimarySidebar && showPrimarySidebar
303+ shouldRenderPrimarySidebar && showPrimarySidebar && ! layout . primarySidebarOverlaysContent
286304 ? ( layout . listPaneWidth ?? 0 ) + ( layout . listPaneGap ?? 0 )
287305 : 0 ,
288306 } ) ,
@@ -366,6 +384,13 @@ function AdaptiveWorkspaceLayoutContent(
366384 setFocusedAuxiliaryPaneRole ( null ) ;
367385 } ;
368386 } ;
387+ const setPrimarySidebarVisible = ( visible : boolean ) => {
388+ if ( layout . primarySidebarOverlaysContent ) {
389+ setOverlaySidebar ( ( current ) => ( { ...current , visible } ) ) ;
390+ } else {
391+ setPrimarySidebarPreferredVisible ( visible ) ;
392+ }
393+ } ;
369394 const togglePrimarySidebar = ( ) => {
370395 if ( primarySidebarPinned ) {
371396 return ;
@@ -381,14 +406,14 @@ function AdaptiveWorkspaceLayoutContent(
381406 setPrimarySidebarPreferredVisible ( true ) ;
382407 return ;
383408 }
384- setPrimarySidebarPreferredVisible ( ( current ) => ! current ) ;
409+ setPrimarySidebarVisible ( ! preferredSidebarVisible ) ;
385410 } ;
386411 const revealPrimarySidebar = ( ) => {
387412 if ( composerKeyboardActive ) void KeyboardController . dismiss ( ) ;
388413 if ( panes . primarySidebarSuppressedByAuxiliary ) {
389414 setFileInspectorPreferredVisible ( false ) ;
390415 }
391- setPrimarySidebarPreferredVisible ( true ) ;
416+ setPrimarySidebarVisible ( true ) ;
392417 } ;
393418 const handleToggleSidebarCommand = ( ) => {
394419 togglePrimarySidebar ( ) ;
@@ -745,6 +770,7 @@ function AdaptiveWorkspaceLayoutContent(
745770 showAuxiliaryPane,
746771 toggleAuxiliaryPane,
747772 togglePrimarySidebar,
773+ setPrimarySidebarVisible,
748774 setAuxiliaryPaneWidth,
749775 composerKeyboardActive,
750776 setComposerEditing,
0 commit comments