@wordpress/block-editor 12.10.0 → 12.10.1

package/src/components/inserter/block-patterns-explorer/patterns-list.js

@@ -17,31 +17,13 @@ import InserterListbox from '../../inserter-listbox';
 import { searchItems } from '../search-items';
 import BlockPatternsPaging from '../../block-patterns-paging';
 import usePatternsPaging from '../hooks/use-patterns-paging';
-import { allPatternsCategory, isPatternFiltered } from '../block-patterns-tab';
-import { BlockPatternsSyncFilter } from '../block-patterns-sync-filter';
-import {
-	PATTERN_TYPES,
-	PATTERN_SOURCE_FILTERS,
-} from '../block-patterns-source-filter';
-
-function PatternsListHeader( {
-	filterValue,
-	filteredBlockPatternsLength,
-	selectedCategory,
-	patternCategories,
-} ) {
+import { allPatternsCategory, myPatternsCategory } from '../block-patterns-tab';
+
+function PatternsListHeader( { filterValue, filteredBlockPatternsLength } ) {
 	if ( ! filterValue ) {
 		return null;
 	}
-	let filter = filterValue;
-	if ( selectedCategory !== allPatternsCategory.name ) {
-		const category = patternCategories.find(
-			( patternCategory ) => patternCategory.name === selectedCategory
-		);
-		if ( category ) {
-			filter = `${ filter } - ${ category?.label }`;
-		}
-	}
+
 	return (
 		<Heading
 			level={ 2 }
@@ -49,26 +31,19 @@ function PatternsListHeader( {
 			className="block-editor-block-patterns-explorer__search-results-count"
 		>
 			{ sprintf(
-				/* translators: %d: number of patterns. %s: block pattern search query */
+				/* translators: %d: number of patterns. */
 				_n(
-					'%1$d pattern found for "%2$s"',
-					'%1$d patterns found for "%2$s"',
+					'%d pattern found',
+					'%d patterns found',
 					filteredBlockPatternsLength
 				),
-				filteredBlockPatternsLength,
-				filter
+				filteredBlockPatternsLength
 			) }
 		</Heading>
 	);
 }
 
-function PatternList( {
-	searchValue,
-	patternSourceFilter,
-	selectedCategory,
-	patternCategories,
-} ) {
-	const [ patternSyncFilter, setPatternSyncFilter ] = useState( 'all' );
+function PatternList( { searchValue, selectedCategory, patternCategories } ) {
 	const container = useRef();
 	const debouncedSpeak = useDebounce( speak, 500 );
 	const [ destinationRootClientId, onInsertBlocks ] = useInsertionPoint( {
@@ -89,20 +64,12 @@ function PatternList( {
 
 	const filteredBlockPatterns = useMemo( () => {
 		const filteredPatterns = patterns.filter( ( pattern ) => {
-			if (
-				isPatternFiltered(
-					pattern,
-					patternSourceFilter,
-					patternSyncFilter
-				)
-			) {
-				return false;
-			}
-
 			if ( selectedCategory === allPatternsCategory.name ) {
 				return true;
 			}
-
+			if ( selectedCategory === myPatternsCategory.name && pattern.id ) {
+				return true;
+			}
 			if ( selectedCategory === 'uncategorized' ) {
 				const hasKnownCategory = pattern.categories.some(
 					( category ) =>
@@ -119,18 +86,12 @@ function PatternList( {
 			return filteredPatterns;
 		}
 
-		return searchItems(
-			filteredPatterns,
-			searchValue,
-			patternSourceFilter
-		);
+		return searchItems( filteredPatterns, searchValue );
 	}, [
 		searchValue,
-		patternSourceFilter,
 		patterns,
 		selectedCategory,
 		registeredPatternCategories,
-		patternSyncFilter,
 	] );
 
 	// Announce search results on change.
@@ -150,10 +111,17 @@ function PatternList( {
 	const pagingProps = usePatternsPaging(
 		filteredBlockPatterns,
 		selectedCategory,
-		container,
-		patternSourceFilter
+		container
 	);
 
+	// Reset page when search value changes.
+	const [ previousSearchValue, setPreviousSearchValue ] =
+		useState( searchValue );
+	if ( searchValue !== previousSearchValue ) {
+		setPreviousSearchValue( searchValue );
+		pagingProps.changePage( 1 );
+	}
+
 	const hasItems = !! filteredBlockPatterns?.length;
 	return (
 		<div
@@ -161,23 +129,11 @@ function PatternList( {
 			ref={ container }
 		>
 			<PatternsListHeader
-				filterValue={
-					searchValue || PATTERN_SOURCE_FILTERS[ patternSourceFilter ]
-				}
+				filterValue={ searchValue }
 				filteredBlockPatternsLength={ filteredBlockPatterns.length }
-				selectedCategory={ selectedCategory }
-				patternCategories={ patternCategories }
 			/>
 
 			<InserterListbox>
-				{ patternSourceFilter === PATTERN_TYPES.user &&
-					! searchValue && (
-						<BlockPatternsSyncFilter
-							patternSyncFilter={ patternSyncFilter }
-							setPatternSyncFilter={ setPatternSyncFilter }
-						/>
-					) }
-
 				{ hasItems && (
 					<BlockPatternsList
 						shownPatterns={ pagingProps.categoryPatternsAsyncList }

package/src/components/inserter/block-patterns-explorer/sidebar.js

@@ -4,12 +4,6 @@
 import { Button, SearchControl } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
-/**
- * Internal dependencies
- */
-import { default as BlockPatternsSourceFilter } from '../block-patterns-source-filter';
-import { allPatternsCategory } from '../block-patterns-tab';
-
 function PatternCategoriesList( {
 	selectedCategory,
 	patternCategories,
@@ -56,8 +50,6 @@ function PatternExplorerSidebar( {
 	selectedCategory,
 	patternCategories,
 	onClickCategory,
-	patternSourceFilter,
-	setPatternSourceFilter,
 	searchValue,
 	setSearchValue,
 } ) {
@@ -68,13 +60,6 @@ function PatternExplorerSidebar( {
 				searchValue={ searchValue }
 				setSearchValue={ setSearchValue }
 			/>
-			<BlockPatternsSourceFilter
-				value={ patternSourceFilter }
-				onChange={ ( value ) => {
-					setPatternSourceFilter( value );
-					onClickCategory( allPatternsCategory.name );
-				} }
-			/>
 			{ ! searchValue && (
 				<PatternCategoriesList
 					selectedCategory={ selectedCategory }

package/src/components/inserter/block-patterns-filter.js

@@ -0,0 +1,183 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	SVG,
+	Path,
+	DropdownMenu,
+	MenuGroup,
+	MenuItemsChoice,
+} from '@wordpress/components';
+import { __ } from '@wordpress/i18n';
+import { Icon } from '@wordpress/icons';
+import { useMemo } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { myPatternsCategory } from './block-patterns-tab';
+
+export const PATTERN_TYPES = {
+	all: 'all',
+	synced: 'synced',
+	unsynced: 'unsynced',
+	user: 'user',
+	theme: 'theme',
+	directory: 'directory',
+};
+
+export const SYNC_TYPES = {
+	all: 'all',
+	full: 'fully',
+	unsynced: 'unsynced',
+};
+
+const getShouldDisableSyncFilter = ( sourceFilter ) =>
+	sourceFilter !== PATTERN_TYPES.all && sourceFilter !== PATTERN_TYPES.user;
+
+const getShouldDisableNonUserSources = ( category ) => {
+	return category.name === myPatternsCategory.name;
+};
+
+export function BlockPatternsSyncFilter( {
+	setPatternSyncFilter,
+	setPatternSourceFilter,
+	patternSyncFilter,
+	patternSourceFilter,
+	scrollContainerRef,
+	category,
+} ) {
+	// If the category is `myPatterns` then we need to set the source filter to `user`, but
+	// we do this by deriving from props rather than calling setPatternSourceFilter otherwise
+	// the user may be confused when switching to another category if the haven't explicity set
+	// this filter themselves.
+	const currentPatternSourceFilter =
+		category.name === myPatternsCategory.name
+			? PATTERN_TYPES.user
+			: patternSourceFilter;
+
+	// We need to disable the sync filter option if the source filter is not 'all' or 'user'
+	// otherwise applying them will just result in no patterns being shown.
+	const shouldDisableSyncFilter = getShouldDisableSyncFilter(
+		currentPatternSourceFilter
+	);
+
+	// We also need to disable the directory and theme source filter options if the category
+	// is `myPatterns` otherwise applying them will also just result in no patterns being shown.
+	const shouldDisableNonUserSources =
+		getShouldDisableNonUserSources( category );
+
+	const patternSyncMenuOptions = useMemo(
+		() => [
+			{ value: SYNC_TYPES.all, label: __( 'All' ) },
+			{
+				value: SYNC_TYPES.full,
+				label: __( 'Synced' ),
+				info: __( 'Updated everywhere' ),
+				disabled: shouldDisableSyncFilter,
+			},
+			{
+				value: SYNC_TYPES.unsynced,
+				label: __( 'Standard' ),
+				info: __( 'Edit freely' ),
+				disabled: shouldDisableSyncFilter,
+			},
+		],
+		[ shouldDisableSyncFilter ]
+	);
+
+	const patternSourceMenuOptions = useMemo(
+		() => [
+			{
+				value: PATTERN_TYPES.all,
+				label: __( 'All' ),
+				disabled: shouldDisableNonUserSources,
+			},
+			{
+				value: PATTERN_TYPES.directory,
+				label: __( 'Directory' ),
+				info: __( 'Pattern directory & core' ),
+				disabled: shouldDisableNonUserSources,
+			},
+			{
+				value: PATTERN_TYPES.theme,
+				label: __( 'Theme' ),
+				info: __( 'Bundled with the theme' ),
+				disabled: shouldDisableNonUserSources,
+			},
+			{
+				value: PATTERN_TYPES.user,
+				label: __( 'User' ),
+				info: __( 'Custom created' ),
+			},
+		],
+		[ shouldDisableNonUserSources ]
+	);
+
+	function handleSetSourceFilterChange( newSourceFilter ) {
+		setPatternSourceFilter( newSourceFilter );
+		if ( getShouldDisableSyncFilter( newSourceFilter ) ) {
+			setPatternSyncFilter( SYNC_TYPES.all );
+		}
+	}
+
+	return (
+		<>
+			<DropdownMenu
+				popoverProps={ {
+					placement: 'right-end',
+				} }
+				label="Filter patterns"
+				icon={
+					<Icon
+						icon={
+							<SVG
+								width="24"
+								height="24"
+								viewBox="0 0 24 24"
+								fill="none"
+								xmlns="http://www.w3.org/2000/svg"
+							>
+								<Path
+									d="M10 17.5H14V16H10V17.5ZM6 6V7.5H18V6H6ZM8 12.5H16V11H8V12.5Z"
+									fill="#1E1E1E"
+								/>
+							</SVG>
+						}
+					/>
+				}
+			>
+				{ () => (
+					<>
+						<MenuGroup label={ __( 'Author' ) }>
+							<MenuItemsChoice
+								choices={ patternSourceMenuOptions }
+								onSelect={ ( value ) => {
+									handleSetSourceFilterChange( value );
+									scrollContainerRef.current?.scrollTo(
+										0,
+										0
+									);
+								} }
+								value={ currentPatternSourceFilter }
+							/>
+						</MenuGroup>
+						<MenuGroup label={ __( 'Type' ) }>
+							<MenuItemsChoice
+								choices={ patternSyncMenuOptions }
+								onSelect={ ( value ) => {
+									setPatternSyncFilter( value );
+									scrollContainerRef.current?.scrollTo(
+										0,
+										0
+									);
+								} }
+								value={ patternSyncFilter }
+							/>
+						</MenuGroup>
+					</>
+				) }
+			</DropdownMenu>
+		</>
+	);
+}

package/src/components/inserter/block-patterns-tab.js

@@ -14,6 +14,9 @@ import {
 	__experimentalItemGroup as ItemGroup,
 	__experimentalItem as Item,
 	__experimentalHStack as HStack,
+	__experimentalVStack as VStack,
+	__experimentalHeading as Heading,
+	__experimentalText as Text,
 	FlexBlock,
 	Button,
 } from '@wordpress/components';
@@ -28,48 +31,68 @@ import usePatternsState from './hooks/use-patterns-state';
 import BlockPatternList from '../block-patterns-list';
 import PatternsExplorerModal from './block-patterns-explorer/explorer';
 import MobileTabNavigation from './mobile-tab-navigation';
-import BlockPatternsPaging from '../block-patterns-paging';
 import usePatternsPaging from './hooks/use-patterns-paging';
-import {
-	PATTERN_TYPES,
-	default as BlockPatternsSourceFilter,
-} from './block-patterns-source-filter';
 import {
 	BlockPatternsSyncFilter,
 	SYNC_TYPES,
-} from './block-patterns-sync-filter';
+	PATTERN_TYPES,
+} from './block-patterns-filter';
 
 const noop = () => {};
 
 export const allPatternsCategory = {
 	name: 'allPatterns',
-	label: __( 'All categories' ),
+	label: __( 'All Patterns' ),
+};
+
+export const myPatternsCategory = {
+	name: 'myPatterns',
+	label: __( 'My patterns' ),
 };
 
 export function isPatternFiltered( pattern, sourceFilter, syncFilter ) {
+	const isUserPattern = pattern.name.startsWith( 'core/block' );
+	const isDirectoryPattern =
+		pattern.source === 'core' ||
+		pattern.source?.startsWith( 'pattern-directory' );
+
+	// If theme source selected, filter out user created patterns and those from
+	// the core patterns directory.
 	if (
 		sourceFilter === PATTERN_TYPES.theme &&
-		pattern.name.startsWith( 'core/block' )
+		( isUserPattern || isDirectoryPattern )
+	) {
+		return true;
+	}
+
+	// If the directory source is selected, filter out user created patterns
+	// and those bundled with the theme.
+	if (
+		sourceFilter === PATTERN_TYPES.directory &&
+		( isUserPattern || ! isDirectoryPattern )
 	) {
 		return true;
 	}
+
+	// If user source selected, filter out theme patterns. Any pattern without
+	// an id wasn't created by a user.
 	if ( sourceFilter === PATTERN_TYPES.user && ! pattern.id ) {
 		return true;
 	}
-	if (
-		sourceFilter === PATTERN_TYPES.user &&
-		syncFilter === SYNC_TYPES.full &&
-		pattern.syncStatus !== ''
-	) {
+
+	// Filter by sync status.
+	if ( syncFilter === SYNC_TYPES.full && pattern.syncStatus !== '' ) {
 		return true;
 	}
+
 	if (
-		sourceFilter === PATTERN_TYPES.user &&
 		syncFilter === SYNC_TYPES.unsynced &&
-		pattern.syncStatus !== 'unsynced'
+		pattern.syncStatus !== 'unsynced' &&
+		isUserPattern
 	) {
 		return true;
 	}
+
 	return false;
 }
 
@@ -126,6 +149,9 @@ export function usePatternsCategories( rootClientId, sourceFilter = 'all' ) {
 				label: _x( 'Uncategorized' ),
 			} );
 		}
+		if ( filteredPatterns.some( ( pattern ) => pattern.id ) ) {
+			categories.unshift( myPatternsCategory );
+		}
 		if ( filteredPatterns.length > 0 ) {
 			categories.unshift( {
 				name: allPatternsCategory.name,
@@ -173,6 +199,7 @@ export function BlockPatternsCategoryDialog( {
 			className="block-editor-inserter__patterns-category-dialog"
 		>
 			<BlockPatternsCategoryPanel
+				key={ category.name }
 				rootClientId={ rootClientId }
 				onInsert={ onInsert }
 				onHover={ onHover }
@@ -190,26 +217,26 @@ export function BlockPatternsCategoryPanel( {
 	onHover = noop,
 	category,
 	showTitlesAsTooltip,
-	patternFilter,
 } ) {
 	const [ allPatterns, , onClickPattern ] = usePatternsState(
 		onInsert,
 		rootClientId
 	);
 	const [ patternSyncFilter, setPatternSyncFilter ] = useState( 'all' );
+	const [ patternSourceFilter, setPatternSourceFilter ] = useState( 'all' );
 
 	const availableCategories = usePatternsCategories(
 		rootClientId,
-		patternFilter
+		patternSourceFilter
 	);
-	const container = useRef();
+	const scrollContainerRef = useRef();
 	const currentCategoryPatterns = useMemo(
 		() =>
 			allPatterns.filter( ( pattern ) => {
 				if (
 					isPatternFiltered(
 						pattern,
-						patternFilter,
+						patternSourceFilter,
 						patternSyncFilter
 					)
 				) {
@@ -219,6 +246,9 @@ export function BlockPatternsCategoryPanel( {
 				if ( category.name === allPatternsCategory.name ) {
 					return true;
 				}
+				if ( category.name === myPatternsCategory.name && pattern.id ) {
+					return true;
+				}
 				if ( category.name !== 'uncategorized' ) {
 					return pattern.categories?.includes( category.name );
 				}
@@ -239,7 +269,7 @@ export function BlockPatternsCategoryPanel( {
 			allPatterns,
 			availableCategories,
 			category.name,
-			patternFilter,
+			patternSourceFilter,
 			patternSyncFilter,
 		]
 	);
@@ -247,33 +277,66 @@ export function BlockPatternsCategoryPanel( {
 	const pagingProps = usePatternsPaging(
 		currentCategoryPatterns,
 		category,
-		container
+		scrollContainerRef
 	);
+	const { changePage } = pagingProps;
 
 	// Hide block pattern preview on unmount.
 	// eslint-disable-next-line react-hooks/exhaustive-deps
 	useEffect( () => () => onHover( null ), [] );
 
+	const onSetPatternSyncFilter = useCallback(
+		( value ) => {
+			setPatternSyncFilter( value );
+			changePage( 1 );
+		},
+		[ setPatternSyncFilter, changePage ]
+	);
+	const onSetPatternSourceFilter = useCallback(
+		( value ) => {
+			setPatternSourceFilter( value );
+			changePage( 1 );
+		},
+		[ setPatternSourceFilter, changePage ]
+	);
+
 	return (
-		<div
-			className="block-editor-inserter__patterns-category-panel"
-			ref={ container }
-		>
-			<div className="block-editor-inserter__patterns-category-panel-title">
-				{ category.label }
-			</div>
-			<p>{ category.description }</p>
-			{ patternFilter === PATTERN_TYPES.user && (
-				<BlockPatternsSyncFilter
-					patternSyncFilter={ patternSyncFilter }
-					setPatternSyncFilter={ setPatternSyncFilter }
-				/>
-			) }
-			{ ! currentCategoryPatterns.length && (
-				<div>{ __( 'No results found' ) }</div>
-			) }
+		<div className="block-editor-inserter__patterns-category-panel">
+			<VStack
+				spacing={ 2 }
+				className="block-editor-inserter__patterns-category-panel-header"
+			>
+				<HStack>
+					<FlexBlock>
+						<Heading level={ 4 } as="div">
+							{ category.label }
+						</Heading>
+					</FlexBlock>
+					<BlockPatternsSyncFilter
+						patternSyncFilter={ patternSyncFilter }
+						patternSourceFilter={ patternSourceFilter }
+						setPatternSyncFilter={ onSetPatternSyncFilter }
+						setPatternSourceFilter={ onSetPatternSourceFilter }
+						scrollContainerRef={ scrollContainerRef }
+						category={ category }
+					/>
+				</HStack>
+				{ category.description && (
+					<Text>{ category.description }</Text>
+				) }
+				{ ! currentCategoryPatterns.length && (
+					<Text
+						variant="muted"
+						className="block-editor-inserter__patterns-category-no-results"
+					>
+						{ __( 'No results found' ) }
+					</Text>
+				) }
+			</VStack>
+
 			{ currentCategoryPatterns.length > 0 && (
 				<BlockPatternList
+					ref={ scrollContainerRef }
 					shownPatterns={ pagingProps.categoryPatternsAsyncList }
 					blockPatterns={ pagingProps.categoryPatterns }
 					onClickPattern={ onClickPattern }
@@ -283,12 +346,10 @@ export function BlockPatternsCategoryPanel( {
 					category={ category.name }
 					isDraggable
 					showTitlesAsTooltip={ showTitlesAsTooltip }
-					patternFilter={ patternFilter }
+					patternFilter={ patternSourceFilter }
+					pagingProps={ pagingProps }
 				/>
 			) }
-			{ pagingProps.numPages > 1 && (
-				<BlockPatternsPaging { ...pagingProps } />
-			) }
 		</div>
 	);
 }
@@ -300,12 +361,8 @@ function BlockPatternsTabs( {
 	rootClientId,
 } ) {
 	const [ showPatternsExplorer, setShowPatternsExplorer ] = useState( false );
-	const [ patternSourceFilter, setPatternSourceFilter ] = useState( 'all' );
 
-	const categories = usePatternsCategories(
-		rootClientId,
-		patternSourceFilter
-	);
+	const categories = usePatternsCategories( rootClientId );
 
 	const initialCategory = selectedCategory || categories[ 0 ];
 	const isMobile = useViewportMatch( 'medium', '<' );
@@ -317,23 +374,13 @@ function BlockPatternsTabs( {
 						aria-label={ __( 'Block pattern categories' ) }
 						className="block-editor-inserter__block-patterns-tabs"
 					>
-						<BlockPatternsSourceFilter
-							value={ patternSourceFilter }
-							onChange={ ( value ) => {
-								setPatternSourceFilter( value );
-								onSelectCategory( allPatternsCategory, value );
-							} }
-						/>
 						<ItemGroup role="list">
 							{ categories.map( ( category ) => (
 								<Item
 									role="listitem"
 									key={ category.name }
 									onClick={ () =>
-										onSelectCategory(
-											category,
-											patternSourceFilter
-										)
+										onSelectCategory( category )
 									}
 									className={
 										category === selectedCategory
@@ -380,6 +427,7 @@ function BlockPatternsTabs( {
 				<MobileTabNavigation categories={ categories }>
 					{ ( category ) => (
 						<BlockPatternsCategoryPanel
+							key={ category.name }
 							onInsert={ onInsert }
 							rootClientId={ rootClientId }
 							category={ category }

package/src/components/inserter/hooks/use-patterns-paging.js

@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useMemo, useState } from '@wordpress/element';
+import { useMemo, useState, useEffect } from '@wordpress/element';
 import { useAsyncList, usePrevious } from '@wordpress/compose';
 import { getScrollContainer } from '@wordpress/dom';
 
@@ -54,6 +54,17 @@ export default function usePatternsPaging(
 
 		setCurrentPage( page );
 	};
+
+	useEffect(
+		function scrollToTopOnCategoryChange() {
+			const scrollContainer = getScrollContainer(
+				scrollContainerRef?.current
+			);
+			scrollContainer?.scrollTo( 0, 0 );
+		},
+		[ currentCategory, scrollContainerRef ]
+	);
+
 	return {
 		totalItems,
 		categoryPatterns,