fixes

SeleniumHQ · Nov 4, 2021 · f8e6738 · f8e6738
1 parent 8db7a30
commit f8e6738
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitWebElement.java b/src/main/java/org/openqa/selenium/htmlunit/HtmlUnitWebElement.java
@@ -322,8 +322,12 @@ public String getAttribute(String name) {
         return null;
       }
     }
+
     if ("disabled".equals(lowerName)) {
-      return trueOrNull(!isEnabled());
+        if (element instanceof DisabledElement) {
+            return trueOrNull(((DisabledElement) element).isDisabled());
+        }
+        return "true";
     }
 
     if ("multiple".equals(lowerName) && element instanceof HtmlSelect) {
@@ -401,7 +405,9 @@ public String getDomProperty(String name) {
     }
 
     if ("disabled".equals(lowerName)) {
-        return "true";
+        if (element instanceof DisabledElement) {
+            return trueOrNull(((DisabledElement) element).isDisabled());
+        }
     }
 
     if (ATTRIBUTE_VALUE_EMPTY == value) {