Skip to content

Post Content: Update placeholder when editing template #58361

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

Closed
noisysocks wants to merge 2 commits into from
Closed

Post Content: Update placeholder when editing template #58361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c47e866
Post Content: Update placeholder when editing template
noisysocks Jan 29, 2024
3368838
Update e2e test
noisysocks Jan 29, 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
29 changes: 12 additions & 17 deletions packages/block-library/src/post-content/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import {
store as coreStore,
} from '@wordpress/core-data';
import { useSelect } from '@wordpress/data';
import { Placeholder } from '@wordpress/components';

/**
* Internal dependencies
*/
Expand Down Expand Up @@ -104,25 +106,18 @@ function Content( props ) {
);
}

function Placeholder( { layoutClassNames } ) {
function PostContentPlaceholder( { layoutClassNames } ) {
const blockProps = useBlockProps( { className: layoutClassNames } );
return (
<div { ...blockProps }>
<p>
{ __(
'This is the Content block, it will display all the blocks in any single post or page.'
) }
</p>
<p>
{ __(
'That might be a simple arrangement like consecutive paragraphs in a blog post, or a more elaborate composition that includes image galleries, videos, tables, columns, and any other block types.'
) }
</p>
<p>
{ __(
'If there are any Custom Post Types registered at your site, the Content block can display the contents of those entries as well.'
) }
</p>
<Placeholder
className="wp-block-post-content__placeholder"
withIllustration
>
<p>
{ __( 'This block will be replaced with your content.' ) }
</p>
</Placeholder>
</div>
);
}
Expand Down Expand Up @@ -157,7 +152,7 @@ export default function PostContentEdit( {
layoutClassNames={ layoutClassNames }
/>
) : (
<Placeholder layoutClassNames={ layoutClassNames } />
<PostContentPlaceholder layoutClassNames={ layoutClassNames } />
) }
</RecursionProvider>
);
Expand Down
23 changes: 20 additions & 3 deletions packages/block-library/src/post-content/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,21 @@
// Disable text selection in the post content placeholder.
.wp-block-post-content.wp-block-post-content {
user-select: none;
.wp-block-post-content__placeholder {
&.has-illustration::before {
background: none;
border: 1px solid currentColor;
}

.components-placeholder__illustration {
opacity: 0.1;
}

.components-placeholder__fieldset {
align-self: center;
font-family: inherit;
font-size: inherit;

p {
font-family: inherit;
font-size: inherit;
}
}
}
8 changes: 3 additions & 5 deletions test/e2e/specs/site-editor/pages.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ async function addPageContent( editor, page ) {
.getByRole( 'document', {
name: 'Block: Content',
} )
.getByRole( 'document', {
name: 'Empty block; start writing or type forward slash to choose a block',
.getByRole( 'button', {
name: 'Start blank',
} )
.click();

Expand Down Expand Up @@ -124,9 +124,7 @@ test.describe( 'Pages', () => {
editor.canvas.getByRole( 'document', {
name: 'Block: Content',
} )
).toContainText(
'This is the Content block, it will display all the blocks in any single post or page.'
);
).toContainText( 'This block will be replaced with your content.' );
await expect(
page.locator(
'role=button[name="Dismiss this notice"i] >> text="Editing template. Changes made here affect all posts and pages that use the template."'
Expand Down