From dd92786fb038c4eb7c6545928646ec8aa9ecfa36 Mon Sep 17 00:00:00 2001
From: Ben Alpert <ben@benalpert.com>
Date: Mon, 20 Oct 2014 17:03:42 -0700
Subject: [PATCH] Support but warn on key={null}

Fixes #2386.

Test Plan: jest
---
 src/core/ReactElement.js                | 11 ++++++++++-
 src/core/__tests__/ReactElement-test.js | 16 ++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/core/ReactElement.js b/src/core/ReactElement.js
index 508aedbf73..653f3d4f5f 100644
--- a/src/core/ReactElement.js
+++ b/src/core/ReactElement.js
@@ -137,7 +137,16 @@ ReactElement.createElement = function(type, config, children) {
 
   if (config != null) {
     ref = config.ref === undefined ? null : config.ref;
-    key = config.key === undefined ? null : '' + config.key;
+    if (__DEV__) {
+      warning(
+        config.key !== null,
+        'createElement(...): Encountered component with a `key` of null. In ' +
+        'a future version, this will be treated as equivalent to the string ' +
+        '\'null\'; instead, provide an explicit key or use undefined.'
+      );
+    }
+    // TODO: Change this back to `config.key === undefined`
+    key = config.key == null ? null : '' + config.key;
     // Remaining properties are added to a new props object
     for (propName in config) {
       if (config.hasOwnProperty(propName) &&
diff --git a/src/core/__tests__/ReactElement-test.js b/src/core/__tests__/ReactElement-test.js
index ff9ec13e79..70737f753b 100644
--- a/src/core/__tests__/ReactElement-test.js
+++ b/src/core/__tests__/ReactElement-test.js
@@ -81,6 +81,22 @@ describe('ReactElement', function() {
     expect(element.props).toEqual({foo:'56'});
   });
 
+  it('treats a null key as omitted but warns', function() {
+    spyOn(console, 'warn');
+    var element = React.createFactory(ComponentFactory)({
+      key: null,
+      foo: '56'
+    });
+    expect(element.type).toBe(ComponentClass);
+    expect(element.key).toBe(null);  // as opposed to string 'null'
+    expect(element.ref).toBe(null);
+    expect(element.props).toEqual({foo:'56'});
+    expect(console.warn.argsForCall.length).toBe(1);
+    expect(console.warn.argsForCall[0][0]).toContain(
+      'will be treated as equivalent to the string \'null\''
+    );
+  });
+
   it('preserves the context on the element', function() {
     var Component = React.createFactory(ComponentFactory);
     var element;