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

Patterns: revert usePatternsState to return an array instead of object #54582

Merged
merged 1 commit into from
Sep 19, 2023
Merged

Patterns: revert usePatternsState to return an array instead of object #54582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions packages/block-editor/src/components/inserter/block-patterns-explorer/patterns-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function PatternList( {
const [ destinationRootClientId, onInsertBlocks ] = useInsertionPoint( {
shouldFocusBlock: true,
} );
const { patterns: allPatterns, onClickPattern } = usePatternsState(
const [ patterns, , onClickPattern ] = usePatternsState(
onInsertBlocks,
destinationRootClientId
);
Expand All @@ -88,7 +88,7 @@ function PatternList( {
);

const filteredBlockPatterns = useMemo( () => {
const filteredPatterns = allPatterns.filter( ( pattern ) => {
const filteredPatterns = patterns.filter( ( pattern ) => {
if (
isPatternFiltered(
pattern,
Expand Down Expand Up @@ -127,7 +127,7 @@ function PatternList( {
}, [
searchValue,
patternSourceFilter,
allPatterns,
patterns,
selectedCategory,
registeredPatternCategories,
patternSyncFilter,
Expand Down
10 changes: 5 additions & 5 deletions packages/block-editor/src/components/inserter/block-patterns-tab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,20 +74,20 @@ export function isPatternFiltered( pattern, sourceFilter, syncFilter ) {
}

export function usePatternsCategories( rootClientId, sourceFilter = 'all' ) {
const { patterns: allPatterns, allCategories } = usePatternsState(
const [ patterns, allCategories ] = usePatternsState(
undefined,
rootClientId
);

const filteredPatterns = useMemo(
() =>
sourceFilter === 'all'
? allPatterns
: allPatterns.filter(
? patterns
: patterns.filter(
( pattern ) =>
! isPatternFiltered( pattern, sourceFilter )
),
[ sourceFilter, allPatterns ]
[ sourceFilter, patterns ]
);

const hasRegisteredCategory = useCallback(
Expand Down Expand Up @@ -192,7 +192,7 @@ export function BlockPatternsCategoryPanel( {
showTitlesAsTooltip,
patternFilter,
} ) {
const { patterns: allPatterns, onClickPattern } = usePatternsState(
const [ allPatterns, , onClickPattern ] = usePatternsState(
onInsert,
rootClientId
);
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/inserter/hooks/use-patterns-state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const usePatternsState = ( onInsert, rootClientId ) => {
[ createSuccessNotice, onInsert ]
);

return { patterns, allCategories, onClickPattern };
return [ patterns, allCategories, onClickPattern ];
};

export default usePatternsState;
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/inserter/quick-inserter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function QuickInserter( {
onInsertBlocks
);

const { patterns } = usePatternsState(
const [ patterns ] = usePatternsState(
onInsertBlocks,
destinationRootClientId
);
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/inserter/search-results.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function InserterSearchResults( {
blockTypeCollections,
onSelectBlockType,
] = useBlockTypesState( destinationRootClientId, onInsertBlocks );
const { patterns, onClickPattern } = usePatternsState(
const [ patterns, , onClickPattern ] = usePatternsState(
onInsertBlocks,
destinationRootClientId
);
Expand Down
Loading