Skip to content

Fix parsing flex-basis in shorthand flex when not a value #245

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
Sep 21, 2025
+22 −6
Merged

Fix parsing flex-basis in shorthand flex when not a value #245

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
7661755
Fix parsing flex-basis in shorthand flex when not a value
matmannion Sep 15, 2025
bf87300
PR feedback: Remove illegal GlobalKeyword case for val2
matmannion Sep 17, 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
16 changes: 10 additions & 6 deletions lib/properties/flex.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,15 @@ module.exports.parse = function parse(v, opt = {}) {
return name;
}
case "Identifier": {
if (name === "auto") {
flex["flex-basis"] = name;
return flex;
} else if (name === "none") {
if (name === "none") {
return {
"flex-grow": "0",
"flex-shrink": "0",
"flex-basis": "auto"
};
}
break;
flex["flex-basis"] = name;
return flex;
}
case "Number": {
flex["flex-grow"] = itemValue;
Expand Down Expand Up @@ -92,7 +90,9 @@ module.exports.parse = function parse(v, opt = {}) {
} else {
return;
}
if (val3.type === "Calc" && !val3.isNumber) {
if (val3.type === "GlobalKeyword" || val3.type === "Identifier") {
flex["flex-basis"] = val3.name;
} else if (val3.type === "Calc" && !val3.isNumber) {
flex["flex-basis"] = `${val3.name}(${val3.value})`;
} else if (val3.type === "Dimension") {
flex["flex-basis"] = `${val3.value}${val3.unit}`;
Expand Down Expand Up @@ -123,6 +123,10 @@ module.exports.parse = function parse(v, opt = {}) {
flex["flex-basis"] = `${val2.value}%`;
break;
}
case "Identifier": {
flex["flex-basis"] = val2.name;
break;
}
default: {
return;
}
Expand Down
12 changes: 12 additions & 0 deletions test/CSSStyleDeclaration.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,6 +1143,18 @@ describe("CSSStyleDeclaration", () => {
assert.strictEqual(style.getPropertyValue("flex-shrink"), "1");
assert.strictEqual(style.getPropertyValue("flex-basis"), "250px");
style.removeProperty("flex");
style.setProperty("flex", "0 0 auto");
assert.strictEqual(style.getPropertyValue("flex"), "0 0 auto");
assert.strictEqual(style.getPropertyValue("flex-grow"), "0");
assert.strictEqual(style.getPropertyValue("flex-shrink"), "0");
assert.strictEqual(style.getPropertyValue("flex-basis"), "auto");
style.removeProperty("flex");
style.setProperty("flex", "0 auto");
assert.strictEqual(style.getPropertyValue("flex"), "0 1 auto");
assert.strictEqual(style.getPropertyValue("flex-grow"), "0");
assert.strictEqual(style.getPropertyValue("flex-shrink"), "1");
assert.strictEqual(style.getPropertyValue("flex-basis"), "auto");
style.removeProperty("flex");
style.setProperty("flex", "2");
assert.strictEqual(style.getPropertyValue("flex-grow"), "2");
assert.strictEqual(style.getPropertyValue("flex-shrink"), "1");
Expand Down