Skip to content

Allow template part editing in write mode #67372

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 16 commits into from
Dec 24, 2024
Merged

Allow template part editing in write mode #67372

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3616308
Allow template part editing in write mode
talldan Nov 28, 2024
e8c33f1
Update unit tests for template parts
talldan Nov 28, 2024
05542c6
Refine block editing mode calculation - allow editing of inner templa…
talldan Nov 27, 2024
0ebb6ea
Update tests for content blocks in template parts
talldan Nov 28, 2024
700f059
Add content role to site logo block
talldan Nov 28, 2024
508bd39
Consider template parts a section in navigation mode
talldan Dec 4, 2024
5e68eea
Allow content blocks to be explicitly disabled even when they have a …
talldan Dec 6, 2024
f609354
Avoid showing template parts when edting a page in Write Mode
talldan Dec 10, 2024
d6243e4
entries().some is not widely available, so switch to Array.from().some
talldan Dec 10, 2024
adde4d2
Update test to show explicitly disabled block
talldan Dec 10, 2024
0d4cf1d
Update unit tests
talldan Dec 11, 2024
673f4b0
Remove unused argument
talldan Dec 11, 2024
80d9048
Add optimization for disabled blocks calculation
talldan Dec 11, 2024
98f98cb
Avoid state updates when setting block editor modes to the same thing…
talldan Dec 11, 2024
e008553
Update DisableNonPageContentBlocks to not set block editor modes on a…
talldan Dec 11, 2024
0051caf
Try breaking DisableNonPageContentBlocks into separate useEffect calls
talldan Dec 11, 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
Prev Previous commit
Next Next commit
Update unit tests for template parts
  • Loading branch information
@talldan
talldan committed Dec 24, 2024
commit e8c33f12bbfe1d2dda2a44e2a026def7712b9337
75 changes: 55 additions & 20 deletions packages/block-editor/src/store/test/reducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3975,38 +3975,58 @@ describe( 'state', () => {
{
type: 'UPDATE_SETTINGS',
settings: {
[ sectionRootClientIdKey ]: '',
[ sectionRootClientIdKey ]: 'section-root',
},
},
{
type: 'RESET_BLOCKS',
blocks: [
{
name: 'core/template-part',
clientId: 'header',
attributes: {},
innerBlocks: [],
},
{
name: 'core/group',
clientId: 'group-1',
clientId: 'section-root',
attributes: {},
innerBlocks: [
{
name: 'core/paragraph',
clientId: 'paragraph-1',
attributes: {},
innerBlocks: [],
},
{
name: 'core/group',
clientId: 'group-2',
clientId: 'group-1',
attributes: {},
innerBlocks: [
{
name: 'core/paragraph',
clientId: 'paragraph-2',
clientId: 'paragraph-1',
attributes: {},
innerBlocks: [],
},
{
name: 'core/group',
clientId: 'group-2',
attributes: {},
innerBlocks: [
{
name: 'core/paragraph',
clientId:
'paragraph-2',
attributes: {},
innerBlocks: [],
},
],
},
],
},
],
},
{
name: 'core/template-part',
clientId: 'footer',
attributes: {},
innerBlocks: [],
},
],
},
],
Expand All @@ -4022,7 +4042,10 @@ describe( 'state', () => {
expect( initialState.derivedNavModeBlockEditingModes ).toEqual(
new Map(
Object.entries( {
'': 'contentOnly', // Section root.
'': 'disabled',
header: 'contentOnly', // Template part.
footer: 'contentOnly', // Template part.
'section-root': 'contentOnly', // Section root.
'group-1': 'contentOnly', // Section block.
'paragraph-1': 'contentOnly', // Content block in section.
'group-2': 'disabled', // Non-content block in section.
Expand All @@ -4047,7 +4070,10 @@ describe( 'state', () => {
expect( derivedNavModeBlockEditingModes ).toEqual(
new Map(
Object.entries( {
'': 'contentOnly',
'': 'disabled',
header: 'contentOnly',
footer: 'contentOnly',
'section-root': 'contentOnly',
'group-1': 'contentOnly',
'paragraph-1': 'contentOnly',
} )
Expand All @@ -4060,7 +4086,7 @@ describe( 'state', () => {
[
{
type: 'INSERT_BLOCKS',
rootClientId: '',
rootClientId: 'section-root',
blocks: [
{
name: 'core/group',
Expand Down Expand Up @@ -4091,7 +4117,10 @@ describe( 'state', () => {
expect( derivedNavModeBlockEditingModes ).toEqual(
new Map(
Object.entries( {
'': 'contentOnly', // Section root.
'': 'disabled', // Section root.
header: 'contentOnly', // Template part.
footer: 'contentOnly', // Template part.
'section-root': 'contentOnly', // Section root.
'group-1': 'contentOnly', // Section block.
'paragraph-1': 'contentOnly', // Content block in section.
'group-2': 'disabled', // Non-content block in section.
Expand All @@ -4111,7 +4140,7 @@ describe( 'state', () => {
type: 'MOVE_BLOCKS_TO_POSITION',
clientIds: [ 'group-2' ],
fromRootClientId: 'group-1',
toRootClientId: '',
toRootClientId: 'section-root',
},
],
testReducer,
Expand All @@ -4120,7 +4149,10 @@ describe( 'state', () => {
expect( derivedNavModeBlockEditingModes ).toEqual(
new Map(
Object.entries( {
'': 'contentOnly', // Section root.
'': 'disabled', // Section root.
header: 'contentOnly', // Template part.
footer: 'contentOnly', // Template part.
'section-root': 'contentOnly', // Section root.
'group-1': 'contentOnly', // Section block.
'paragraph-1': 'contentOnly', // Content block in section.
'group-2': 'contentOnly', // New section block.
Expand Down Expand Up @@ -4148,10 +4180,13 @@ describe( 'state', () => {
new Map(
Object.entries( {
'': 'disabled',
'group-1': 'contentOnly',
'paragraph-1': 'contentOnly',
'group-2': 'contentOnly',
'paragraph-2': 'contentOnly',
header: 'contentOnly',
footer: 'contentOnly',
'section-root': 'disabled',
'group-1': 'contentOnly', // New section root.
'paragraph-1': 'contentOnly', // Section and content block
'group-2': 'contentOnly', // Section.
'paragraph-2': 'contentOnly', // Content block.
} )
)
);
Expand Down