marko 5.32.10 → 5.32.11

package/dist/runtime/vdom/VElement.js

@@ -22,28 +22,51 @@ var FLAG_SIMPLE_ATTRS = 1;
 var FLAG_CUSTOM_ELEMENT = 2;
 var FLAG_SPREAD_ATTRS = 4;
 
-var defineProperty = Object.defineProperty;
-
 var ATTR_HREF = "href";
-var EMPTY_OBJECT = Object.freeze({});
+var EMPTY_OBJECT = Object.freeze(Object.create(null));
+var specialElHandlers = {
+  option: {
+    selected: function (fromEl, value) {
+      fromEl.selected = value !== undefined;
+    }
+  },
+  input: {
+    value: function (fromEl, value) {
+      fromEl.value = value === undefined ? "" : value;
+    },
+    checked: function (fromEl, value) {
+      fromEl.checked = value !== undefined;
+    }
+  }
+};
 
-function convertAttrValue(type, value) {
+function normalizeValue(value) {
   if (value === true) {
     return "";
-  } else if (type == "object") {
-    switch (value.toString) {
-      case Object.prototype.toString:
-      case Array.prototype.toString:
-        // eslint-disable-next-line no-constant-condition
+  }
 
+  if (value == null || value === false) {
+    return;
+  }
 
+  switch (typeof value) {
+    case "string":
+      return value;
+    case "object":
+      switch (value.toString) {
+        case Object.prototype.toString:
+        case Array.prototype.toString:
+          // eslint-disable-next-line no-constant-condition
 
 
 
-        return JSON.stringify(value);
-      case RegExp.prototype.toString:
-        return value.source;
-    }
+
+
+          return JSON.stringify(value);
+        case RegExp.prototype.toString:
+          return value.source;
+      }
+      break;
   }
 
   return value + "";
@@ -57,22 +80,6 @@ function assign(a, b) {
   }
 }
 
-function setAttribute(el, namespaceURI, name, value) {
-  if (namespaceURI === null) {
-    el.setAttribute(name, value);
-  } else {
-    el.setAttributeNS(namespaceURI, name, value);
-  }
-}
-
-function removeAttribute(el, namespaceURI, name) {
-  if (namespaceURI === null) {
-    el.removeAttribute(name);
-  } else {
-    el.removeAttributeNS(namespaceURI, name);
-  }
-}
-
 function VElementClone(other) {
   this.bW_ = other.bW_;
   this.bT_ = null;
@@ -177,19 +184,11 @@ VElement.prototype = {
       assign(el, attributes);
     } else {
       for (var attrName in attributes) {
-        var attrValue = attributes[attrName];
-
-        if (attrValue !== false && attrValue != null) {
-          var type = typeof attrValue;
-
-          if (type !== "string") {
-            // Special attributes aren't copied to the real DOM. They are only
-            // kept in the virtual attributes map
-            attrValue = convertAttrValue(type, attrValue);
-          }
+        var attrValue = normalizeValue(attributes[attrName]);
 
+        if (attrValue !== undefined) {
           if (attrName == ATTR_XLINK_HREF) {
-            setAttribute(el, NS_XLINK, ATTR_HREF, attrValue);
+            el.setAttributeNS(NS_XLINK, ATTR_HREF, attrValue);
           } else {
             el.setAttribute(attrName, attrValue);
           }
@@ -197,7 +196,7 @@ VElement.prototype = {
       }
 
       if (tagName === "textarea") {
-        el.defaultValue = el.value = this.e_;
+        el.defaultValue = this.bZ_;
       }
     }
 
@@ -217,39 +216,7 @@ VElement.prototype = {
 
 inherit(VElement, VNode);
 
-var proto = VElementClone.prototype = VElement.prototype;
-
-["checked", "selected", "disabled"].forEach(function (name) {
-  defineProperty(proto, name, {
-    get: function () {
-      var value = this.bX_[name];
-      return value !== false && value != null;
-    }
-  });
-});
-
-defineProperty(proto, "e_", {
-  get: function () {
-    var value = this.bZ_;
-    if (value == null) {
-      value = this.bX_.value;
-    }
-    return value != null && value !== false ?
-    value + "" :
-    this.bX_.type === "checkbox" ||
-    this.bX_.type === "radio" ?
-    "on" :
-    "";
-  }
-});
-
-VElement.cc_ = function (attrs) {
-  // By default this static method is a no-op, but if there are any
-  // compiled components that have "no-update" attributes then
-  // `preserve-attrs.js` will be imported and this method will be replaced
-  // with a method that actually does something
-  return attrs;
-};
+VElementClone.prototype = VElement.prototype;
 
 function virtualizeElement(node, virtualizeChildNodes, ownerComponent) {
   var attributes = node.attributes;
@@ -300,23 +267,18 @@ function virtualizeElement(node, virtualizeChildNodes, ownerComponent) {
   return vdomEl;
 }
 
-VElement.cd_ = virtualizeElement;
-
-VElement.ce_ = function (fromEl, vFromEl, toEl) {
-  var removePreservedAttributes = VElement.cc_;
+VElement.cc_ = virtualizeElement;
 
+VElement.cd_ = function (fromEl, vFromEl, toEl) {
   var fromFlags = vFromEl.t_;
   var toFlags = toEl.t_;
-
-  vElementByDOMNode.set(fromEl, toEl);
-
   var attrs = toEl.bX_;
-  var props = toEl._L_;
 
   if (toFlags & FLAG_CUSTOM_ELEMENT) {
     return assign(fromEl, attrs);
   }
 
+  var props = toEl._L_;
   var attrName;
 
   // We use expando properties to associate the previous HTML
@@ -329,16 +291,12 @@ VElement.ce_ = function (fromEl, vFromEl, toEl) {
 
   var oldAttrs = vFromEl.bX_;
 
-  if (oldAttrs) {
-    if (oldAttrs === attrs) {
-      // For constant attributes the same object will be provided
-      // every render and we can use that to our advantage to
-      // not waste time diffing a constant, immutable attribute
-      // map.
-      return;
-    } else {
-      oldAttrs = removePreservedAttributes(oldAttrs, props);
-    }
+  if (oldAttrs === attrs) {
+    // For constant attributes the same object will be provided
+    // every render and we can use that to our advantage to
+    // not waste time diffing a constant, immutable attribute
+    // map.
+    return;
   }
 
   var attrValue;
@@ -356,36 +314,32 @@ VElement.ce_ = function (fromEl, vFromEl, toEl) {
     return;
   }
 
-  // In some cases we only want to set an attribute value for the first
-  // render or we don't want certain attributes to be touched. To support
-  // that use case we delete out all of the preserved attributes
-  // so it's as if they never existed.
-  attrs = removePreservedAttributes(attrs, props, true);
-
-  var namespaceURI;
+  var preserve = props && props.pa || EMPTY_OBJECT;
+  var specialAttrs = specialElHandlers[toEl.bY_] || EMPTY_OBJECT;
+  var specialAttr;
 
   // Loop over all of the attributes in the attribute map and compare
   // them to the value in the old map. However, if the value is
   // null/undefined/false then we want to remove the attribute
   for (attrName in attrs) {
-    attrValue = attrs[attrName];
-    namespaceURI = null;
-
-    if (attrName === ATTR_XLINK_HREF) {
-      namespaceURI = NS_XLINK;
-      attrName = ATTR_HREF;
-    }
-
-    if (attrValue == null || attrValue === false) {
-      removeAttribute(fromEl, namespaceURI, attrName);
-    } else if (oldAttrs[attrName] !== attrValue) {
-      var type = typeof attrValue;
-
-      if (type !== "string") {
-        attrValue = convertAttrValue(type, attrValue);
+    if (
+    !preserve[attrName] &&
+    normalizeValue(oldAttrs[attrName]) !== (
+    attrValue = normalizeValue(attrs[attrName])))
+    {
+      if (specialAttr = specialAttrs[attrName]) {
+        specialAttr(fromEl, attrValue);
+      } else if (attrName === ATTR_XLINK_HREF) {
+        if (attrValue === undefined) {
+          fromEl.removeAttributeNS(NS_XLINK, ATTR_HREF);
+        } else {
+          fromEl.setAttributeNS(NS_XLINK, ATTR_HREF, attrValue);
+        }
+      } else if (attrValue === undefined) {
+        fromEl.removeAttribute(attrName);
+      } else {
+        fromEl.setAttribute(attrName, attrValue);
       }
-
-      setAttribute(fromEl, namespaceURI, attrName, attrValue);
     }
   }
 
@@ -402,7 +356,9 @@ VElement.ce_ = function (fromEl, vFromEl, toEl) {
   if (toEl.bR_ === null || fromFlags & FLAG_SPREAD_ATTRS) {
     for (attrName in oldAttrs) {
       if (!(attrName in attrs)) {
-        if (attrName === ATTR_XLINK_HREF) {
+        if (specialAttr = specialAttrs[attrName]) {
+          specialAttr(fromEl, undefined);
+        } else if (attrName === ATTR_XLINK_HREF) {
           fromEl.removeAttributeNS(ATTR_XLINK_HREF, ATTR_HREF);
         } else {
           fromEl.removeAttribute(attrName);

package/dist/runtime/vdom/VNode.js

@@ -3,10 +3,10 @@ function VNode() {}
 
 VNode.prototype = {
   bQ_: function (finalChildCount, ownerComponent) {
-    this.cf_ = finalChildCount;
-    this.cg_ = 0;
+    this.ce_ = finalChildCount;
+    this.cf_ = 0;
     this.bW_ = null;
-    this.ch_ = null;
+    this.cg_ = null;
     this.bT_ = null;
     this.bU_ = null;
     this._J_ = ownerComponent;
@@ -21,24 +21,24 @@ VNode.prototype = {
       // If the DocumentFragment node has a first child then we will return that.
       // Otherwise, the DocumentFragment node is not *really* the first child and
       // we need to skip to its next sibling
-      return nestedFirstChild || firstChild.ci_;
+      return nestedFirstChild || firstChild.ch_;
     }
 
     return firstChild;
   },
 
-  get ci_() {
+  get ch_() {
     var nextSibling = this.bU_;
 
     if (nextSibling) {
       if (nextSibling.bV_) {
         var firstChild = nextSibling.ay_;
-        return firstChild || nextSibling.ci_;
+        return firstChild || nextSibling.ch_;
       }
     } else {
       var parentNode = this.bT_;
       if (parentNode && parentNode.bV_) {
-        return parentNode.ci_;
+        return parentNode.ch_;
       }
     }
 
@@ -46,19 +46,17 @@ VNode.prototype = {
   },
 
   bI_: function (child) {
-    this.cg_++;
+    this.cf_++;
 
     if (this.bY_ === "textarea") {
-      if (child.cj_) {
-        var childValue = child.ck_;
+      if (child.ci_) {
+        var childValue = child.cj_;
         this.bZ_ = (this.bZ_ || "") + childValue;
-      } else if (child.aa_ || child.a__) {
-        this.cl_ = true;
       } else {
         throw TypeError();
       }
     } else {
-      var lastChild = this.ch_;
+      var lastChild = this.cg_;
 
       child.bT_ = this;
 
@@ -68,14 +66,14 @@ VNode.prototype = {
         this.bW_ = child;
       }
 
-      this.ch_ = child;
+      this.cg_ = child;
     }
 
     return child;
   },
 
   ca_: function finishChild() {
-    if (this.cg_ === this.cf_ && this.bT_) {
+    if (this.cf_ === this.ce_ && this.bT_) {
       return this.bT_.ca_();
     } else {
       return this;

package/dist/runtime/vdom/VText.js

@@ -3,20 +3,20 @@ var VNode = require("./VNode");
 
 function VText(value, ownerComponent) {
   this.bQ_(-1 /* no children */, ownerComponent);
-  this.ck_ = value;
+  this.cj_ = value;
 }
 
 VText.prototype = {
-  cj_: true,
+  ci_: true,
 
   bS_: 3,
 
   bP_: function (host) {
-    return (host.ownerDocument || host).createTextNode(this.ck_);
+    return (host.ownerDocument || host).createTextNode(this.cj_);
   },
 
   bJ_: function () {
-    return new VText(this.ck_);
+    return new VText(this.cj_);
   }
 };
 

package/dist/runtime/vdom/hot-reload.js

@@ -44,7 +44,7 @@ exports.t = runtime.t = function (typeName) {
                 instance.P_(input, out);
               };
 
-              instance.cm_ = true;
+              instance.ck_ = true;
               instance.am_();
               instance._t_ = false;
 
@@ -78,7 +78,7 @@ registry._C_ = function (typeName, id) {
   if (instances) {
     instances.add(instance);
     instance.once("destroy", function () {
-      if (!instance.cm_) {
+      if (!instance.ck_) {
         instances.delete(instance);
       }
     });

package/dist/runtime/vdom/morphdom/fragment.js

@@ -80,8 +80,8 @@ function createFragmentNode(startNode, nextNode, parentNode) {
 
 function beginFragmentNode(startNode, parentNode) {
   var fragment = createFragmentNode(startNode, null, parentNode);
-  fragment.cn_ = function (nextNode) {
-    fragment.cn_ = null;
+  fragment.cl_ = function (nextNode) {
+    fragment.cl_ = null;
     insertBefore(
       fragment.endNode,
       nextNode,
@@ -92,4 +92,4 @@ function beginFragmentNode(startNode, parentNode) {
 }
 
 exports._h_ = createFragmentNode;
-exports.co_ = beginFragmentNode;
+exports.cm_ = beginFragmentNode;

package/dist/runtime/vdom/morphdom/helpers.js

@@ -37,6 +37,6 @@ function removeChild(node) {
 
 exports.bc_ = insertBefore;
 exports.bd_ = insertAfter;
-exports.ci_ = nextSibling;
+exports.ch_ = nextSibling;
 exports.ay_ = firstChild;
 exports.be_ = removeChild;

package/dist/runtime/vdom/morphdom/index.js

@@ -11,9 +11,8 @@ var KeySequence = require("../../components/KeySequence");
 var VElement = require("../vdom").br_;
 var fragment = require("./fragment");
 var helpers = require("./helpers");
-var specialElHandlers = require("./specialElHandlers");
-var virtualizeElement = VElement.cd_;
-var morphAttrs = VElement.ce_;
+var virtualizeElement = VElement.cc_;
+var morphAttrs = VElement.cd_;
 var keysByDOMNode = domData._G_;
 var componentByDOMNode = domData._l_;
 var vElementByDOMNode = domData._H_;
@@ -21,11 +20,11 @@ var detachedByDOMNode = domData.aT_;
 
 var insertBefore = helpers.bc_;
 var insertAfter = helpers.bd_;
-var nextSibling = helpers.ci_;
+var nextSibling = helpers.ch_;
 var firstChild = helpers.ay_;
 var removeChild = helpers.be_;
 var createFragmentNode = fragment._h_;
-var beginFragmentNode = fragment.co_;
+var beginFragmentNode = fragment.cm_;
 
 var ELEMENT_NODE = 1;
 var TEXT_NODE = 3;
@@ -162,7 +161,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
     var fromComponent;
 
     outer: while (curToNodeChild) {
-      toNextSibling = curToNodeChild.ci_;
+      toNextSibling = curToNodeChild.ch_;
       curToNodeType = curToNodeChild.bS_;
       curToNodeKey = curToNodeChild.bR_;
 
@@ -598,11 +597,11 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             toNextSibling.bS_ === TEXT_NODE)
             {
               fromNextSibling = curFromNodeChild.splitText(
-                curToNodeChild.ck_.length
+                curToNodeChild.cj_.length
               );
             }
-            if (curFromNodeChild.nodeValue !== curToNodeChild.ck_) {
-              curFromNodeChild.nodeValue = curToNodeChild.ck_;
+            if (curFromNodeChild.nodeValue !== curToNodeChild.cj_) {
+              curFromNodeChild.nodeValue = curToNodeChild.cj_;
             }
           }
         }
@@ -636,10 +635,10 @@ function morphdom(fromNode, toNode, host, componentsContext) {
     }
 
     // We have processed all of the "to nodes".
-    if (fromNode.cn_) {
+    if (fromNode.cl_) {
       // If we are in an unfinished fragment, we have reached the end of the nodes
       // we were matching up and need to end the fragment
-      fromNode.cn_(curFromNodeChild);
+      fromNode.cl_(curFromNodeChild);
     } else {
       // If curFromNodeChild is non-null then we still have some from nodes
       // left over that need to be removed
@@ -680,8 +679,9 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
   function morphEl(fromEl, vFromEl, toEl, parentComponent) {
     var nodeName = toEl.bY_;
-
     var constId = toEl.c__;
+    vElementByDOMNode.set(fromEl, toEl);
+
     if (constId !== undefined && vFromEl.c__ === constId) {
       return;
     }
@@ -692,14 +692,15 @@ function morphdom(fromNode, toNode, host, componentsContext) {
       return;
     }
 
-    if (nodeName !== "textarea") {
+    if (nodeName === "textarea") {
+      var newValue = toEl.bZ_ || "";
+      var oldValue = vFromEl.bZ_ || "";
+      if (oldValue !== newValue) {
+        fromEl.value = newValue;
+      }
+    } else {
       morphChildren(fromEl, toEl, parentComponent);
     }
-
-    var specialElHandler = specialElHandlers[nodeName];
-    if (specialElHandler !== undefined) {
-      specialElHandler(fromEl, toEl);
-    }
   } // END: morphEl(...)
 
   // eslint-disable-next-line no-constant-condition

package/dist/runtime/vdom/vdom.js

@@ -19,7 +19,7 @@ function virtualizeChildNodes(node, vdomParent, ownerComponent) {
 function virtualize(node, ownerComponent) {
   switch (node.nodeType) {
     case 1:
-      return VElement.cd_(node, virtualizeChildNodes, ownerComponent);
+      return VElement.cc_(node, virtualizeChildNodes, ownerComponent);
     case 3:
       return new VText(node.nodeValue, ownerComponent);
     case 11:
@@ -78,5 +78,5 @@ exports.br_ = VElement;
 exports.bt_ = VText;
 exports.bu_ = VComponent;
 exports.bv_ = VFragment;
-exports.cd_ = virtualize;
+exports.cc_ = virtualize;
 exports.bw_ = virtualizeHTML;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marko",
-    "version": "5.32.10",
+    "version": "5.32.11",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "keywords": [
         "front-end",
@@ -65,7 +65,7 @@
     },
     "dependencies": {
         "@marko/compiler": "^5.34.7",
-        "@marko/translator-default": "^5.31.15",
+        "@marko/translator-default": "^5.31.16",
         "app-module-path": "^2.2.0",
         "argly": "^1.2.0",
         "browser-refresh-client": "1.1.4",

package/src/runtime/vdom/VElement.js

@@ -22,28 +22,51 @@ var FLAG_SIMPLE_ATTRS = 1;
 var FLAG_CUSTOM_ELEMENT = 2;
 var FLAG_SPREAD_ATTRS = 4;
 
-var defineProperty = Object.defineProperty;
-
 var ATTR_HREF = "href";
-var EMPTY_OBJECT = Object.freeze({});
+var EMPTY_OBJECT = Object.freeze(Object.create(null));
+var specialElHandlers = {
+  option: {
+    selected: function (fromEl, value) {
+      fromEl.selected = value !== undefined;
+    },
+  },
+  input: {
+    value: function (fromEl, value) {
+      fromEl.value = value === undefined ? "" : value;
+    },
+    checked: function (fromEl, value) {
+      fromEl.checked = value !== undefined;
+    },
+  },
+};
 
-function convertAttrValue(type, value) {
+function normalizeValue(value) {
   if (value === true) {
     return "";
-  } else if (type == "object") {
-    switch (value.toString) {
-      case Object.prototype.toString:
-      case Array.prototype.toString:
-        // eslint-disable-next-line no-constant-condition
-        if ("MARKO_DEBUG") {
-          complain(
-            "Relying on JSON.stringify for attribute values is deprecated, in future versions of Marko these will be cast to strings instead.",
-          );
-        }
-        return JSON.stringify(value);
-      case RegExp.prototype.toString:
-        return value.source;
-    }
+  }
+
+  if (value == null || value === false) {
+    return;
+  }
+
+  switch (typeof value) {
+    case "string":
+      return value;
+    case "object":
+      switch (value.toString) {
+        case Object.prototype.toString:
+        case Array.prototype.toString:
+          // eslint-disable-next-line no-constant-condition
+          if ("MARKO_DEBUG") {
+            complain(
+              "Relying on JSON.stringify for attribute values is deprecated, in future versions of Marko these will be cast to strings instead.",
+            );
+          }
+          return JSON.stringify(value);
+        case RegExp.prototype.toString:
+          return value.source;
+      }
+      break;
   }
 
   return value + "";
@@ -57,22 +80,6 @@ function assign(a, b) {
   }
 }
 
-function setAttribute(el, namespaceURI, name, value) {
-  if (namespaceURI === null) {
-    el.setAttribute(name, value);
-  } else {
-    el.setAttributeNS(namespaceURI, name, value);
-  }
-}
-
-function removeAttribute(el, namespaceURI, name) {
-  if (namespaceURI === null) {
-    el.removeAttribute(name);
-  } else {
-    el.removeAttributeNS(namespaceURI, name);
-  }
-}
-
 function VElementClone(other) {
   this.___firstChildInternal = other.___firstChildInternal;
   this.___parentNode = null;
@@ -177,19 +184,11 @@ VElement.prototype = {
       assign(el, attributes);
     } else {
       for (var attrName in attributes) {
-        var attrValue = attributes[attrName];
-
-        if (attrValue !== false && attrValue != null) {
-          var type = typeof attrValue;
-
-          if (type !== "string") {
-            // Special attributes aren't copied to the real DOM. They are only
-            // kept in the virtual attributes map
-            attrValue = convertAttrValue(type, attrValue);
-          }
+        var attrValue = normalizeValue(attributes[attrName]);
 
+        if (attrValue !== undefined) {
           if (attrName == ATTR_XLINK_HREF) {
-            setAttribute(el, NS_XLINK, ATTR_HREF, attrValue);
+            el.setAttributeNS(NS_XLINK, ATTR_HREF, attrValue);
           } else {
             el.setAttribute(attrName, attrValue);
           }
@@ -197,7 +196,7 @@ VElement.prototype = {
       }
 
       if (tagName === "textarea") {
-        el.defaultValue = el.value = this.___value;
+        el.defaultValue = this.___valueInternal;
       }
     }
 
@@ -217,39 +216,7 @@ VElement.prototype = {
 
 inherit(VElement, VNode);
 
-var proto = (VElementClone.prototype = VElement.prototype);
-
-["checked", "selected", "disabled"].forEach(function (name) {
-  defineProperty(proto, name, {
-    get: function () {
-      var value = this.___attributes[name];
-      return value !== false && value != null;
-    },
-  });
-});
-
-defineProperty(proto, "___value", {
-  get: function () {
-    var value = this.___valueInternal;
-    if (value == null) {
-      value = this.___attributes.value;
-    }
-    return value != null && value !== false
-      ? value + ""
-      : this.___attributes.type === "checkbox" ||
-          this.___attributes.type === "radio"
-        ? "on"
-        : "";
-  },
-});
-
-VElement.___removePreservedAttributes = function (attrs) {
-  // By default this static method is a no-op, but if there are any
-  // compiled components that have "no-update" attributes then
-  // `preserve-attrs.js` will be imported and this method will be replaced
-  // with a method that actually does something
-  return attrs;
-};
+VElementClone.prototype = VElement.prototype;
 
 function virtualizeElement(node, virtualizeChildNodes, ownerComponent) {
   var attributes = node.attributes;
@@ -303,20 +270,15 @@ function virtualizeElement(node, virtualizeChildNodes, ownerComponent) {
 VElement.___virtualize = virtualizeElement;
 
 VElement.___morphAttrs = function (fromEl, vFromEl, toEl) {
-  var removePreservedAttributes = VElement.___removePreservedAttributes;
-
   var fromFlags = vFromEl.___flags;
   var toFlags = toEl.___flags;
-
-  vElementByDOMNode.set(fromEl, toEl);
-
   var attrs = toEl.___attributes;
-  var props = toEl.___properties;
 
   if (toFlags & FLAG_CUSTOM_ELEMENT) {
     return assign(fromEl, attrs);
   }
 
+  var props = toEl.___properties;
   var attrName;
 
   // We use expando properties to associate the previous HTML
@@ -329,16 +291,12 @@ VElement.___morphAttrs = function (fromEl, vFromEl, toEl) {
 
   var oldAttrs = vFromEl.___attributes;
 
-  if (oldAttrs) {
-    if (oldAttrs === attrs) {
-      // For constant attributes the same object will be provided
-      // every render and we can use that to our advantage to
-      // not waste time diffing a constant, immutable attribute
-      // map.
-      return;
-    } else {
-      oldAttrs = removePreservedAttributes(oldAttrs, props);
-    }
+  if (oldAttrs === attrs) {
+    // For constant attributes the same object will be provided
+    // every render and we can use that to our advantage to
+    // not waste time diffing a constant, immutable attribute
+    // map.
+    return;
   }
 
   var attrValue;
@@ -356,36 +314,32 @@ VElement.___morphAttrs = function (fromEl, vFromEl, toEl) {
     return;
   }
 
-  // In some cases we only want to set an attribute value for the first
-  // render or we don't want certain attributes to be touched. To support
-  // that use case we delete out all of the preserved attributes
-  // so it's as if they never existed.
-  attrs = removePreservedAttributes(attrs, props, true);
-
-  var namespaceURI;
+  var preserve = (props && props.pa) || EMPTY_OBJECT;
+  var specialAttrs = specialElHandlers[toEl.___nodeName] || EMPTY_OBJECT;
+  var specialAttr;
 
   // Loop over all of the attributes in the attribute map and compare
   // them to the value in the old map. However, if the value is
   // null/undefined/false then we want to remove the attribute
   for (attrName in attrs) {
-    attrValue = attrs[attrName];
-    namespaceURI = null;
-
-    if (attrName === ATTR_XLINK_HREF) {
-      namespaceURI = NS_XLINK;
-      attrName = ATTR_HREF;
-    }
-
-    if (attrValue == null || attrValue === false) {
-      removeAttribute(fromEl, namespaceURI, attrName);
-    } else if (oldAttrs[attrName] !== attrValue) {
-      var type = typeof attrValue;
-
-      if (type !== "string") {
-        attrValue = convertAttrValue(type, attrValue);
+    if (
+      !preserve[attrName] &&
+      normalizeValue(oldAttrs[attrName]) !==
+        (attrValue = normalizeValue(attrs[attrName]))
+    ) {
+      if ((specialAttr = specialAttrs[attrName])) {
+        specialAttr(fromEl, attrValue);
+      } else if (attrName === ATTR_XLINK_HREF) {
+        if (attrValue === undefined) {
+          fromEl.removeAttributeNS(NS_XLINK, ATTR_HREF);
+        } else {
+          fromEl.setAttributeNS(NS_XLINK, ATTR_HREF, attrValue);
+        }
+      } else if (attrValue === undefined) {
+        fromEl.removeAttribute(attrName);
+      } else {
+        fromEl.setAttribute(attrName, attrValue);
       }
-
-      setAttribute(fromEl, namespaceURI, attrName, attrValue);
     }
   }
 
@@ -402,7 +356,9 @@ VElement.___morphAttrs = function (fromEl, vFromEl, toEl) {
   if (toEl.___key === null || fromFlags & FLAG_SPREAD_ATTRS) {
     for (attrName in oldAttrs) {
       if (!(attrName in attrs)) {
-        if (attrName === ATTR_XLINK_HREF) {
+        if ((specialAttr = specialAttrs[attrName])) {
+          specialAttr(fromEl, undefined);
+        } else if (attrName === ATTR_XLINK_HREF) {
           fromEl.removeAttributeNS(ATTR_XLINK_HREF, ATTR_HREF);
         } else {
           fromEl.removeAttribute(attrName);

package/src/runtime/vdom/VNode.js

@@ -52,8 +52,6 @@ VNode.prototype = {
       if (child.___Text) {
         var childValue = child.___nodeValue;
         this.___valueInternal = (this.___valueInternal || "") + childValue;
-      } else if (child.___preserve || child.___preserveBody) {
-        this.___preserveTextAreaValue = true;
       } else {
         throw TypeError();
       }

package/src/runtime/vdom/morphdom/index.js

@@ -11,7 +11,6 @@ var KeySequence = require("../../components/KeySequence");
 var VElement = require("../vdom").___VElement;
 var fragment = require("./fragment");
 var helpers = require("./helpers");
-var specialElHandlers = require("./specialElHandlers");
 var virtualizeElement = VElement.___virtualize;
 var morphAttrs = VElement.___morphAttrs;
 var keysByDOMNode = domData.___keyByDOMNode;
@@ -680,8 +679,9 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
   function morphEl(fromEl, vFromEl, toEl, parentComponent) {
     var nodeName = toEl.___nodeName;
-
     var constId = toEl.___constId;
+    vElementByDOMNode.set(fromEl, toEl);
+
     if (constId !== undefined && vFromEl.___constId === constId) {
       return;
     }
@@ -692,14 +692,15 @@ function morphdom(fromNode, toNode, host, componentsContext) {
       return;
     }
 
-    if (nodeName !== "textarea") {
+    if (nodeName === "textarea") {
+      var newValue = toEl.___valueInternal || "";
+      var oldValue = vFromEl.___valueInternal || "";
+      if (oldValue !== newValue) {
+        fromEl.value = newValue;
+      }
+    } else {
       morphChildren(fromEl, toEl, parentComponent);
     }
-
-    var specialElHandler = specialElHandlers[nodeName];
-    if (specialElHandler !== undefined) {
-      specialElHandler(fromEl, toEl);
-    }
   } // END: morphEl(...)
 
   // eslint-disable-next-line no-constant-condition

package/dist/runtime/vdom/morphdom/specialElHandlers.js

@@ -1,106 +0,0 @@
-"use strict";function syncBooleanAttrProp(fromEl, toEl, name) {
-  if (fromEl[name] !== toEl[name]) {
-    fromEl[name] = toEl[name];
-    if (fromEl[name]) {
-      fromEl.setAttribute(name, "");
-    } else {
-      fromEl.removeAttribute(name, "");
-    }
-  }
-}
-
-function forEachOption(el, fn, i) {
-  var curChild = el.ay_;
-
-  while (curChild) {
-    if (curChild.bY_ === "option") {
-      fn(curChild, ++i);
-    } else {
-      i = forEachOption(curChild, fn, i);
-    }
-
-    curChild = curChild.ci_;
-  }
-
-  return i;
-}
-
-// We use a JavaScript class to benefit from fast property lookup
-function SpecialElHandlers() {}
-SpecialElHandlers.prototype = {
-  /**
-   * Needed for IE. Apparently IE doesn't think that "selected" is an
-   * attribute when reading over the attributes using selectEl.attributes
-   */
-  option: function (fromEl, toEl) {
-    syncBooleanAttrProp(fromEl, toEl, "selected");
-  },
-  button: function (fromEl, toEl) {
-    syncBooleanAttrProp(fromEl, toEl, "disabled");
-  },
-  /**
-   * The "value" attribute is special for the <input> element since it sets
-   * the initial value. Changing the "value" attribute without changing the
-   * "value" property will have no effect since it is only used to the set the
-   * initial value.  Similar for the "checked" attribute, and "disabled".
-   */
-  input: function (fromEl, toEl) {
-    syncBooleanAttrProp(fromEl, toEl, "checked");
-    syncBooleanAttrProp(fromEl, toEl, "disabled");
-
-    if (fromEl.value != toEl.e_) {
-      fromEl.value = toEl.e_;
-    }
-
-    if (fromEl.hasAttribute("value") && !toEl.cb_("value")) {
-      fromEl.removeAttribute("value");
-    }
-  },
-
-  textarea: function (fromEl, toEl) {
-    if (toEl.cl_) {
-      return;
-    }
-
-    var newValue = toEl.e_;
-    if (fromEl.value != newValue) {
-      fromEl.value = newValue;
-    }
-
-    var firstChild = fromEl.firstChild;
-    if (firstChild) {
-      // Needed for IE. Apparently IE sets the placeholder as the
-      // node value and vise versa. This ignores an empty update.
-      var oldValue = firstChild.nodeValue;
-
-      if (
-      oldValue == newValue ||
-      !newValue && oldValue == fromEl.placeholder)
-      {
-        return;
-      }
-
-      firstChild.nodeValue = newValue;
-    }
-  },
-  select: function (fromEl, toEl) {
-    if (!toEl.cb_("multiple")) {
-      var selected = 0;
-      forEachOption(
-        toEl,
-        function (option, i) {
-          if (option.cb_("selected")) {
-            selected = i;
-          }
-        },
-        -1
-      );
-
-      if (fromEl.selectedIndex !== selected) {
-        fromEl.selectedIndex = selected;
-      }
-    }
-  }
-};
-
-module.exports = new SpecialElHandlers();

package/dist/runtime/vdom/preserve-attrs.js

@@ -1,15 +0,0 @@
-"use strict";var extend = require("raptor-util/extend");
-
-function removePreservedAttributes(attrs, props) {
-  var preservedAttrs = props && props.pa;
-  if (preservedAttrs) {
-    attrs = extend({}, attrs);
-    preservedAttrs.forEach(function (preservedAttrName) {
-      delete attrs[preservedAttrName];
-    });
-  }
-
-  return attrs;
-}
-
-require("./VElement").cc_ = removePreservedAttributes;

package/src/runtime/vdom/morphdom/specialElHandlers.js

@@ -1,106 +0,0 @@
-function syncBooleanAttrProp(fromEl, toEl, name) {
-  if (fromEl[name] !== toEl[name]) {
-    fromEl[name] = toEl[name];
-    if (fromEl[name]) {
-      fromEl.setAttribute(name, "");
-    } else {
-      fromEl.removeAttribute(name, "");
-    }
-  }
-}
-
-function forEachOption(el, fn, i) {
-  var curChild = el.___firstChild;
-
-  while (curChild) {
-    if (curChild.___nodeName === "option") {
-      fn(curChild, ++i);
-    } else {
-      i = forEachOption(curChild, fn, i);
-    }
-
-    curChild = curChild.___nextSibling;
-  }
-
-  return i;
-}
-
-// We use a JavaScript class to benefit from fast property lookup
-function SpecialElHandlers() {}
-SpecialElHandlers.prototype = {
-  /**
-   * Needed for IE. Apparently IE doesn't think that "selected" is an
-   * attribute when reading over the attributes using selectEl.attributes
-   */
-  option: function (fromEl, toEl) {
-    syncBooleanAttrProp(fromEl, toEl, "selected");
-  },
-  button: function (fromEl, toEl) {
-    syncBooleanAttrProp(fromEl, toEl, "disabled");
-  },
-  /**
-   * The "value" attribute is special for the <input> element since it sets
-   * the initial value. Changing the "value" attribute without changing the
-   * "value" property will have no effect since it is only used to the set the
-   * initial value.  Similar for the "checked" attribute, and "disabled".
-   */
-  input: function (fromEl, toEl) {
-    syncBooleanAttrProp(fromEl, toEl, "checked");
-    syncBooleanAttrProp(fromEl, toEl, "disabled");
-
-    if (fromEl.value != toEl.___value) {
-      fromEl.value = toEl.___value;
-    }
-
-    if (fromEl.hasAttribute("value") && !toEl.___hasAttribute("value")) {
-      fromEl.removeAttribute("value");
-    }
-  },
-
-  textarea: function (fromEl, toEl) {
-    if (toEl.___preserveTextAreaValue) {
-      return;
-    }
-
-    var newValue = toEl.___value;
-    if (fromEl.value != newValue) {
-      fromEl.value = newValue;
-    }
-
-    var firstChild = fromEl.firstChild;
-    if (firstChild) {
-      // Needed for IE. Apparently IE sets the placeholder as the
-      // node value and vise versa. This ignores an empty update.
-      var oldValue = firstChild.nodeValue;
-
-      if (
-        oldValue == newValue ||
-        (!newValue && oldValue == fromEl.placeholder)
-      ) {
-        return;
-      }
-
-      firstChild.nodeValue = newValue;
-    }
-  },
-  select: function (fromEl, toEl) {
-    if (!toEl.___hasAttribute("multiple")) {
-      var selected = 0;
-      forEachOption(
-        toEl,
-        function (option, i) {
-          if (option.___hasAttribute("selected")) {
-            selected = i;
-          }
-        },
-        -1,
-      );
-
-      if (fromEl.selectedIndex !== selected) {
-        fromEl.selectedIndex = selected;
-      }
-    }
-  },
-};
-
-module.exports = new SpecialElHandlers();

package/src/runtime/vdom/preserve-attrs.js

@@ -1,15 +0,0 @@
-var extend = require("raptor-util/extend");
-
-function removePreservedAttributes(attrs, props) {
-  var preservedAttrs = props && props.pa;
-  if (preservedAttrs) {
-    attrs = extend({}, attrs);
-    preservedAttrs.forEach(function (preservedAttrName) {
-      delete attrs[preservedAttrName];
-    });
-  }
-
-  return attrs;
-}
-
-require("./VElement").___removePreservedAttributes = removePreservedAttributes;