Trim whitespace-only text nodes from the start and end of HTML strings since they're not inside a tag.

Author: rayd

lib/parse.js

@@ -4,7 +4,7 @@ var parseTag = require('./parse-tag');
 // re-used obj for quick lookups of components
 var empty = Object.create ? Object.create(null) : {};
 // common logic for pushing a child node onto a list
-function pushTextNode(list, html, start, ignoreWhitespace) {
+function pushTextNode(list, html, level, start, ignoreWhitespace) {
     // calculate correct end of the content slice in case there's
     // no tag after the text node.
     var end = html.indexOf('<', start);
@@ -14,7 +14,11 @@ function pushTextNode(list, html, start, ignoreWhitespace) {
     if (/^\s*$/.test(content)) {
         content = ' ';
     }
-    if (!ignoreWhitespace || content !== ' ') {
+    // don't add whitespace-only text nodes if they would be trailing text nodes
+    // or if they would be leading whitespace-only text nodes:
+    //  * end > -1 indicates this is not a trailing text node
+    //  * leading node is when level is -1 and list has length 0
+    if ((!ignoreWhitespace && end > -1 && level + list.length >= 0) || content !== ' ') {
         list.push({
             type: 'text',
             content: content
@@ -57,7 +61,7 @@ module.exports = function parse(html, options) {
             }
 
             if (!current.voidElement && !inComponent && nextChar && nextChar !== '<') {
-                pushTextNode(current.children, html, start, options.ignoreWhitespace);
+                pushTextNode(current.children, html, level, start, options.ignoreWhitespace);
             }
 
             byTag[current.tagName] = current;
@@ -85,14 +89,14 @@ module.exports = function parse(html, options) {
                 // if we're at the root, push a base text node. otherwise add as
                 // a child to the current node.
                 parent = level === -1 ? result : arr[level].children;
-                pushTextNode(parent, html, start, options.ignoreWhitespace);
+                pushTextNode(parent, html, level, start, options.ignoreWhitespace);
             }
         }
     });
 
     // If the "html" passed isn't actually html, add it as a text node.
     if (!result.length && html.length) {
-        pushTextNode(result, html, 0, options.ignoreWhitespace);
+        pushTextNode(result, html, 0, 0, options.ignoreWhitespace);
     }
 
     return result;