Fix wrapping in headings, table cells

Closes GH-58.

Author: wooorm

index.js

@@ -16,6 +16,7 @@ function toMdast(tree, options) {
   h.nodeById = byId
   h.baseFound = false
   h.frozenBaseUrl = null
+  h.wrapText = true
 
   h.handlers = xtend(handlers, settings.handlers || {})
   h.augment = augment

lib/handlers/break.js

@@ -3,5 +3,5 @@
 module.exports = br
 
 function br(h, node) {
-  return h(node, 'break')
+  return h.wrapText ? h(node, 'break') : h(node, 'text', ' ')
 }

lib/handlers/code.js

@@ -6,6 +6,7 @@ var is = require('hast-util-is-element')
 var has = require('hast-util-has-property')
 var toText = require('hast-util-to-text')
 var trim = require('trim-trailing-lines')
+var wrapText = require('../util/wrap-text')
 
 var prefix = 'language-'
 
@@ -43,5 +44,10 @@ function code(h, node) {
     }
   }
 
-  return h(node, 'code', {lang: lang || null, meta: null}, trim(toText(node)))
+  return h(
+    node,
+    'code',
+    {lang: lang || null, meta: null},
+    trim(wrapText(h, toText(node)))
+  )
 }

lib/handlers/comment.js

@@ -2,6 +2,8 @@
 
 module.exports = comment
 
+var wrapText = require('../util/wrap-text')
+
 function comment(h, node) {
-  return h(node, 'html', '<!--' + node.value + '-->')
+  return h(node, 'html', '<!--' + wrapText(h, node.value) + '-->')
 }

lib/handlers/heading.js

@@ -5,10 +5,16 @@ module.exports = heading
 var all = require('../all')
 
 function heading(h, node) {
-  var depth = Number(node.tagName.charAt(1))
+  var rank = Number(node.tagName.charAt(1))
+  var wrap = h.wrapText
+  var result
 
   /* istanbul ignore next - `else` shouldn’t happen, of course… */
-  depth = depth || 1
+  rank = rank || 1
 
-  return h(node, 'heading', {depth: depth}, all(h, node))
+  h.wrapText = false
+  result = h(node, 'heading', {depth: rank}, all(h, node))
+  h.wrapText = wrap
+
+  return result
 }

lib/handlers/iframe.js

@@ -3,6 +3,7 @@
 module.exports = iframe
 
 var resolve = require('../util/resolve')
+var wrapText = require('../util/wrap-text')
 
 function iframe(h, node) {
   var src = node.properties.src
@@ -17,7 +18,7 @@ function iframe(h, node) {
       type: 'link',
       title: null,
       url: resolve(h, src),
-      children: [{type: 'text', value: title}]
+      children: [{type: 'text', value: wrapText(h, title)}]
     }
   }
 }

lib/handlers/inline-code.js

@@ -3,7 +3,8 @@
 module.exports = inlineCode
 
 var toText = require('hast-util-to-text')
+var wrapText = require('../util/wrap-text')
 
 function inlineCode(h, node) {
-  return h(node, 'inlineCode', toText(node))
+  return h(node, 'inlineCode', wrapText(h, toText(node)))
 }

lib/handlers/input.js

@@ -4,6 +4,7 @@ var repeat = require('repeat-string')
 var is = require('hast-util-is-element')
 var resolve = require('../util/resolve')
 var findSelectedOptions = require('../util/find-selected-options')
+var wrapText = require('../util/wrap-text')
 
 module.exports = input
 
@@ -43,7 +44,7 @@ function input(h, node) {
     list in byId &&
     is(byId[list], 'datalist')
   ) {
-    values = findSelectedOptions(byId[list], props)
+    values = findSelectedOptions(h, byId[list], props)
   }
 
   if (values.length === 0) {
@@ -59,8 +60,8 @@ function input(h, node) {
   if (type === 'image') {
     return h(node, 'image', {
       url: resolve(h, props.src),
-      title: props.title || null,
-      alt: values[0][0]
+      title: (props.title && wrapText(h, props.title)) || null,
+      alt: wrapText(h, values[0][0])
     })
   }
 
@@ -74,7 +75,7 @@ function input(h, node) {
       results.push(value[1] ? value[1] + ' (' + value[0] + ')' : value[0])
     }
 
-    return h.augment(node, {type: 'text', value: results.join(', ')})
+    return h(node, 'text', wrapText(h, results.join(', ')))
   }
 
   while (++index < length) {
@@ -83,8 +84,8 @@ function input(h, node) {
     url = type === 'email' ? 'mailto:' + text : text
 
     results.push(
-      h(node, 'link', {title: null, url: url}, [
-        {type: 'text', value: value[1] || text}
+      h(node, 'link', {title: null, url: wrapText(h, url)}, [
+        {type: 'text', value: wrapText(h, value[1] || text)}
       ])
     )
 

lib/handlers/select.js

@@ -1,11 +1,12 @@
 'use strict'
 
 var findSelectedOptions = require('../util/find-selected-options')
+var wrapText = require('../util/wrap-text')
 
 module.exports = select
 
 function select(h, node) {
-  var values = findSelectedOptions(node)
+  var values = findSelectedOptions(h, node)
   var length = values.length
   var index = -1
   var results = []
@@ -17,9 +18,6 @@ function select(h, node) {
   }
 
   if (results.length !== 0) {
-    return h.augment(node, {
-      type: 'text',
-      value: results.join(', ')
-    })
+    return h(node, 'text', wrapText(h, results.join(', ')))
   }
 }

lib/handlers/table-cell.js

@@ -5,5 +5,12 @@ module.exports = cell
 var all = require('../all')
 
 function cell(h, node) {
-  return h(node, 'tableCell', all(h, node))
+  var wrap = h.wrapText
+  var result
+
+  h.wrapText = false
+  result = h(node, 'tableCell', all(h, node))
+  h.wrapText = wrap
+
+  return result
 }