Merge pull request #147 from lakshyaranganath/fix/htmlfor

Author: marvinhagemeister

src/index.js

@@ -167,6 +167,11 @@ function renderToString(vnode, context, opts, inner, isSvgMode, selectValue) {
 				name = name.toLowerCase().replace(/^xlink:?/, 'xlink:');
 			}
 
+			if (name==='htmlFor') {
+				if (props.for) continue;
+				name = 'for';
+			}
+
 			if (name==='style' && v && typeof v==='object') {
 				v = styleObjToCss(v);
 			}
@@ -244,7 +249,7 @@ function renderToString(vnode, context, opts, inner, isSvgMode, selectValue) {
 				if (ret) {
 					if (pretty) {
 						let isText = ret.length > 0 && ret[0]!='<';
-						
+
 						// We merge adjacent text nodes, otherwise each piece would be printed
 						// on a new line.
 						if (lastWasText && isText) {

test/render.js

@@ -573,6 +573,23 @@ describe('render', () => {
 		});
 	});
 
+	describe('htmlFor / for massaging', () => {
+		it('should render for using htmlFor', () => {
+			let rendered = render(<label htmlFor="foo" />);
+			expect(rendered).to.equal('<label for="foo"></label>');
+		});
+
+		it('should render for using for', () => {
+			let rendered = render(<label for="foo" />);
+			expect(rendered).to.equal('<label for="foo"></label>');
+		});
+
+		it('should prefer for over htmlFor', () => {
+			let rendered = render(<label for="foo" htmlFor="bar" />);
+			expect(rendered).to.equal('<label for="foo"></label>');
+		});
+	});
+
 	describe('sortAttributes', () => {
 		it('should leave attributes unsorted by default', () => {
 			let rendered = render(<div b1="b1" c="c" a="a" b="b" />);
@@ -602,7 +619,7 @@ describe('render', () => {
 			expect(renderXml(<div foo={false} bar={0} />)).to.equal(`<div bar="0" />`);
 		});
 	});
-	
+
 	describe('state locking', () => {
 		it('should set _dirty and __d to true', () => {
 			let inst;
@@ -615,9 +632,9 @@ describe('render', () => {
 					return <div />;
 				}
 			}
-			
+
 			expect(render(<Foo />)).to.equal('<div></div>');
-			
+
 			expect(inst).to.have.property('_dirty', true);
 			expect(inst).to.have.property('__d', true);
 		});
@@ -635,9 +652,9 @@ describe('render', () => {
 					return <Bar count={++count} />;
 				}
 			}
-			
+
 			expect(render(<Foo />)).to.equal('<div></div>');
-			
+
 			expect(Bar).to.have.been.calledOnce.and.calledWithMatch({ count: 1 });
 		});
 	});