Skip to content

Min Height: Add height control component with slider #45875

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
andrewserong merged 4 commits into from
Nov 24, 2022
Merged

Min Height: Add height control component with slider #45875

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c408c62
Min Height: Add height control component with slider
andrewserong Nov 18, 2022
d2aac5e
Fix typo for rem unit
andrewserong Nov 21, 2022
c8351eb
Add some handling for switching between unit types
andrewserong Nov 22, 2022
8cad9c7
Add storybook example
andrewserong Nov 22, 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
Next Next commit
Add some handling for switching between unit types
  • Loading branch information
@andrewserong
andrewserong committed Nov 22, 2022
commit c8351ebf6bd5ce8c0ea65d4902327d438d9427d6
50 changes: 39 additions & 11 deletions packages/block-editor/src/components/height-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import { __ } from '@wordpress/i18n';
*/
import useSetting from '../use-setting';

const CUSTOM_VALUE_SETTINGS = {
px: { max: 1000, steps: 1 },
'%': { max: 100, steps: 1 },
vw: { max: 100, steps: 1 },
vh: { max: 100, steps: 1 },
em: { max: 50, steps: 0.1 },
rem: { max: 50, steps: 0.1 },
const RANGE_CONTROL_CUSTOM_SETTINGS = {
px: { max: 1000, step: 1 },
'%': { max: 100, step: 1 },
vw: { max: 100, step: 1 },
vh: { max: 100, step: 1 },
em: { max: 50, step: 0.1 },
rem: { max: 50, step: 0.1 },
};

export default function HeightControl( {
Expand All @@ -50,12 +50,38 @@ export default function HeightControl( {
useMemo(
() => parseQuantityAndUnitFromRawValue( value ),
[ value ]
)[ 1 ] || units[ 0 ].value;
)[ 1 ] ||
units[ 0 ]?.value ||
'px';

const handleSliderChange = ( next ) => {
onChange( [ next, selectedUnit ].join( '' ) );
};

const handleUnitChange = ( newUnit ) => {
// Attempt to smooth over differences between currentUnit and newUnit.
// This should slightly improve the experience of switching between unit types.
const [ currentValue, currentUnit ] =
parseQuantityAndUnitFromRawValue( value );

if ( [ 'em', 'rem' ].includes( newUnit ) && currentUnit === 'px' ) {
// Convert pixel value to an approximate of the new unit, assuming a root size of 16px.
onChange( ( currentValue / 16 ).toFixed( 2 ) + newUnit );
} else if (
[ 'em', 'rem' ].includes( currentUnit ) &&
newUnit === 'px'
) {
// Convert to pixel value assuming a root size of 16px.
onChange( Math.round( currentValue * 16 ) + newUnit );
} else if (
[ 'vh', 'vw', '%' ].includes( newUnit ) &&
currentValue > 100
) {
// When converting to `vh`, `vw`, or `%` units, cap the new value at 100.
onChange( 100 + newUnit );
}
};

return (
<fieldset className="component-height-control">
<BaseControl.VisualLabel as="legend">
Expand All @@ -67,6 +93,7 @@ export default function HeightControl( {
value={ value }
units={ units }
onChange={ onChange }
onUnitChange={ handleUnitChange }
min={ 0 }
size={ '__unstable-large' }
/>
Expand All @@ -77,11 +104,12 @@ export default function HeightControl( {
value={ customRangeValue }
min={ 0 }
max={
CUSTOM_VALUE_SETTINGS[ selectedUnit ]?.max ?? 10
RANGE_CONTROL_CUSTOM_SETTINGS[ selectedUnit ]
?.max ?? 100
}
step={
CUSTOM_VALUE_SETTINGS[ selectedUnit ]?.steps ??
0.1
RANGE_CONTROL_CUSTOM_SETTINGS[ selectedUnit ]
?.step ?? 0.1
}
withInputField={ false }
onChange={ handleSliderChange }
Expand Down