Skip to content

RTC: Fix "Edit as HTML" content reset during collaboration #77043

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
alecgeatches merged 2 commits into from
Apr 6, 2026
+13 −3
Merged

RTC: Fix "Edit as HTML" content reset during collaboration #77043

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee617e8
Precompute blockContent to prevent RESET_BLOCKS from interfering with…
alecgeatches Apr 3, 2026
4440dc1
Memoize block content to avoid `getBlockContent()` every render
alecgeatches Apr 3, 2026
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/block-list/block-html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import TextareaAutosize from 'react-autosize-textarea';
/**
* WordPress dependencies
*/
import { useEffect, useState } from '@wordpress/element';
import { useEffect, useMemo, useState } from '@wordpress/element';
import { useSelect, useDispatch } from '@wordpress/data';
import {
getBlockAttributes,
Expand All @@ -28,6 +28,16 @@ function BlockHTML( { clientId } ) {
[ clientId ]
);
const { updateBlock } = useDispatch( blockEditorStore );

// Derive block content as a primitive string so the effect only fires
// when the serialized content genuinely changes, not when the block
// object reference changes (which happens on every RESET_BLOCKS during
// RTC sync, even for unchanged blocks).
const blockContent = useMemo(
() => ( block ? getBlockContent( block ) : '' ),
[ block ]
);

const onChange = () => {
const blockType = getBlockType( block.name );

Expand Down Expand Up @@ -64,8 +74,8 @@ function BlockHTML( { clientId } ) {
};

useEffect( () => {
setHtml( getBlockContent( block ) );
}, [ block ] );
setHtml( blockContent );
}, [ blockContent ] );

return (
<TextareaAutosize
Expand Down
Loading