Fix phx-disable-with not restoring disabled state on non-diff ack. Cl…

…oses #2993
phoenixframework · Jan 17, 2024 · a36861b · a36861b
1 parent 82a4df9
commit a36861b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/assets/js/phoenix_live_view/view.js b/assets/js/phoenix_live_view/view.js
@@ -798,6 +798,7 @@ export default class View {
           el.setAttribute(PHX_DISABLE_WITH_RESTORE, el.innerText)
         }
         if(disableText !== ""){ el.innerText = disableText }
+        el.setAttribute(PHX_DISABLED, el.disabled)
         el.setAttribute("disabled", "")
       }
     })

diff --git a/priv/static/phoenix_live_view.cjs.js b/priv/static/phoenix_live_view.cjs.js
diff --git a/priv/static/phoenix_live_view.cjs.js.map b/priv/static/phoenix_live_view.cjs.js.map
diff --git a/priv/static/phoenix_live_view.esm.js b/priv/static/phoenix_live_view.esm.js
diff --git a/priv/static/phoenix_live_view.esm.js.map b/priv/static/phoenix_live_view.esm.js.map
diff --git a/priv/static/phoenix_live_view.js b/priv/static/phoenix_live_view.js
@@ -3455,6 +3455,7 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
           if (disableText !== "") {
             el.innerText = disableText;
           }
+          el.setAttribute(PHX_DISABLED, el.disabled);
           el.setAttribute("disabled", "");
         }
       });

diff --git a/priv/static/phoenix_live_view.min.js b/priv/static/phoenix_live_view.min.js