phoenix_live_view 1.0.3 → 1.0.4

package/priv/static/phoenix_live_view.js

@@ -1195,9 +1195,11 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
             aria_default.focusFirst(this.el);
           }
         });
-        this.el.addEventListener("phx:show-end", () => this.el.focus());
-        if (window.getComputedStyle(this.el).display !== "none") {
-          aria_default.focusFirst(this.el);
+        if (!this.el.contains(document.activeElement)) {
+          this.el.addEventListener("phx:show-end", () => this.el.focus());
+          if (window.getComputedStyle(this.el).display !== "none") {
+            aria_default.focusFirst(this.el);
+          }
         }
       }
     }
@@ -1495,7 +1497,7 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
     }
   };
 
-  // node_modules/morphdom/dist/morphdom-esm.js
+  // ../node_modules/morphdom/dist/morphdom-esm.js
   var DOCUMENT_FRAGMENT_NODE = 11;
   function morphAttrs(fromNode, toNode) {
     var toNodeAttrs = toNode.attributes;
@@ -2372,7 +2374,7 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
     transitionPendingRemoves() {
       let { pendingRemoves, liveSocket } = this;
       if (pendingRemoves.length > 0) {
-        liveSocket.transitionRemoves(pendingRemoves, false, () => {
+        liveSocket.transitionRemoves(pendingRemoves, () => {
           pendingRemoves.forEach((el) => {
             let child = dom_default.firstPhxChild(el);
             if (child) {
@@ -2832,10 +2834,10 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
       view.liveSocket.pushHistoryPatch(e, href, replace ? "replace" : "push", sourceEl);
     },
     exec_focus(e, eventType, phxEvent, view, sourceEl, el) {
-      window.requestAnimationFrame(() => aria_default.attemptFocus(el));
+      aria_default.attemptFocus(el);
     },
     exec_focus_first(e, eventType, phxEvent, view, sourceEl, el) {
-      window.requestAnimationFrame(() => aria_default.focusFirstInteractive(el) || aria_default.focusFirst(el));
+      aria_default.focusFirstInteractive(el) || aria_default.focusFirst(el);
     },
     exec_push_focus(e, eventType, phxEvent, view, sourceEl, el) {
       window.requestAnimationFrame(() => focusStack.push(el || sourceEl));
@@ -2941,18 +2943,14 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
         }
       } else {
         if (this.isVisible(el)) {
-          window.requestAnimationFrame(() => {
-            el.dispatchEvent(new Event("phx:hide-start"));
-            dom_default.putSticky(el, "toggle", (currentEl) => currentEl.style.display = "none");
-            el.dispatchEvent(new Event("phx:hide-end"));
-          });
+          el.dispatchEvent(new Event("phx:hide-start"));
+          dom_default.putSticky(el, "toggle", (currentEl) => currentEl.style.display = "none");
+          el.dispatchEvent(new Event("phx:hide-end"));
         } else {
-          window.requestAnimationFrame(() => {
-            el.dispatchEvent(new Event("phx:show-start"));
-            let stickyDisplay = display || this.defaultDisplay(el);
-            dom_default.putSticky(el, "toggle", (currentEl) => currentEl.style.display = stickyDisplay);
-            el.dispatchEvent(new Event("phx:show-end"));
-          });
+          el.dispatchEvent(new Event("phx:show-start"));
+          let stickyDisplay = display || this.defaultDisplay(el);
+          dom_default.putSticky(el, "toggle", (currentEl) => currentEl.style.display = stickyDisplay);
+          el.dispatchEvent(new Event("phx:show-end"));
         }
       }
     },
@@ -4796,7 +4794,7 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
     }
     // public
     version() {
-      return "1.0.3";
+      return "1.0.4";
     }
     isProfileEnabled() {
       return this.sessionStorage.getItem(PHX_LV_PROFILE) === "true";
@@ -5014,20 +5012,21 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
       browser_default.redirect(to, flash);
     }
     replaceMain(href, flash, callback = null, linkRef = this.setPendingLink(href)) {
-      let liveReferer = this.currentLocation.href;
+      const liveReferer = this.currentLocation.href;
       this.outgoingMainEl = this.outgoingMainEl || this.main.el;
-      let removeEls = dom_default.all(this.outgoingMainEl, `[${this.binding("remove")}]`);
-      let newMainEl = dom_default.cloneNode(this.outgoingMainEl, "");
+      const stickies = dom_default.findPhxSticky(document) || [];
+      const removeEls = dom_default.all(this.outgoingMainEl, `[${this.binding("remove")}]`).filter((el) => !dom_default.isChildOfAny(el, stickies));
+      const newMainEl = dom_default.cloneNode(this.outgoingMainEl, "");
       this.main.showLoader(this.loaderTimeout);
       this.main.destroy();
       this.main = this.newRootView(newMainEl, flash, liveReferer);
       this.main.setRedirect(href);
-      this.transitionRemoves(removeEls, true);
+      this.transitionRemoves(removeEls);
       this.main.join((joinCount, onDone) => {
         if (joinCount === 1 && this.commitPendingLink(linkRef)) {
           this.requestDOMUpdate(() => {
             removeEls.forEach((el) => el.remove());
-            dom_default.findPhxSticky(document).forEach((el) => newMainEl.appendChild(el));
+            stickies.forEach((el) => newMainEl.appendChild(el));
             this.outgoingMainEl.replaceWith(newMainEl);
             this.outgoingMainEl = null;
             callback && callback(linkRef);
@@ -5036,12 +5035,8 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
         }
       });
     }
-    transitionRemoves(elements, skipSticky, callback) {
+    transitionRemoves(elements, callback) {
       let removeAttr = this.binding("remove");
-      if (skipSticky) {
-        const stickies = dom_default.findPhxSticky(document) || [];
-        elements = elements.filter((el) => !dom_default.isChildOfAny(el, stickies));
-      }
       let silenceEvents = (e) => {
         e.preventDefault();
         e.stopImmediatePropagation();
@@ -5401,7 +5396,8 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
       this.registerNewLocation(window.location);
     }
     historyRedirect(e, href, linkState, flash, targetEl) {
-      if (targetEl && e.isTrusted && e.type !== "popstate") {
+      const clickLoading = targetEl && e.isTrusted && e.type !== "popstate";
+      if (clickLoading) {
         targetEl.classList.add("phx-click-loading");
       }
       if (!this.isConnected() || !this.main.isMain()) {
@@ -5427,6 +5423,9 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
             dom_default.dispatchEvent(window, "phx:navigate", { detail: { href, patch: false, pop: false, direction: "forward" } });
             this.registerNewLocation(window.location);
           }
+          if (clickLoading) {
+            targetEl.classList.remove("phx-click-loading");
+          }
           done();
         });
       });