Skip to content

Add preferences modal to site editor #39485

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
tellthemachines merged 4 commits into from
Mar 18, 2022
Merged

Add preferences modal to site editor #39485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a3d143
Add preferences modal to site editor
tellthemachines Mar 16, 2022
f55c01c
Add spotlight feature
tellthemachines Mar 17, 2022
f88d949
Add caret inside block setting
tellthemachines Mar 17, 2022
7fcfe06
Improvements to enable feature selector.
tellthemachines Mar 18, 2022
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
Next Next commit
Add preferences modal to site editor
  • Loading branch information
@tellthemachines
tellthemachines committed Mar 16, 2022
commit 0a3d1437eb16d032c00400e349fa3ed04fa0bbc2
15 changes: 15 additions & 0 deletions packages/edit-site/src/components/header/more-menu/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { PreferenceToggleMenuItem } from '@wordpress/preferences';
* Internal dependencies
*/
import KeyboardShortcutHelpModal from '../../keyboard-shortcut-help-modal';
import EditSitePreferencesModal from '../../preferences-modal';
import ToolsMoreMenuGroup from '../tools-more-menu-group';
import SiteExport from './site-export';
import WelcomeGuideMenuItem from './welcome-guide-menu-item';
Expand All @@ -26,6 +27,11 @@ export default function MoreMenu() {
false
);

const [ isPreferencesModalActive, togglePreferencesModal ] = useReducer(
( isActive ) => ! isActive,
false
);

useShortcut( 'core/edit-site/keyboard-shortcuts', toggleModal );

return (
Expand Down Expand Up @@ -99,13 +105,22 @@ export default function MoreMenu() {
fillProps={ { onClose } }
/>
</MenuGroup>
<MenuGroup>
<MenuItem onClick={ togglePreferencesModal }>
{ __( 'Preferences' ) }
</MenuItem>
</MenuGroup>
</>
) }
</MoreMenuDropdown>
<KeyboardShortcutHelpModal
isModalActive={ isModalActive }
toggleModal={ toggleModal }
/>
<EditSitePreferencesModal
isModalActive={ isPreferencesModalActive }
toggleModal={ togglePreferencesModal }
/>
</>
);
}
38 changes: 38 additions & 0 deletions packages/edit-site/src/components/preferences-modal/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/**
* WordPress dependencies
*/
import {
PreferencesModal,
PreferencesModalTabs,
PreferencesModalSection,
} from '@wordpress/interface';
import { useMemo } from '@wordpress/element';
import { __ } from '@wordpress/i18n';

export default function EditSitePreferencesModal( {
isModalActive,
toggleModal,
} ) {
const sections = useMemo( () => [
{
name: 'general',
tabLabel: __( 'General' ),
content: (
<PreferencesModalSection
title={ __( 'Appearance' ) }
description={ __(
'Customize options related to the block editor interface and editing flow.'
) }
></PreferencesModalSection>
),
},
] );
if ( ! isModalActive ) {
return null;
}
return (
<PreferencesModal closeModal={ toggleModal }>
<PreferencesModalTabs sections={ sections } />
Copy link
Contributor

@talldan talldan Mar 17, 2022

Choose a reason for hiding this comment

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

It does still feel a bit empty with one setting per tab. I wonder if right now an option could be to not add the tabs until there are more settings later on, and instead render the two PreferenceModalSections directly in the modal.

I don't know if the styles will work out of the box, but it might be possible to make some quick fixes there.

Could be good to get some design feedback on it though.

Copy link
Member

@Mamaduka Mamaduka Mar 17, 2022

Choose a reason for hiding this comment

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

I think tabs will fill up faster now that we've modal.

Copy link
Contributor

@talldan talldan Mar 17, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Should be pretty easy to get the block manager in there as well now.

I think the component needs to be moved out of edit-post, but the rest of the implementation shouldn't be too difficult.

Copy link
Contributor Author

@tellthemachines tellthemachines Mar 18, 2022

Choose a reason for hiding this comment

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

Yeah, I added the second tab mainly thinking about the block manager which takes up a huge chunk of space 😄

Plus with #38317 there'll be at least one more item under Appearance soon.

</PreferencesModal>
);
}