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

Feat: Moves size settings to inspector controls. #65729

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
+18 −54
Open

Feat: Moves size settings to inspector controls. #65729

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e7b9e4
feat: Adds the size control in inspector control.
vipul0425 Sep 30, 2024
793521f
feat: Removes the size control from block controls.
vipul0425 Sep 30, 2024
ca448f3
feat: Replace Toggle Group Controls with Select Control.
vipul0425 Oct 1, 2024
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
72 changes: 18 additions & 54 deletions packages/block-library/src/social-links/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import clsx from 'clsx';
*/
import { useEffect, useRef } from '@wordpress/element';
import {
BlockControls,
useInnerBlocksProps,
useBlockProps,
InspectorControls,
Expand All @@ -19,22 +18,15 @@ import {
__experimentalUseMultipleOriginColorsAndGradients as useMultipleOriginColorsAndGradients,
store as blockEditorStore,
} from '@wordpress/block-editor';
import {
MenuGroup,
MenuItem,
PanelBody,
ToggleControl,
ToolbarDropdownMenu,
} from '@wordpress/components';
import { PanelBody, ToggleControl, SelectControl } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { check } from '@wordpress/icons';
import { useSelect } from '@wordpress/data';

const sizeOptions = [
{ name: __( 'Small' ), value: 'has-small-icon-size' },
{ name: __( 'Normal' ), value: 'has-normal-icon-size' },
{ name: __( 'Large' ), value: 'has-large-icon-size' },
{ name: __( 'Huge' ), value: 'has-huge-icon-size' },
{ label: __( 'Small' ), value: 'has-small-icon-size' },
{ label: __( 'Normal' ), value: 'has-normal-icon-size' },
{ label: __( 'Large' ), value: 'has-large-icon-size' },
{ label: __( 'Huge' ), value: 'has-huge-icon-size' },
];

export function SocialLinksEdit( props ) {
Expand Down Expand Up @@ -117,10 +109,6 @@ export function SocialLinksEdit( props ) {
renderAppender: hasAnySelected && InnerBlocks.ButtonBlockAppender,
} );

const POPOVER_PROPS = {
position: 'bottom right',
};

const colorSettings = [
{
// Use custom attribute as fallback to prevent loss of named color selection when
Expand Down Expand Up @@ -161,45 +149,21 @@ export function SocialLinksEdit( props ) {

return (
<>
<BlockControls group="other">
<ToolbarDropdownMenu
label={ __( 'Size' ) }
text={ __( 'Size' ) }
icon={ null }
popoverProps={ POPOVER_PROPS }
>
{ ( { onClose } ) => (
<MenuGroup>
{ sizeOptions.map( ( entry ) => {
return (
<MenuItem
icon={
( size === entry.value ||
( ! size &&
entry.value ===
'has-normal-icon-size' ) ) &&
check
}
isSelected={ size === entry.value }
key={ entry.value }
onClick={ () => {
setAttributes( {
size: entry.value,
} );
} }
onClose={ onClose }
role="menuitemradio"
>
{ entry.name }
</MenuItem>
);
} ) }
</MenuGroup>
) }
</ToolbarDropdownMenu>
</BlockControls>
<InspectorControls>
<PanelBody title={ __( 'Settings' ) }>
<SelectControl
__next40pxDefaultSize
__nextHasNoMarginBottom
help={ __( 'Choose the size of the Social Icons.' ) }
label={ __( 'Size' ) }
onChange={ ( entry ) => {
setAttributes( {
size: entry,
} );
} }
value={ size ?? 'has-normal-icon-size' }
options={ sizeOptions }
/>
<ToggleControl
__nextHasNoMarginBottom
label={ __( 'Open links in new tab' ) }
Expand Down
Loading