Skip to content

Border radius presets: support mixed values in the rangecontrol slider #73033

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
t-hamano merged 2 commits into from
Nov 7, 2025
Merged

Border radius presets: support mixed values in the rangecontrol slider #73033

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
31b7271
Enhance getAllValue function to handle complex CSS values and preserv…
ramonjd Nov 6, 2025
e324343
Remove comment
ramonjd Nov 6, 2025
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
90 changes: 90 additions & 0 deletions packages/block-editor/src/components/border-radius-control/test/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,96 @@ describe( 'getAllValue', () => {
expect( getAllValue( undefined ) ).toBe( undefined );
} );
} );

describe( 'when provided complex CSS values (clamp, min, max, calc)', () => {
it( 'should preserve clamp values when all corners have the same clamp value', () => {
const clampValue = 'clamp(1rem, 2vw, 3rem)';
const values = {
bottomLeft: clampValue,
bottomRight: clampValue,
topLeft: clampValue,
topRight: clampValue,
};
expect( getAllValue( values ) ).toBe( clampValue );
} );

it( 'should preserve min() values when all corners have the same min value', () => {
const minValue = 'min(10px, 5vw)';
const values = {
bottomLeft: minValue,
bottomRight: minValue,
topLeft: minValue,
topRight: minValue,
};
expect( getAllValue( values ) ).toBe( minValue );
} );

it( 'should preserve max() values when all corners have the same max value', () => {
const maxValue = 'max(20px, 10vw)';
const values = {
bottomLeft: maxValue,
bottomRight: maxValue,
topLeft: maxValue,
topRight: maxValue,
};
expect( getAllValue( values ) ).toBe( maxValue );
} );

it( 'should preserve calc() values when all corners have the same calc value', () => {
const calcValue = 'calc(100% - 20px)';
const values = {
bottomLeft: calcValue,
bottomRight: calcValue,
topLeft: calcValue,
topRight: calcValue,
};
expect( getAllValue( values ) ).toBe( calcValue );
} );

it( 'should return undefined when complex CSS values are mixed', () => {
const values = {
bottomLeft: 'clamp(1rem, 2vw, 3rem)',
bottomRight: 'clamp(1rem, 2vw, 3rem)',
topLeft: 'min(10px, 5vw)',
topRight: 'clamp(1rem, 2vw, 3rem)',
};
expect( getAllValue( values ) ).toBe( undefined );
} );

it( 'should return undefined when complex CSS values are mixed with simple values', () => {
const values = {
bottomLeft: 'clamp(1rem, 2vw, 3rem)',
bottomRight: 'clamp(1rem, 2vw, 3rem)',
topLeft: '2px',
topRight: 'clamp(1rem, 2vw, 3rem)',
};
expect( getAllValue( values ) ).toBe( undefined );
} );

it( 'should preserve string values that cannot be parsed at all (no numeric prefix)', () => {
// Values with no numeric prefix cannot be parsed, so they should be preserved
const unparseableValue = 'apples';
const values = {
bottomLeft: unparseableValue,
bottomRight: unparseableValue,
topLeft: unparseableValue,
topRight: unparseableValue,
};
expect( getAllValue( values ) ).toBe( unparseableValue );
} );

it( 'should parse numeric prefix from partially parseable values', () => {
// Values with numeric prefix get parsed, so "32apples" becomes "32"
const partiallyParseableValue = '32apples';
const values = {
bottomLeft: partiallyParseableValue,
bottomRight: partiallyParseableValue,
topLeft: partiallyParseableValue,
topRight: partiallyParseableValue,
};
expect( getAllValue( values ) ).toBe( '32' );
} );
} );
} );

describe( 'hasMixedValues', () => {
Expand Down
10 changes: 7 additions & 3 deletions packages/block-editor/src/components/border-radius-control/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,13 @@ export function getAllValue( values = {} ) {
return values;
}

const parsedQuantitiesAndUnits = Object.values( values ).map( ( value ) =>
parseQuantityAndUnitFromRawValue( value )
);
const parsedQuantitiesAndUnits = Object.values( values ).map( ( value ) => {
const newValue = parseQuantityAndUnitFromRawValue( value );
if ( typeof value === 'string' && newValue[ 0 ] === undefined ) {
return [ value, '' ];
Copy link
Member Author

@ramonjd ramonjd Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will return the string no matter what it is. I think that's okay since the value should match what's in the presets array in order for the steppers to work.

The Theme JSON class sanitizes the values on the backend.

https://github.com/WordPress/gutenberg/blob/trunk/lib/class-wp-theme-json-gutenberg.php#L3716

Copy link
Contributor

@aaronrobertshaw aaronrobertshaw Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At a glance, this looks ok to me as well.

There's a possibility the values are values originating from the preset values but instead custom values entered by the user. These would be entered via the custom value inputs and should be safe simple CSS values.

The Theme JSON class does sanitize style values on the backend but that happens here:

https://github.com/WordPress/gutenberg/blob/trunk/lib/class-wp-theme-json-gutenberg.php#L3779

It might pay to dig a little deeper and confirm safety for the application of styles in the editor. If there's an issue there it wouldn't be unique to this fix or PR.

Copy link
Contributor

@aaronrobertshaw aaronrobertshaw Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked a little closer and didn't see any obvious issues but it might pay to get a fresher set of eyes on it.

}
return newValue;
} );

const allValues = parsedQuantitiesAndUnits.map(
( value ) => value[ 0 ] ?? ''
Expand Down
Loading