Skip to content

Spacing Support: Update padding support to allow configurable sides #30607

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
aaronrobertshaw merged 9 commits into from
Apr 30, 2021
Merged

Spacing Support: Update padding support to allow configurable sides #30607

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9c109ce
Update padding block support for configurable sides
aaronrobertshaw Apr 8, 2021
589368e
Update padding support to use array sides config
aaronrobertshaw Apr 9, 2021
e962dcd
Make selector for theme spacing values more generic
aaronrobertshaw Apr 9, 2021
5a2bf1f
Use hasPaddingSupport from padding hook
aaronrobertshaw Apr 19, 2021
d3588ea
Update block supports api readme
aaronrobertshaw Apr 22, 2021
2567acf
Unset padding values instead of resetting to theme values
aaronrobertshaw Apr 23, 2021
5d1b856
Reuse useCustomSides from block editor hooks
aaronrobertshaw Apr 29, 2021
a3497f9
Inline SpacingControlPanel subcomponents directly
aaronrobertshaw Apr 29, 2021
ac06fb4
Merge branch 'trunk' into update/padding-support-with-configurable-sides
nosolosw Apr 29, 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
Make selector for theme spacing values more generic
  • Loading branch information
@aaronrobertshaw
aaronrobertshaw committed Apr 22, 2021
commit e962dcddd1cbcee04e2aa1377d1ac1159c0dd61c
21 changes: 12 additions & 9 deletions packages/edit-site/src/components/sidebar/spacing-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,24 @@ function filterValuesBySides( values, sides ) {
return filteredValues;
}

export default function SpacingPanel( { context, getStyle, setStyle } ) {
const { name } = context;
const showPaddingControl = useHasPadding( context );
const units = useCustomUnits( { contextName: name, units: CSS_UNITS } );

const paddingValues = getStyle( name, 'padding' );
const themePaddingValues = useSelect(
function useThemeValues( name, feature ) {
return useSelect(
( select ) => {
const baseStyles = select( editSiteStore ).getSettings()
.__experimentalGlobalStylesBaseStyles;
return baseStyles?.styles?.[ name ]?.spacing?.padding;
return baseStyles?.styles?.[ name ]?.spacing?.[ feature ];
},
[ name ]
[ name, feature ]
);
}

export default function SpacingPanel( { context, getStyle, setStyle } ) {
const { name } = context;
const showPaddingControl = useHasPadding( context );
const units = useCustomUnits( { contextName: name, units: CSS_UNITS } );

const paddingValues = getStyle( name, 'padding' );
const themePaddingValues = useThemeValues( name, 'padding' );
const paddingSides = useCustomSides( name, 'padding' );

const setPaddingValues = ( newPaddingValues ) => {
Expand Down