Site Editor sidebar: provide explicit backPaths, remove the getBackPath helper #61286
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ import buildNavigationLabel from '../sidebar-navigation-screen-navigation-menus/ | |
|
|
||
| export default function SingleNavigationMenu( { | ||
| navigationMenu, | ||
| backPath, | ||
| handleDelete, | ||
| handleDuplicate, | ||
| handleSave, | ||
|
|
@@ -32,6 +33,7 @@ export default function SingleNavigationMenu( { | |
| /> | ||
| </> | ||
| } | ||
| backPath={ backPath } | ||
| title={ buildNavigationLabel( | ||
| navigationMenu?.title, | ||
| navigationMenu?.id, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,7 +46,7 @@ function buildMenuLabel( title, id, status ) { | |
| // Save a boolean to prevent us creating a fallback more than once per session. | ||
| let hasCreatedFallback = false; | ||
|
|
||
| export default function SidebarNavigationScreenNavigationMenus( { backPath } ) { | ||
| const { | ||
| records: navigationMenus, | ||
| isResolving: isResolvingNavigationMenus, | ||
|
|
@@ -87,7 +87,7 @@ export default function SidebarNavigationScreenNavigationMenus() { | |
|
|
||
| if ( isLoading ) { | ||
| return ( | ||
| <SidebarNavigationScreenWrapper backPath={ backPath }> | ||
| <Spinner className="edit-site-sidebar-navigation-screen-navigation-menus__loading" /> | ||
| </SidebarNavigationScreenWrapper> | ||
| ); | ||
|
|
@@ -97,6 +97,7 @@ export default function SidebarNavigationScreenNavigationMenus() { | |
| return ( | ||
| <SidebarNavigationScreenWrapper | ||
| description={ __( 'No Navigation Menus found.' ) } | ||
| backPath={ backPath } | ||
| /> | ||
| ); | ||
| } | ||
|
|
@@ -106,6 +107,7 @@ export default function SidebarNavigationScreenNavigationMenus() { | |
| return ( | ||
| <SingleNavigationMenu | ||
| navigationMenu={ firstNavigationMenu } | ||
| backPath={ backPath } | ||
| handleDelete={ () => handleDelete( firstNavigationMenu ) } | ||
| handleDuplicate={ () => handleDuplicate( firstNavigationMenu ) } | ||
| handleSave={ ( edits ) => | ||
|
|
@@ -116,7 +118,7 @@ export default function SidebarNavigationScreenNavigationMenus() { | |
| } | ||
|
|
||
| return ( | ||
| <SidebarNavigationScreenWrapper backPath={ backPath }> | ||
| <ItemGroup> | ||
| { navigationMenus?.map( ( { id, title, status }, index ) => ( | ||
| <NavMenuItem | ||
|
|
@@ -138,12 +140,14 @@ export function SidebarNavigationScreenWrapper( { | |
| actions, | ||
| title, | ||
| description, | ||
| backPath, | ||
| } ) { | ||
| return ( | ||
| <SidebarNavigationScreen | ||
| title={ title || __( 'Navigation' ) } | ||
| actions={ actions } | ||
| description={ description || __( 'Manage your Navigation Menus.' ) } | ||
| backPath={ backPath } | ||
| content={ children } | ||
| /> | ||
| ); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,24 +19,18 @@ import TemplateActions from '../template-actions'; | |
|
|
||
| const { useLocation, useHistory } = unlock( routerPrivateApis ); | ||
|
|
||
| export default function SidebarNavigationScreenPattern( { backPath } ) { | ||
| const history = useHistory(); | ||
| const location = useLocation(); | ||
| const { | ||
| params: { postType, postId }, | ||
| } = location; | ||
| const { setCanvasMode } = unlock( useDispatch( editSiteStore ) ); | ||
|
|
||
| useInitEditedEntityFromURL(); | ||
|
|
||
| const patternDetails = usePatternDetails( postType, postId ); | ||
|
|
||
| return ( | ||
| <SidebarNavigationScreen | ||
| actions={ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -110,7 +110,7 @@ function CategoriesGroup( { | |
| ); | ||
| } | ||
|
|
||
| export default function SidebarNavigationScreenPatterns( { backPath } ) { | ||
| const { | ||
| params: { categoryType, categoryId, path }, | ||
| } = useLocation(); | ||
|
|
@@ -144,6 +144,7 @@ export default function SidebarNavigationScreenPatterns() { | |
| description={ __( | ||
| 'Manage what patterns are available when editing the site.' | ||
| ) } | ||
| backPath={ backPath } | ||
| actions={ <AddNewPattern /> } | ||
| content={ | ||
| <> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -94,7 +94,7 @@ function useTemplateDetails( postType, postId ) { | |
| return { title, description, content, footer }; | ||
| } | ||
|
|
||
| export default function SidebarNavigationScreenTemplate( { backPath } ) { | ||
| const history = useHistory(); | ||
| const { | ||
| params: { postType, postId }, | ||
|
|
@@ -108,6 +108,7 @@ export default function SidebarNavigationScreenTemplate() { | |
| return ( | ||
| <SidebarNavigationScreen | ||
| title={ title } | ||
| backPath={ backPath } | ||
| actions={ | ||
| <> | ||
| <TemplateActions | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ import DataviewsTemplatesSidebarContent from './content'; | |
|
|
||
| const { useLocation } = unlock( routerPrivateApis ); | ||
|
|
||
| export default function SidebarNavigationScreenTemplatesBrowse( { backPath } ) { | ||
| const { | ||
| params: { activeView = 'all' }, | ||
| } = useLocation(); | ||
|
|
@@ -24,6 +24,7 @@ export default function SidebarNavigationScreenTemplatesBrowse() { | |
| description={ __( | ||
| 'Create new templates, or reset any customizations made to the templates supplied by your theme.' | ||
| ) } | ||
| backPath={ backPath } | ||
| content={ | ||
| <DataviewsTemplatesSidebarContent | ||
| activeView={ activeView } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,32 +32,6 @@ import { SidebarNavigationContext } from '../sidebar'; | |
|
|
||
| const { useHistory, useLocation } = unlock( routerPrivateApis ); | ||
|
|
||
|
There was a problem hiding this comment. This is nice, thank you. What do you think of collocating the backPath info in the router and always pass it down as a prop to the sidebar? if ( path === '/page' ) {
return {
sidebar: <SidebarNavigationScreen backPath={ { path: '/page', postId } } />,
// ....
};
}It's not big of a difference, really, given that it'd now behave like a prop to the sidebar component. This slight change just means that we still have a centralized place (the router) with all the routing information, so it's easier maintenance. When we open this for extension or introduce an API for route registration, it may be good to provide all routing logic in that API and not require clients to provide the backpath separately, as part of their Sidebar UI component. There was a problem hiding this comment. That's a great idea, I implemented it. Now all the wiring between paths and rendered components is concentrated in the router, including the backpaths. |
||
| export default function SidebarNavigationScreen( { | ||
| isRoot, | ||
| title, | ||
|
|
@@ -89,7 +63,9 @@ export default function SidebarNavigationScreen( { | |
| const location = useLocation(); | ||
| const history = useHistory(); | ||
| const navigate = useContext( SidebarNavigationContext ); | ||
| const backPath = backPathProp ?? location.state?.backPath; | ||
| const icon = isRTL() ? chevronRight : chevronLeft; | ||
|
|
||
| return ( | ||
| <> | ||
| <VStack | ||
|
|
@@ -107,10 +83,6 @@ export default function SidebarNavigationScreen( { | |
| { ! isRoot && ( | ||
| <SidebarButton | ||
| onClick={ () => { | ||
| history.push( backPath ); | ||
| navigate( 'back' ); | ||
| } } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.