Skip to content

Fix Inset.toString() shortest-form serialization #1744

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

Open
durvesh1992 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Inset.toString() shortest-form serialization #1744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions packages/style-value-parser/src/css-types/__tests__/basic-shape.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,23 @@ describe('Basic Shapes', () => {
expect(() => Inset.parser.parseToEnd('inset(invalid)')).toThrow();
expect(() => Inset.parser.parseToEnd('inset(10px, invalid)')).toThrow();
});

it('should stringify the shortest valid form', () => {
const roundtrip = (css: string): string =>
Inset.parser.parseToEnd(css).toString();
// 1 value: all four sides equal.
expect(roundtrip('inset(10px)')).toBe('inset(10px)');
// 2 values: vertical / horizontal.
expect(roundtrip('inset(10px 20px)')).toBe('inset(10px 20px)');
// 3 values: top / horizontal / bottom (left === right).
expect(roundtrip('inset(10px 20px 30px)')).toBe('inset(10px 20px 30px)');
// 4 values: all distinct (no trailing space before the paren).
expect(roundtrip('inset(10px 20px 30px 40px)')).toBe(
'inset(10px 20px 30px 40px)',
);
// round radius is preserved.
expect(roundtrip('inset(10px round 5px)')).toBe('inset(10px round 5px)');
});
});

describe('Circle', () => {
Expand Down
13 changes: 4 additions & 9 deletions packages/style-value-parser/src/css-types/basic-shape.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,19 @@ export class Inset extends BasicShape {
}
// Stringify the shortest possible version of the inset
toString(): string {
const { top, right, bottom, left, round } = this;
const { top, right, bottom, left } = this;
const roundStr =
this.round != null ? ` round ${this.round.toString()}` : '';
if (
top === right &&
right === bottom &&
bottom === left &&
left === round
) {
if (top === right && right === bottom && bottom === left && left === top) {
return `inset(${top.toString()}${roundStr})`;
}
if (top === bottom && left === right) {
return `inset(${top.toString()} ${right.toString()}${roundStr})`;
}
if (top === bottom) {
if (left === right) {
return `inset(${top.toString()} ${right.toString()} ${bottom.toString()}${roundStr})`;
}
return `inset(${top.toString()} ${right.toString()} ${bottom.toString()} ${left.toString()} ${roundStr})`;
return `inset(${top.toString()} ${right.toString()} ${bottom.toString()} ${left.toString()}${roundStr})`;
}

static get parser(): TokenParser<Inset> {
Expand Down