DisabledElement now implements Element and provides a default implementation of isDisable()

rbri · rbri · commit d4b001d6102c · 2026-07-31T12:13:43.000+02:00
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -8,6 +8,9 @@
 
     <body>
         <release version="5.4.0" date="August xx, 2026" description="Firefox 153, Bugfixes">
+            <action type="update" dev="rbri">
+                DisabledElement now implements Element and provides a default implementation of isDisabled().
+            </action>
             <action type="fix" dev="rbri">
                 Fixed HtmlTextArea.reset(): the text entry cursor/selection is now only moved to the end of the restored
                 value when that value actually differs from the current one, instead of always being forced to the end.
diff --git a/src/main/java/org/htmlunit/html/DisabledElement.java b/src/main/java/org/htmlunit/html/DisabledElement.java
@@ -14,13 +14,16 @@
  */
 package org.htmlunit.html;
 
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
 /**
  * A marker interface for those classes that can be disabled.
  *
  * @author David D. Kilzer
  * @author Ronald Brill
  */
-public interface DisabledElement {
+public interface DisabledElement extends Element {
 
     /** The "disabled" attribute name. */
     String ATTRIBUTE_DISABLED = "disabled";
@@ -29,7 +32,22 @@ public interface DisabledElement {
      * Returns {@code true} if the disabled attribute is set for this element.
      * @return {@code true} if the disabled attribute is set for this element
      */
-    boolean isDisabled();
+    default boolean isDisabled() {
+        if (hasAttribute(ATTRIBUTE_DISABLED)) {
+            return true;
+        }
+
+        Node node = getParentNode();
+        while (node != null) {
+            if (node instanceof DisabledElement element
+                    && element.isDisabled()) {
+                return true;
+            }
+            node = node.getParentNode();
+        }
+
+        return false;
+    }
 
     /**
      * Returns the value of the attribute {@code disabled}. Refer to the
diff --git a/src/main/java/org/htmlunit/html/HtmlButton.java b/src/main/java/org/htmlunit/html/HtmlButton.java
@@ -26,7 +26,6 @@
 import org.htmlunit.javascript.host.event.MouseEvent;
 import org.htmlunit.util.NameValuePair;
 import org.htmlunit.util.StringUtils;
-import org.w3c.dom.Node;
 
 /**
  * Wrapper for the HTML element "button".
@@ -105,27 +104,6 @@ protected boolean doClickStateUpdate(final boolean shiftKey, final boolean ctrlK
         return false;
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final boolean isDisabled() {
-        if (hasAttribute(ATTRIBUTE_DISABLED)) {
-            return true;
-        }
-
-        Node node = getParentNode();
-        while (node != null) {
-            if (node instanceof DisabledElement element
-                    && element.isDisabled()) {
-                return true;
-            }
-            node = node.getParentNode();
-        }
-
-        return false;
-    }
-
     /**
      * Returns {@code true} if this element is read only.
      * @return {@code true} if this element is read only
@@ -245,7 +223,7 @@ public final String getValueAttribute() {
      * @return the value of the attribute {@code type} or the default value if that attribute isn't defined
      */
     public final String getTypeAttribute() {
-        return getAttribute(TYPE_ATTRIBUTE);
+        return getAttributeDirect(TYPE_ATTRIBUTE);
     }
 
     /**
diff --git a/src/main/java/org/htmlunit/html/HtmlFieldSet.java b/src/main/java/org/htmlunit/html/HtmlFieldSet.java
@@ -93,25 +93,4 @@ public boolean isValidValidityState() {
     public final String getDisabledAttribute() {
         return getAttributeDirect(ATTRIBUTE_DISABLED);
     }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final boolean isDisabled() {
-        if (hasAttribute(ATTRIBUTE_DISABLED)) {
-            return true;
-        }
-
-        DomNode node = getParentNode();
-        while (node != null) {
-            if (node instanceof DisabledElement element
-                    && element.isDisabled()) {
-                return true;
-            }
-            node = node.getParentNode();
-        }
-
-        return false;
-    }
 }
diff --git a/src/main/java/org/htmlunit/html/HtmlInput.java b/src/main/java/org/htmlunit/html/HtmlInput.java
@@ -206,27 +206,6 @@ public final String getDisabledAttribute() {
         return getAttributeDirect(ATTRIBUTE_DISABLED);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final boolean isDisabled() {
-        if (hasAttribute(ATTRIBUTE_DISABLED)) {
-            return true;
-        }
-
-        DomNode node = getParentNode();
-        while (node != null) {
-            if (node instanceof DisabledElement element
-                    && element.isDisabled()) {
-                return true;
-            }
-            node = node.getParentNode();
-        }
-
-        return false;
-    }
-
     /**
      * Returns the value of the attribute {@code readonly}. Refer to the
      * <a href="http://www.w3.org/TR/html401/">HTML 4.01</a>
@@ -994,7 +973,12 @@ private boolean isPatternValid() {
         }
 
         try (Context cx = HtmlUnitContextFactory.getGlobal().enterContext()) {
+            // compile the raw pattern first: this is a validity check only (result discarded).
+            // Wrapping with "^(?:...)$ " cannot mask a genuinely invalid pattern -- the wrapper
+            // contributes a balanced open/close pair, so any unmatched parent/bracket or other
+            // structural defect in the raw pattern persists identically once wrapped.
             RegExpEngineAccess.compile(cx, pattern, "");
+
             final RegExpEngineAccess.CompiledRegExp compiled
                     = RegExpEngineAccess.compile(cx, "^(?:" + pattern + ")$", "");
 
diff --git a/src/main/java/org/htmlunit/html/HtmlOption.java b/src/main/java/org/htmlunit/html/HtmlOption.java
@@ -23,7 +23,6 @@
 import org.htmlunit.html.serializer.HtmlSerializerNormalizedText;
 import org.htmlunit.javascript.host.event.Event;
 import org.htmlunit.javascript.host.event.MouseEvent;
-import org.w3c.dom.Node;
 
 /**
  * Wrapper for the HTML element "option".
@@ -167,31 +166,6 @@ public final boolean isDefaultSelected() {
         return hasAttribute("selected");
     }
 
-    /**
-     * Returns whether this element is disabled.
-     *
-     * @return {@code true} if this element is disabled, either because it has
-     *         the {@code disabled} attribute or because it is contained in a
-     *         disabled ancestor element
-     */
-    @Override
-    public final boolean isDisabled() {
-        if (hasAttribute(ATTRIBUTE_DISABLED)) {
-            return true;
-        }
-
-        Node node = getParentNode();
-        while (node != null) {
-            if (node instanceof DisabledElement element
-                    && element.isDisabled()) {
-                return true;
-            }
-            node = node.getParentNode();
-        }
-
-        return false;
-    }
-
     /**
      * {@inheritDoc}
      */
diff --git a/src/main/java/org/htmlunit/html/HtmlOptionGroup.java b/src/main/java/org/htmlunit/html/HtmlOptionGroup.java
@@ -17,7 +17,6 @@
 import java.util.Map;
 
 import org.htmlunit.SgmlPage;
-import org.w3c.dom.Node;
 
 /**
  * Wrapper for the HTML element "optgroup".
@@ -48,31 +47,6 @@ public class HtmlOptionGroup extends HtmlElement implements DisabledElement {
         super(qualifiedName, page, attributes);
     }
 
-    /**
-     * Returns whether this element is disabled.
-     *
-     * @return {@code true} if this element is disabled, either because it has
-     *         the {@code disabled} attribute or because one of its ancestor
-     *         elements is disabled
-     */
-    @Override
-    public final boolean isDisabled() {
-        if (hasAttribute(ATTRIBUTE_DISABLED)) {
-            return true;
-        }
-
-        Node node = getParentNode();
-        while (node != null) {
-            if (node instanceof DisabledElement element
-                    && element.isDisabled()) {
-                return true;
-            }
-            node = node.getParentNode();
-        }
-
-        return false;
-    }
-
     /**
      * {@inheritDoc}
      */
diff --git a/src/main/java/org/htmlunit/html/HtmlSelect.java b/src/main/java/org/htmlunit/html/HtmlSelect.java
@@ -594,27 +594,6 @@ public final String getDisabledAttribute() {
         return getAttributeDirect(ATTRIBUTE_DISABLED);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final boolean isDisabled() {
-        if (hasAttribute(ATTRIBUTE_DISABLED)) {
-            return true;
-        }
-
-        Node node = getParentNode();
-        while (node != null) {
-            if (node instanceof DisabledElement element
-                    && element.isDisabled()) {
-                return true;
-            }
-            node = node.getParentNode();
-        }
-
-        return false;
-    }
-
     /**
      * Returns the value of the attribute {@code tabindex}. Refer to the <a
      * href="http://www.w3.org/TR/html401/">HTML 4.01</a> documentation for details on the use of this attribute.
diff --git a/src/main/java/org/htmlunit/html/HtmlTextArea.java b/src/main/java/org/htmlunit/html/HtmlTextArea.java
@@ -24,7 +24,6 @@
 import org.htmlunit.javascript.host.event.MouseEvent;
 import org.htmlunit.util.NameValuePair;
 import org.htmlunit.util.StringUtils;
-import org.w3c.dom.Node;
 
 /**
  * Wrapper for the HTML element "textarea".
@@ -289,7 +288,8 @@ public String getDefaultValue() {
     }
 
     /**
-     * {@inheritDoc} This implementation is empty; only checkboxes and radio buttons
+     * {@inheritDoc}
+     * This implementation is empty; only check boxes and radio buttons
      * really care what the default checked value is.
      * @see SubmittableElement#setDefaultChecked(boolean)
      * @see HtmlRadioButtonInput#setDefaultChecked(boolean)
@@ -345,27 +345,6 @@ public final String getColumnsAttribute() {
         return getAttributeDirect("cols");
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public final boolean isDisabled() {
-        if (hasAttribute(ATTRIBUTE_DISABLED)) {
-            return true;
-        }
-
-        Node node = getParentNode();
-        while (node != null) {
-            if (node instanceof DisabledElement element
-                    && element.isDisabled()) {
-                return true;
-            }
-            node = node.getParentNode();
-        }
-
-        return false;
-    }
-
     /**
      * {@inheritDoc}
      */
