Property HTMLFieldSetElement.type added

rbri · rbri · commit 15df9a4b9630 · 2026-08-02T11:30:23.000+02:00
Method HTMLFieldSetElement.elements() added
Fixed DisabledElement.isDisabled(): a disabled fieldset no longer disables descendants of its first legend element, matching the spec's exemption for controls placed inside a fieldset's legend.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,16 @@
 
     <body>
         <release version="5.4.0" date="August xx, 2026" description="Firefox 153, Bugfixes">
+            <action type="add" dev="rbri">
+                Property HTMLFieldSetElement.type added.
+            </action>
+            <action type="add" dev="rbri">
+                Method HTMLFieldSetElement.elements() added.
+            </action>
+            <action type="fix" dev="rbri">
+                Fixed DisabledElement.isDisabled(): a disabled fieldset no longer disables descendants of its
+                first legend element, matching the spec's exemption for controls placed inside a fieldset's legend.
+            </action>
             <action type="fix" dev="rbri">
                 Fixed checkValidity()/reportValidity() and the CSS :valid/:invalid pseudo-classes
                 for HtmlButtons, HtmlTextarea.
@@ -17,8 +27,8 @@
                 'value' attribute; it now simply clears the selected files, without firing a change event.
             </action>
             <action type="fix" dev="rbri">
-                 HtmlFileInput.isValid(): a disabled file input is no longer incorrectly reported as invalid
-                 by checkValidity() when 'required' is set and no file is selected
+                HtmlFileInput.isValid(): a disabled file input is no longer incorrectly reported as invalid
+                by checkValidity() when 'required' is set and no file is selected
             </action>
             <action type="add" dev="rbri">
                 Method reportValidity() support to various form controls added.
diff --git a/src/main/java/org/htmlunit/html/DisabledElement.java b/src/main/java/org/htmlunit/html/DisabledElement.java
@@ -30,25 +30,71 @@ public interface DisabledElement extends Element {
 
     /**
      * Returns {@code true} if the disabled attribute is set for this element.
+     * <p>
+     * Per spec, a disabled {@link HtmlFieldSet} ancestor disables its
+     * descendants EXCEPT for descendants of that fieldset's first
+     * {@code <legend>} child, if any. This is checked cheaply while walking
+     * up the ancestor chain: at each step, the node we just came from
+     * (tracked as {@code previous}) is by construction a direct child of the
+     * node we're currently examining, so when that node turns out to be a
+     * disabled fieldset we already know its relevant direct child without
+     * any second traversal -- see {@link #isFirstLegendChild(HtmlFieldSet, Node)}.
+     * </p>
+     *
      * @return {@code true} if the disabled attribute is set for this element
      */
     default boolean isDisabled() {
         if (hasAttribute(ATTRIBUTE_DISABLED)) {
             return true;
         }
 
+        Node previous = this;
         Node node = getParentNode();
         while (node != null) {
-            if (node instanceof DisabledElement element
-                    && element.isDisabled()) {
+            if (node instanceof HtmlFieldSet fieldSet) {
+                if (fieldSet.hasAttribute(ATTRIBUTE_DISABLED)
+                        && !isFirstLegendChild(fieldSet, previous)) {
+                    return true;
+                }
+            }
+            else if (node instanceof DisabledElement element
+                    && element.hasAttribute(ATTRIBUTE_DISABLED)) {
                 return true;
             }
+            previous = node;
             node = node.getParentNode();
         }
 
         return false;
     }
 
+    /**
+     * Checks whether {@code candidate} -- the direct child of {@code fieldSet}
+     * that lies on the path up from this element -- is {@code fieldSet}'s
+     * FIRST {@code <legend>} child. The exemption from fieldset disabling
+     * applies only to the first legend -- a control inside a second,
+     * non-conforming {@code <legend>} is still disabled. Bounded by how many
+     * children precede the first legend (in practice O(1), since a legend is
+     * almost always the first child), not by how deep this element is nested
+     * inside it.
+     *
+     * @param fieldSet the disabled fieldset ancestor to check the exemption against
+     * @param candidate the direct child of {@code fieldSet} on the path up from this element
+     * @return {@code true} if {@code candidate} is {@code fieldSet}'s first {@code <legend>} child
+     */
+    private static boolean isFirstLegendChild(final HtmlFieldSet fieldSet, final Node candidate) {
+        if (!(candidate instanceof HtmlLegend)) {
+            return false;
+        }
+
+        for (final DomNode child : fieldSet.getChildren()) {
+            if (child instanceof HtmlLegend) {
+                return child == candidate;
+            }
+        }
+        return false;
+    }
+
     /**
      * Returns the value of the attribute {@code disabled}. Refer to the
      * <a href="http://www.w3.org/TR/html401/">HTML 4.01</a>
@@ -57,5 +103,4 @@ default boolean isDisabled() {
      * @return the value of the attribute {@code disabled} or an empty string if that attribute isn't defined
      */
     String getDisabledAttribute();
-
 }
diff --git a/src/main/java/org/htmlunit/javascript/host/html/HTMLFieldSetElement.java b/src/main/java/org/htmlunit/javascript/host/html/HTMLFieldSetElement.java
@@ -14,9 +14,19 @@
  */
 package org.htmlunit.javascript.host.html;
 
+import java.io.Serializable;
+import java.util.function.Predicate;
+
 import org.htmlunit.html.DomElement;
+import org.htmlunit.html.DomNode;
+import org.htmlunit.html.HtmlButton;
 import org.htmlunit.html.HtmlFieldSet;
 import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlInput;
+import org.htmlunit.html.HtmlObject;
+import org.htmlunit.html.HtmlOutput;
+import org.htmlunit.html.HtmlSelect;
+import org.htmlunit.html.HtmlTextArea;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstructor;
 import org.htmlunit.javascript.configuration.JsxFunction;
@@ -78,13 +88,31 @@ public HTMLFormElement getForm() {
         return (HTMLFormElement) getScriptableFor(form);
     }
 
+    /**
+     * Returns the {@code type} property; always "fieldset".
+     * @return the {@code type} property
+     */
+    @JsxGetter
+    public String getType() {
+        return "fieldset";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public HtmlFieldSet getDomNodeOrDie() {
+        return (HtmlFieldSet) super.getDomNodeOrDie();
+    }
+
     /**
      * Checks whether the element has any constraints and whether it satisfies them.
      * @return {@code true} if the element is valid
      */
     @JsxFunction
     public boolean checkValidity() {
-        return getDomNodeOrDie().isValid();
+        final HtmlFieldSet fieldSet = getDomNodeOrDie();
+        return !fieldSet.willValidate() || fieldSet.isValid();
     }
 
     /**
@@ -133,7 +161,7 @@ public ValidityState getValidity() {
      */
     @JsxGetter
     public boolean isWillValidate() {
-        return ((HtmlFieldSet) getDomNodeOrDie()).willValidate();
+        return getDomNodeOrDie().willValidate();
     }
 
     /**
@@ -142,6 +170,51 @@ public boolean isWillValidate() {
      */
     @JsxFunction
     public void setCustomValidity(final String message) {
-        ((HtmlFieldSet) getDomNodeOrDie()).setCustomValidity(message);
+        getDomNodeOrDie().setCustomValidity(message);
+    }
+
+    /**
+     * Returns the fieldset's associated form controls -- listed elements whose
+     * closest fieldset element ancestor is this fieldset.
+     * <p>
+     * Per spec, this is purely a tree-position question: it does not consult
+     * the 'form' attribute or form ownership at all (a control physically
+     * inside this fieldset is included even if 'form' points elsewhere), and a
+     * nested inner &lt;fieldset&gt;'s own descendants are excluded here even
+     * though they're still tree-descendants of this fieldset -- only the inner
+     * fieldset ELEMENT itself counts, since it is the listed element whose
+     * closest fieldset ancestor is this one.
+     * </p>
+     *
+     * @return the fieldset's associated form controls
+     * @see <a href="https://developer.mozilla.org/en-US/docs/Web/API/HTMLFieldSetElement/elements">MDN Documentation</a>
+     */
+    @JsxGetter
+    public HTMLCollection getElements() {
+        final DomElement elt = getDomNodeOrDie();
+
+        final HTMLCollection elements = new HTMLCollection(elt, true);
+
+        elements.setIsMatchingPredicate((Predicate<DomNode> & Serializable) node -> isListedElement(node));
+
+        return elements;
+    }
+
+    /**
+     * Checks whether {@code node} belongs to the HTML "listed" category of
+     * form-associated elements (button, fieldset, input except type=image,
+     * object, output, select, textarea).
+     *
+     * @param node the node to check
+     * @return {@code true} if {@code node} is a listed element
+     */
+    private static boolean isListedElement(final DomNode node) {
+        return node instanceof HtmlInput
+                || node instanceof HtmlButton
+                || node instanceof HtmlFieldSet
+                || node instanceof HtmlObject
+                || node instanceof HtmlOutput
+                || node instanceof HtmlSelect
+                || node instanceof HtmlTextArea;
     }
 }
diff --git a/src/test/java/org/htmlunit/general/ElementOwnPropertiesTest.java b/src/test/java/org/htmlunit/general/ElementOwnPropertiesTest.java
@@ -5528,14 +5528,14 @@ public void em() throws Exception {
             FF_ESR = "checkValidity(),constructor(),disabled[GSCE],elements[GCE],form[GCE],name[GSCE],reportValidity(),"
                 + "setCustomValidity(),type[GCE],validationMessage[GCE],validity[GCE],"
                 + "willValidate[GCE]")
-    @HtmlUnitNYI(CHROME = "checkValidity(),constructor(),disabled[GSCE],form[GCE],name[GSCE],"
-                + "reportValidity(),setCustomValidity(),validity[GCE],willValidate[GCE]",
-            EDGE = "checkValidity(),constructor(),disabled[GSCE],form[GCE],name[GSCE],"
-                + "reportValidity(),setCustomValidity(),validity[GCE],willValidate[GCE]",
-            FF_ESR = "checkValidity(),constructor(),disabled[GSCE],form[GCE],name[GSCE],"
-                + "reportValidity(),setCustomValidity(),validity[GCE],willValidate[GCE]",
-            FF = "checkValidity(),constructor(),disabled[GSCE],form[GCE],name[GSCE],"
-                + "reportValidity(),setCustomValidity(),validity[GCE],willValidate[GCE]")
+    @HtmlUnitNYI(CHROME = "checkValidity(),constructor(),disabled[GSCE],elements[GCE],form[GCE],name[GSCE],"
+                + "reportValidity(),setCustomValidity(),type[GCE],validity[GCE],willValidate[GCE]",
+            EDGE = "checkValidity(),constructor(),disabled[GSCE],elements[GCE],form[GCE],name[GSCE],"
+                + "reportValidity(),setCustomValidity(),type[GCE],validity[GCE],willValidate[GCE]",
+            FF_ESR = "checkValidity(),constructor(),disabled[GSCE],elements[GCE],form[GCE],name[GSCE],"
+                + "reportValidity(),setCustomValidity(),type[GCE],validity[GCE],willValidate[GCE]",
+            FF = "checkValidity(),constructor(),disabled[GSCE],elements[GCE],form[GCE],name[GSCE],"
+                + "reportValidity(),setCustomValidity(),type[GCE],validity[GCE],willValidate[GCE]")
     public void fieldset() throws Exception {
         test("fieldset");
     }
diff --git a/src/test/java/org/htmlunit/general/ElementPropertiesTest.java b/src/test/java/org/htmlunit/general/ElementPropertiesTest.java
@@ -1865,10 +1865,15 @@ public void em() throws Exception {
     @Test
     @Alerts("checkValidity(),disabled,elements,form,name,reportValidity(),setCustomValidity(),type,"
                 + "validationMessage,validity,willValidate")
-    @HtmlUnitNYI(CHROME = "checkValidity(),disabled,form,name,reportValidity(),setCustomValidity(),validity,willValidate",
-            EDGE = "checkValidity(),disabled,form,name,reportValidity(),setCustomValidity(),validity,willValidate",
-            FF_ESR = "checkValidity(),disabled,form,name,reportValidity(),setCustomValidity(),validity,willValidate",
-            FF = "checkValidity(),disabled,form,name,reportValidity(),setCustomValidity(),validity,willValidate")
+    @HtmlUnitNYI(
+            CHROME = "checkValidity(),disabled,elements,form,name,reportValidity(),setCustomValidity(),"
+                    + "type,validity,willValidate",
+            EDGE = "checkValidity(),disabled,elements,form,name,reportValidity(),setCustomValidity(),"
+                    + "type,validity,willValidate",
+            FF_ESR = "checkValidity(),disabled,elements,form,name,reportValidity(),setCustomValidity(),"
+                    + "type,validity,willValidate",
+            FF = "checkValidity(),disabled,elements,form,name,reportValidity(),setCustomValidity(),"
+                    + "type,validity,willValidate")
     public void fieldset() throws Exception {
         test("fieldset");
     }
diff --git a/src/test/java/org/htmlunit/javascript/host/html/HTMLFieldSetElementTest.java b/src/test/java/org/htmlunit/javascript/host/html/HTMLFieldSetElementTest.java
diff --git a/src/test/java/org/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java b/src/test/java/org/htmlunit/javascript/host/html/HTMLTextAreaElementTest.java
