Skip to content

Component System: Upgrade FontSizePicker #27594

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
ItsJonQ merged 7 commits into from
Jan 20, 2021
Merged

Component System: Upgrade FontSizePicker #27594

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
49dc3b6
Update min/max for FontSizeControl and improve getSelectOptions() to …
jorgefilipecosta Dec 21, 2020
9ef47ce
Update @wp-g2 packages to latest 0.0.135 with babel runtime handling
Jan 13, 2021
93c697d
Update package-lock.json
Jan 20, 2021
d6ef394
Update @wp-g2 to latest 0.0.139
Jan 20, 2021
4f6a34e
Re-enabled E2E font-size-picker reset test
Jan 20, 2021
4e28a34
Update @wp-g2 to v0.0.140 - Removing @wp-g2/substate as a dependency
Jan 20, 2021
fa706a8
Refactor usage of noop and is utils
Jan 20, 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
Refactor usage of noop and is utils
  • Loading branch information
Jon Q committed Jan 20, 2021
commit fa706a814f81b0e3e78a51949e95cb6b760e22ab
2 changes: 1 addition & 1 deletion packages/components/src/font-size-picker/next/font-size-control-select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { __ } from '@wordpress/i18n';
/**
* External dependencies
*/
import { noop } from 'lodash';
import { contextConnect, useContextSystem } from '@wp-g2/context';
import { noop } from '@wp-g2/utils';
import {
Grid,
TextInput,
Expand Down
3 changes: 2 additions & 1 deletion packages/components/src/font-size-picker/next/font-size-control-slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';

/**
* External dependencies
*/
import { noop } from '@wp-g2/utils';
import { noop } from 'lodash';

/**
* Internal dependencies
Expand Down
13 changes: 8 additions & 5 deletions packages/components/src/font-size-picker/next/font-size-control-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';

/**
* External dependencies
*/
import { ui } from '@wp-g2/styles';
import { createUnitValue, is, parseUnitValue } from '@wp-g2/utils';
import { createUnitValue, parseUnitValue } from '@wp-g2/utils';

const DEFAULT_FONT_SIZE = 'default';
const CUSTOM_FONT_SIZE = 'custom';
Expand Down Expand Up @@ -55,9 +56,10 @@ export function getSelectOptions( {
}

return options.map( ( option ) => {
const fontSize = is.number( option.size )
? createUnitValue( option.size, 'px' )
: option.size;
const fontSize =
typeof option.size === 'number'
? createUnitValue( option.size, 'px' )
: option.size;

return {
...option,
Expand All @@ -80,7 +82,8 @@ export function getInputValue( fontSizes = [], value ) {
}

const isPixelValue =
is.number( value ) || ( is.string( value ) && value.endsWith( 'px' ) );
typeof value === 'number' ||
( typeof value === 'string' && value.endsWith( 'px' ) );

const inputValue = ( isPixelValue && noUnitsValue ) || '';

Expand Down
1 change: 1 addition & 0 deletions packages/components/src/font-size-picker/next/font-size-control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';

/**
* External dependencies
*/
Expand Down