Skip to content

Inline Commenting: Added new sidebar as extension of the canvas #67347

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
ellatrix merged 6 commits into from
Dec 2, 2024
Merged

Inline Commenting: Added new sidebar as extension of the canvas #67347

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
35c9f23
Create new sidebar as extension of editor canvas for commenting
akasunil Nov 27, 2024
f1d7e1c
Cleanup and error fix
akasunil Nov 27, 2024
b1f0488
Merge branch 'trunk' of github.com:WordPress/gutenberg into try/inlin…
akasunil Nov 29, 2024
c60972c
Keep collab sidebar open when comments are available
akasunil Nov 29, 2024
06c49ba
Merge branch 'trunk' of github.com:WordPress/gutenberg into try/inlin…
akasunil Nov 29, 2024
d096211
Remove fallback background color function
akasunil Nov 29, 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
Cleanup and error fix
  • Loading branch information
@akasunil
akasunil committed Nov 27, 2024
commit f1d7e1c79743a38d7e6b29752489ab3e5a16eca7
8 changes: 4 additions & 4 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 @@ -238,10 +238,6 @@ export default function CollabSidebar() {
enableComplementaryArea( 'core', 'edit-post/collab-sidebar' );
};

const AddCommentComponent = blockCommentId
? AddCommentToolbarButton
: AddCommentButton;

const { threads } = useSelect( ( select ) => {
const { getCurrentPostId } = select( editorStore );
const _postId = getCurrentPostId();
Expand Down Expand Up @@ -294,6 +290,10 @@ export default function CollabSidebar() {
return null; // or maybe return some message indicating no threads are available.
}

const AddCommentComponent = blockCommentId
? AddCommentToolbarButton
: AddCommentButton;

return (
<>
<AddCommentComponent onClick={ openCollabBoard } />
Expand Down
4 changes: 2 additions & 2 deletions packages/editor/src/components/collab-sidebar/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ export function getEditorCanvasBackgroundColor() {
const iframe = document.querySelector( 'iframe[name="editor-canvas"]' );
const iframeDocument =
iframe?.contentDocument || iframe?.contentWindow.document;
const iframeBody = iframeDocument?.querySelector( 'body' );
const iframeBody = iframeDocument?.body;
if ( iframeBody ) {
const style = window.getComputedStyle( iframeBody );
return style.backgroundColor;
return style?.backgroundColor;
Copy link
Member

@ellatrix ellatrix Nov 28, 2024

Choose a reason for hiding this comment

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

It would be nice if we can just get the colour from global styles, but I guess this is fine for now.

Copy link
Member Author

@akasunil akasunil Nov 29, 2024

Choose a reason for hiding this comment

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

I’ve updated the implementation to pull the color directly from the global styles., and also kept this function for fallback background color.

Copy link
Member

@ellatrix ellatrix Nov 29, 2024

Choose a reason for hiding this comment

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

Let's remove it for now, and reduce complexity. There's also cases where the editor doesn't have an iframe, so this code is too fragile atm.

Copy link
Member Author

@akasunil akasunil Nov 29, 2024

Choose a reason for hiding this comment

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

Got it, I'll remove the fallback function for now. However, we might still encounter cases where global styles aren't supported, should we consider that later?

}

return '';
Expand Down
Loading