Skip to content

Commit f86d210

Browse files
committed
feat: add none presets to padding and margin similar to native
1 parent f74c488 commit f86d210

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

src/block-components/helpers/size/edit.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,14 @@ const Spacing = props => {
139139
highlight: 'margin',
140140
}
141141

142-
const presetMarks = usePresetControls( 'spacingSizes' )?.getPresetMarks() || null
142+
// Add additional presets for setting margins and paddings to None
143+
const nonePreset = {
144+
name: 'None',
145+
size: '0rem',
146+
slug: 'none',
147+
}
148+
const presetMarks = usePresetControls( 'spacingSizes' )
149+
?.getPresetMarks( { additionalPresets: [ nonePreset ] } ) || null
143150

144151
return (
145152
<>

src/block-components/typography/edit.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ export const Controls = props => {
104104

105105
const onChangeContent = useCallback( text => setDebouncedText( escapeHTMLIfInvalid( text ) ), [] )
106106

107-
const presetMarks = usePresetControls( 'fontSizes' )?.getPresetMarks( useTypographyAsPresets ) || null
107+
const presetMarks = usePresetControls( 'fontSizes' )
108+
?.getPresetMarks( { customOnly: useTypographyAsPresets } ) || null
108109

109110
return (
110111
<>

src/hooks/use-preset-controls.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ export const usePresetControls = property => {
5656

5757
// Get the merge preset marks with the CSS Variable value
5858
// Setting customOnly to true returns the preset marks for custom presets only
59-
const getPresetMarks = ( customOnly = false ) => {
59+
const getPresetMarks = ( { customOnly = false, additionalPresets = [] } = {} ) => {
6060
const prefix = PRESET_MAPPING[ property ].prefix
61-
const presets = customOnly ? allCustomPresets[ property ] ?? [] : getMergedPresets()
61+
let presets = customOnly ? allCustomPresets[ property ] ?? [] : getMergedPresets()
62+
presets = [ ...additionalPresets, ...presets ]
6263

6364
return presets
6465
.filter( preset => ! ( preset?.isDiscarded ) )

0 commit comments

Comments
 (0)