happy-dom 17.6.3 → 18.0.1

package/src/css/declaration/computed-style/CSSStyleDeclarationComputedStyle.ts

@@ -23,7 +23,7 @@ const CSS_MEASUREMENT_REGEXP = /[0-9.]+(px|rem|em|vw|vh|%|vmin|vmax|cm|mm|in|pt|
 const CSS_VARIABLE_REGEXP = /var\( *(--[^), ]+)\)|var\( *(--[^), ]+), *(.+)\)/;
 
 type IStyleAndElement = {
-	element: Element | ShadowRoot | Document;
+	element: Element | ShadowRoot | Document | null;
 	cssTexts: Array<{ cssText: string; priorityWeight: number }>;
 };
 
@@ -96,7 +96,7 @@ export default class CSSStyleDeclarationComputedStyle {
 						this.parseCSSRules({
 							elements: documentElements,
 							rootElement:
-								documentElements[0].element[PropertySymbol.tagName] === 'HTML'
+								(<Element>documentElements[0].element)[PropertySymbol.tagName] === 'HTML'
 									? documentElements[0]
 									: null,
 							cssRules: sheet.cssRules
@@ -108,7 +108,7 @@ export default class CSSStyleDeclarationComputedStyle {
 					this.parseCSSRules({
 						elements: documentElements,
 						rootElement:
-							documentElements[0].element[PropertySymbol.tagName] === 'HTML'
+							(<Element>documentElements[0].element)[PropertySymbol.tagName] === 'HTML'
 								? documentElements[0]
 								: null,
 						cssRules: sheet.cssRules
@@ -168,39 +168,21 @@ export default class CSSStyleDeclarationComputedStyle {
 		for (const parentElement of parentElements) {
 			parentElement.cssTexts.sort((a, b) => a.priorityWeight - b.priorityWeight);
 
+			const defaultCSS = (<any>CSSStyleDeclarationElementDefaultCSS)[
+				(<Element>parentElement.element)[PropertySymbol.tagName]!
+			];
 			let elementCSSText = '';
-			if (
-				CSSStyleDeclarationElementDefaultCSS[
-					(<Element>parentElement.element)[PropertySymbol.tagName]
-				]
-			) {
-				if (
-					typeof CSSStyleDeclarationElementDefaultCSS[
-						(<Element>parentElement.element)[PropertySymbol.tagName]
-					] === 'string'
-				) {
-					elementCSSText +=
-						CSSStyleDeclarationElementDefaultCSS[
-							(<Element>parentElement.element)[PropertySymbol.tagName]
-						];
+
+			if (defaultCSS) {
+				if (typeof defaultCSS === 'string') {
+					elementCSSText += defaultCSS;
 				} else {
-					for (const key of Object.keys(
-						CSSStyleDeclarationElementDefaultCSS[
-							(<Element>parentElement.element)[PropertySymbol.tagName]
-						]
-					)) {
-						if (key === 'default' || !!parentElement.element[key]) {
-							elementCSSText +=
-								CSSStyleDeclarationElementDefaultCSS[
-									(<Element>parentElement.element)[PropertySymbol.tagName]
-								][key];
+					for (const key of Object.keys(defaultCSS)) {
+						if (key === 'default' || !!(<any>parentElement.element)[key]) {
+							elementCSSText += defaultCSS[key];
 						}
 					}
 				}
-				elementCSSText +=
-					CSSStyleDeclarationElementDefaultCSS[
-						(<Element>parentElement.element)[PropertySymbol.tagName]
-					];
 			}
 
 			for (const cssText of parentElement.cssTexts) {
@@ -220,7 +202,7 @@ export default class CSSStyleDeclarationComputedStyle {
 
 			for (const { name, value, important } of rules) {
 				if (
-					CSSStyleDeclarationElementInheritedProperties[name] ||
+					(<any>CSSStyleDeclarationElementInheritedProperties)[name] ||
 					parentElement === targetElement
 				) {
 					const parsedValue = this.parseCSSVariablesInValue(value.trim(), cssProperties);

package/src/css/declaration/property-manager/CSSStyleDeclarationPropertyManager.ts

@@ -572,7 +572,7 @@ export default class CSSStyleDeclarationPropertyManager {
 	public toString(): string {
 		const result = [];
 		const clone = this.clone();
-		const properties = {};
+		const properties: { [k: string]: ICSSStyleDeclarationPropertyValue } = {};
 
 		for (const shorthandPropertyGroup of TO_STRING_SHORTHAND_PROPERTIES) {
 			for (const shorthandProperty of shorthandPropertyGroup) {
@@ -601,7 +601,7 @@ export default class CSSStyleDeclarationPropertyManager {
 		}
 
 		for (const name of Object.keys(clone.properties)) {
-			properties[name] = clone.get(name);
+			properties[name] = clone.get(name)!;
 		}
 
 		for (const definedPropertyName of Object.keys(this.definedPropertyNames)) {