Skip to content

Buttons Block: Show inserter if button have variations (#53498) #53783

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
stokesman merged 3 commits into from
Sep 11, 2023
Merged

Buttons Block: Show inserter if button have variations (#53498) #53783

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e7c858
Buttons Block: Show inserter if button have variations (#53498)
petitphp Aug 17, 2023
94e1c4b
Combine `useSelect` variations with the existing one
petitphp Aug 18, 2023
eeb82ba
Add comment about the custom check for the `directInsert` option valu…
petitphp Aug 18, 2023
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
16 changes: 13 additions & 3 deletions packages/block-library/src/buttons/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
store as blockEditorStore,
} from '@wordpress/block-editor';
import { useSelect } from '@wordpress/data';
import { store as blocksStore } from '@wordpress/blocks';

/**
* Internal dependencies
Expand Down Expand Up @@ -42,17 +43,26 @@ function ButtonsEdit( { attributes, className } ) {
'has-custom-font-size': fontSize || style?.typography?.fontSize,
} ),
} );
const preferredStyle = useSelect( ( select ) => {
const { preferredStyle, hasButtonVariations } = useSelect( ( select ) => {
const preferredStyleVariations =
select( blockEditorStore ).getSettings()
.__experimentalPreferredStyleVariations;
return preferredStyleVariations?.value?.[ buttonBlockName ];
const buttonVariations = select( blocksStore ).getBlockVariations(
buttonBlockName,
'inserter'
);
return {
preferredStyle:
preferredStyleVariations?.value?.[ buttonBlockName ],
hasButtonVariations: buttonVariations.length > 0,
};
}, [] );

const innerBlocksProps = useInnerBlocksProps( blockProps, {
allowedBlocks: ALLOWED_BLOCKS,
defaultBlock: DEFAULT_BLOCK,
directInsert: true,
// This check should be handled by the `Inserter` internally to be consistent across all blocks that use it.

@youknowriad youknowriad Sep 11, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this considered a follow-up? What prevented us from actually implementing this solution?

@stokesman stokesman Sep 12, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I understood it to be for a follow-up.

What prevented us from actually implementing this solution?

I suppose nothing besides someone putting in the effort. I've taken a closer look and the logic is actually already there. It seems the Buttons block was working as in this PR before #37905. In that PR directInsert: true was added and which forces it even when there are variations. I think I found a way to reconcile this.

directInsert: ! hasButtonVariations,
template: [
[
buttonBlockName,
Expand Down