Skip to content

BorderRadius Presets: Fix Generating wrong variable names in pattern code #71631

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
merged 6 commits into from
Sep 16, 2025
Merged

BorderRadius Presets: Fix Generating wrong variable names in pattern code #71631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8127323
fix: remove decodeValue to use preset format in border-radius
USERSATOSHI Sep 12, 2025
bf5bd8d
refactor: remove unnecessary changes
USERSATOSHI Sep 15, 2025
c105abc
Merge branch 'WordPress:trunk' into fix/border-radius-generate-wrong-…
USERSATOSHI Sep 15, 2025
abb6385
tests: remove the 0 slug test
USERSATOSHI Sep 15, 2025
3239c57
tests: mirror presets that are actually used
USERSATOSHI Sep 16, 2025
9e6f0a4
Remove translation from tests
aaronrobertshaw Sep 16, 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
71 changes: 71 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 @@ -7,6 +7,8 @@ import {
hasMixedValues,
hasDefinedValues,
mode,
getPresetValueFromCustomValue,
getPresetValueFromControlValue,
} from '../utils';

const defaultUnitSelections = {
Expand Down Expand Up @@ -180,3 +182,72 @@ describe( 'mode', () => {
expect( mode( values ) ).toBe( 'a' );
} );
} );

describe( 'getPresetValueFromCustomValue', () => {
const presets = [
{ name: 'None', slug: '0', size: 0 },
{ name: 'Small', slug: 'sm', size: '4px' },
{ name: 'Medium', slug: 'md', size: 'clamp(2px, 1vw, 8px)' },
];

it( 'should return "0" if value is "0"', () => {
expect( getPresetValueFromCustomValue( '0', presets ) ).toBe( '0' );
} );

it( 'should return preset reference if value matches a preset', () => {
expect( getPresetValueFromCustomValue( '4px', presets ) ).toBe(
'var:preset|border-radius|sm'
);
expect(
getPresetValueFromCustomValue( 'clamp(2px, 1vw, 8px)', presets )
).toBe( 'var:preset|border-radius|md' );
} );

it( 'should return value as-is if no matching preset', () => {
expect( getPresetValueFromCustomValue( '7px', presets ) ).toBe( '7px' );
} );

it( 'should return value as-is if already a preset reference', () => {
expect(
getPresetValueFromCustomValue(
'var:preset|border-radius|md',
presets
)
).toBe( 'var:preset|border-radius|md' );
} );

it( 'should return undefined if value is undefined', () => {
expect(
getPresetValueFromCustomValue( undefined, presets )
).toBeUndefined();
} );
} );

describe( 'getPresetValueFromControlValue', () => {
const presets = [
{ name: 'None', slug: '0', size: 0 },
{ name: 'Small', slug: 'sm', size: '4px' },
{ name: 'Medium', slug: 'md', size: 'clamp(2px, 1vw, 8px)' },
];

it( 'should return "0" if control value is 0 and not selectList', () => {
expect( getPresetValueFromControlValue( 0, 'slider', presets ) ).toBe(
'0'
);
} );

it( 'should return undefined if control value is 0 and controlType is selectList', () => {
expect(
getPresetValueFromControlValue( 0, 'selectList', presets )
).toBeUndefined();
} );

it( 'should return preset reference for other values', () => {
expect( getPresetValueFromControlValue( 1, 'slider', presets ) ).toBe(
'var:preset|border-radius|sm'
);
expect( getPresetValueFromControlValue( 2, 'slider', presets ) ).toBe(
'var:preset|border-radius|md'
);
} );
} );
1 change: 1 addition & 0 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 @@ -234,6 +234,7 @@ export function getPresetValueFromControlValue(
} else if ( size === 0 ) {
return '0';
}

return `var:preset|border-radius|${ presets[ controlValue ]?.slug }`;
}

Expand Down
13 changes: 7 additions & 6 deletions packages/block-editor/src/components/global-styles/border-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,15 +147,16 @@ export default function BorderPanel( {
const showBorderRadius = useHasBorderRadiusControl( settings );
const borderRadiusValues = useMemo( () => {
if ( typeof border?.radius !== 'object' ) {
return decodeValue( border?.radius );
return border?.radius;
}

return {
topLeft: decodeValue( border?.radius?.topLeft ),
topRight: decodeValue( border?.radius?.topRight ),
bottomLeft: decodeValue( border?.radius?.bottomLeft ),
bottomRight: decodeValue( border?.radius?.bottomRight ),
topLeft: border?.radius?.topLeft,
topRight: border?.radius?.topRight,
bottomLeft: border?.radius?.bottomLeft,
bottomRight: border?.radius?.bottomRight,
};
}, [ border?.radius, decodeValue ] );
}, [ border?.radius ] );
const setBorderRadius = ( newBorderRadius ) =>
setBorder( { ...border, radius: newBorderRadius } );
const hasBorderRadius = () => {
Expand Down
Loading