Skip to content

Add back button for isolated template part editor #34732

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
merged 8 commits into from
Sep 28, 2021
Merged

Add back button for isolated template part editor #34732

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
62832c0
Add back button for isolated template part editor
kevin940726 Sep 10, 2021
ed98415
Fix unit tests
kevin940726 Sep 10, 2021
9b3eea0
Add push template part
kevin940726 Sep 14, 2021
df94d4b
Use push on edit button and simplify label
kevin940726 Sep 24, 2021
34ce49b
Only show background in focus mode
kevin940726 Sep 24, 2021
81380b5
Fix unit tests
kevin940726 Sep 24, 2021
3e2326b
Always show focus mode in template part editor
kevin940726 Sep 25, 2021
75ac321
Remove useTemplateTitle
kevin940726 Sep 27, 2021
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
Prev Previous commit
Next Next commit
Always show focus mode in template part editor
  • Loading branch information
@kevin940726
kevin940726 committed Sep 25, 2021
commit 3e2326b7a101640f3e01e8e9a2d2332e9dbded56
28 changes: 6 additions & 22 deletions packages/edit-site/src/components/block-editor/back-button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,24 @@
import { Button } from '@wordpress/components';
import { arrowLeft } from '@wordpress/icons';
import { useSelect, useDispatch } from '@wordpress/data';
import { __, sprintf } from '@wordpress/i18n';
import { __ } from '@wordpress/i18n';

/**
* Internal dependencies
*/
import { store as editSiteStore } from '../../store';
import useTemplateTitle from '../use-template-title';

function BackButton() {
const {
isTemplatePart,
previousTemplateType,
previousTemplateId,
} = useSelect( ( select ) => {
const {
getEditedPostType,
getPreviousEditedPostType,
getPreviousEditedPostId,
} = select( editSiteStore );
const { isTemplatePart, previousTemplateId } = useSelect( ( select ) => {
const { getEditedPostType, getPreviousEditedPostId } = select(
editSiteStore
);

return {
isTemplatePart: getEditedPostType() === 'wp_template_part',
previousTemplateType: getPreviousEditedPostType(),
previousTemplateId: getPreviousEditedPostId(),
};
}, [] );
const previousTemplateTitle = useTemplateTitle(
previousTemplateType,
previousTemplateId
);
const { goBack } = useDispatch( editSiteStore );

if ( ! isTemplatePart || ! previousTemplateId ) {
Expand All @@ -48,11 +36,7 @@ function BackButton() {
goBack();
} }
>
{ sprintf(
/* translators: Template name. */
__( 'Back to %s' ),
previousTemplateTitle
) }
{ __( 'Back' ) }
</Button>
);
}
Expand Down
14 changes: 4 additions & 10 deletions packages/edit-site/src/components/block-editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,28 +42,20 @@ const LAYOUT = {
};

export default function BlockEditor( { setIsInserterOpen } ) {
const {
settings,
templateType,
page,
deviceType,
hasPreviousPage,
} = useSelect(
const { settings, templateType, page, deviceType } = useSelect(
( select ) => {
const {
getSettings,
getEditedPostType,
getPage,
__experimentalGetPreviewDeviceType,
getPreviousEditedPostId,
} = select( editSiteStore );

return {
settings: getSettings( setIsInserterOpen ),
templateType: getEditedPostType(),
page: getPage(),
deviceType: __experimentalGetPreviewDeviceType(),
hasPreviousPage: !! getPreviousEditedPostId(),
};
},
[ setIsInserterOpen ]
Expand All @@ -78,6 +70,8 @@ export default function BlockEditor( { setIsInserterOpen } ) {
const contentRef = useRef();
const mergedRefs = useMergeRefs( [ contentRef, useTypingObserver() ] );

const isTemplatePart = templateType === 'wp_template_part';

return (
<BlockEditorProvider
settings={ settings }
Expand Down Expand Up @@ -105,7 +99,7 @@ export default function BlockEditor( { setIsInserterOpen } ) {
</SidebarInspectorFill>
<BlockTools
className={ classnames( 'edit-site-visual-editor', {
'is-focus-mode': hasPreviousPage,
'is-focus-mode': isTemplatePart,
} ) }
__unstableContentRef={ contentRef }
>
Expand Down