Skip to content

show comment form if there is no comment on any block #66458

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

Closed
wants to merge 9 commits into from
Closed

show comment form if there is no comment on any block #66458

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b40fc18
show comment form if there is no comment on any block and sidebar is …
rishishah-multidots Oct 25, 2024
5186ba1
resolve conflict with trunk
rishishah-multidots Nov 25, 2024
e84e4b8
resolve conflict with trunk
rishishah-multidots Nov 25, 2024
4f7ff2c
resolve conflict with trunk
rishishah-multidots Nov 25, 2024
7bc0488
resolve trunk conflict
rishishah-multidots Nov 28, 2024
335db94
resolve trunk conflict
rishishah-multidots Dec 3, 2024
8837ba7
fix link error
rishishah-multidots Dec 3, 2024
d816027
resolve trunk conflict
rishishah-multidots Dec 5, 2024
b034e3c
Merge branch 'WordPress:trunk' into fix/issue-66377-7
rishishah-multidots Dec 12, 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
resolve trunk conflict
  • Loading branch information
@rishishah-multidots
rishishah-multidots committed Dec 3, 2024
commit 335db94509894fc7bbc799f251b794f258d02aac
24 changes: 17 additions & 7 deletions packages/editor/src/components/collab-sidebar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
import { useSelect, useDispatch, resolveSelect } from '@wordpress/data';
import {
useSelect,
useDispatch,
resolveSelect,
subscribe,
} from '@wordpress/data';
import { useMemo } from '@wordpress/element';
import { comment as commentIcon } from '@wordpress/icons';
import { addFilter } from '@wordpress/hooks';
Expand Down Expand Up @@ -45,7 +50,10 @@ addFilter(
modifyBlockCommentAttributes
);

function CollabSidebarContent( {} ) {
function CollabSidebarContent( {
styles,
comments,
} ) {
const { createNotice } = useDispatch( noticesStore );
const { saveEntityRecord, deleteEntityRecord } = useDispatch( coreStore );
const { getEntityRecord } = resolveSelect( coreStore );
Expand Down Expand Up @@ -185,8 +193,10 @@ function CollabSidebarContent( {} ) {
};

return (
<div className="editor-collab-sidebar-panel">
<AddComment onSubmit={ addNewComment } />
<div className="editor-collab-sidebar-panel" style={ styles }>
<AddComment
onSubmit={ addNewComment }
/>
<Comments
threads={ comments }
onEditComment={ onEditComment }
Expand Down Expand Up @@ -308,7 +318,9 @@ export default function CollabSidebar() {
title={ __( 'Comments' ) }
icon={ commentIcon }
>
<CollabSidebarContent />
<CollabSidebarContent
comments={ resultComments }
/>
</PluginSidebar>
<PluginSidebar
isPinnable={ false }
Expand All @@ -319,8 +331,6 @@ export default function CollabSidebar() {
>
<CollabSidebarContent
comments={ resultComments }
showCommentBoard={ showCommentBoard }
setShowCommentBoard={ setShowCommentBoard }
styles={ {
backgroundColor,
} }
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.