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

Remove copy for managing a block's style variations #48367

Merged
merged 7 commits into from
Feb 25, 2023
Merged

Remove copy for managing a block's style variations #48367

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2df4231
Improve copy for managing a block's style variations
tomdevisser Feb 23, 2023
1ab8137
Replaced concatenation with sprintf
tomdevisser Feb 23, 2023
c553514
Updated blockName to blockTitle and reverted deconstructuring
tomdevisser Feb 23, 2023
388b800
Replaced prop with blockStore
tomdevisser Feb 23, 2023
8091ab4
Update packages/edit-site/src/components/global-styles/screen-variati…
ntsekouras Feb 24, 2023
2706097
Removed copy
tomdevisser Feb 24, 2023
8ccf83e
Merge branch 'update/copy-manage-style-variations' of https://github.…
tomdevisser Feb 24, 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
8 changes: 6 additions & 2 deletions packages/edit-site/src/components/global-styles/context-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const {
overrideSettingsWithSupports,
} = unlock( blockEditorPrivateApis );

function ContextMenu( { name, parentMenu = '' } ) {
function ContextMenu( { blockName, name, parentMenu = '' } ) {
const [ rawSettings ] = useGlobalSetting( '', name );
const supports = useSupportedStyles( name );
const settings = useMemo(
Expand Down Expand Up @@ -127,7 +127,11 @@ function ContextMenu( { name, parentMenu = '' } ) {
</NavigationButtonAsItem>
) }
{ hasVariationsPanel && (
<ScreenVariations name={ name } path={ parentMenu } />
<ScreenVariations
blockName={ blockName }
name={ name }
path={ parentMenu }
/>
) }
{ isBlocksPanel && canEditCSS && (
<>
Expand Down
1 change: 1 addition & 0 deletions packages/edit-site/src/components/global-styles/screen-block.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ function ScreenBlock( { name } ) {
<ContextMenu
parentMenu={ '/blocks/' + encodeURIComponent( name ) }
name={ name }
blockName={ blockType.title }
/>
</>
);
Expand Down
13 changes: 10 additions & 3 deletions packages/edit-site/src/components/global-styles/screen-variations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
import { __, sprintf } from '@wordpress/i18n';
import { __experimentalVStack as VStack } from '@wordpress/components';
/**
* Internal dependencies
Expand All @@ -15,7 +15,8 @@ import ScreenHeader from './header';
import BlockPreviewPanel from './block-preview-panel';
import Subtitle from './subtitle';

export function ScreenVariations( { name, path = '' } ) {
export function ScreenVariations( props ) {
const { blockName, name, path } = props;
tomdevisser marked this conversation as resolved.
Show resolved Hide resolved
const hasVariationsPanel = useHasVariationsPanel( name, path );

if ( ! hasVariationsPanel ) {
Expand All @@ -24,7 +25,13 @@ export function ScreenVariations( { name, path = '' } ) {
return (
<div className="edit-site-global-styles-screen-variations">
<VStack spacing={ 3 }>
<p>Manage style variations, saved block appearence presets.</p>
<p>
{ sprintf(
// Translators: Name of the block.
__( 'Customize variations of the block: %s' ),
blockName
) }
</p>
<Subtitle>{ __( 'Style Variations' ) }</Subtitle>
<VariationsPanel name={ name } />
</VStack>
Expand Down