marko 5.32.12 → 5.32.14

package/dist/runtime/helpers/attr-tag.js

@@ -28,7 +28,10 @@ exports.i = function attrTagInput(render, input) {
   var prevOwnerInput = ownerInput;
   ownerInput = input || {};
   try {
-    ownerInput.renderBody = render();
+    var renderBody = render();
+    if (renderBody) {
+      ownerInput.renderBody = renderBody;
+    }
     return ownerInput;
   } finally {
     ownerInput = prevOwnerInput;

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

@@ -179,7 +179,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         (matchingFromComponent = existingComponentLookup[component.id]) ===
         undefined)
         {
-          if (isHydrate === true) {
+          if (isHydrate) {
             var rootNode = beginFragmentNode(curFromNodeChild, fromNode);
             component._A_ = rootNode;
             componentByDOMNode.set(rootNode, component);
@@ -321,7 +321,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           matchingFromEl === undefined ||
           matchingFromEl === curFromNodeChild)
           {
-            if (isHydrate === true && curFromNodeChild) {
+            if (isHydrate && curFromNodeChild) {
               if (
               curFromNodeChild.nodeType === ELEMENT_NODE && (
               curToNodeChild.aa_ ||
@@ -544,7 +544,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             // Both nodes being compared are Element nodes
             curVFromNodeChild = vElementByDOMNode.get(curFromNodeChild);
             if (curVFromNodeChild === undefined) {
-              if (isHydrate === true) {
+              if (isHydrate) {
                 curVFromNodeChild = virtualizeElement(curFromNodeChild);
 
                 if (
@@ -587,21 +587,24 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           {
             // Both nodes being compared are Text or Comment nodes
             isCompatible = true;
-            // Simply update nodeValue on the original node to
-            // change the text value
-
-            if (
-            isHydrate === true &&
-            toNextSibling &&
-            curFromNodeType === TEXT_NODE &&
-            toNextSibling.bS_ === TEXT_NODE)
-            {
-              fromNextSibling = curFromNodeChild.splitText(
-                curToNodeChild.cj_.length
-              );
-            }
-            if (curFromNodeChild.nodeValue !== curToNodeChild.cj_) {
-              curFromNodeChild.nodeValue = curToNodeChild.cj_;
+            var curToNodeValue = curToNodeChild.cj_;
+            var curFromNodeValue = curFromNodeChild.nodeValue;
+            if (curFromNodeValue !== curToNodeValue) {
+              if (
+              isHydrate &&
+              curFromNodeType === TEXT_NODE &&
+              curFromNodeValue.startsWith(curToNodeValue))
+              {
+                // In hydrate mode we can use splitText to more efficiently handle
+                // adjacent text vdom nodes that were merged.
+                fromNextSibling = curFromNodeChild.splitText(
+                  curToNodeValue.length
+                );
+              } else {
+                // Simply update nodeValue on the original node to
+                // change the text value
+                curFromNodeChild.nodeValue = curToNodeValue;
+              }
             }
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marko",
-    "version": "5.32.12",
+    "version": "5.32.14",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "keywords": [
         "front-end",

package/src/runtime/helpers/attr-tag.js

@@ -28,7 +28,10 @@ exports.i = function attrTagInput(render, input) {
   var prevOwnerInput = ownerInput;
   ownerInput = input || {};
   try {
-    ownerInput.renderBody = render();
+    var renderBody = render();
+    if (renderBody) {
+      ownerInput.renderBody = renderBody;
+    }
     return ownerInput;
   } finally {
     ownerInput = prevOwnerInput;

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

@@ -179,7 +179,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           (matchingFromComponent = existingComponentLookup[component.id]) ===
           undefined
         ) {
-          if (isHydrate === true) {
+          if (isHydrate) {
             var rootNode = beginFragmentNode(curFromNodeChild, fromNode);
             component.___rootNode = rootNode;
             componentByDOMNode.set(rootNode, component);
@@ -321,7 +321,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             matchingFromEl === undefined ||
             matchingFromEl === curFromNodeChild
           ) {
-            if (isHydrate === true && curFromNodeChild) {
+            if (isHydrate && curFromNodeChild) {
               if (
                 curFromNodeChild.nodeType === ELEMENT_NODE &&
                 (curToNodeChild.___preserve ||
@@ -544,7 +544,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             // Both nodes being compared are Element nodes
             curVFromNodeChild = vElementByDOMNode.get(curFromNodeChild);
             if (curVFromNodeChild === undefined) {
-              if (isHydrate === true) {
+              if (isHydrate) {
                 curVFromNodeChild = virtualizeElement(curFromNodeChild);
 
                 if (
@@ -587,21 +587,24 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           ) {
             // Both nodes being compared are Text or Comment nodes
             isCompatible = true;
-            // Simply update nodeValue on the original node to
-            // change the text value
-
-            if (
-              isHydrate === true &&
-              toNextSibling &&
-              curFromNodeType === TEXT_NODE &&
-              toNextSibling.___nodeType === TEXT_NODE
-            ) {
-              fromNextSibling = curFromNodeChild.splitText(
-                curToNodeChild.___nodeValue.length,
-              );
-            }
-            if (curFromNodeChild.nodeValue !== curToNodeChild.___nodeValue) {
-              curFromNodeChild.nodeValue = curToNodeChild.___nodeValue;
+            var curToNodeValue = curToNodeChild.___nodeValue;
+            var curFromNodeValue = curFromNodeChild.nodeValue;
+            if (curFromNodeValue !== curToNodeValue) {
+              if (
+                isHydrate &&
+                curFromNodeType === TEXT_NODE &&
+                curFromNodeValue.startsWith(curToNodeValue)
+              ) {
+                // In hydrate mode we can use splitText to more efficiently handle
+                // adjacent text vdom nodes that were merged.
+                fromNextSibling = curFromNodeChild.splitText(
+                  curToNodeValue.length,
+                );
+              } else {
+                // Simply update nodeValue on the original node to
+                // change the text value
+                curFromNodeChild.nodeValue = curToNodeValue;
+              }
             }
           }
         }