Skip to content

Spacer block: use same min value resizable box and controls, remove max limit #39577

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
ciampo merged 7 commits into from
Mar 22, 2022
Merged

Spacer block: use same min value resizable box and controls, remove max limit #39577

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
28b2a10
Spacer block: update min size from 1 to 10
ciampo Mar 18, 2022
f72012e
Spacer: apply min/max sizes to ResizableSpacer
ciampo Mar 18, 2022
9b248db
Spacer block: apply min/max sizes to controls
ciampo Mar 18, 2022
c2d1a04
Separate width/height constraints for horizontal or vertical configur…
ciampo Mar 18, 2022
5d94bfa
Set `min` to `0`
ciampo Mar 21, 2022
e8000d4
Remove `max` value
ciampo Mar 21, 2022
6ae3da6
Unify vertical/horizontal min sizes back into one variable
ciampo Mar 21, 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
Prev Previous commit
Unify vertical/horizontal min sizes back into one variable
  • Loading branch information
@ciampo
ciampo committed Mar 21, 2022
commit 6ae3da6383ca0a6c950a2091f79d5b7527246dd7
16 changes: 3 additions & 13 deletions packages/block-library/src/spacer/controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,9 @@ import { useInstanceId } from '@wordpress/compose';
/**
* Internal dependencies
*/
import { MIN_SPACER_WIDTH, MIN_SPACER_HEIGHT } from './edit';
import { MIN_SPACER_SIZE } from './edit';

function DimensionInput( {
label,
onChange,
isResizing,
value = '',
min,
max,
} ) {
function DimensionInput( { label, onChange, isResizing, value = '' } ) {
const inputId = useInstanceId( UnitControl, 'block-spacer-height-input' );

// In most contexts the spacer size cannot meaningfully be set to a
Expand Down Expand Up @@ -63,8 +56,7 @@ function DimensionInput( {
<UnitControl
id={ inputId }
isResetValueOnUnitChange
min={ min }
max={ max }
min={ MIN_SPACER_SIZE }
onChange={ handleOnChange }
style={ { maxWidth: 80 } }
value={ computedValue }
Expand Down Expand Up @@ -92,7 +84,6 @@ export default function SpacerControls( {
setAttributes( { width: nextWidth } )
}
isResizing={ isResizing }
min={ MIN_SPACER_WIDTH }
/>
) }
{ orientation !== 'horizontal' && (
Expand All @@ -103,7 +94,6 @@ export default function SpacerControls( {
setAttributes( { height: nextHeight } )
}
isResizing={ isResizing }
min={ MIN_SPACER_HEIGHT }
/>
) }
</PanelBody>
Expand Down
8 changes: 2 additions & 6 deletions packages/block-library/src/spacer/controls.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { __ } from '@wordpress/i18n';
/**
* Internal dependencies
*/
import { MIN_SPACER_WIDTH, MIN_SPACER_HEIGHT } from './edit';
import { MIN_SPACER_SIZE } from './edit';
import styles from './style.scss';

const DEFAULT_VALUES = { px: 100, em: 10, rem: 10, vw: 10, vh: 25 };
Expand Down Expand Up @@ -67,11 +67,7 @@ function Controls( { attributes, context, setAttributes } ) {
<PanelBody title={ __( 'Dimensions' ) }>
<UnitControl
label={ label }
min={
orientation === 'horizontal'
? MIN_SPACER_WIDTH
: MIN_SPACER_HEIGHT
}
min={ MIN_SPACER_SIZE }
value={ value }
onChange={ handleChange }
onUnitChange={ handleUnitChange }
Expand Down
7 changes: 3 additions & 4 deletions packages/block-library/src/spacer/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ import { View } from '@wordpress/primitives';
*/
import SpacerControls from './controls';

export const MIN_SPACER_WIDTH = 0;
export const MIN_SPACER_HEIGHT = 0;
export const MIN_SPACER_SIZE = 0;

const ResizableSpacer = ( {
orientation,
Expand Down Expand Up @@ -119,7 +118,7 @@ const SpacerEdit = ( {
if ( blockOrientation === 'horizontal' ) {
return (
<ResizableSpacer
minWidth={ MIN_SPACER_WIDTH }
minWidth={ MIN_SPACER_SIZE }
enable={ {
top: false,
right: true,
Expand All @@ -144,7 +143,7 @@ const SpacerEdit = ( {
return (
<>
<ResizableSpacer
minHeight={ MIN_SPACER_HEIGHT }
minHeight={ MIN_SPACER_SIZE }
enable={ {
top: false,
right: false,
Expand Down