happy-dom 7.5.6 → 7.5.8
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/lib/css/declaration/AbstractCSSStyleDeclaration.js +4 -3
- package/lib/css/declaration/AbstractCSSStyleDeclaration.js.map +1 -1
- package/lib/query-selector/QuerySelector.js +2 -2
- package/lib/query-selector/QuerySelector.js.map +1 -1
- package/package.json +2 -2
- package/src/css/declaration/AbstractCSSStyleDeclaration.ts +5 -3
- package/src/query-selector/QuerySelector.ts +2 -2
@@ -111,7 +111,8 @@ class AbstractCSSStyleDeclaration {
|
|
111
111
|
if (priority !== '' && priority !== undefined && priority !== 'important') {
|
112
112
|
return;
|
113
113
|
}
|
114
|
-
|
114
|
+
const stringValue = String(value);
|
115
|
+
if (!stringValue) {
|
115
116
|
this.removeProperty(name);
|
116
117
|
}
|
117
118
|
else if (this._ownerElement) {
|
@@ -121,14 +122,14 @@ class AbstractCSSStyleDeclaration {
|
|
121
122
|
this._ownerElement['_attributes']['style'].name = 'style';
|
122
123
|
}
|
123
124
|
const style = this._elementStyle.getElementStyle();
|
124
|
-
style.set(name,
|
125
|
+
style.set(name, stringValue, !!priority);
|
125
126
|
if (this._ownerElement.isConnected) {
|
126
127
|
this._ownerElement.ownerDocument['_cacheID']++;
|
127
128
|
}
|
128
129
|
this._ownerElement['_attributes']['style'].value = style.toString();
|
129
130
|
}
|
130
131
|
else {
|
131
|
-
this._style.set(name,
|
132
|
+
this._style.set(name, stringValue, !!priority);
|
132
133
|
}
|
133
134
|
}
|
134
135
|
/**
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AbstractCSSStyleDeclaration.js","sourceRoot":"","sources":["../../../src/css/declaration/AbstractCSSStyleDeclaration.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"AbstractCSSStyleDeclaration.js","sourceRoot":"","sources":["../../../src/css/declaration/AbstractCSSStyleDeclaration.ts"],"names":[],"mappings":"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"}
|
@@ -85,10 +85,10 @@ class QuerySelector {
|
|
85
85
|
}
|
86
86
|
const selector = new SelectorItem_1.default(selectorParts[0]);
|
87
87
|
const result = selector.match(currentNode);
|
88
|
-
if (targetNode === currentNode && !result.matches) {
|
88
|
+
if ((targetNode === currentNode || !currentNode.parentNode) && !result.matches) {
|
89
89
|
return { priorityWeight: 0, matches: false };
|
90
90
|
}
|
91
|
-
return this.matchesSelector(isDirectChild ? currentNode.parentNode : targetNode, currentNode.parentNode, selectorParts.slice(1), priorityWeight + result.priorityWeight);
|
91
|
+
return this.matchesSelector(isDirectChild ? currentNode.parentNode : targetNode, currentNode.parentNode, result.matches ? selectorParts.slice(1) : selectorParts, priorityWeight + result.priorityWeight);
|
92
92
|
}
|
93
93
|
/**
|
94
94
|
* Finds elements based on a query selector for a part of a list of selectors separated with comma.
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"QuerySelector.js","sourceRoot":"","sources":["../../src/query-selector/QuerySelector.ts"],"names":[],"mappings":";;;;;AAGA,8DAAsC;AAEtC,kEAA0C;AAC1C,oFAA4D;AAE5D,MAAM,oBAAoB,GAAG,gDAAgD,CAAC;AAE9E;;;;GAIG;AACH,MAAqB,aAAa;IACjC;;;;;;OAMG;IACI,MAAM,CAAC,gBAAgB,CAAC,IAAW,EAAE,QAAgB;QAC3D,MAAM,OAAO,GAAwB,yBAAe,CAAC,MAAM,EAAE,CAAC;QAE9D,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YACpD,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,EAAE;gBACxD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;oBAC/B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACtB;aACD;SACD;QAED,OAAO,OAAO,CAAC;IAChB,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,aAAa,CAAC,IAAW,EAAE,QAAgB;QACxD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YACpD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;YAElD,IAAI,KAAK,EAAE;gBACV,OAAO,KAAK,CAAC;aACb;SACD;QAED,OAAO,IAAI,CAAC;IACb,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,KAAK,CAAC,IAAW,EAAE,QAAgB;QAChD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE;YACpD,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;YAEjE,IAAI,MAAM,CAAC,OAAO,EAAE;gBACnB,OAAO,MAAM,CAAC;aACd;SACD;QAED,OAAO,EAAE,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC9C,CAAC;IAED;;;;;;;;OAQG;IACK,MAAM,CAAC,eAAe,CAC7B,UAAiB,EACjB,WAAkB,EAClB,aAAuB,EACvB,cAAc,GAAG,CAAC;QAKlB,MAAM,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC;QAC/C,IAAI,aAAa,EAAE;YAClB,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACvC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC/B,OAAO,EAAE,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;aAC7C;SACD;QAED,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SACzC;QAED,MAAM,QAAQ,GAAG,IAAI,sBAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAU,WAAW,CAAC,CAAC;QAEpD,IAAI,UAAU,KAAK,WAAW,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;
|
1
|
+
{"version":3,"file":"QuerySelector.js","sourceRoot":"","sources":["../../src/query-selector/QuerySelector.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "happy-dom",
|
3
|
-
"version": "7.5.
|
3
|
+
"version": "7.5.8",
|
4
4
|
"license": "MIT",
|
5
5
|
"homepage": "https://github.com/capricorn86/happy-dom",
|
6
6
|
"repository": "https://github.com/capricorn86/happy-dom",
|
@@ -75,5 +75,5 @@
|
|
75
75
|
"ts-jest": "^27.1.3",
|
76
76
|
"typescript": "^4.6.2"
|
77
77
|
},
|
78
|
-
"gitHead": "
|
78
|
+
"gitHead": "6d94d17ce372740b80a1d576228a3844c7948cdb"
|
79
79
|
}
|
@@ -129,7 +129,9 @@ export default abstract class AbstractCSSStyleDeclaration {
|
|
129
129
|
return;
|
130
130
|
}
|
131
131
|
|
132
|
-
|
132
|
+
const stringValue = String(value);
|
133
|
+
|
134
|
+
if (!stringValue) {
|
133
135
|
this.removeProperty(name);
|
134
136
|
} else if (this._ownerElement) {
|
135
137
|
if (!this._ownerElement['_attributes']['style']) {
|
@@ -139,7 +141,7 @@ export default abstract class AbstractCSSStyleDeclaration {
|
|
139
141
|
}
|
140
142
|
|
141
143
|
const style = this._elementStyle.getElementStyle();
|
142
|
-
style.set(name,
|
144
|
+
style.set(name, stringValue, !!priority);
|
143
145
|
|
144
146
|
if (this._ownerElement.isConnected) {
|
145
147
|
this._ownerElement.ownerDocument['_cacheID']++;
|
@@ -147,7 +149,7 @@ export default abstract class AbstractCSSStyleDeclaration {
|
|
147
149
|
|
148
150
|
this._ownerElement['_attributes']['style'].value = style.toString();
|
149
151
|
} else {
|
150
|
-
this._style.set(name,
|
152
|
+
this._style.set(name, stringValue, !!priority);
|
151
153
|
}
|
152
154
|
}
|
153
155
|
|
@@ -106,14 +106,14 @@ export default class QuerySelector {
|
|
106
106
|
const selector = new SelectorItem(selectorParts[0]);
|
107
107
|
const result = selector.match(<Element>currentNode);
|
108
108
|
|
109
|
-
if (targetNode === currentNode && !result.matches) {
|
109
|
+
if ((targetNode === currentNode || !currentNode.parentNode) && !result.matches) {
|
110
110
|
return { priorityWeight: 0, matches: false };
|
111
111
|
}
|
112
112
|
|
113
113
|
return this.matchesSelector(
|
114
114
|
isDirectChild ? currentNode.parentNode : targetNode,
|
115
115
|
currentNode.parentNode,
|
116
|
-
selectorParts.slice(1),
|
116
|
+
result.matches ? selectorParts.slice(1) : selectorParts,
|
117
117
|
priorityWeight + result.priorityWeight
|
118
118
|
);
|
119
119
|
}
|