happy-dom 12.3.0 → 12.5.0

package/src/nodes/html-element/HTMLElementUtility.ts

@@ -16,16 +16,20 @@ export default class HTMLElementUtility {
 			return;
 		}
 
+		const relatedTarget = element.ownerDocument['_nextActiveElement'] ?? null;
+
 		element.ownerDocument['_activeElement'] = null;
 
 		element.dispatchEvent(
 			new FocusEvent('blur', {
+				relatedTarget,
 				bubbles: false,
 				composed: true
 			})
 		);
 		element.dispatchEvent(
 			new FocusEvent('focusout', {
+				relatedTarget,
 				bubbles: true,
 				composed: true
 			})
@@ -42,20 +46,30 @@ export default class HTMLElementUtility {
 			return;
 		}
 
+		// Set the next active element so `blur` can use it for `relatedTarget`.
+		element.ownerDocument['_nextActiveElement'] = element;
+
+		const relatedTarget = element.ownerDocument['_activeElement'];
+
 		if (element.ownerDocument['_activeElement'] !== null) {
 			element.ownerDocument['_activeElement'].blur();
 		}
 
+		// Clean up after blur, so it does not affect next blur call.
+		element.ownerDocument['_nextActiveElement'] = null;
+
 		element.ownerDocument['_activeElement'] = element;
 
 		element.dispatchEvent(
 			new FocusEvent('focus', {
+				relatedTarget,
 				bubbles: false,
 				composed: true
 			})
 		);
 		element.dispatchEvent(
 			new FocusEvent('focusin', {
+				relatedTarget,
 				bubbles: true,
 				composed: true
 			})

package/src/nodes/html-script-element/HTMLScriptElement.ts

@@ -189,6 +189,8 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 						type === 'application/x-javascript' ||
 						type.startsWith('text/javascript'))
 				) {
+					this.ownerDocument['_currentScript'] = this;
+
 					if (this.ownerDocument.defaultView.happyDOM.settings.disableErrorCapturing) {
 						this.ownerDocument.defaultView.eval(textContent);
 					} else {
@@ -196,6 +198,8 @@ export default class HTMLScriptElement extends HTMLElement implements IHTMLScrip
 							this.ownerDocument.defaultView.eval(textContent)
 						);
 					}
+
+					this.ownerDocument['_currentScript'] = null;
 				}
 			}
 		}

package/src/nodes/html-script-element/HTMLScriptElementUtility.ts

@@ -56,6 +56,7 @@ export default class HTMLScriptElementUtility {
 					throw error;
 				}
 			} else {
+				element.ownerDocument['_currentScript'] = element;
 				if (element.ownerDocument.defaultView.happyDOM.settings.disableErrorCapturing) {
 					element.ownerDocument.defaultView.eval(code);
 				} else {
@@ -63,6 +64,7 @@ export default class HTMLScriptElementUtility {
 						element.ownerDocument.defaultView.eval(code)
 					);
 				}
+				element.ownerDocument['_currentScript'] = null;
 				element.dispatchEvent(new Event('load'));
 			}
 		} else {
@@ -81,6 +83,7 @@ export default class HTMLScriptElementUtility {
 					throw error;
 				}
 			} else {
+				element.ownerDocument['_currentScript'] = element;
 				if (element.ownerDocument.defaultView.happyDOM.settings.disableErrorCapturing) {
 					element.ownerDocument.defaultView.eval(code);
 				} else {
@@ -88,6 +91,7 @@ export default class HTMLScriptElementUtility {
 						element.ownerDocument.defaultView.eval(code)
 					);
 				}
+				element.ownerDocument['_currentScript'] = null;
 				element.dispatchEvent(new Event('load'));
 			}
 		}