Revert custom back button behaviour

WordPress · tellthemachines · May 30, 2023 · May 15, 2023 · May 15, 2023 · May 16, 2023
commit a107162929cacdd984617b7fd7b0ae3a5949c830
diff --git a/packages/components/src/navigator/context.ts b/packages/components/src/navigator/context.ts
@@ -16,6 +16,5 @@ const initialContextValue: NavigatorContextType = {
 	addScreen: () => {},
 	removeScreen: () => {},
 	params: {},
-	backToPreviousScreen: false,
 };
 export const NavigatorContext = createContext( initialContextValue );
diff --git a/packages/components/src/navigator/navigator-provider/component.tsx b/packages/components/src/navigator/navigator-provider/component.tsx
@@ -59,13 +59,8 @@ function UnconnectedNavigatorProvider(
 	props: WordPressComponentProps< NavigatorProviderProps, 'div' >,
 	forwardedRef: ForwardedRef< any >
 ) {
-	const {
-		initialPath,
-		children,
-		className,
-		backToPreviousScreen,
-		...otherProps
-	} = useContextSystem( props, 'NavigatorProvider' );
+	const { initialPath, children, className, ...otherProps } =
+		useContextSystem( props, 'NavigatorProvider' );
 
 	const [ locationHistory, setLocationHistory ] = useState<
 		NavigatorLocation[]
@@ -235,7 +230,6 @@ function UnconnectedNavigatorProvider(
 			goToParent,
 			addScreen,
 			removeScreen,
-			backToPreviousScreen,
 		} ),
 		[
 			locationHistory,
@@ -245,7 +239,6 @@ function UnconnectedNavigatorProvider(
 			goToParent,
 			addScreen,
 			removeScreen,
-			backToPreviousScreen,
 		]
 	);
 

diff --git a/packages/components/src/navigator/types.ts b/packages/components/src/navigator/types.ts
@@ -29,7 +29,6 @@ export type Navigator = {
 	goTo: ( path: string, options?: NavigateOptions ) => void;
 	goBack: () => void;
 	goToParent: () => void;
-	backToPreviousScreen?: boolean;
 };
 
 export type NavigatorContext = Navigator & {
@@ -47,13 +46,6 @@ export type NavigatorProviderProps = {
 	 * The children elements.
 	 */
 	children: ReactNode;
-	/**
-	 * Whether the navigator should restore focus to the previous screen when
-	 * navigating back.
-	 *
-	 * @default false
-	 */
-	backToPreviousScreen?: boolean;
 };
 
 export type NavigatorScreenProps = {

diff --git a/packages/components/src/navigator/use-navigator.ts b/packages/components/src/navigator/use-navigator.ts
@@ -13,15 +13,15 @@ import type { Navigator } from './types';
  * Retrieves a `navigator` instance.
  */
 function useNavigator(): Navigator {
-	const { location, params, goTo, goBack, goToParent, backToPreviousScreen } =
+	const { location, params, goTo, goBack, goToParent } =
 		useContext( NavigatorContext );
+
 	return {
 		location,
 		goTo,
 		goBack,
 		goToParent,
 		params,
-		backToPreviousScreen,
 	};
 }
 

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
@@ -24,7 +24,6 @@ const PageItem = ( { postType = 'page', postId, ...props } ) => {
 	const linkInfo = useLink( {
 		postType,
 		postId,
-		backToPreviousScreen: true,
 	} );
 	return <SidebarNavigationItem { ...linkInfo } { ...props } />;
 };

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-template/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-template/index.js
@@ -87,7 +87,7 @@ function useTemplateTitleAndDescription( postType, postId ) {
 }
 
 export default function SidebarNavigationScreenTemplate() {
-	const { params, backToPreviousScreen } = useNavigator();
+	const { params } = useNavigator();
 	const { postType, postId } = params;
 	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
 	const { title, description } = useTemplateTitleAndDescription(
@@ -106,7 +106,6 @@ export default function SidebarNavigationScreenTemplate() {
 				/>
 			}
 			description={ description }
-			backToPreviousScreen={ backToPreviousScreen }
 		/>
 	);
 }
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen/index.js b/packages/edit-site/src/components/sidebar-navigation-screen/index.js
@@ -5,7 +5,6 @@ import {
 	__experimentalHStack as HStack,
 	__experimentalVStack as VStack,
 	__experimentalNavigatorToParentButton as NavigatorToParentButton,
-	__experimentalNavigatorBackButton as NavigatorBackButton,
 	__experimentalHeading as Heading,
 } from '@wordpress/components';
 import { isRTL, __, sprintf } from '@wordpress/i18n';
@@ -32,7 +31,6 @@ export default function SidebarNavigationScreen( {
 	content,
 	footer,
 	description,
-	backToPreviousScreen = false,
 } ) {
 	const { dashboardLink } = useSelect( ( select ) => {
 		const { getSettings } = unlock( select( editSiteStore ) );
@@ -42,9 +40,7 @@ export default function SidebarNavigationScreen( {
 	}, [] );
 	const { getTheme } = useSelect( coreStore );
 	const theme = getTheme( currentlyPreviewingTheme() );
-	const NavigatorReturnButton = backToPreviousScreen
-		? NavigatorBackButton
-		: NavigatorToParentButton;
+
 	return (
 		<VStack spacing={ 0 }>
 			<HStack
@@ -53,7 +49,7 @@ export default function SidebarNavigationScreen( {
 				className="edit-site-sidebar-navigation-screen__title-icon"
 			>
 				{ ! isRoot ? (
-					<NavigatorReturnButton
+					<NavigatorToParentButton
 						as={ SidebarButton }
 						icon={ isRTL() ? chevronRight : chevronLeft }
 						label={ __( 'Back' ) }

diff --git a/packages/edit-site/src/components/sidebar/index.js b/packages/edit-site/src/components/sidebar/index.js
@@ -67,13 +67,12 @@ function SidebarScreens() {
 function Sidebar() {
 	const { params: urlParams } = useLocation();
 	const initialPath = useRef( getPathFromURL( urlParams ) );
-	const { backToPreviousScreen } = urlParams;
+
 	return (
 		<>
 			<NavigatorProvider
 				className="edit-site-sidebar__content"
 				initialPath={ initialPath.current }
-				backToPreviousScreen={ backToPreviousScreen }
 			>
 				<SidebarScreens />
 			</NavigatorProvider>