Fixes key creation skipping elements with null keys

metal · Aug 31, 2016 · 669af22 · 669af22
1 parent 800a9e1
commit 669af22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/metal-jsx/src/JSXRenderer.js b/packages/metal-jsx/src/JSXRenderer.js
@@ -56,7 +56,7 @@ class JSXRenderer extends IncrementalDomRenderer {
 	handleJSXElementOpened_({args}) {
 		if (childrenCount.length > 0) {
 			const count = ++childrenCount[childrenCount.length - 1];
-			if (!core.isDef(args[1])) {
+			if (!core.isDefAndNotNull(args[1])) {
 				args[1] = JSXRenderer.KEY_PREFIX + count;
 			}
 		}

diff --git a/packages/metal-jsx/test/JSXRenderer.js b/packages/metal-jsx/test/JSXRenderer.js
@@ -157,8 +157,8 @@ describe('JSXRenderer', function() {
 		class TestComponent extends TestJSXComponent {
 			render() {
 				return <div>
-					{!this.props.hide && <div><ChildComponent /></div>}
-					<div><ChildComponent2 /></div>
+					{!this.props.hide && <div class="child1"><ChildComponent /></div>}
+					<div class="child1"><ChildComponent2 /></div>
 				</div>
 			}
 		}