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

Spacing presets: fix/minor issues noted in initial UI PR #43214

Merged
merged 4 commits into from
Aug 15, 2022
Merged

Spacing presets: fix/minor issues noted in initial UI PR #43214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c9c691
Make sure custom toggle is 24px, same as font control.
glendaviesnz Aug 14, 2022
fc42537
Only show the spacing presets control in global styles if there are s…
glendaviesnz Aug 14, 2022
bf1d758
Fix layout of custom sizing box control if no spacing presets are ava…
glendaviesnz Aug 14, 2022
e766621
Revert theme.json change committed in error
glendaviesnz Aug 14, 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
1 change: 1 addition & 0 deletions packages/block-editor/src/components/spacing-sizes-control/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
.components-spacing-sizes-control__custom-toggle-single {
&.is-small.has-icon {
padding: 0;
min-width: $icon-size;
}
}

Expand Down
12 changes: 11 additions & 1 deletion packages/block-editor/src/hooks/dimensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* External dependencies
*/
import classnames from 'classnames';

/**
* WordPress dependencies
*/
Expand Down Expand Up @@ -33,6 +38,7 @@ import {
resetPadding,
useIsPaddingDisabled,
} from './padding';
import useSetting from '../components/use-setting';

export const SPACING_SUPPORT_KEY = 'spacing';
export const ALL_SIDES = [ 'top', 'right', 'bottom', 'left' ];
Expand All @@ -51,6 +57,7 @@ export function DimensionsPanel( props ) {
const isMarginDisabled = useIsMarginDisabled( props );
const isDisabled = useIsDimensionsDisabled( props );
const isSupported = hasDimensionsSupport( props.name );
const spacingSizes = useSetting( 'spacing.spacingSizes' );

if ( isDisabled || ! isSupported ) {
return null;
Expand All @@ -77,7 +84,10 @@ export function DimensionsPanel( props ) {
<InspectorControls __experimentalGroup="dimensions">
{ ! isPaddingDisabled && (
<ToolsPanelItem
className="tools-panel-item-spacing"
className={ classnames( {
'tools-panel-item-spacing':
spacingSizes && spacingSizes.length > 0,
} ) }
hasValue={ () => hasPaddingValue( props ) }
label={ __( 'Padding' ) }
onDeselect={ () => resetPadding( props ) }
Expand Down
47 changes: 37 additions & 10 deletions packages/edit-site/src/components/global-styles/dimensions-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/**
* External dependencies
*/
import classnames from 'classnames';

/**
* WordPress dependencies
*/
Expand Down Expand Up @@ -69,6 +74,12 @@ function useHasGap( name ) {
return settings && supports.includes( 'blockGap' );
}

function useHasSpacingPresets() {
const [ settings ] = useSetting( 'spacing.spacingSizes' );

return settings && settings.length > 0;
}

function filterValuesBySides( values, sides ) {
if ( ! sides ) {
// If no custom side configuration all sides are opted into by default.
Expand Down Expand Up @@ -224,6 +235,7 @@ export default function DimensionsPanel( { name } ) {
const showPaddingControl = useHasPadding( name );
const showMarginControl = useHasMargin( name );
const showGapControl = useHasGap( name );
const showSpacingPresetsControl = useHasSpacingPresets();
const units = useCustomUnits( {
availableUnits: useSetting( 'spacing.units', name )[ 0 ] || [
'%',
Expand Down Expand Up @@ -345,17 +357,32 @@ export default function DimensionsPanel( { name } ) {
label={ __( 'Padding' ) }
onDeselect={ resetPaddingValue }
isShownByDefault={ true }
className="tools-panel-item-spacing"
className={ classnames( {
'tools-panel-item-spacing': showSpacingPresetsControl,
} ) }
>
<SpacingSizesControl
values={ paddingValues }
onChange={ setPaddingValues }
label={ __( 'Padding' ) }
sides={ paddingSides }
units={ units }
allowReset={ false }
splitOnAxis={ isAxialPadding }
/>
{ ! showSpacingPresetsControl && (
<BoxControl
values={ paddingValues }
onChange={ setPaddingValues }
label={ __( 'Padding' ) }
sides={ paddingSides }
units={ units }
allowReset={ false }
splitOnAxis={ isAxialPadding }
/>
) }
{ showSpacingPresetsControl && (
<SpacingSizesControl
values={ paddingValues }
onChange={ setPaddingValues }
label={ __( 'Padding' ) }
sides={ paddingSides }
units={ units }
allowReset={ false }
splitOnAxis={ isAxialPadding }
/>
) }
</ToolsPanelItem>
) }
{ showMarginControl && (
Expand Down