fix: restore disableOnClick attribute (#7071) (#7072)

* fix: restore disableOnClick attribute * rename to disableonclick Co-authored-by: Sascha Ißbrücker <[email protected]>
vaadin · Jan 29, 2025 · 1c4a2e6 · 1c4a2e6
1 parent 21f763d
commit 1c4a2e6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/...ase/src/main/java/com/vaadin/flow/component/shared/internal/DisableOnClickController.java b/...ase/src/main/java/com/vaadin/flow/component/shared/internal/DisableOnClickController.java
@@ -77,9 +77,9 @@ public DisableOnClickController(C component) {
     public void setDisableOnClick(boolean disableOnClick) {
         this.disableOnClick = disableOnClick;
         if (disableOnClick) {
-            component.getElement().setProperty("disableOnClick", "true");
+            component.getElement().setAttribute("disableonclick", "true");
         } else {
-            component.getElement().removeProperty("disableOnClick");
+            component.getElement().removeAttribute("disableonclick");
         }
     }
 

diff --git a/...components-base/src/main/resources/META-INF/resources/frontend/disableOnClickFunctions.js b/...components-base/src/main/resources/META-INF/resources/frontend/disableOnClickFunctions.js
@@ -1,5 +1,5 @@
 document.addEventListener('click', (event) => {
-  const target = event.composedPath().find((node) => node.disableOnClick);
+  const target = event.composedPath().find((node) => node.hasAttribute && node.hasAttribute('disableonclick'));
   if (target) {
     target.disabled = true;
   }

diff --git a/...nts-base/src/test/java/com/vaadin/flow/component/shared/DisableOnClickControllerTest.java b/...nts-base/src/test/java/com/vaadin/flow/component/shared/DisableOnClickControllerTest.java
@@ -50,6 +50,17 @@ public void setDisableOnClick_disableOnClickUpdated() {
         Assert.assertFalse(component.isDisableOnClick());
     }
 
+    @Test
+    public void setDisableOnClick_updatesAttribute() {
+        component.setDisableOnClick(true);
+        Assert.assertTrue(
+                component.getElement().hasAttribute("disableonclick"));
+
+        component.setDisableOnClick(false);
+        Assert.assertFalse(
+                component.getElement().hasAttribute("disableonclick"));
+    }
+
     @Test
     public void disableOnClickNotSetUp_click_componentIsStillEnabled() {
         var componentIsEnabled = new AtomicBoolean(true);