Skip to content

Fix inserter / block directory issues #17517

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
talldan merged 4 commits into from
Sep 26, 2019
Merged

Fix inserter / block directory issues #17517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcb5f74
Fix flipped `hasItems` value
talldan Sep 23, 2019
ef0ea34
Only show help panel when blocks are available
talldan Sep 23, 2019
ae562e1
Only render the block directory when a search term has been entered
talldan Sep 23, 2019
086dc29
Make boolean logic more readable
talldan Sep 26, 2019
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
13 changes: 8 additions & 5 deletions packages/block-editor/src/components/inserter/menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,13 @@ export class InserterMenu extends Component {
openPanels,
reusableItems,
suggestedItems,
filterValue,
} = this.state;

const isPanelOpen = ( panel ) => openPanels.indexOf( panel ) !== -1;
const hasItems = isEmpty( suggestedItems ) && isEmpty( reusableItems ) && isEmpty( itemsPerCategory );
const hasItems = ! isEmpty( suggestedItems ) || ! isEmpty( reusableItems ) || ! isEmpty( itemsPerCategory );
const hoveredItemBlockType = hoveredItem ? getBlockType( hoveredItem.name ) : null;
const hasHelpPanel = hasItems && showInserterHelpPanel;

// Disable reason (no-autofocus): The inserter menu is a modal display, not one which
// is always visible, and one which already incurs this behavior of autoFocus via
Expand All @@ -276,7 +279,7 @@ export class InserterMenu extends Component {
return (
<div
className={ classnames( 'editor-inserter__menu block-editor-inserter__menu', {
'has-help-panel': showInserterHelpPanel,
'has-help-panel': hasHelpPanel,
} ) }
onKeyPress={ stopKeyPropagation }
onKeyDown={ this.onKeyDown }
Expand Down Expand Up @@ -362,15 +365,15 @@ export class InserterMenu extends Component {
fillProps={ {
onSelect,
onHover: this.onHover,
filterValue: this.state.filterValue,
filterValue,
hasItems,
} }
>
{ ( fills ) => {
if ( fills.length ) {
return fills;
}
if ( hasItems ) {
if ( ! hasItems ) {
return (
<p className="editor-inserter__no-results block-editor-inserter__no-results">{ __( 'No blocks found.' ) }</p>
);
Expand All @@ -381,7 +384,7 @@ export class InserterMenu extends Component {
</div>
</div>

{ showInserterHelpPanel && (
{ hasHelpPanel && (
<div className="block-editor-inserter__menu-help-panel">
{ hoveredItem && (
<>
Expand Down
2 changes: 1 addition & 1 deletion packages/editor/src/components/inserter-menu-downloadable-blocks-panel/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function InserterMenuDownloadableBlocksPanel() {
<__experimentalInserterMenuExtension>
{
( { onSelect, onHover, filterValue, hasItems } ) => {
if ( ! hasItems ) {
if ( hasItems || ! filterValue ) {
return null;
}

Expand Down