Skip to content

Mobile - Fix parsing of css units for null matched values #48484

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
geriux merged 2 commits into from
Mar 2, 2023
Merged

Mobile - Fix parsing of css units for null matched values #48484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
789b55e
Mobile - Fix parsing of css units for null matched values
Feb 27, 2023
7c22a52
Mobile - getPxFromCssUnit - Add new case to test
Feb 27, 2023
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
23 changes: 14 additions & 9 deletions packages/block-editor/src/utils/parse-css-unit-to-px.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,24 @@ function evalMathExpression( cssUnit ) {
// The following regex matches numbers that have a following unit
// E.g. 5.25rem, 1vw
const cssUnitsBits = cssUnit.match( /\d+\.?\d*[a-zA-Z]+|\.\d+[a-zA-Z]+/g );
for ( const unit of cssUnitsBits ) {
// Standardize the unit to px and extract the value.
const parsedUnit = parseUnit( getPxFromCssUnit( unit ) );
if ( ! parseFloat( parsedUnit.value ) ) {
errorFound = true;
// End early since we are dealing with a null value.
break;
if ( cssUnitsBits ) {
for ( const unit of cssUnitsBits ) {
// Standardize the unit to px and extract the value.
const parsedUnit = parseUnit( getPxFromCssUnit( unit ) );
if ( ! parseFloat( parsedUnit.value ) ) {
errorFound = true;
// End early since we are dealing with a null value.
break;
}
cssUnit = cssUnit.replace( unit, parsedUnit.value );
}
cssUnit = cssUnit.replace( unit, parsedUnit.value );
} else {
errorFound = true;
}

// For mixed math expressions wrapped within CSS expressions
if ( ! errorFound && cssUnit.match( /(max|min|clamp)/g ) ) {
const expressionsMatches = cssUnit.match( /(max|min|clamp)/g );
if ( ! errorFound && expressionsMatches ) {
const values = cssUnit.split( ',' );
for ( const currentValue of values ) {
// Check for nested calc() and remove them to calculate the value.
Expand Down
1 change: 1 addition & 0 deletions packages/block-editor/src/utils/test/parse-css-unit-to-px.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ describe( 'getPxFromCssUnit', () => {
'clamp(2.625rem, calc(2.625rem + ((1vw - 0.48rem) * 8.4135)), 3.25rem)',
'42px',
],
[ 'var:preset|font-size|medium', null ],
];

test.each( testData )( 'getPxFromCssUnit( %s )', ( unit, expected ) => {
Expand Down