happy-dom 7.6.4 → 7.6.5

package/src/nodes/html-select-element/HTMLSelectElement.ts

@@ -167,13 +167,14 @@ export default class HTMLSelectElement extends HTMLElement implements IHTMLSelec
 	 * @returns Value.
 	 */
 	public get value(): string {
-		if (this.options.selectedIndex === -1) {
-			return '';
+		for (let i = 0, max = this.options.length; i < max; i++) {
+			const option = <HTMLOptionElement>this.options[i];
+			if (option._selectedness) {
+				return option.value;
+			}
 		}
 
-		const option = this.options[this.options.selectedIndex];
-
-		return option instanceof HTMLOptionElement ? option.value : '';
+		return '';
 	}
 
 	/**
@@ -182,9 +183,15 @@ export default class HTMLSelectElement extends HTMLElement implements IHTMLSelec
 	 * @param value Value.
 	 */
 	public set value(value: string) {
-		this.options.selectedIndex = this.options.findIndex(
-			(o) => o instanceof HTMLOptionElement && o.value === value
-		);
+		for (let i = 0, max = this.options.length; i < max; i++) {
+			const option = <HTMLOptionElement>this.options[i];
+			if (option.value === value) {
+				option._selectedness = true;
+				option._dirtyness = true;
+			} else {
+				option._selectedness = false;
+			}
+		}
 	}
 
 	/**
@@ -193,16 +200,31 @@ export default class HTMLSelectElement extends HTMLElement implements IHTMLSelec
 	 * @returns Value.
 	 */
 	public get selectedIndex(): number {
-		return this.options.selectedIndex;
+		for (let i = 0, max = this.options.length; i < max; i++) {
+			if ((<HTMLOptionElement>this.options[i])._selectedness) {
+				return i;
+			}
+		}
+		return -1;
 	}
 
 	/**
 	 * Sets value.
 	 *
-	 * @param value Value.
+	 * @param selectedIndex Selected index.
 	 */
-	public set selectedIndex(value: number) {
-		this.options.selectedIndex = value;
+	public set selectedIndex(selectedIndex: number) {
+		if (typeof selectedIndex === 'number' && !isNaN(selectedIndex)) {
+			for (let i = 0, max = this.options.length; i < max; i++) {
+				(<HTMLOptionElement>this.options[i])._selectedness = false;
+			}
+
+			const selectedOption = <HTMLOptionElement>this.options[selectedIndex];
+			if (selectedOption) {
+				selectedOption._selectedness = true;
+				selectedOption._dirtyness = true;
+			}
+		}
 	}
 
 	/**
@@ -287,13 +309,10 @@ export default class HTMLSelectElement extends HTMLElement implements IHTMLSelec
 
 			if (element.tagName === 'OPTION' || element.tagName === 'OPTGROUP') {
 				this.options.push(<IHTMLOptionElement | IHTMLOptGroupElement>element);
-
-				if (this.options.length === 1) {
-					this.options.selectedIndex = 0;
-				}
 			}
 
 			this._updateIndexProperties(previousLength, this.options.length);
+			this._resetOptionSelectednes();
 		}
 
 		return super.appendChild(node);
@@ -332,15 +351,15 @@ export default class HTMLSelectElement extends HTMLElement implements IHTMLSelec
 				} else {
 					this.options.push(<IHTMLOptionElement | IHTMLOptGroupElement>newElement);
 				}
-
-				if (this.options.length === 1) {
-					this.options.selectedIndex = 0;
-				}
 			}
 
 			this._updateIndexProperties(previousLength, this.options.length);
 		}
 
+		if (newNode.nodeType === NodeTypeEnum.elementNode) {
+			this._resetOptionSelectednes();
+		}
+
 		return returnValue;
 	}
 
@@ -358,20 +377,83 @@ export default class HTMLSelectElement extends HTMLElement implements IHTMLSelec
 				if (index !== -1) {
 					this.options.splice(index, 1);
 				}
+			}
 
-				if (this.options.selectedIndex >= this.options.length) {
-					this.options.selectedIndex = this.options.length - 1;
+			this._updateIndexProperties(previousLength, this.options.length);
+			this._resetOptionSelectednes();
+		}
+
+		return super.removeChild(node);
+	}
+
+	/**
+	 * Resets the option selectedness.
+	 *
+	 * Based on:
+	 * https://github.com/jsdom/jsdom/blob/master/lib/jsdom/living/nodes/HTMLSelectElement-impl.js
+	 *
+	 * @param [newOption] Optional new option element to be selected.
+	 * @see https://html.spec.whatwg.org/multipage/form-elements.html#selectedness-setting-algorithm
+	 */
+	public _resetOptionSelectednes(newOption?: IHTMLOptionElement): void {
+		if (this.hasAttributeNS(null, 'multiple')) {
+			return;
+		}
+
+		const selected: HTMLOptionElement[] = [];
+
+		for (let i = 0, max = this.options.length; i < max; i++) {
+			if (newOption) {
+				(<HTMLOptionElement>this.options[i])._selectedness = this.options[i] === newOption;
+			}
+
+			if ((<HTMLOptionElement>this.options[i])._selectedness) {
+				selected.push(<HTMLOptionElement>this.options[i]);
+			}
+		}
+
+		const size = this._getDisplaySize();
+
+		if (size === 1 && !selected.length) {
+			for (let i = 0, max = this.options.length; i < max; i++) {
+				const option = <HTMLOptionElement>this.options[i];
+
+				let disabled = option.hasAttributeNS(null, 'disabled');
+				const parentNode = <IHTMLElement>option.parentNode;
+				if (
+					parentNode &&
+					parentNode.nodeType === NodeTypeEnum.elementNode &&
+					parentNode.tagName === 'OPTGROUP' &&
+					parentNode.hasAttributeNS(null, 'disabled')
+				) {
+					disabled = true;
 				}
 
-				if (!this.options.length) {
-					this.options.selectedIndex = -1;
+				if (!disabled) {
+					option._selectedness = true;
+					break;
 				}
 			}
-
-			this._updateIndexProperties(previousLength, this.options.length);
+		} else if (selected.length >= 2) {
+			for (let i = 0, max = this.options.length; i < max; i++) {
+				(<HTMLOptionElement>this.options[i])._selectedness = i === selected.length - 1;
+			}
 		}
+	}
 
-		return super.removeChild(node);
+	/**
+	 * Returns display size.
+	 *
+	 * @returns Display size.
+	 */
+	protected _getDisplaySize(): number {
+		if (this.hasAttributeNS(null, 'size')) {
+			const size = parseInt(this.getAttributeNS(null, 'size'));
+			if (!isNaN(size) && size >= 0) {
+				return size;
+			}
+		}
+		return this.hasAttributeNS(null, 'multiple') ? 4 : 1;
 	}
 
 	/**

package/src/nodes/svg-element/SVGElement.ts

@@ -74,11 +74,7 @@ export default class SVGElement extends Element implements ISVGElement {
 	}
 
 	/**
-	 * The setAttributeNode() method adds a new Attr node to the specified element.
-	 *
 	 * @override
-	 * @param attribute Attribute.
-	 * @returns Replaced attribute.
 	 */
 	public setAttributeNode(attribute: IAttr): IAttr {
 		const replacedAttribute = super.setAttributeNode(attribute);
@@ -91,16 +87,15 @@ export default class SVGElement extends Element implements ISVGElement {
 	}
 
 	/**
-	 * Removes an Attr node.
-	 *
 	 * @override
-	 * @param attribute Attribute.
 	 */
-	public removeAttributeNode(attribute: IAttr): void {
+	public removeAttributeNode(attribute: IAttr): IAttr {
 		super.removeAttributeNode(attribute);
 
 		if (attribute.name === 'style' && this._style) {
 			this._style.cssText = '';
 		}
+
+		return attribute;
 	}
 }