Skip to content

Site Editor: Only show 'Back' button when user came from an editor canvas #58710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
noisysocks merged 5 commits into from
Feb 7, 2024
Merged

Site Editor: Only show 'Back' button when user came from an editor canvas #58710

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee588f1
Site Editor: Only show 'Back' button when came from an editor canvas
noisysocks Feb 6, 2024
aef38f8
Check for presense of postType and postId
noisysocks Feb 7, 2024
8068fe3
usePrevious: Update implementation to return previous value, instead …
noisysocks Feb 7, 2024
26ebd90
Revert "usePrevious: Update implementation to return previous value, …
noisysocks Feb 7, 2024
2a012fa
Ignore react-hooks/exhaustive-deps for now
noisysocks Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions packages/edit-site/src/components/block-editor/use-site-editor-settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useMemo } from '@wordpress/element';
import { store as coreStore } from '@wordpress/core-data';
import { privateApis as editorPrivateApis } from '@wordpress/editor';
import { privateApis as routerPrivateApis } from '@wordpress/router';
import { usePrevious } from '@wordpress/compose';

/**
* Internal dependencies
Expand Down Expand Up @@ -92,13 +93,24 @@ function useArchiveLabel( templateSlug ) {

function useGoBack() {
const location = useLocation();
const previousLocation = usePrevious( location );
const history = useHistory();
const goBack = useMemo( () => {
const isFocusMode =
location.params.focusMode ||
FOCUSABLE_ENTITIES.includes( location.params.postType );
return isFocusMode ? () => history.back() : undefined;
}, [ location.params.focusMode, location.params.postType, history ] );
( location.params.postId &&
FOCUSABLE_ENTITIES.includes( location.params.postType ) );
const didComeFromEditorCanvas =
Comment thread
noisysocks marked this conversation as resolved.
previousLocation?.params.postId &&
previousLocation?.params.postType &&
previousLocation?.params.canvas === 'edit';
const showBackButton = isFocusMode && didComeFromEditorCanvas;
return showBackButton ? () => history.back() : undefined;
// Disable reason: previousLocation changes when the component updates for any reason, not
// just when location changes. Until this is fixed we can't add it to deps. See
// https://github.com/WordPress/gutenberg/pull/58710#discussion_r1479219465.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [ location, history ] );
return goBack;
}

Expand Down