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

[Block Editor]: Fix block variation registration when icon is an object and contains transform scope #41457

Merged
merged 2 commits into from
Jun 1, 2022
Merged

[Block Editor]: Fix block variation registration when icon is an object and contains transform scope #41457

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c89bc01
[Block Editor]: Fix block variation registration when `icon` is an `o…
ntsekouras May 31, 2022
5c94ce8
show colors
ntsekouras May 31, 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
5 changes: 3 additions & 2 deletions packages/block-editor/src/components/block-variation-transforms/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { chevronDown } from '@wordpress/icons';
/**
* Internal dependencies
*/
import BlockIcon from '../block-icon';
import { store as blockEditorStore } from '../../store';

function VariationsButtons( {
Expand All @@ -33,7 +34,7 @@ function VariationsButtons( {
{ variations.map( ( variation ) => (
<Button
key={ variation.name }
icon={ variation.icon }
icon={ <BlockIcon icon={ variation.icon } /> }
ntsekouras marked this conversation as resolved.
Show resolved Hide resolved
isPressed={ selectedValue === variation.name }
label={
selectedValue === variation.name
Expand Down Expand Up @@ -126,7 +127,7 @@ function __experimentalBlockVariationTransforms( { blockClientId } ) {
}
variations.forEach( ( variation ) => {
if ( variation.icon ) {
variationIcons.add( variation.icon );
variationIcons.add( variation.icon?.src || variation.icon );
}
} );
return variationIcons.size === variations.length;
Expand Down