Skip to content

Button: update spacing support to use axial padding #33859

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
apeatling merged 10 commits into from
Aug 12, 2021
Merged

Button: update spacing support to use axial padding #33859

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c3ae5dc
Add support for axial sides to padding block support
stacimc Aug 3, 2021
421350d
Update button to support general and axial padding only
stacimc Aug 3, 2021
cb0127a
Update docs
stacimc Aug 3, 2021
b0b5d89
Enable axial support for margin block support
stacimc Aug 3, 2021
248cbfa
Warn against invalid sides configuration and disable support
stacimc Aug 4, 2021
3541b6e
Update docs
stacimc Aug 4, 2021
bc5ff48
Clearer hook name
stacimc Aug 4, 2021
fb26fd6
Check that support is defined in useCustomSides
stacimc Aug 4, 2021
48724db
Update global styles panel
stacimc Aug 6, 2021
fddeb7e
Make padding a default control for the button block
stacimc Aug 11, 2021
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
Prev Previous commit
Next Next commit
Update global styles panel
  • Loading branch information
@stacimc
stacimc committed Aug 11, 2021
commit 48724db457c0c1af7bfdba11200093e25c53049f
22 changes: 21 additions & 1 deletion packages/edit-site/src/components/sidebar/dimensions-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import { __experimentalUseCustomSides as useCustomSides } from '@wordpress/block
*/
import { useSetting } from '../editor/utils';

const AXIAL_SIDES = [ 'horizontal', 'vertical' ];

export function useHasDimensionsPanel( context ) {
const hasPadding = useHasPadding( context );
const hasMargin = useHasMargin( context );
Expand Down Expand Up @@ -42,7 +44,17 @@ function filterValuesBySides( values, sides ) {

// Only include sides opted into within filtered values.
const filteredValues = {};
sides.forEach( ( side ) => ( filteredValues[ side ] = values[ side ] ) );
sides.forEach( ( side ) => {
if ( side === 'vertical' ) {
filteredValues.top = values.top;
filteredValues.bottom = values.bottom;
}
if ( side === 'horizontal' ) {
filteredValues.left = values.left;
filteredValues.right = values.right;
}
filteredValues[ side ] = values[ side ];
} );

return filteredValues;
}
Expand Down Expand Up @@ -78,6 +90,9 @@ export default function DimensionsPanel( { context, getStyle, setStyle } ) {

const paddingValues = splitStyleValue( getStyle( name, 'padding' ) );
const paddingSides = useCustomSides( name, 'padding' );
const isAxialPadding =
paddingSides &&
paddingSides.some( ( side ) => AXIAL_SIDES.includes( side ) );

const setPaddingValues = ( newPaddingValues ) => {
const padding = filterValuesBySides( newPaddingValues, paddingSides );
Expand All @@ -89,6 +104,9 @@ export default function DimensionsPanel( { context, getStyle, setStyle } ) {

const marginValues = splitStyleValue( getStyle( name, 'margin' ) );
const marginSides = useCustomSides( name, 'margin' );
const isAxialMargin =
marginSides &&
marginSides.some( ( side ) => AXIAL_SIDES.includes( side ) );

const setMarginValues = ( newMarginValues ) => {
const margin = filterValuesBySides( newMarginValues, marginSides );
Expand Down Expand Up @@ -123,6 +141,7 @@ export default function DimensionsPanel( { context, getStyle, setStyle } ) {
sides={ paddingSides }
units={ units }
allowReset={ false }
splitOnAxis={ isAxialPadding }
/>
</ToolsPanelItem>
) }
Expand All @@ -140,6 +159,7 @@ export default function DimensionsPanel( { context, getStyle, setStyle } ) {
sides={ marginSides }
units={ units }
allowReset={ false }
splitOnAxis={ isAxialMargin }
/>
</ToolsPanelItem>
) }
Expand Down