Skip to content
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

Handle CSSNumericValue instances while parsing #221

Merged
merged 5 commits into from
Feb 4, 2024
Merged

Handle CSSNumericValue instances while parsing #221

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6d959b
Fix inheritance of various CSSOM classes
bramus Feb 1, 2024
708d1aa
Don’t parse a numeric value if it already is a CSSNumericValue
bramus Feb 1, 2024
8fd46e2
CSSMathValue should also extend CSSNumericValue
bramus Feb 4, 2024
2111863
Add CSSMathValue and CSSNumericValue to cssOMTypes directly.
flackr Feb 2, 2024
b22d7fd
Remove object construction - use entries of cssOMTypes.
flackr Feb 2, 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
40 changes: 25 additions & 15 deletions src/proxy-cssom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,20 @@ export function installCSSOM() {
return result;
}

class MathOperation {
class CSSNumericValue {
static parse(value) {
if (value instanceof CSSNumericValue) return value;

return simplifyCalculation(parseCSSNumericValue(value), {});
}

// TODO: Add other methods: add, sub, mul, div, …
// Spec: https://drafts.css-houdini.org/css-typed-om/#numeric-value
}

class CSSMathValue extends CSSNumericValue {
constructor(values, operator, opt_name, opt_delimiter) {
super();
privateDetails.set(this, {
values: toCssNumericArray(values),
operator: operator,
Expand All @@ -71,13 +83,11 @@ export function installCSSOM() {
}

const cssOMTypes = {
'CSSNumericValue': class {
static parse(value) {
return parseCSSNumericValue(value);
}
},
'CSSUnitValue': class {
'CSSNumericValue': CSSNumericValue,
'CSSMathValue': CSSMathValue,
bramus marked this conversation as resolved.
Show resolved Hide resolved
'CSSUnitValue': class extends CSSNumericValue {
constructor(value, unit) {
super();
privateDetails.set(this, {
value: value,
unit: unit
Expand Down Expand Up @@ -126,13 +136,13 @@ export function installCSSOM() {
}
},

'CSSMathSum': class extends MathOperation {
'CSSMathSum': class extends CSSMathValue {
constructor(values) {
super(arguments, 'sum', 'calc', ' + ');
}
},

'CSSMathProduct': class extends MathOperation {
'CSSMathProduct': class extends CSSMathValue {
constructor(values) {
super(arguments, 'product', 'calc', ' * ');
}
Expand All @@ -148,7 +158,7 @@ export function installCSSOM() {
}
},

'CSSMathNegate': class extends MathOperation {
'CSSMathNegate': class extends CSSMathValue {
constructor(values) {
super([arguments[0]], 'negate', '-');
}
Expand All @@ -158,7 +168,7 @@ export function installCSSOM() {
}
},

'CSSMathInvert': class extends MathOperation {
'CSSMathInvert': class extends CSSMathValue {
constructor(values) {
super([1, arguments[0]], 'invert', 'calc', ' / ');
}
Expand All @@ -174,13 +184,13 @@ export function installCSSOM() {
}
},

'CSSMathMax': class extends MathOperation {
'CSSMathMax': class extends CSSMathValue {
constructor() {
super(arguments, 'max');
}
},

'CSSMathMin': class extends MathOperation {
'CSSMathMin': class extends CSSMathValue {
constructor() {
super(arguments, 'min');
}
Expand Down Expand Up @@ -237,10 +247,10 @@ export function installCSSOM() {
});
}

for (let type in cssOMTypes) {
for (let [type, value] of Object.entries(cssOMTypes)) {
if (type in window)
continue;
if (!Reflect.defineProperty(window, type, { value: cssOMTypes[type] }))
if (!Reflect.defineProperty(window, type, { value }))
throw Error(`Error installing CSSOM support for ${type}`);
}
}
Loading