happy-dom 13.0.3 → 13.0.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of happy-dom might be problematic. Click here for more details.
- package/cjs/css/declaration/element-style/CSSStyleDeclarationElementStyle.cjs +8 -2
- package/cjs/css/declaration/element-style/CSSStyleDeclarationElementStyle.cjs.map +1 -1
- package/cjs/css/declaration/element-style/CSSStyleDeclarationElementStyle.d.ts.map +1 -1
- package/cjs/version.cjs +1 -1
- package/lib/css/declaration/element-style/CSSStyleDeclarationElementStyle.d.ts.map +1 -1
- package/lib/css/declaration/element-style/CSSStyleDeclarationElementStyle.js +8 -2
- package/lib/css/declaration/element-style/CSSStyleDeclarationElementStyle.js.map +1 -1
- package/lib/version.js +1 -1
- package/package.json +1 -1
- package/src/css/declaration/element-style/CSSStyleDeclarationElementStyle.ts +7 -2
|
@@ -38,7 +38,7 @@ const QuerySelector_js_1 = __importDefault(require("../../../query-selector/Quer
|
|
|
38
38
|
const CSSMeasurementConverter_js_1 = __importDefault(require("../measurement-converter/CSSMeasurementConverter.cjs"));
|
|
39
39
|
const MediaQueryList_js_1 = __importDefault(require("../../../match-media/MediaQueryList.cjs"));
|
|
40
40
|
const WindowBrowserSettingsReader_js_1 = __importDefault(require("../../../window/WindowBrowserSettingsReader.cjs"));
|
|
41
|
-
const CSS_VARIABLE_REGEXP = /var\( *(--[^) ]+)\)/g;
|
|
41
|
+
const CSS_VARIABLE_REGEXP = /var\( *(--[^), ]+)\)|var\( *(--[^), ]+), *([^), ]+)\)/g;
|
|
42
42
|
const CSS_MEASUREMENT_REGEXP = /[0-9.]+(px|rem|em|vw|vh|%|vmin|vmax|cm|mm|in|pt|pc|Q)/g;
|
|
43
43
|
/**
|
|
44
44
|
* CSS Style Declaration utility
|
|
@@ -294,7 +294,13 @@ class CSSStyleDeclarationElementStyle {
|
|
|
294
294
|
let newValue = value;
|
|
295
295
|
let match;
|
|
296
296
|
while ((match = regexp.exec(value)) !== null) {
|
|
297
|
-
|
|
297
|
+
// Fallback value - E.g. var(--my-var, #FFFFFF)
|
|
298
|
+
if (match[2] !== undefined) {
|
|
299
|
+
newValue = newValue.replace(match[0], cssVariables[match[2]] || match[3]);
|
|
300
|
+
}
|
|
301
|
+
else {
|
|
302
|
+
newValue = newValue.replace(match[0], cssVariables[match[1]] || '');
|
|
303
|
+
}
|
|
298
304
|
}
|
|
299
305
|
return newValue;
|
|
300
306
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CSSStyleDeclarationElementStyle.cjs","sourceRoot":"","sources":["../../../../src/css/declaration/element-style/CSSStyleDeclarationElementStyle.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,2EAA6D;AAK7D,sIAA2G;AAC3G,0FAA+D;AAC/D,kFAAuD;AAIvD,+HAAoG;AACpG,iJAAsH;AACtH,qJAA0H;AAC1H,oHAAyF;AACzF,gGAAqE;AACrE,qHAA0F;AAC1F,+FAAoE;AACpE,oHAAyF;AAEzF,MAAM,mBAAmB,GAAG,
|
|
1
|
+
{"version":3,"file":"CSSStyleDeclarationElementStyle.cjs","sourceRoot":"","sources":["../../../../src/css/declaration/element-style/CSSStyleDeclarationElementStyle.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CSSStyleDeclarationElementStyle.d.ts","sourceRoot":"","sources":["../../../../src/css/declaration/element-style/CSSStyleDeclarationElementStyle.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,oCAAoC,CAAC;AAI1D,OAAO,kCAAkC,MAAM,2DAA2D,CAAC;AAuB3G;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,+BAA+B;IACnD,OAAO,CAAC,KAAK,CAQX;IAEF,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,QAAQ,CAAU;IAE1B;;;;;OAKG;gBACS,OAAO,EAAE,QAAQ,EAAE,QAAQ,UAAQ;IAK/C;;;;OAIG;IACI,eAAe,IAAI,kCAAkC;IAmB5D;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IA+K/B;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;IAoDrB;;;;;;OAMG;IACH,OAAO,CAAC,wBAAwB;
|
|
1
|
+
{"version":3,"file":"CSSStyleDeclarationElementStyle.d.ts","sourceRoot":"","sources":["../../../../src/css/declaration/element-style/CSSStyleDeclarationElementStyle.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,oCAAoC,CAAC;AAI1D,OAAO,kCAAkC,MAAM,2DAA2D,CAAC;AAuB3G;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,+BAA+B;IACnD,OAAO,CAAC,KAAK,CAQX;IAEF,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,QAAQ,CAAU;IAE1B;;;;;OAKG;gBACS,OAAO,EAAE,QAAQ,EAAE,QAAQ,UAAQ;IAK/C;;;;OAIG;IACI,eAAe,IAAI,kCAAkC;IAmB5D;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IA+K/B;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;IAoDrB;;;;;;OAMG;IACH,OAAO,CAAC,wBAAwB;IAiBhC;;;;;;;;;OASG;IACH,OAAO,CAAC,wBAAwB;CAoChC"}
|
package/cjs/version.cjs
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
module.exports = { default: { version: '13.0.
|
|
1
|
+
module.exports = { default: { version: '13.0.5' } };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CSSStyleDeclarationElementStyle.d.ts","sourceRoot":"","sources":["../../../../src/css/declaration/element-style/CSSStyleDeclarationElementStyle.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,oCAAoC,CAAC;AAI1D,OAAO,kCAAkC,MAAM,2DAA2D,CAAC;AAuB3G;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,+BAA+B;IACnD,OAAO,CAAC,KAAK,CAQX;IAEF,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,QAAQ,CAAU;IAE1B;;;;;OAKG;gBACS,OAAO,EAAE,QAAQ,EAAE,QAAQ,UAAQ;IAK/C;;;;OAIG;IACI,eAAe,IAAI,kCAAkC;IAmB5D;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IA+K/B;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;IAoDrB;;;;;;OAMG;IACH,OAAO,CAAC,wBAAwB;
|
|
1
|
+
{"version":3,"file":"CSSStyleDeclarationElementStyle.d.ts","sourceRoot":"","sources":["../../../../src/css/declaration/element-style/CSSStyleDeclarationElementStyle.ts"],"names":[],"mappings":"AAEA,OAAO,QAAQ,MAAM,oCAAoC,CAAC;AAI1D,OAAO,kCAAkC,MAAM,2DAA2D,CAAC;AAuB3G;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,+BAA+B;IACnD,OAAO,CAAC,KAAK,CAQX;IAEF,OAAO,CAAC,OAAO,CAAW;IAC1B,OAAO,CAAC,QAAQ,CAAU;IAE1B;;;;;OAKG;gBACS,OAAO,EAAE,QAAQ,EAAE,QAAQ,UAAQ;IAK/C;;;;OAIG;IACI,eAAe,IAAI,kCAAkC;IAmB5D;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IA+K/B;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;IAoDrB;;;;;;OAMG;IACH,OAAO,CAAC,wBAAwB;IAiBhC;;;;;;;;;OASG;IACH,OAAO,CAAC,wBAAwB;CAoChC"}
|
|
@@ -10,7 +10,7 @@ import QuerySelector from '../../../query-selector/QuerySelector.js';
|
|
|
10
10
|
import CSSMeasurementConverter from '../measurement-converter/CSSMeasurementConverter.js';
|
|
11
11
|
import MediaQueryList from '../../../match-media/MediaQueryList.js';
|
|
12
12
|
import WindowBrowserSettingsReader from '../../../window/WindowBrowserSettingsReader.js';
|
|
13
|
-
const CSS_VARIABLE_REGEXP = /var\( *(--[^) ]+)\)/g;
|
|
13
|
+
const CSS_VARIABLE_REGEXP = /var\( *(--[^), ]+)\)|var\( *(--[^), ]+), *([^), ]+)\)/g;
|
|
14
14
|
const CSS_MEASUREMENT_REGEXP = /[0-9.]+(px|rem|em|vw|vh|%|vmin|vmax|cm|mm|in|pt|pc|Q)/g;
|
|
15
15
|
/**
|
|
16
16
|
* CSS Style Declaration utility
|
|
@@ -266,7 +266,13 @@ export default class CSSStyleDeclarationElementStyle {
|
|
|
266
266
|
let newValue = value;
|
|
267
267
|
let match;
|
|
268
268
|
while ((match = regexp.exec(value)) !== null) {
|
|
269
|
-
|
|
269
|
+
// Fallback value - E.g. var(--my-var, #FFFFFF)
|
|
270
|
+
if (match[2] !== undefined) {
|
|
271
|
+
newValue = newValue.replace(match[0], cssVariables[match[2]] || match[3]);
|
|
272
|
+
}
|
|
273
|
+
else {
|
|
274
|
+
newValue = newValue.replace(match[0], cssVariables[match[1]] || '');
|
|
275
|
+
}
|
|
270
276
|
}
|
|
271
277
|
return newValue;
|
|
272
278
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CSSStyleDeclarationElementStyle.js","sourceRoot":"","sources":["../../../../src/css/declaration/element-style/CSSStyleDeclarationElementStyle.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,cAAc,MAAM,4BAA4B,CAAC;AAK7D,OAAO,kCAAkC,MAAM,2DAA2D,CAAC;AAC3G,OAAO,YAAY,MAAM,qCAAqC,CAAC;AAC/D,OAAO,eAAe,MAAM,0BAA0B,CAAC;AAIvD,OAAO,oCAAoC,MAAM,kDAAkD,CAAC;AACpG,OAAO,6CAA6C,MAAM,2DAA2D,CAAC;AACtH,OAAO,+CAA+C,MAAM,6DAA6D,CAAC;AAC1H,OAAO,4BAA4B,MAAM,+CAA+C,CAAC;AACzF,OAAO,aAAa,MAAM,0CAA0C,CAAC;AACrE,OAAO,uBAAuB,MAAM,qDAAqD,CAAC;AAC1F,OAAO,cAAc,MAAM,wCAAwC,CAAC;AACpE,OAAO,2BAA2B,MAAM,gDAAgD,CAAC;AAEzF,MAAM,mBAAmB,GAAG,
|
|
1
|
+
{"version":3,"file":"CSSStyleDeclarationElementStyle.js","sourceRoot":"","sources":["../../../../src/css/declaration/element-style/CSSStyleDeclarationElementStyle.ts"],"names":[],"mappings":"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"}
|
package/lib/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export default { version: '13.0.
|
|
1
|
+
export default { version: '13.0.5' };
|
package/package.json
CHANGED
|
@@ -19,7 +19,7 @@ import CSSMeasurementConverter from '../measurement-converter/CSSMeasurementConv
|
|
|
19
19
|
import MediaQueryList from '../../../match-media/MediaQueryList.js';
|
|
20
20
|
import WindowBrowserSettingsReader from '../../../window/WindowBrowserSettingsReader.js';
|
|
21
21
|
|
|
22
|
-
const CSS_VARIABLE_REGEXP = /var\( *(--[^) ]+)\)/g;
|
|
22
|
+
const CSS_VARIABLE_REGEXP = /var\( *(--[^), ]+)\)|var\( *(--[^), ]+), *([^), ]+)\)/g;
|
|
23
23
|
const CSS_MEASUREMENT_REGEXP = /[0-9.]+(px|rem|em|vw|vh|%|vmin|vmax|cm|mm|in|pt|pc|Q)/g;
|
|
24
24
|
|
|
25
25
|
type IStyleAndElement = {
|
|
@@ -333,7 +333,12 @@ export default class CSSStyleDeclarationElementStyle {
|
|
|
333
333
|
let match;
|
|
334
334
|
|
|
335
335
|
while ((match = regexp.exec(value)) !== null) {
|
|
336
|
-
|
|
336
|
+
// Fallback value - E.g. var(--my-var, #FFFFFF)
|
|
337
|
+
if (match[2] !== undefined) {
|
|
338
|
+
newValue = newValue.replace(match[0], cssVariables[match[2]] || match[3]);
|
|
339
|
+
} else {
|
|
340
|
+
newValue = newValue.replace(match[0], cssVariables[match[1]] || '');
|
|
341
|
+
}
|
|
337
342
|
}
|
|
338
343
|
|
|
339
344
|
return newValue;
|