Skip to content

Real-time collaboration: Fix "Show Template" view #72405

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

Open
alecgeatches wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Real-time collaboration: Fix "Show Template" view #72405

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions packages/block-editor/src/components/provider/use-block-sync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,25 @@ export default function useBlockSync( {
// and so it would already be persisted.
__unstableMarkNextChangeAsNotPersistent();
if ( clientId ) {
const blockName = getBlockName( clientId );
const isPostContentBlock = blockName === 'core/post-content';

// It is important to batch here because otherwise,
// as soon as `setHasControlledInnerBlocks` is called
// the effect to restore might be triggered
// before the actual blocks get set properly in state.
registry.batch( () => {
setHasControlledInnerBlocks( clientId, true );
const storeBlocks = controlledBlocks.map( ( block ) =>
cloneBlock( block )
);

// For post-content block children, preserve the
// original blocks to maintain UUIDs used for
// multi-user collaboration
//
// Unsure: Why are these blocks being cloned? Do they need to be?
Copy link
Contributor Author

@alecgeatches alecgeatches Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have this code change in for discussion, but this comment should probably be removed before merging.

const storeBlocks = isPostContentBlock
? controlledBlocks
: controlledBlocks.map( ( block ) => cloneBlock( block ) );

if ( subscribedRef.current ) {
pendingChangesRef.current.incoming = storeBlocks;
}
Expand Down
Loading