Skip to content

Auto-inserting blocks: Add block icon to block inspector panel toggles #54029

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
ockham merged 5 commits into from
Sep 4, 2023
Merged

Auto-inserting blocks: Add block icon to block inspector panel toggles #54029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d866c2
Auto-inserting blocks: Add block icon to block inspector panel toggles
ockham Aug 29, 2023
dd8eb2d
Right-align toggle
ockham Aug 29, 2023
f7d9241
Add comment to scss file
ockham Aug 29, 2023
af33711
Use BEM classname
ockham Aug 30, 2023
2aa4888
Use HStack to align icon and text label
ockham Aug 30, 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
23 changes: 19 additions & 4 deletions packages/block-editor/src/hooks/auto-inserting-blocks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@
import { __ } from '@wordpress/i18n';
import { addFilter } from '@wordpress/hooks';
import { Fragment } from '@wordpress/element';
import { PanelBody, ToggleControl } from '@wordpress/components';
import {
__experimentalHStack as HStack,
PanelBody,
ToggleControl,
} from '@wordpress/components';
import { createHigherOrderComponent } from '@wordpress/compose';
import { createBlock, store as blocksStore } from '@wordpress/blocks';
import { useDispatch, useSelect } from '@wordpress/data';

/**
* Internal dependencies
*/
import { InspectorControls } from '../components';
import { BlockIcon, InspectorControls } from '../components';
import { store as blockEditorStore } from '../store';

function AutoInsertingBlocksControl( props ) {
Expand Down Expand Up @@ -151,7 +155,11 @@ function AutoInsertingBlocksControl( props ) {

return (
<InspectorControls>
<PanelBody title={ __( 'Plugins' ) } initialOpen={ true }>
<PanelBody
className="block-editor-hooks__auto-inserting-blocks"
title={ __( 'Plugins' ) }
initialOpen={ true }
>
{ Object.keys( groupedAutoInsertedBlocks ).map( ( vendor ) => {
return (
<Fragment key={ vendor }>
Expand All @@ -169,7 +177,14 @@ function AutoInsertingBlocksControl( props ) {
<ToggleControl
checked={ checked }
key={ block.title }
label={ block.title }
label={
<HStack justify="flex-start">
<BlockIcon
icon={ block.icon }
/>
<span>{ block.title }</span>
</HStack>
}
onChange={ () => {
if ( ! checked ) {
// Create and insert block.
Expand Down
16 changes: 16 additions & 0 deletions packages/block-editor/src/hooks/auto-inserting-blocks.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.block-editor-hooks__auto-inserting-blocks {
/**
* Since we're displaying the block icon alongside the block name,
* we need to right-align the toggle.
*/
.components-toggle-control .components-h-stack {
flex-direction: row-reverse;
}

/**
* Un-reverse the flex direction for the toggle's label.
*/
.components-toggle-control .components-h-stack .components-h-stack {
flex-direction: row;
}
}
1 change: 1 addition & 0 deletions packages/block-editor/src/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
@import "./components/url-input/style.scss";
@import "./components/url-popover/style.scss";
@import "./hooks/anchor.scss";
@import "./hooks/auto-inserting-blocks.scss";
@import "./hooks/border.scss";
@import "./hooks/color.scss";
@import "./hooks/dimensions.scss";
Expand Down