Skip to content

Fix serialization of negative percentages #554

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 2 commits into from
Jun 16, 2024
Merged

Fix serialization of negative percentages #554

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
12fc7b5
Fix serialization of negative percentages
lloydk Jun 15, 2024
0ede7fc
Avoid abbreviation
lloydk Jun 16, 2024
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
16 changes: 13 additions & 3 deletions src/Type.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default class Type {
return this.range;
}
if (this.type === "<percentage>") {
return [-1, 1];
return this.pctRange();
}
else if (this.type === "<angle>") {
return [0, 360];
Expand Down Expand Up @@ -72,7 +72,7 @@ export default class Type {
let toRange = this.coordRange;

if (this.type === "<percentage>") {
toRange ??= [-1, 1];
toRange ??= this.pctRange();
}

return mapRange(fromRange, toRange, number);
Expand All @@ -84,7 +84,8 @@ export default class Type {
* @param {number} [precision]
*/
serialize (number, precision) {
let toRange = this.type === "<percentage>" ? [-100, 100] : this.computedRange;
let toRange = this.type === "<percentage>" ? this.pctRange(100) : this.computedRange;

let unit = this.unit;

number = mapRange(this.coordRange, toRange, number);
Expand All @@ -104,6 +105,15 @@ export default class Type {
return ret;
}

/**
* Returns a percentage range for values of this type
* @param {number} scale
*/
percentageRange (scale = 1) {
let range = this.coordRange && this.coordRange[0] < 0 ? [-1, 1] : [0, 1];
return range.map(v => v * scale);
}

static get (type, ...args) {
if (type instanceof this) {
return type;
Expand Down
16 changes: 1 addition & 15 deletions src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,21 +112,7 @@ export function mapRange (from, to, value) {
return value;
}

// Make sure 0 is mapped to 0
let [minFrom, maxFrom] = from;
let [minTo, maxTo] = to;

// We assume max* is positive
if (value < 0) {
maxFrom = Math.min(0, maxFrom);
maxTo = Math.min(0, maxTo);
}
else {
minFrom = Math.max(0, minFrom);
minTo = Math.max(0, minTo);
}

return interpolate(minTo, maxTo, interpolateInv(minFrom, maxFrom, value));
return interpolate(to[0], to[1], interpolateInv(from[0], from[1], value));
}

/**
Expand Down
40 changes: 40 additions & 0 deletions test/serialize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,46 @@ const tests = {
},
],
},
{
name: "Values outside of range or refRange",
tests: [
{
name: "sRGB negative %",
args: ["srgb", [-0.5, 0, 0], 1, {inGamut: false}],
expect: "rgb(-50% 0% 0%)",
},
{
name: "sRGB %",
args: ["srgb", [1.5, 0, 0], 1, {inGamut: false}],
expect: "rgb(150% 0% 0%)",
},
{
name: "sRGB %, inGamut: true",
args: ["srgb", [-0.5, 0, 0], 1],
expect: "rgb(0% 0% 0%)",
},
{
name: "rgb() with <number> coords",
args: ["srgb", [2, 2, 2], 1, {inGamut: false, coords: ["<number>[0,255]", "<number>[0,255]", "<number>[0,255]"]}],
expect: "rgb(510 510 510)",
},
{
name: "oklch negative values",
args: ["oklch", [-0.1, -0.6, -50], 1],
expect: "oklch(-10% -0.6 -50)",
},
{
name: "hsl negative values",
args: ["hsl", [-50, -10, -30], 1, {inGamut: false}],
expect: "hsl(-50 -10% -30%)",
},
{
name: "hsl positive values",
args: ["hsl", [400, 123, 456], 1, {inGamut: false}],
expect: "hsl(400 123% 456%)",
},
],
},
],
};

Expand Down