Skip to content

Update design of FontSizePicker when withSlider is set #44598

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
noisysocks merged 10 commits into from
Oct 24, 2022
Merged

Update design of FontSizePicker when withSlider is set #44598

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c68f0ec
Update design of FontSizePicker when withSlider is true
noisysocks Sep 30, 2022
b02b43e
splitNumberAndUnitFromSize -> parseNumberAndUnitFromSize
noisysocks Oct 4, 2022
9e0a116
Add 8px margin to slider
noisysocks Oct 13, 2022
fb3f709
Add min=0 to UnitControl
noisysocks Oct 13, 2022
5fb3a56
Go back to rounding pixel values when there are no units
noisysocks Oct 13, 2022
1c15c19
Restore previous logic for determining hasUnits
noisysocks Oct 13, 2022
afb70ab
Guard against missing first size
noisysocks Oct 13, 2022
fd6a76a
Use existing parseQuantityAndUnitFromRawValue
noisysocks Oct 24, 2022
df15dc5
Use same min, max and step values as in SpacingSizesControl
noisysocks Oct 24, 2022
f2cc79d
Update CHANGELOG.md
noisysocks Oct 24, 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
Restore previous logic for determining hasUnits
  • Loading branch information
@noisysocks
noisysocks committed Oct 24, 2022
commit 1c15c198c09e88683cff41ba5013cb8b00384181
10 changes: 6 additions & 4 deletions packages/components/src/font-size-picker/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,15 @@ const UnforwardedFontSizePicker = (
selectedOption.name
);

// If neither the value or first font size is a string, then FontSizePicker
// operates in a legacy "unitless" mode where UnitControl can only be used
// to select px values and onChange() is always called with number values.
const hasUnits =
typeof value === 'string' || typeof fontSizes[ 0 ].size === 'string';

const [ valueNumber, valueUnit ] = parseNumberAndUnitFromSize( value );
const isValueUnitRelative =
!! valueUnit && [ 'em', 'rem' ].includes( valueUnit );
const [ , firstFontSizeUnit ] = parseNumberAndUnitFromSize(
fontSizes[ 0 ]?.size
);
const hasUnits = !! valueUnit || !! firstFontSizeUnit;

return (
<Container ref={ ref } className="components-font-size-picker">
Expand Down