Skip to content

Notes: Conditionally restore default sidebar #75455

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

Open
Mamaduka wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Notes: Conditionally restore default sidebar #75455

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
18 changes: 14 additions & 4 deletions packages/editor/src/components/collab-sidebar/hooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { store as interfaceStore } from '@wordpress/interface';
* Internal dependencies
*/
import { store as editorStore } from '../../store';
import { sidebars as DEFAULT_SIDEBARS } from '../sidebar/constants';
import { FLOATING_NOTES_SIDEBAR } from './constants';
import { unlock } from '../../lock-unlock';
import { noop } from './utils';
Expand Down Expand Up @@ -348,19 +349,28 @@ export function useEnableFloatingSidebar( enabled = false ) {
const { disableComplementaryArea, enableComplementaryArea } =
registry.dispatch( interfaceStore );

let wasHiddenByUser = false;
const unsubscribe = registry.subscribe( () => {
// Return `null` to indicate the user hid the complementary area.
if ( getActiveComplementaryArea( 'core' ) === null ) {
wasHiddenByUser = true;
enableComplementaryArea( 'core', FLOATING_NOTES_SIDEBAR );
}
} );

return () => {
unsubscribe();
if (
getActiveComplementaryArea( 'core' ) === FLOATING_NOTES_SIDEBAR
) {
disableComplementaryArea( 'core', FLOATING_NOTES_SIDEBAR );
Copy link
Member Author

@Mamaduka Mamaduka Feb 12, 2026

Choose a reason for hiding this comment

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

The disableComplementaryArea only accepts one argument, which I forgot. Should be fixed now.

const activeArea = getActiveComplementaryArea( 'core' );
if ( activeArea === FLOATING_NOTES_SIDEBAR ) {
if ( wasHiddenByUser ) {
disableComplementaryArea( 'core' );
} else {
// Restore the default sidebar if user didn't explicitly hide it.
enableComplementaryArea(
'core',
DEFAULT_SIDEBARS.document
);
}
}
};
}, [ enabled, registry ] );
Expand Down
Loading