phoenix_live_view 0.18.0 → 0.18.2

package/assets/js/phoenix_live_view/live_socket.js

@@ -603,7 +603,7 @@ export default class LiveSocket {
   }
 
   bindClicks(){
-    window.addEventListener("mousedown", e => this.clickStartedAtTarget = e.target)
+    window.addEventListener("click", e => this.clickStartedAtTarget = e.target)
     this.bindClick("click", "click", false)
     this.bindClick("mousedown", "capture-click", true)
   }

package/assets/js/phoenix_live_view/utils.js

@@ -36,7 +36,7 @@ export let clone = (obj) => { return JSON.parse(JSON.stringify(obj)) }
 
 export let closestPhxBinding = (el, binding, borderEl) => {
   do {
-    if(el.matches(`[${binding}]`)){ return el }
+    if(el.matches(`[${binding}]`) && !el.disabled){ return el }
     el = el.parentElement || el.parentNode
   } while(el !== null && el.nodeType === 1 && !((borderEl && borderEl.isSameNode(el)) || el.matches(PHX_VIEW_SELECTOR)))
   return null

package/assets/js/phoenix_live_view/view.js

@@ -110,8 +110,6 @@ export default class View {
         flash: this.flash,
       }
     })
-    this.showLoader(this.liveSocket.loaderTimeout)
-    this.bindChannel()
   }
 
   setHref(href){ this.href = href }
@@ -611,6 +609,8 @@ export default class View {
   joinDead(){ this.isDead = true }
 
   join(callback){
+    this.showLoader(this.liveSocket.loaderTimeout)
+    this.bindChannel()
     if(this.isMain()){
       this.stopCallback = this.liveSocket.withPageLoading({to: this.href, kind: "initial"})
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phoenix_live_view",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "description": "The Phoenix LiveView JavaScript client.",
   "license": "MIT",
   "module": "./priv/static/phoenix_live_view.esm.js",

package/priv/static/phoenix_live_view.cjs.js

@@ -172,7 +172,7 @@ var clone = (obj) => {
 };
 var closestPhxBinding = (el, binding, borderEl) => {
   do {
-    if (el.matches(`[${binding}]`)) {
+    if (el.matches(`[${binding}]`) && !el.disabled) {
       return el;
     }
     el = el.parentElement || el.parentNode;
@@ -2312,8 +2312,6 @@ var View = class {
         flash: this.flash
       };
     });
-    this.showLoader(this.liveSocket.loaderTimeout);
-    this.bindChannel();
   }
   setHref(href) {
     this.href = href;
@@ -2776,6 +2774,8 @@ var View = class {
     this.isDead = true;
   }
   join(callback) {
+    this.showLoader(this.liveSocket.loaderTimeout);
+    this.bindChannel();
     if (this.isMain()) {
       this.stopCallback = this.liveSocket.withPageLoading({ to: this.href, kind: "initial" });
     }
@@ -3778,7 +3778,7 @@ var LiveSocket = class {
     }
   }
   bindClicks() {
-    window.addEventListener("mousedown", (e) => this.clickStartedAtTarget = e.target);
+    window.addEventListener("click", (e) => this.clickStartedAtTarget = e.target);
     this.bindClick("click", "click", false);
     this.bindClick("mousedown", "capture-click", true);
   }