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

Jump to bottom

Fix: Inserter impossible to collapse panels while searching. #13884

Merged
merged 2 commits into from
Mar 11, 2019
Merged

Fix: Inserter impossible to collapse panels while searching. #13884

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2010aa2
Fix: Inserter impossible to collapse panels while searching.
jorgefilipecosta Feb 14, 2019
f8e2c44
Extract filterOpenPanels funcion
jorgefilipecosta Mar 11, 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
50 changes: 34 additions & 16 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 @@ -170,6 +170,25 @@ export class InserterMenu extends Component {
};
}

filterOpenPanels( filterValue, itemsPerCategory, filteredItems, reusableItems ) {
if ( filterValue === this.state.filterValue ) {
return this.state.openPanels;
}
if ( ! filterValue ) {
return [ 'suggested' ];
}
let openPanels = [];
if ( reusableItems.length > 0 ) {
openPanels.push( 'reusable' );
}
if ( filteredItems.length > 0 ) {
openPanels = openPanels.concat(
Object.keys( itemsPerCategory )
);
}
return openPanels;
}

filter( filterValue = '' ) {
const { debouncedSpeak, items, rootChildBlocks } = this.props;
const filteredItems = searchItems( items, filterValue );
Expand All @@ -193,26 +212,19 @@ export class InserterMenu extends Component {
( itemList ) => groupBy( itemList, 'category' )
)( filteredItems );

let openPanels = this.state.openPanels;
if ( filterValue !== this.state.filterValue ) {
if ( ! filterValue ) {
openPanels = [ 'suggested' ];
} else if ( reusableItems.length ) {
openPanels = [ 'reusable' ];
} else if ( filteredItems.length ) {
const firstCategory = find( getCategories(), ( { slug } ) => itemsPerCategory[ slug ] && itemsPerCategory[ slug ].length );
openPanels = [ firstCategory.slug ];
}
}

this.setState( {
hoveredItem: null,
childItems,
filterValue,
suggestedItems,
reusableItems,
itemsPerCategory,
openPanels,
openPanels: this.filterOpenPanels(
filterValue,
itemsPerCategory,
filteredItems,
reusableItems
),
} );

const resultCount = Object.keys( itemsPerCategory ).reduce( ( accumulator, currentCategorySlug ) => {
Expand All @@ -236,9 +248,15 @@ export class InserterMenu extends Component {

render() {
const { instanceId, onSelect, rootClientId } = this.props;
const { childItems, filterValue, hoveredItem, suggestedItems, reusableItems, itemsPerCategory, openPanels } = this.state;
const {
childItems,
hoveredItem,
itemsPerCategory,
openPanels,
reusableItems,
suggestedItems,
} = this.state;
const isPanelOpen = ( panel ) => openPanels.indexOf( panel ) !== -1;
const isSearching = !! filterValue;

// 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 Down Expand Up @@ -300,7 +318,7 @@ export class InserterMenu extends Component {
key={ category.slug }
title={ category.title }
icon={ category.icon }
opened={ isSearching || isPanelOpen( category.slug ) }
opened={ isPanelOpen( category.slug ) }
onToggle={ this.onTogglePanel( category.slug ) }
ref={ this.bindPanel( category.slug ) }
>
Expand Down