Merge remote-tracking branch 'upstream/master' into tag-failures

Conflicts: lib/index.js
reactjs · Apr 14, 2015 · 72ecb69 · 72ecb69
2 parents e52b7e5 + e7d1373
commit 72ecb69
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/lib/__tests__/index-test.js b/lib/__tests__/index-test.js
@@ -35,6 +35,18 @@ describe('props', () => {
         });
       });
 
+      it('does not warn if onClick is null', () => {
+        doNotExpectWarning(assertions.props.onClick.NO_LABEL.msg, () => {
+          <div onClick={null}/>;
+        });
+      });
+
+      it('does not warn if onClick is undefined', () => {
+        doNotExpectWarning(assertions.props.onClick.NO_LABEL.msg, () => {
+          <div onClick={undefined}/>;
+        });
+      });
+
       it('does not warn if there is an aria-label', () => {
         doNotExpectWarning(assertions.props.onClick.NO_LABEL.msg, () => {
           <div aria-label="foo" onClick={k}/>;

diff --git a/lib/index.js b/lib/index.js
@@ -12,6 +12,7 @@ var assertAccessibility = (tagName, props, children) => {
 
   var propTests;
   for (var propName in props) {
+    if (props[propName] === null || props[propName] === undefined) continue;
     propTests = assertions.props[propName] || [];
     for (key in propTests)
       if (propTests[key] && !propTests[key].test(tagName, props, children))