Release 1.0.0-rc.4

CHANGELOG.md

@@ -108,6 +108,11 @@ generated user module:
      if valid_password?(changeset.data, password) do
 ```
 
+## 1.0.0-rc.4 (2024-06-20)
+
+### Bug fixes
+  * Fix bug allowing focused input to be overwritten on acknowledgement
+
 ## 1.0.0-rc.3 (2024-06-20)
 
 ### Bug fixes

assets/js/phoenix_live_view/dom_patch.js

@@ -214,6 +214,8 @@ export default class DOMPatch {
           // We keep a reference to the cloned tree in the element's private data, and
           // on ack (view.undoRefs), we morph the cloned tree with the true fromEl in the DOM to
           // apply any changes that happened while the element was locked.
+          let isFocusedFormEl = focused && fromEl.isSameNode(focused) && DOM.isFormInput(fromEl)
+          let focusedSelectChanged = isFocusedFormEl && this.isChangedSelect(fromEl, toEl)
           if(fromEl.hasAttribute(PHX_REF)){
             if(DOM.isUploadInput(fromEl)){
               DOM.mergeAttrs(fromEl, toEl, {isIgnored: true})
@@ -223,7 +225,9 @@ export default class DOMPatch {
             DOM.applyStickyOperations(fromEl)
             let clone = DOM.private(fromEl, PHX_REF) || fromEl.cloneNode(true)
             DOM.putPrivate(fromEl, PHX_REF, clone)
-            fromEl = clone
+            if(!isFocusedFormEl){
+              fromEl = clone
+            }
           }
 
           // nested view handling
@@ -239,9 +243,7 @@ export default class DOMPatch {
           // input handling
           DOM.copyPrivates(toEl, fromEl)
 
-          let isFocusedFormEl = focused && fromEl.isSameNode(focused) && DOM.isFormInput(fromEl)
           // skip patching focused inputs unless focus is a select that has changed options
-          let focusedSelectChanged = isFocusedFormEl && this.isChangedSelect(fromEl, toEl)
           if(isFocusedFormEl && fromEl.type !== "hidden" && !focusedSelectChanged){
             this.trackBefore("updated", fromEl, toEl)
             DOM.mergeFocusedInput(fromEl, toEl)

assets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phoenix_live_view",
-  "version": "1.0.0-rc.3",
+  "version": "1.0.0-rc.4",
   "description": "The Phoenix LiveView JavaScript client.",
   "license": "MIT",
   "repository": {},

mix.exs

@@ -1,7 +1,7 @@
 defmodule Phoenix.LiveView.MixProject do
   use Mix.Project
 
-  @version "1.0.0-rc.3"
+  @version "1.0.0-rc.4"
 
   def project do
     [

package.json

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

priv/static/phoenix_live_view.js

@@ -1884,11 +1884,8 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
           delete fromNodesLookup[toElKey];
         }
         if (!childrenOnly2) {
-          var beforeUpdateResult = onBeforeElUpdated(fromEl, toEl);
-          if (beforeUpdateResult === false) {
+          if (onBeforeElUpdated(fromEl, toEl) === false) {
             return;
-          } else if (beforeUpdateResult instanceof HTMLElement) {
-            fromEl = beforeUpdateResult;
           }
           morphAttrs2(fromEl, toEl);
           onElUpdated(fromEl);
@@ -2234,6 +2231,8 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
             if (fromEl.type === "number" && (fromEl.validity && fromEl.validity.badInput)) {
               return false;
             }
+            let isFocusedFormEl = focused && fromEl.isSameNode(focused) && dom_default.isFormInput(fromEl);
+            let focusedSelectChanged = isFocusedFormEl && this.isChangedSelect(fromEl, toEl);
             if (fromEl.hasAttribute(PHX_REF)) {
               if (dom_default.isUploadInput(fromEl)) {
                 dom_default.mergeAttrs(fromEl, toEl, { isIgnored: true });
@@ -2243,7 +2242,9 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
               dom_default.applyStickyOperations(fromEl);
               let clone2 = dom_default.private(fromEl, PHX_REF) || fromEl.cloneNode(true);
               dom_default.putPrivate(fromEl, PHX_REF, clone2);
-              fromEl = clone2;
+              if (!isFocusedFormEl) {
+                fromEl = clone2;
+              }
             }
             if (dom_default.isPhxChild(toEl)) {
               let prevSession = fromEl.getAttribute(PHX_SESSION);
@@ -2256,8 +2257,6 @@ removing illegal node: "${(childNode.outerHTML || childNode.nodeValue).trim()}"
               return false;
             }
             dom_default.copyPrivates(toEl, fromEl);
-            let isFocusedFormEl = focused && fromEl.isSameNode(focused) && dom_default.isFormInput(fromEl);
-            let focusedSelectChanged = isFocusedFormEl && this.isChangedSelect(fromEl, toEl);
             if (isFocusedFormEl && fromEl.type !== "hidden" && !focusedSelectChanged) {
               this.trackBefore("updated", fromEl, toEl);
               dom_default.mergeFocusedInput(fromEl, toEl);