Skip to content

Fix: pattern selection missing after making duplicate selection #434

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
brookewp merged 3 commits into from
Mar 26, 2025
Merged

Fix: pattern selection missing after making duplicate selection #434

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b345f31
Fix issue where patterns aren’t available in modal
brookewp Mar 24, 2025
364095f
Cursor!
brookewp Mar 25, 2025
ad920af
Improve types
chriszarate Mar 26, 2025
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
26 changes: 19 additions & 7 deletions src/blocks/remote-data-container/hooks/usePatterns.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,25 @@ export function cloneBlockWithAttributes(
export function usePatterns( remoteDataBlockName: string, rootClientId: string = '' ) {
const { patterns } = getBlockConfig( remoteDataBlockName ) ?? {};
const { replaceInnerBlocks } = useDispatch< BlockEditorStoreActions >( blockEditorStore );
const { getBlocks, getPatternsByBlockTypes, __experimentalGetAllowedPatterns } =
useSelect< BlockEditorStoreSelectors >( blockEditorStore, [
remoteDataBlockName,
[ remoteDataBlockName, rootClientId ],
] );

// Extract patterns with defined roles.
const { getBlocks, getPatternsByBlockTypes, allowedPatterns } = useSelect<
BlockEditorStoreSelectors,
Pick< BlockEditorStoreSelectors, 'getBlocks' | 'getPatternsByBlockTypes' > & {
allowedPatterns: BlockPattern[];
}
>(
select => {
const store = select( blockEditorStore );
return {
getBlocks: store.getBlocks,
getPatternsByBlockTypes: store.getPatternsByBlockTypes,
allowedPatterns: store.__experimentalGetAllowedPatterns( rootClientId ) ?? [],
};
},
[ remoteDataBlockName, rootClientId ]
);

// Extract patterns with defined roles
const patternsByBlockTypes = getPatternsByBlockTypes( remoteDataBlockName );
const defaultPattern = patternsByBlockTypes.find( ( { name } ) => name === patterns?.default );
const innerBlocksPattern = patternsByBlockTypes.find(
Expand All @@ -58,7 +70,7 @@ export function usePatterns( remoteDataBlockName: string, rootClientId: string =
);
},
getSupportedPatterns: ( result?: RemoteDataApiResult ): BlockPattern[] => {
const supportedPatterns = __experimentalGetAllowedPatterns( rootClientId ).filter(
const supportedPatterns = allowedPatterns.filter(
pattern =>
pattern?.blockTypes?.includes( remoteDataBlockName ) ||
pattern.blocks.some( block => hasBlockBinding( block, remoteDataBlockName ) )
Expand Down