Revert "Improve performance of appending <option> to <select>"

This reverts commit 3a569a6.
jsdom · Jan 7, 2023 · dc20dbc · dc20dbc
1 parent bda8241
commit dc20dbc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 72 deletions.
diff --git a/benchmark/html/index.js b/benchmark/html/index.js
@@ -1,6 +1,5 @@
 "use strict";
 
 module.exports = {
-  parsing: require("./parsing"),
-  select: require("./select")
+  parsing: require("./parsing")
 };
diff --git a/benchmark/html/select.js b/benchmark/html/select.js
diff --git a/lib/jsdom/living/nodes/HTMLSelectElement-impl.js b/lib/jsdom/living/nodes/HTMLSelectElement-impl.js
@@ -42,10 +42,6 @@ class HTMLSelectElementImpl extends HTMLElementImpl {
     this._customValidityErrorMessage = "";
 
     this._labels = null;
-
-    // Essentially a cache for the current selected element for use while building a select by appending options.
-    // See _selectednessSettingAlgorithmWithKnownNewAddition().
-    this._lastSelectedOptionForFastPath = null;
   }
 
   _formReset() {
@@ -57,10 +53,6 @@ class HTMLSelectElementImpl extends HTMLElementImpl {
   }
 
   _askedForAReset() {
-    this._selectednessSettingAlgorithm();
-  }
-
-  _selectednessSettingAlgorithm() {
     if (this.hasAttributeNS(null, "multiple")) {
       return;
     }
@@ -82,7 +74,6 @@ class HTMLSelectElementImpl extends HTMLElementImpl {
         if (!disabled) {
           // (do not set dirty)
           option._selectedness = true;
-          this._lastSelectedOptionForFastPath = option;
           break;
         }
       }
@@ -91,56 +82,19 @@ class HTMLSelectElementImpl extends HTMLElementImpl {
       selected.forEach((option, index) => {
         option._selectedness = index === selected.length - 1;
       });
-      this._lastSelectedOptionForFastPath = selected[selected.length - 1];
-    }
-  }
-
-  _selectednessSettingAlgorithmWithKnownNewAddition(child) {
-    if (this.hasAttributeNS(null, "multiple")) {
-      return;
-    }
-    if (child.hasAttributeNS(null, "disabled")) {
-      return;
-    }
-    const optArr = toOptionArray(child);
-    if (optArr.length === 0) {
-      return;
-    }
-    const selectedOptions = optArr.filter(opt => opt._selectedness);
-    // If any selected is last selected
-    if (selectedOptions.length > 0) {
-      // pushed at least one element with selected=true, reset
-      this._askedForAReset();
-      return;
-    }
-
-    // No selection so first option is selected
-    if ((!this._lastSelectedOptionForFastPath || !this._lastSelectedOptionForFastPath._selectedness) &&
-        this._displaySize === 1) {
-      this._lastSelectedOptionForFastPath = optArr[0];
-      this._lastSelectedOptionForFastPath._selectedness = true;
     }
   }
 
   _descendantAdded(parent, child) {
     if (child.nodeType === NODE_TYPE.ELEMENT_NODE) {
-      if (parent === this) {
-        this._selectednessSettingAlgorithmWithKnownNewAddition(child);
-      } else if (parent._localName === "optgroup") {
-        this._selectednessSettingAlgorithmWithKnownNewAddition(parent);
-      } else {
-        this._askedForAReset();
-      }
+      this._askedForAReset();
     }
 
     super._descendantAdded(parent, child);
   }
 
   _descendantRemoved(parent, child) {
     if (child.nodeType === NODE_TYPE.ELEMENT_NODE) {
-      if (this._lastSelectedOptionForFastPath === child) {
-        this._lastSelectedOptionForFastPath = null;
-      }
       this._askedForAReset();
     }
 
@@ -324,20 +278,6 @@ class HTMLSelectElementImpl extends HTMLElementImpl {
 
 mixin(HTMLSelectElementImpl.prototype, DefaultConstraintValidationImpl.prototype);
 
-function toOptionArray(child) {
-  const array = [];
-  if (child._localName === "option" && !child.hasAttributeNS(null, "disabled")) {
-    array.push(child);
-  } else if (child._localName === "optgroup") {
-    for (const childOfGroup of domSymbolTree.childrenIterator(child)) {
-      if (childOfGroup._localName === "option" && !childOfGroup.hasAttributeNS(null, "disabled")) {
-        array.push(childOfGroup);
-      }
-    }
-  }
-  return array;
-}
-
 module.exports = {
   implementation: HTMLSelectElementImpl
 };