Skip to content

Block Comments: Prevent commenting on empty blocks #71497

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
t-hamano merged 1 commit into from
Sep 11, 2025
Merged

Block Comments: Prevent commenting on empty blocks #71497

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
29 changes: 20 additions & 9 deletions packages/editor/src/components/collab-sidebar/add-comment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
__experimentalVStack as VStack,
} from '@wordpress/components';
import { store as blockEditorStore } from '@wordpress/block-editor';
import { isUnmodifiedDefaultBlock } from '@wordpress/blocks';

/**
* Internal dependencies
Expand All @@ -29,16 +30,26 @@ export function AddComment( {
showCommentBoard,
setShowCommentBoard,
} ) {
const { clientId, blockCommentId } = useSelect( ( select ) => {
const { getSelectedBlock } = select( blockEditorStore );
const selectedBlock = getSelectedBlock();
return {
clientId: selectedBlock?.clientId,
blockCommentId: selectedBlock?.attributes?.blockCommentId,
};
} );
const { clientId, blockCommentId, isEmptyDefaultBlock } = useSelect(
( select ) => {
const { getSelectedBlock } = select( blockEditorStore );
const selectedBlock = getSelectedBlock();
return {
clientId: selectedBlock?.clientId,
blockCommentId: selectedBlock?.attributes?.blockCommentId,
isEmptyDefaultBlock: selectedBlock
? isUnmodifiedDefaultBlock( selectedBlock )
: false,
};
}
);

if ( ! showCommentBoard || ! clientId || undefined !== blockCommentId ) {
if (
! showCommentBoard ||
! clientId ||
undefined !== blockCommentId ||
isEmptyDefaultBlock
) {
return null;
}

Expand Down
Loading