Skip to content

Notes: Use preferences store when applicable #75008

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
Mamaduka merged 1 commit into from
Jan 30, 2026
Merged

Notes: Use preferences store when applicable #75008

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
36 changes: 18 additions & 18 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 @@ -9,6 +9,7 @@ import { useViewportMatch } from '@wordpress/compose';
import { comment as commentIcon } from '@wordpress/icons';
import { store as blockEditorStore } from '@wordpress/block-editor';
import { store as interfaceStore } from '@wordpress/interface';
import { store as preferencesStore } from '@wordpress/preferences';

/**
* Internal dependencies
Expand Down Expand Up @@ -91,24 +92,23 @@ function NotesSidebar( { postId } ) {

const showFloatingSidebar = isLargeViewport;

const { clientId, blockCommentId, isDistractionFree } = useSelect(
( select ) => {
const {
getBlockAttributes,
getSelectedBlockClientId,
getSettings,
} = select( blockEditorStore );
const _clientId = getSelectedBlockClientId();
return {
clientId: _clientId,
blockCommentId: _clientId
? getBlockAttributes( _clientId )?.metadata?.noteId
: null,
isDistractionFree: getSettings().isDistractionFree,
};
},
[]
);
const { clientId, blockCommentId } = useSelect( ( select ) => {
const { getBlockAttributes, getSelectedBlockClientId } =
select( blockEditorStore );
const _clientId = getSelectedBlockClientId();
return {
clientId: _clientId,
blockCommentId: _clientId
? getBlockAttributes( _clientId )?.metadata?.noteId
: null,
};
}, [] );
const { isDistractionFree } = useSelect( ( select ) => {
const { get } = select( preferencesStore );
return {
isDistractionFree: get( 'core', 'distractionFree' ),
};
}, [] );

const {
resultComments,
Expand Down
Loading