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.

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

Use custom name in block sidebar if available (retaining block type information) #65641

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 18 additions & 5 deletions packages/block-editor/src/components/block-card/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,21 @@ import {
Button,
__experimentalText as Text,
__experimentalVStack as VStack,
privateApis as componentsPrivateApis,
} from '@wordpress/components';
import { chevronLeft, chevronRight } from '@wordpress/icons';
import { __, _x, isRTL, sprintf } from '@wordpress/i18n';
import { useSelect, useDispatch } from '@wordpress/data';
import { createInterpolateElement } from '@wordpress/element';

/**
* Internal dependencies
*/
import BlockIcon from '../block-icon';
import { store as blockEditorStore } from '../../store';
import { unlock } from '../../lock-unlock';

const { Badge } = unlock( componentsPrivateApis );

function BlockCard( { title, icon, description, blockType, className, name } ) {
if ( blockType ) {
Expand Down Expand Up @@ -67,11 +72,19 @@ function BlockCard( { title, icon, description, blockType, className, name } ) {
<VStack spacing={ 1 }>
<h2 className="block-editor-block-card__title">
{ name?.length
? sprintf(
// translators: 1: Custom block name. 2: Block title.
_x( '%1$s (%2$s)', 'block label' ),
name,
title
? createInterpolateElement(
sprintf(
// translators: 1: Custom block name. 2: Block title.
_x(
'%1$s <badge>%2$s</badge>',
'block label'
),
name,
title
),
{
badge: <Badge />,
}
)
: title }
</h2>
Expand Down
4 changes: 4 additions & 0 deletions packages/block-editor/src/components/block-card/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

.block-editor-block-card__title {
font-weight: 500;
display: flex;
align-items: center;
gap: 0 $grid-unit-10;

&.block-editor-block-card__title {
font-size: $default-font-size;
Expand All @@ -27,3 +30,4 @@
.block-editor-block-card.is-synced .block-editor-block-icon {
color: var(--wp-block-synced-color);
}

Loading