Skip to content
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

Settings: Show message when Visual or Code editor are disabled #52737

Merged
merged 11 commits into from
Jul 31, 2023
Merged

Settings: Show message when Visual or Code editor are disabled #52737

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9b2aaa8
Settings: Show message when Visual or Code editor are disabled
danielbachhuber Jul 18, 2023
c449a7a
Merge branch 'trunk' into improve/visual-editor-disabled-message
danielbachhuber Jul 24, 2023
eef2581
Merge branch 'trunk' into improve/visual-editor-disabled-message
danielbachhuber Jul 24, 2023
3176fbd
Use disabled menu items instead of a `<Notice>`
danielbachhuber Jul 24, 2023
cb1a182
Merge branch 'trunk' into improve/visual-editor-disabled-message
danielbachhuber Jul 27, 2023
6ae7a4e
Softer language
danielbachhuber Jul 27, 2023
815e989
Better description
danielbachhuber Jul 28, 2023
eee6284
Import `disabled` prop
danielbachhuber Jul 28, 2023
7cddb17
Mention `disabled` in `menu-item/README.md`
danielbachhuber Jul 28, 2023
6e2744c
Add a changelog entry
danielbachhuber Jul 28, 2023
8214f40
Remove superfluous message
danielbachhuber Jul 31, 2023
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
22 changes: 19 additions & 3 deletions packages/edit-post/src/components/header/mode-switcher/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
import { MenuItemsChoice, MenuGroup } from '@wordpress/components';
import { MenuItemsChoice, MenuGroup, Notice } from '@wordpress/components';
import { useSelect, useDispatch } from '@wordpress/data';
import { store as keyboardShortcutsStore } from '@wordpress/keyboard-shortcuts';
import { store as editorStore } from '@wordpress/editor';
Expand Down Expand Up @@ -55,8 +55,24 @@ function ModeSwitcher() {
return null;
}

if ( ! isRichEditingEnabled || ! isCodeEditingEnabled ) {
return null;
if ( ! isRichEditingEnabled ) {
return (
<MenuGroup label={ __( 'Editor' ) }>
<Notice isDismissible={ false }>
danielbachhuber marked this conversation as resolved.
Show resolved Hide resolved
{ __( 'Visual editor is disabled.' ) }
</Notice>
</MenuGroup>
);
}

if ( ! isCodeEditingEnabled ) {
return (
<MenuGroup label={ __( 'Editor' ) }>
<Notice isDismissible={ false }>
{ __( 'Code editor is disabled.' ) }
</Notice>
</MenuGroup>
);
}

const choices = MODES.map( ( choice ) => {
Expand Down