phoenix_live_view 0.19.0 → 0.19.2

package/assets/js/phoenix_live_view/dom.js

@@ -69,10 +69,13 @@ let DOM = {
     return !e.defaultPrevented && !this.wantsNewTab(e)
   },
 
-  isNewPageHref(href, currentLocation){
+  isNewPageClick(e, currentLocation){
+    let href = e.target instanceof HTMLAnchorElement ? e.target.getAttribute("href") : null
+    let url
+
+    if(e.defaultPrevented || href === null || this.wantsNewTab(e)){ return false }
     if(href.startsWith("mailto:") || href.startsWith("tel:")){ return false }
 
-    let url
     try {
       url = new URL(href)
     } catch(e) {
@@ -89,7 +92,7 @@ let DOM = {
         return url.hash === "" && !url.href.endsWith("#")
       }
     }
-    return true
+    return url.protocol.startsWith("http")
   },
 
   markPhxChildDestroyed(el){

package/assets/js/phoenix_live_view/dom_patch.js

@@ -143,11 +143,18 @@ export default class DOMPatch {
             parent.insertBefore(child, sibling)
           }
           let children = limit !== null && Array.from(parent.children)
+          let childrenToRemove = []
           if(limit && limit < 0 && children.length > limit * -1){
-            children.slice(0, children.length + limit).forEach(child => this.removeStreamChildElement(child))
+            childrenToRemove = children.slice(0, children.length + limit)
           } else if(limit && limit >= 0 && children.length > limit){
-            children.slice(limit).forEach(child => this.removeStreamChildElement(child))
+            childrenToRemove = children.slice(limit)
           }
+          childrenToRemove.forEach(removeChild => {
+            // do not remove child as part of limit if we are re-adding it
+            if(!this.streamInserts[removeChild.id]){
+              this.removeStreamChildElement(removeChild)
+            }
+          })
         },
         onBeforeNodeAdded: (el) => {
           DOM.maybeAddPrivateHooks(el, phxViewportTop, phxViewportBottom)
@@ -167,7 +174,7 @@ export default class DOMPatch {
             externalFormTriggered = el
           }
 
-          if(el.getAttribute && el.getAttribute("name")){
+          if(el.getAttribute && el.getAttribute("name") && DOM.isFormInput(el)){
             trackedInputs.push(el)
           }
           // nested view handling
@@ -196,6 +203,7 @@ export default class DOMPatch {
           this.maybeReOrderStream(el)
         },
         onBeforeElUpdated: (fromEl, toEl) => {
+          DOM.maybeAddPrivateHooks(toEl, phxViewportTop, phxViewportBottom)
           DOM.cleanChildNodes(toEl, phxUpdate)
           if(this.skipCIDSibling(toEl)){ return false }
           if(DOM.isPhxSticky(fromEl)){ return false }
@@ -243,10 +251,9 @@ export default class DOMPatch {
               appendPrependUpdates.push(new DOMPostMorphRestorer(fromEl, toEl, toEl.getAttribute(phxUpdate)))
             }
 
-            DOM.maybeAddPrivateHooks(toEl, phxViewportTop, phxViewportBottom)
             DOM.syncAttrsToProps(toEl)
             DOM.applyStickyOperations(toEl)
-            if(toEl.getAttribute("name")){
+            if(toEl.getAttribute("name") && DOM.isFormInput(toEl)){
               trackedInputs.push(toEl)
             }
             this.trackBefore("updated", fromEl, toEl)

package/assets/js/phoenix_live_view/live_socket.js

@@ -638,13 +638,12 @@ export default class LiveSocket {
       }
       let phxEvent = target && target.getAttribute(click)
       if(!phxEvent){
-        let href = e.target instanceof HTMLAnchorElement ? e.target.getAttribute("href") : null
-        if(!capture && href !== null && !DOM.wantsNewTab(e) && DOM.isNewPageHref(href, window.location)){
-          this.unload()
-        }
+        if(!capture && DOM.isNewPageClick(e, window.location)){ this.unload() }
         return
       }
+
       if(target.getAttribute("href") === "#"){ e.preventDefault() }
+
       // noop if we are in the middle of awaiting an ack for this el already
       if(target.hasAttribute(PHX_REF)){ return }
 

package/assets/js/phoenix_live_view/view.js

@@ -849,7 +849,7 @@ export default class View {
       let name = el.attributes[i].name
       if(name.startsWith(prefix)){ meta[name.replace(prefix, "")] = el.getAttribute(name) }
     }
-    if(el.value !== undefined){
+    if(el.value !== undefined && !(el instanceof HTMLFormElement)){
       if(!meta){ meta = {} }
       meta.value = el.value
 

package/assets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phoenix_live_view",
-  "version": "0.19.0",
+  "version": "0.19.2",
   "description": "The Phoenix LiveView JavaScript client.",
   "license": "MIT",
   "repository": {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phoenix_live_view",
-  "version": "0.19.0",
+  "version": "0.19.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

@@ -318,17 +318,21 @@ var DOM = {
   isUnloadableFormSubmit(e) {
     return !e.defaultPrevented && !this.wantsNewTab(e);
   },
-  isNewPageHref(href, currentLocation) {
+  isNewPageClick(e, currentLocation) {
+    let href = e.target instanceof HTMLAnchorElement ? e.target.getAttribute("href") : null;
+    let url;
+    if (e.defaultPrevented || href === null || this.wantsNewTab(e)) {
+      return false;
+    }
     if (href.startsWith("mailto:") || href.startsWith("tel:")) {
       return false;
     }
-    let url;
     try {
       url = new URL(href);
-    } catch (e) {
+    } catch (e2) {
       try {
         url = new URL(href, currentLocation);
-      } catch (e2) {
+      } catch (e3) {
         return true;
       }
     }
@@ -337,7 +341,7 @@ var DOM = {
         return url.hash === "" && !url.href.endsWith("#");
       }
     }
-    return true;
+    return url.protocol.startsWith("http");
   },
   markPhxChildDestroyed(el) {
     if (this.isPhxChild(el)) {
@@ -1792,11 +1796,17 @@ var DOMPatch = class {
             parent.insertBefore(child, sibling);
           }
           let children = limit !== null && Array.from(parent.children);
+          let childrenToRemove = [];
           if (limit && limit < 0 && children.length > limit * -1) {
-            children.slice(0, children.length + limit).forEach((child2) => this.removeStreamChildElement(child2));
+            childrenToRemove = children.slice(0, children.length + limit);
           } else if (limit && limit >= 0 && children.length > limit) {
-            children.slice(limit).forEach((child2) => this.removeStreamChildElement(child2));
+            childrenToRemove = children.slice(limit);
           }
+          childrenToRemove.forEach((removeChild) => {
+            if (!this.streamInserts[removeChild.id]) {
+              this.removeStreamChildElement(removeChild);
+            }
+          });
         },
         onBeforeNodeAdded: (el) => {
           dom_default.maybeAddPrivateHooks(el, phxViewportTop, phxViewportBottom);
@@ -1815,7 +1825,7 @@ var DOMPatch = class {
           if (dom_default.isNowTriggerFormExternal(el, phxTriggerExternal)) {
             externalFormTriggered = el;
           }
-          if (el.getAttribute && el.getAttribute("name")) {
+          if (el.getAttribute && el.getAttribute("name") && dom_default.isFormInput(el)) {
             trackedInputs.push(el);
           }
           if (dom_default.isPhxChild(el) && view.ownsElement(el) || dom_default.isPhxSticky(el) && view.ownsElement(el.parentNode)) {
@@ -1847,6 +1857,7 @@ var DOMPatch = class {
           this.maybeReOrderStream(el);
         },
         onBeforeElUpdated: (fromEl, toEl) => {
+          dom_default.maybeAddPrivateHooks(toEl, phxViewportTop, phxViewportBottom);
           dom_default.cleanChildNodes(toEl, phxUpdate);
           if (this.skipCIDSibling(toEl)) {
             return false;
@@ -1896,10 +1907,9 @@ var DOMPatch = class {
             if (dom_default.isPhxUpdate(toEl, phxUpdate, ["append", "prepend"])) {
               appendPrependUpdates.push(new DOMPostMorphRestorer(fromEl, toEl, toEl.getAttribute(phxUpdate)));
             }
-            dom_default.maybeAddPrivateHooks(toEl, phxViewportTop, phxViewportBottom);
             dom_default.syncAttrsToProps(toEl);
             dom_default.applyStickyOperations(toEl);
-            if (toEl.getAttribute("name")) {
+            if (toEl.getAttribute("name") && dom_default.isFormInput(toEl)) {
               trackedInputs.push(toEl);
             }
             this.trackBefore("updated", fromEl, toEl);
@@ -3325,7 +3335,7 @@ var View = class {
         meta[name.replace(prefix, "")] = el.getAttribute(name);
       }
     }
-    if (el.value !== void 0) {
+    if (el.value !== void 0 && !(el instanceof HTMLFormElement)) {
       if (!meta) {
         meta = {};
       }
@@ -4153,8 +4163,7 @@ var LiveSocket = class {
       }
       let phxEvent = target && target.getAttribute(click);
       if (!phxEvent) {
-        let href = e.target instanceof HTMLAnchorElement ? e.target.getAttribute("href") : null;
-        if (!capture && href !== null && !dom_default.wantsNewTab(e) && dom_default.isNewPageHref(href, window.location)) {
+        if (!capture && dom_default.isNewPageClick(e, window.location)) {
           this.unload();
         }
         return;