capricorn86#709@trivial: Adds checks for if the element is a ShadowRo…

…ot in more places where the host property is used.
romansp · Feb 2, 2023 · 7d006c3 · 7d006c3
1 parent 2ea4662
commit 7d006c3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/packages/happy-dom/src/css/declaration/utilities/CSSStyleDeclarationElementStyle.ts b/packages/happy-dom/src/css/declaration/utilities/CSSStyleDeclarationElementStyle.ts
@@ -129,7 +129,10 @@ export default class CSSStyleDeclarationElementStyle {
 				}
 
 				styleAndElement = { element: null, cssTexts: [] };
-			} else if ((<IShadowRoot>styleAndElement.element).host) {
+			} else if (
+				styleAndElement.element.nodeType === NodeTypeEnum.documentFragmentNode &&
+				(<IShadowRoot>styleAndElement.element).host
+			) {
 				const styleSheets = <INodeList<IHTMLStyleElement>>(
 					(<IShadowRoot>styleAndElement.element).querySelectorAll('style,link[rel="stylesheet"]')
 				);

diff --git a/packages/happy-dom/src/event/Event.ts b/packages/happy-dom/src/event/Event.ts
@@ -2,8 +2,8 @@ import IEventInit from './IEventInit';
 import INode from '../nodes/node/INode';
 import IWindow from '../window/IWindow';
 import IShadowRoot from '../nodes/shadow-root/IShadowRoot';
-import ShadowRoot from '../nodes/shadow-root/ShadowRoot';
 import IEventTarget from './IEventTarget';
+import NodeTypeEnum from '../nodes/node/NodeTypeEnum';
 
 /**
  * Event.
@@ -70,8 +70,12 @@ export default class Event {
 			composedPath.push(eventTarget);
 
 			if (this.bubbles) {
-				if (this.composed && eventTarget instanceof ShadowRoot && eventTarget.host) {
-					eventTarget = eventTarget.host;
+				if (
+					this.composed &&
+					(<INode>eventTarget).nodeType === NodeTypeEnum.documentFragmentNode &&
+					(<IShadowRoot>eventTarget).host
+				) {
+					eventTarget = (<IShadowRoot>eventTarget).host;
 				} else if ((<INode>(<unknown>this.target)).ownerDocument === eventTarget) {
 					eventTarget = (<INode>(<unknown>this.target)).ownerDocument.defaultView;
 				} else {

diff --git a/packages/happy-dom/src/nodes/node/Node.ts b/packages/happy-dom/src/nodes/node/Node.ts
@@ -482,7 +482,7 @@ export default class Node extends EventTarget implements INode {
 			}
 
 			// eslint-disable-next-line
-			if (event.composed && (<any>this).host) {
+			if (event.composed && this.nodeType === NodeTypeEnum.documentFragmentNode && (<any>this).host) {
 				// eslint-disable-next-line
 				return (<any>this).host.dispatchEvent(event);
 			}