Merge branch 'master' into Ayc0/crypto

capricorn86 · Sep 14, 2023 · cfe4b1a · cfe4b1a
2 parents 85df6fb + 4724033
commit cfe4b1a
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 11 deletions.
diff --git a/packages/happy-dom/src/config/ElementTag.ts b/packages/happy-dom/src/config/ElementTag.ts
@@ -48,6 +48,7 @@ export default {
 	LABEL: HTMLLabelElement,
 	SLOT: HTMLSlotElement,
 	SVG: SVGSVGElement,
+	G: SVGElement,
 	CIRCLE: SVGElement,
 	ELLIPSE: SVGElement,
 	LINE: SVGElement,

diff --git a/packages/happy-dom/src/dom-parser/DOMParser.ts b/packages/happy-dom/src/dom-parser/DOMParser.ts
@@ -74,16 +74,30 @@ export default class DOMParser {
 				}
 			}
 		} else {
-			const documentElement = newDocument.createElement('html');
-			const bodyElement = newDocument.createElement('body');
-			const headElement = newDocument.createElement('head');
+			switch (mimeType) {
+				case 'image/svg+xml':
+					{
+						for (const node of root._childNodes.slice()) {
+							newDocument.appendChild(node);
+						}
+					}
+					break;
+				case 'text/html':
+				default:
+					{
+						const documentElement = newDocument.createElement('html');
+						const bodyElement = newDocument.createElement('body');
+						const headElement = newDocument.createElement('head');
 
-			documentElement.appendChild(headElement);
-			documentElement.appendChild(bodyElement);
-			newDocument.appendChild(documentElement);
+						documentElement.appendChild(headElement);
+						documentElement.appendChild(bodyElement);
+						newDocument.appendChild(documentElement);
 
-			for (const node of root._childNodes.slice()) {
-				bodyElement.appendChild(node);
+						for (const node of root._childNodes.slice()) {
+							bodyElement.appendChild(node);
+						}
+					}
+					break;
 			}
 		}
 

diff --git a/packages/happy-dom/src/nodes/html-dialog-element/HTMLDialogElement.ts b/packages/happy-dom/src/nodes/html-dialog-element/HTMLDialogElement.ts
@@ -30,9 +30,12 @@ export default class HTMLDialogElement extends HTMLElement implements IHTMLDialo
 	 * @param [returnValue] ReturnValue.
 	 */
 	public close(returnValue = ''): void {
+		const wasOpen = this.open;
 		this.removeAttribute('open');
 		this.returnValue = returnValue;
-		this.dispatchEvent(new Event('close'));
+		if (wasOpen) {
+			this.dispatchEvent(new Event('close'));
+		}
 	}
 
 	/**

diff --git a/packages/happy-dom/test/dom-parser/DOMParser.test.ts b/packages/happy-dom/test/dom-parser/DOMParser.test.ts
@@ -3,6 +3,7 @@ import XMLSerializer from '../../src/xml-serializer/XMLSerializer.js';
 import DOMParser from '../../src/dom-parser/DOMParser.js';
 import DOMParserHTML from './data/DOMParserHTML.js';
 import { beforeEach, describe, it, expect } from 'vitest';
+import DOMParserSVG from './data/DOMParserSVG';
 
 describe('DOMParser', () => {
 	let domParser: DOMParser;
@@ -96,5 +97,12 @@ describe('DOMParser', () => {
 			// Spurious comment `<!--[a-z]/,end:/-->` should be solved
 			expect(newDocument.body.textContent).toBe('here is some html elástica ');
 		});
+
+		it('parses SVGs', () => {
+			const newDocument = domParser.parseFromString(DOMParserSVG, 'image/svg+xml');
+			expect(new XMLSerializer().serializeToString(newDocument).replace(/[\s]/gm, '')).toBe(
+				DOMParserSVG.replace(/[\s]/gm, '')
+			);
+		});
 	});
 });
diff --git a/packages/happy-dom/test/dom-parser/data/DOMParserSVG.ts b/packages/happy-dom/test/dom-parser/data/DOMParserSVG.ts
@@ -0,0 +1,5 @@
+export default `
+	<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+		<path d="M14 6.53333V7.46667H7.46667V14H6.53333V7.46667H0V6.53333H6.53333V0H7.46667V6.53333H14Z" fill="#0078D4"></path>
+	</svg>
+`;
diff --git a/packages/happy-dom/test/nodes/html-dialog-element/HTMLDialogElement.test.ts b/packages/happy-dom/test/nodes/html-dialog-element/HTMLDialogElement.test.ts
@@ -92,6 +92,13 @@ describe('HTMLDialogElement', () => {
 			expect((<Event>(<unknown>dispatched)).bubbles).toBe(false);
 		});
 
+		it('Should only dispatch a close event when dialog wasnt already closed', () => {
+			let dispatched: Event | null = null;
+			element.addEventListener('close', (event: Event) => (dispatched = event));
+			element.close();
+			expect(dispatched).toBe(null);
+		});
+
 		it('Should dispatch a close event when closing a modal', () => {
 			let dispatched: Event | null = null;
 			element.addEventListener('close', (event: Event) => (dispatched = event));

diff --git a/packages/jest-environment/src/index.ts b/packages/jest-environment/src/index.ts
@@ -81,8 +81,6 @@ export default class HappyDOMEnvironment implements JestEnvironment {
 		};
 		this.window.addEventListener('error', this.errorEventListener);
 
-		this.moduleMocker = new ModuleMocker(global);
-
 		this.fakeTimers = new LegacyFakeTimers({
 			config: projectConfig,
 			global: <typeof globalThis>(<unknown>this.window),