Skip to content

[Block Library - Query Loop]: Connect scoped block variation to inserter variations #46410

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
merged 3 commits into from
Dec 20, 2022
Merged

[Block Library - Query Loop]: Connect scoped block variation to inserter variations #46410

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
92cd811
[Block Library - Query Loop]: Connect scoped `block` variation to `in…
ntsekouras Dec 8, 2022
63eb09e
address feedback and support multiple variations connections
ntsekouras Dec 15, 2022
12f85c1
add docs
ntsekouras Dec 19, 2022
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
Prev Previous commit
Next Next commit
address feedback and support multiple variations connections
  • Loading branch information
@ntsekouras
ntsekouras committed Dec 20, 2022
commit 63eb09e6b29fcebaaf2b55b4d99599c101ad6fe6
4 changes: 1 addition & 3 deletions packages/block-library/src/query/edit/query-placeholder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ export default function QueryPlaceholder( {
return (
<QueryVariationPicker
clientId={ clientId }
name={ name }
attributes={ attributes }
setAttributes={ setAttributes }
icon={ icon }
Expand Down Expand Up @@ -103,13 +102,12 @@ export default function QueryPlaceholder( {

function QueryVariationPicker( {
clientId,
name,
attributes,
setAttributes,
icon,
label,
} ) {
const scopeVariations = useScopedBlockVariations( name, attributes );
const scopeVariations = useScopedBlockVariations( attributes );
const { replaceInnerBlocks } = useDispatch( blockEditorStore );
const blockProps = useBlockProps();
return (
Expand Down
25 changes: 12 additions & 13 deletions packages/block-library/src/query/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,17 +275,17 @@ export function useBlockNameForPatterns( clientId, attributes ) {
* Loop are going to be suggested.
*
* The way we determine such variations is with the convention that they have the `namespace`
* attribute defined with the `name` of the variation they want to be connected to.
* attribute defined as an array. This array should contain the names(`name` property) of any
* variations they want to be connected to.
* For example, if we have a `Query Loop` scoped `inserter` variation with the name `products`,
* we can connect a scoped `block` variation by setting its `namespace` attribute to `products`.
* we can connect a scoped `block` variation by setting its `namespace` attribute to `['products']`.
* If the user selects this variation, the `namespace` attribute will be overridden by the
* main `inserter` variation.
*
* @param {string} name The block's name.
* @param {Object} attributes The block's attributes.
* @return {WPBlockVariation[]} The block variations to be suggested in setup flow, when clicking to `start blank`.
*/
export function useScopedBlockVariations( name, attributes ) {
export function useScopedBlockVariations( attributes ) {
const { activeVariationName, blockVariations } = useSelect(
( select ) => {
const { getActiveBlockVariation, getBlockVariations } =
Expand All @@ -295,27 +295,26 @@ export function useScopedBlockVariations( name, attributes ) {
queryLoopName,
attributes
)?.name,
blockVariations: getBlockVariations( name, 'block' ),
blockVariations: getBlockVariations( queryLoopName, 'block' ),
};
},
[ name, attributes ]
[ attributes ]
);
const variations = useMemo( () => {
// Filter out the variations that have defined a `namespace` attribute,
// which means they are 'connected' to a specific variation of the block.
const filterOutConnectedVariationsFn = ( variation ) =>
// which means they are 'connected' to specific variations of the block.
const isNotConnected = ( variation ) =>
! variation.attributes?.namespace;
if ( ! activeVariationName ) {
return blockVariations.filter( filterOutConnectedVariationsFn );
return blockVariations.filter( isNotConnected );
}
const connectedVariations = blockVariations.filter(
( variation ) =>
variation.attributes?.namespace === activeVariationName
const connectedVariations = blockVariations.filter( ( variation ) =>
variation.attributes?.namespace?.includes( activeVariationName )
);
if ( !! connectedVariations.length ) {
return connectedVariations;
}
return blockVariations.filter( filterOutConnectedVariationsFn );
return blockVariations.filter( isNotConnected );
}, [ activeVariationName, blockVariations ] );
return variations;
}