Skip to content
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

Jump to bottom

Fix controlled inner blocks parent block attributes updates #35827

Merged
merged 4 commits into from Oct 29, 2021
Merged

Fix controlled inner blocks parent block attributes updates #35827

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb3b07d
Save controlled inner blocks wrapper attributes
talldan Oct 21, 2021
3e8fa4d
Try simplifying the logic
youknowriad Oct 21, 2021
ff74d5f
Clarify function calls
youknowriad Oct 21, 2021
04d1853
Ensure `UPDATE_BLOCK` reducer maintains tree structure for updated block
talldan Oct 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 36 additions & 18 deletions packages/block-editor/src/store/reducer.js
View file
Open in desktop
Expand Up @@ -240,32 +240,40 @@ function buildBlockTree( state, blocks ) {
return result;
}

function updateParentInnerBlocksInTree( state, tree, updatedClientIds ) {
const clientIds = new Set( [] );
function updateParentInnerBlocksInTree(
state,
tree,
updatedClientIds,
updateChildrenOfUpdatedClientIds = false
) {
const uncontrolledParents = new Set( [] );
const controlledParents = new Set();
for ( const clientId of updatedClientIds ) {
let current = clientId;
let current = updateChildrenOfUpdatedClientIds
? clientId
: state.parents[ clientId ];
do {
if ( state.controlledInnerBlocks[ current ] ) {
controlledParents.add( current );
// Should stop on controlled blocks.
// If we reach a controlled parent, break out of the loop.
controlledParents.add( current );
talldan marked this conversation as resolved.
Show resolved Hide resolved
break;
} else {
clientIds.add( current );
// else continue traversing up through parents.
uncontrolledParents.add( current );
current = state.parents[ current ];
}
// Should stop on controlled blocks.
current = state.parents[ current ];
} while ( current !== undefined );
}

// To make sure the order of assignments doesn't matter,
// we first create empty objects and mutates the inner blocks later.
for ( const clientId of clientIds ) {
for ( const clientId of uncontrolledParents ) {
tree[ clientId ] = {
...tree[ clientId ],
};
}
for ( const clientId of clientIds ) {
for ( const clientId of uncontrolledParents ) {
tree[ clientId ].innerBlocks = ( state.order[ clientId ] || [] ).map(
( subClientId ) => tree[ subClientId ]
);
Expand Down Expand Up @@ -311,7 +319,8 @@ const withBlockTree = ( reducer ) => ( state = {}, action ) => {
...newState.tree,
...subTree,
},
action.rootClientId ? [ action.rootClientId ] : [ '' ]
action.rootClientId ? [ action.rootClientId ] : [ '' ],
true
);
break;
}
Expand All @@ -321,11 +330,13 @@ const withBlockTree = ( reducer ) => ( state = {}, action ) => {
{
...newState.tree,
[ action.clientId ]: {
...newState.tree[ action.clientId ],
...newState.byClientId[ action.clientId ],
attributes: newState.attributes[ action.clientId ],
},
},
[ action.clientId ]
[ action.clientId ],
false
);
break;
case 'UPDATE_BLOCK_ATTRIBUTES': {
Expand All @@ -345,7 +356,8 @@ const withBlockTree = ( reducer ) => ( state = {}, action ) => {
...newState.tree,
...newSubTree,
},
action.clientIds
action.clientIds,
false
);
break;
}
Expand All @@ -364,7 +376,8 @@ const withBlockTree = ( reducer ) => ( state = {}, action ) => {
),
...subTree,
},
action.blocks.map( ( b ) => b.clientId )
action.blocks.map( ( b ) => b.clientId ),
false
);

// If there are no replaced blocks, it means we're removing blocks so we need to update their parent.
Expand All @@ -381,7 +394,8 @@ const withBlockTree = ( reducer ) => ( state = {}, action ) => {
newState.tree = updateParentInnerBlocksInTree(
newState,
newState.tree,
parentsOfRemovedBlocks
parentsOfRemovedBlocks,
true
);
break;
}
Expand All @@ -406,7 +420,8 @@ const withBlockTree = ( reducer ) => ( state = {}, action ) => {
)
)
),
parentsOfRemovedBlocks
parentsOfRemovedBlocks,
true
);
break;
case 'MOVE_BLOCKS_TO_POSITION': {
Expand All @@ -423,7 +438,8 @@ const withBlockTree = ( reducer ) => ( state = {}, action ) => {
newState.tree = updateParentInnerBlocksInTree(
newState,
newState.tree,
updatedBlockUids
updatedBlockUids,
true
);
break;
}
Expand All @@ -435,7 +451,8 @@ const withBlockTree = ( reducer ) => ( state = {}, action ) => {
newState.tree = updateParentInnerBlocksInTree(
newState,
newState.tree,
updatedBlockUids
updatedBlockUids,
true
);
break;
}
Expand All @@ -462,7 +479,8 @@ const withBlockTree = ( reducer ) => ( state = {}, action ) => {
return result;
}, {} ),
},
updatedBlockUids
updatedBlockUids,
false
);
}
}
Expand Down