marko 5.35.23 → 5.35.25

package/dist/runtime/vdom/VElement.js

@@ -5,6 +5,7 @@ var componentsUtil = require("@internal/components-util");
 var domData = require("../components/dom-data");
 var vElementByDOMNode = domData._L_;
 var VNode = require("./VNode");
+var isTextOnly = require("./is-text-only");
 var ATTR_XLINK_HREF = "xlink:href";
 var xmlnsRegExp = /^xmlns(:|$)/;
 var hasOwnProperty = Object.prototype.hasOwnProperty;
@@ -194,8 +195,8 @@ VElement.prototype = {
         }
       }
 
-      if (tagName === "textarea") {
-        el.defaultValue = this.ch_;
+      if (isTextOnly(tagName)) {
+        el.textContent = this.ch_;
       }
     }
 
@@ -249,8 +250,8 @@ function virtualizeElement(node, virtualizeChildNodes, ownerComponent) {
     props
   );
 
-  if (vdomEl.cg_ === "textarea") {
-    vdomEl.ch_ = node.value;
+  if (isTextOnly(tagName)) {
+    vdomEl.ch_ = node.textContent;
   } else if (virtualizeChildNodes) {
     virtualizeChildNodes(node, vdomEl, ownerComponent);
   }

package/dist/runtime/vdom/VNode.js

@@ -1,4 +1,6 @@
-"use strict";function VNode() {}
+"use strict";var hasTextContent = require("./is-text-only");
+
+function VNode() {}
 
 VNode.prototype = {
   bY_: function (finalChildCount, ownerComponent) {
@@ -47,7 +49,7 @@ VNode.prototype = {
   bR_: function (child) {
     this.cn_++;
 
-    if (this.cg_ === "textarea") {
+    if (hasTextContent(this.cg_)) {
       if (child.cq_) {
         this.ch_ += child.bZ_;
       } else {

package/dist/runtime/vdom/is-text-only.js

@@ -0,0 +1,10 @@
+"use strict";module.exports = function isTextOnly(nodeName) {
+  switch (nodeName) {
+    case "textarea":
+    case "script":
+    case "style":
+      return true;
+  }
+
+  return false;
+};

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

@@ -11,6 +11,7 @@ var KeySequence = require("../../components/KeySequence");
 var VElement = require("../vdom").bz_;
 var fragment = require("./fragment");
 var helpers = require("./helpers");
+var isTextOnly = require("../is-text-only");
 var virtualizeElement = VElement.ck_;
 var morphAttrs = VElement.cl_;
 var keysByDOMNode = domData._o_;
@@ -87,7 +88,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         realNode;
       }
 
-      if (vNode.cg_ !== "textarea") {
+      if (!isTextOnly(vNode.cg_)) {
         morphChildren(realNode, vNode, parentComponent);
       }
 
@@ -699,9 +700,13 @@ function morphdom(fromNode, toNode, host, componentsContext) {
       return;
     }
 
-    if (nodeName === "textarea") {
+    if (isTextOnly(nodeName)) {
       if (toEl.ch_ !== vFromEl.ch_) {
-        fromEl.value = toEl.ch_;
+        if (nodeName === "textarea") {
+          fromEl.value = toEl.ch_;
+        } else {
+          fromEl.textContent = toEl.ch_;
+        }
       }
     } else {
       morphChildren(fromEl, toEl, parentComponent);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.35.23",
+  "version": "5.35.25",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",
@@ -66,8 +66,8 @@
     "build": "babel ./src --out-dir ./dist --extensions .js --copy-files --config-file ../../babel.config.js --env-name=production"
   },
   "dependencies": {
-    "@marko/compiler": "^5.37.16",
-    "@marko/translator-default": "^6.0.17",
+    "@marko/compiler": "^5.37.18",
+    "@marko/translator-default": "^6.0.18",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",

package/src/runtime/vdom/VElement.js

@@ -5,6 +5,7 @@ var componentsUtil = require("@internal/components-util");
 var domData = require("../components/dom-data");
 var vElementByDOMNode = domData.___vElementByDOMNode;
 var VNode = require("./VNode");
+var isTextOnly = require("./is-text-only");
 var ATTR_XLINK_HREF = "xlink:href";
 var xmlnsRegExp = /^xmlns(:|$)/;
 var hasOwnProperty = Object.prototype.hasOwnProperty;
@@ -89,7 +90,7 @@ function VElementClone(other) {
   this.___properties = other.___properties;
   this.___nodeName = other.___nodeName;
   this.___flags = other.___flags;
-  this.___valueInternal = other.___valueInternal;
+  this.___textContent = other.___textContent;
   this.___constId = other.___constId;
 }
 
@@ -115,7 +116,7 @@ function VElement(
   this.___attributes = attrs || EMPTY_OBJECT;
   this.___properties = props || EMPTY_OBJECT;
   this.___nodeName = tagName;
-  this.___valueInternal = "";
+  this.___textContent = "";
   this.___constId = constId;
   this.___preserve = false;
   this.___preserveBody = false;
@@ -194,8 +195,8 @@ VElement.prototype = {
         }
       }
 
-      if (tagName === "textarea") {
-        el.defaultValue = this.___valueInternal;
+      if (isTextOnly(tagName)) {
+        el.textContent = this.___textContent;
       }
     }
 
@@ -249,8 +250,8 @@ function virtualizeElement(node, virtualizeChildNodes, ownerComponent) {
     props,
   );
 
-  if (vdomEl.___nodeName === "textarea") {
-    vdomEl.___valueInternal = node.value;
+  if (isTextOnly(tagName)) {
+    vdomEl.___textContent = node.textContent;
   } else if (virtualizeChildNodes) {
     virtualizeChildNodes(node, vdomEl, ownerComponent);
   }

package/src/runtime/vdom/VNode.js

@@ -1,3 +1,5 @@
+var hasTextContent = require("./is-text-only");
+
 function VNode() {}
 
 VNode.prototype = {
@@ -47,9 +49,9 @@ VNode.prototype = {
   ___appendChild: function (child) {
     this.___childCount++;
 
-    if (this.___nodeName === "textarea") {
+    if (hasTextContent(this.___nodeName)) {
       if (child.___Text) {
-        this.___valueInternal += child.___nodeValue;
+        this.___textContent += child.___nodeValue;
       } else {
         throw TypeError();
       }

package/src/runtime/vdom/is-text-only.js

@@ -0,0 +1,10 @@
+module.exports = function isTextOnly(nodeName) {
+  switch (nodeName) {
+    case "textarea":
+    case "script":
+    case "style":
+      return true;
+  }
+
+  return false;
+};

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

@@ -11,6 +11,7 @@ var KeySequence = require("../../components/KeySequence");
 var VElement = require("../vdom").___VElement;
 var fragment = require("./fragment");
 var helpers = require("./helpers");
+var isTextOnly = require("../is-text-only");
 var virtualizeElement = VElement.___virtualize;
 var morphAttrs = VElement.___morphAttrs;
 var keysByDOMNode = domData.___keyByDOMNode;
@@ -87,7 +88,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         ] = realNode;
       }
 
-      if (vNode.___nodeName !== "textarea") {
+      if (!isTextOnly(vNode.___nodeName)) {
         morphChildren(realNode, vNode, parentComponent);
       }
 
@@ -699,9 +700,13 @@ function morphdom(fromNode, toNode, host, componentsContext) {
       return;
     }
 
-    if (nodeName === "textarea") {
-      if (toEl.___valueInternal !== vFromEl.___valueInternal) {
-        fromEl.value = toEl.___valueInternal;
+    if (isTextOnly(nodeName)) {
+      if (toEl.___textContent !== vFromEl.___textContent) {
+        if (nodeName === "textarea") {
+          fromEl.value = toEl.___textContent;
+        } else {
+          fromEl.textContent = toEl.___textContent;
+        }
       }
     } else {
       morphChildren(fromEl, toEl, parentComponent);