happy-dom 16.0.1 → 16.2.0

package/src/window/BrowserWindow.ts

@@ -306,6 +306,7 @@ import SVGUnitTypes from '../svg/SVGUnitTypes.js';
 import DOMPoint from '../dom/DOMPoint.js';
 import SVGAnimatedLengthList from '../svg/SVGAnimatedLengthList.js';
 import CustomElementReactionStack from '../custom-element/CustomElementReactionStack.js';
+import IScrollToOptions from './IScrollToOptions.js';
 
 const TIMER = {
 	setTimeout: globalThis.setTimeout.bind(globalThis),
@@ -1144,28 +1145,35 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 	 * @param x X position or options object.
 	 * @param y Y position.
 	 */
-	public scroll(x: { top?: number; left?: number; behavior?: string } | number, y?: number): void {
-		if (typeof x === 'object') {
-			if (x.behavior === 'smooth') {
-				this.setTimeout(() => {
-					if (x.top !== undefined) {
-						(<number>this.document.documentElement.scrollTop) = x.top;
-					}
-					if (x.left !== undefined) {
-						(<number>this.document.documentElement.scrollLeft) = x.left;
-					}
-				});
-			} else {
-				if (x.top !== undefined) {
-					(<number>this.document.documentElement.scrollTop) = x.top;
+	public scroll(x: IScrollToOptions | number, y?: number): void {
+		if (typeof x !== 'object' && arguments.length === 1) {
+			throw new this.TypeError(
+				"Failed to execute 'scroll' on 'Window': The provided value is not of type 'ScrollToOptions'."
+			);
+		}
+
+		const options = typeof x === 'object' ? x : { left: x, top: y };
+
+		if (options.behavior === 'smooth') {
+			this.setTimeout(() => {
+				if (options.top !== undefined) {
+					const top = Number(options.top);
+					this.document.documentElement.scrollTop = isNaN(top) ? 0 : top;
 				}
-				if (x.left !== undefined) {
-					(<number>this.document.documentElement.scrollLeft) = x.left;
+				if (options.left !== undefined) {
+					const left = Number(options.left);
+					this.document.documentElement.scrollLeft = isNaN(left) ? 0 : left;
 				}
+			});
+		} else {
+			if (options.top !== undefined) {
+				const top = Number(options.top);
+				this.document.documentElement.scrollTop = isNaN(top) ? 0 : top;
+			}
+			if (options.left !== undefined) {
+				const left = Number(options.left);
+				this.document.documentElement.scrollLeft = isNaN(left) ? 0 : left;
 			}
-		} else if (x !== undefined && y !== undefined) {
-			(<number>this.document.documentElement.scrollLeft) = x;
-			(<number>this.document.documentElement.scrollTop) = y;
 		}
 	}
 
@@ -1175,13 +1183,35 @@ export default class BrowserWindow extends EventTarget implements INodeJSGlobal
 	 * @param x X position or options object.
 	 * @param y Y position.
 	 */
-	public scrollTo(
-		x: { top?: number; left?: number; behavior?: string } | number,
-		y?: number
-	): void {
+	public scrollTo(x: IScrollToOptions | number, y?: number): void {
+		if (typeof x !== 'object' && arguments.length === 1) {
+			throw new this.TypeError(
+				"Failed to execute 'scrollTo' on 'Window': The provided value is not of type 'ScrollToOptions'."
+			);
+		}
 		this.scroll(x, y);
 	}
 
+	/**
+	 * Scrolls by a relative amount from the current position.
+	 *
+	 * @param x Pixels to scroll by from top or scroll options object.
+	 * @param y Pixels to scroll by from left.
+	 */
+	public scrollBy(x: IScrollToOptions | number, y?: number): void {
+		if (typeof x !== 'object' && arguments.length === 1) {
+			throw new this.TypeError(
+				"Failed to execute 'scrollBy' on 'Window': The provided value is not of type 'ScrollToOptions'."
+			);
+		}
+		const options = typeof x === 'object' ? x : { left: x, top: y };
+		this.scroll({
+			left: this.document.documentElement.scrollLeft + (options.left ?? 0),
+			top: this.document.documentElement.scrollTop + (options.top ?? 0),
+			behavior: options.behavior
+		});
+	}
+
 	/**
 	 * Shifts focus away from the window.
 	 */

package/src/window/IScrollToOptions.ts

@@ -0,0 +1,5 @@
+export default interface IScrollToOptions {
+	top?: number;
+	left?: number;
+	behavior?: 'auto' | 'smooth';
+}