Turn on 'consistent-return'

react-dnd · Jan 25, 2017 · f8fc637 · f8fc637
1 parent b128097
commit f8fc637
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -15,7 +15,6 @@
     "react/react-in-jsx-scope": 2,
     "react/jsx-filename-extension": "off",
     "react/sort-comp": "off",
-    "class-methods-use-this": "off",
-    "consistent-return": "off"
+    "class-methods-use-this": "off"
   }
 }
diff --git a/examples/00 Chessboard/Tutorial App/Board.js b/examples/00 Chessboard/Tutorial App/Board.js
@@ -28,9 +28,8 @@ export default class Board extends Component {
 
   renderPiece(x, y) {
     const [knightX, knightY] = this.props.knightPosition;
-    if (x === knightX && y === knightY) {
-      return <Knight />;
-    }
+    const isKnightHere = x === knightX && y === knightY;
+    return isKnightHere ? <Knight /> : null;
   }
 
   render() {

diff --git a/src/createTargetFactory.js b/src/createTargetFactory.js
@@ -62,7 +62,7 @@ export default function createTargetFactory(spec) {
 
     drop() {
       if (!spec.drop) {
-        return;
+        return undefined;
       }
 
       const dropResult = spec.drop(this.props, this.monitor, this.component);

diff --git a/src/wrapConnectorHooks.js b/src/wrapConnectorHooks.js
@@ -25,7 +25,7 @@ function wrapHookToRecognizeElement(hook) {
     if (!isValidElement(elementOrNode)) {
       const node = elementOrNode;
       hook(node, options);
-      return;
+      return undefined;
     }
 
     // If passed a ReactElement, clone it and attach this function as a ref.