Skip to content

Block list: Add option in editor settings to show open list view as default #40757

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
ramonjd merged 6 commits into from
May 10, 2022
Merged

Block list: Add option in editor settings to show open list view as default #40757

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
3dcdcc7
initial commit
ramonjd May 2, 2022
d312be6
Added option to site editor
ramonjd May 3, 2022
d4bc855
Change key to `showListViewByDefault`
ramonjd May 3, 2022
f0f6419
Use `name` in locator selector
ramonjd May 3, 2022
48fe306
Move dispatch to initialize editor methods to avoid unnecessary re-re…
ramonjd May 4, 2022
d4e5c3f
Set default value of showListViewByDefault to `false` in the post edi…
ramonjd May 10, 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
Prev Previous commit
Next Next commit
Move dispatch to initialize editor methods to avoid unnecessary re-re… 
…nders using useEffect
  • Loading branch information
@ramonjd
ramonjd committed May 4, 2022
commit 48fe306a19786713d26afa1846dd139a1c4b2204
12 changes: 0 additions & 12 deletions packages/edit-post/src/components/layout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ function Layout( { styles } ) {
setIsInserterOpened,
} = useDispatch( editPostStore );
const { createErrorNotice } = useDispatch( noticesStore );
const { setIsListViewOpened } = useDispatch( editPostStore );
const {
mode,
isFullscreenActive,
Expand All @@ -90,7 +89,6 @@ function Layout( { styles } ) {
showBlockBreadcrumbs,
isTemplateMode,
documentLabel,
isListViewOpenByDefault,
} = useSelect( ( select ) => {
const { getEditorSettings, getPostTypeLabel } = select( editorStore );
const editorSettings = getEditorSettings();
Expand Down Expand Up @@ -131,9 +129,6 @@ function Layout( { styles } ) {
),
// translators: Default label for the Document in the Block Breadcrumb.
documentLabel: postTypeLabel || _x( 'Document', 'noun' ),
isListViewOpenByDefault: select( editPostStore ).isFeatureActive(
'showListViewByDefault'
),
};
}, [] );
const className = classnames( 'edit-post-layout', 'is-mode-' + mode, {
Expand All @@ -147,13 +142,6 @@ function Layout( { styles } ) {
hasBlockSelected ? 'edit-post/block' : 'edit-post/document'
);

// Check if the block list view should be open by default.
useEffect( () => {
if ( isListViewOpenByDefault ) {
setIsListViewOpened( true );
}
}, [] );

// Inserter and Sidebars are mutually exclusive
useEffect( () => {
if ( sidebarIsOpened && ! isHugeViewport ) {
Expand Down
6 changes: 6 additions & 0 deletions packages/edit-post/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,12 @@ export function initializeEditor(
} );

dispatch( blocksStore ).__experimentalReapplyBlockTypeFilters();

// Check if the block list view should be open by default.
if ( select( editPostStore ).isFeatureActive( 'showListViewByDefault' ) ) {
dispatch( editPostStore ).setIsListViewOpened( true );
}

registerCoreBlocks();
if ( process.env.IS_GUTENBERG_PLUGIN ) {
__experimentalRegisterExperimentalCoreBlocks( {
Expand Down
16 changes: 1 addition & 15 deletions packages/edit-site/src/components/editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ function Editor( { onError } ) {
nextShortcut,
editorMode,
showIconLabels,
isListViewOpenByDefault,
} = useSelect( ( select ) => {
const {
isInserterOpened,
Expand Down Expand Up @@ -115,15 +114,9 @@ function Editor( { onError } ) {
'core/edit-site',
'showIconLabels'
),
isListViewOpenByDefault: select( preferencesStore ).get(
'core/edit-site',
'showListViewByDefault'
),
};
}, [] );
const { setPage, setIsInserterOpened, setIsListViewOpened } = useDispatch(
editSiteStore
);
const { setPage, setIsInserterOpened } = useDispatch( editSiteStore );
const { enableComplementaryArea } = useDispatch( interfaceStore );

const [
Expand Down Expand Up @@ -159,13 +152,6 @@ function Editor( { onError } ) {
[ page?.context ]
);

// Check if the block list view should be open by default.
useEffect( () => {
if ( isListViewOpenByDefault ) {
setIsListViewOpened( true );
}
}, [] );

useEffect( () => {
if ( isNavigationOpen ) {
document.body.classList.add( 'is-navigation-sidebar-open' );
Expand Down
11 changes: 11 additions & 0 deletions packages/edit-site/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,19 @@ export function reinitializeEditor( target, settings ) {
keepCaretInsideBlock: false,
welcomeGuide: true,
welcomeGuideStyles: true,
shouldListViewOpenByDefault: false,
} );

// Check if the block list view should be open by default.
if (
select( preferencesStore ).get(
'core/edit-site',
'showListViewByDefault'
)
) {
dispatch( editSiteStore ).setIsListViewOpened( true );
}

dispatch( editSiteStore ).updateSettings( settings );

// Keep the defaultTemplateTypes in the core/editor settings too,
Expand Down