Merge pull request #3 from i-like-robots/master

Do not close void elements
preactjs · Mar 19, 2016 · 71afd4a · 71afd4a
2 parents 4927e5f + bd208bf
commit 71afd4a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/server/src/index.js b/server/src/index.js
@@ -10,6 +10,23 @@ const ESC = {
 
 const EMPTY = {};
 
+const VOID_ELEMENTS = [
+	'area',
+	'base',
+	'br',
+	'col',
+	'embed',
+	'hr',
+	'img',
+	'input',
+	'link',
+	'meta',
+	'param',
+	'source',
+	'track',
+	'wbr'
+];
+
 const HOP = Object.prototype.hasOwnProperty;
 
 let encodeEntities = s => String(s).replace(/[<>"&]/g, escapeChar);
@@ -127,7 +144,10 @@ export default function renderToString(vnode, context, opts, inner) {
 		}
 	}
 
-	s += `</${nodeName}>`
+	if (VOID_ELEMENTS.indexOf(nodeName) === -1) {
+		s += `</${nodeName}>`;
+	}
+
 	return s;
 };
 

diff --git a/server/test/render.js b/server/test/render.js
@@ -41,6 +41,20 @@ describe('render', () => {
 
 			expect(rendered).to.equal(expected);
 		});
+
+		it('does not close void elements', () => {
+			let rendered, expected;
+
+			rendered = render(<div><input type='text' /><wbr /></div>);
+			expected = `<div><input type="text"><wbr></div>`;
+
+			expect(rendered).to.equal(expected);
+
+			rendered = render(<input><p>Hello World</p></input>);
+			expected = `<input><p>Hello World</p>`;
+
+			expect(rendered).to.equal(expected);
+		});
 	});
 
 	describe('Functional Components', () => {