Fix React PropTypes warning

Author: aputinski

package.json

@@ -11,7 +11,7 @@
   "scripts": {
     "start": "webpack-dev-server --content-base examples/ --port 3000 --hot",
     "test": "./node_modules/karma/bin/karma start",
-    "dist": "babel src --out-dir dist",
+    "dist": "rm -rf dist && mkdir dist && babel src --out-dir dist",
     "dist/example": "webpack --dist",
     "prepublish": "npm run dist",
     "lint": "standard"
@@ -22,31 +22,31 @@
   },
   "author": "Adam Putinski",
   "dependencies": {
-    "classnames": "^2.2.3",
+    "classnames": "2.2.5",
     "rebound": "0.0.13"
   },
   "devDependencies": {
-    "babel-cli": "^6.4.0",
-    "babel-core": "^6.4.0",
-    "babel-loader": "^6.2.1",
-    "babel-preset-es2015": "^6.3.13",
-    "babel-preset-react": "^6.3.13",
-    "chai": "^3.4.1",
-    "karma": "^0.13.19",
-    "karma-chai": "^0.1.0",
-    "karma-chrome-launcher": "^0.2.2",
-    "karma-mocha": "^0.2.1",
-    "karma-spec-reporter": "0.0.23",
-    "karma-webpack": "^1.7.0",
-    "minimist": "^1.2.0",
-    "mocha": "^2.3.4",
-    "react": "^0.14.6",
-    "react-addons-test-utils": "^0.14.6",
-    "react-dom": "^0.14.6",
-    "sinon": "^1.17.2",
-    "standard": "^8.0.0-beta.5",
-    "webpack": "^1.12.11",
-    "webpack-dev-server": "^1.14.1"
+    "babel-cli": "6.11.4",
+    "babel-core": "6.13.2",
+    "babel-loader": "6.2.5",
+    "babel-preset-es2015": "6.13.2",
+    "babel-preset-react": "6.11.1",
+    "chai": "3.5.0",
+    "karma": "1.2.0",
+    "karma-chai": "0.1.0",
+    "karma-chrome-launcher": "2.0.0",
+    "karma-mocha": "1.1.1",
+    "karma-spec-reporter": "0.0.26",
+    "karma-webpack": "1.8.0",
+    "minimist": "1.2.0",
+    "mocha": "3.0.2",
+    "react": "15.3.1",
+    "react": "15.3.1",
+    "react": "15.3.1",
+    "sinon": "1.17.5",
+    "standard": "8.0.0-beta.5",
+    "webpack": "1.13.2",
+    "webpack-dev-server": "1.14.1"
   },
   "standard": {
     "ignore": [

spec/navigation-controller.spec.jsx

@@ -1,6 +1,6 @@
 /* global describe, it, beforeEach, expect, requestAnimationFrame, sinon */
 
-import React from 'react/addons'
+import React from 'react'
 
 import {
   isCompositeComponent,

src/navigation-controller.jsx

@@ -19,39 +19,42 @@ const {
   mapValueInRange
 } = rebound.MathUtil
 
+const isNumber = (value) =>
+  typeof value === 'number'
+const isFunction = (value) =>
+  typeof value === 'function'
+const isBool = (value) =>
+  value === true || value === false
+const isArray = (value) =>
+  Array.isArray(value)
+
+const validate = (validator) => (options, key, method) => {
+  if (!validator(options[key])) {
+    throw new Error(`Option "${key}" of method "${method}" was invalid`)
+  }
+}
+
 const optionTypes = {
   pushView: {
-    view: React.PropTypes.element.isRequired,
-    transition: React.PropTypes.oneOfType([
-      React.PropTypes.func,
-      React.PropTypes.number
-    ]),
-    onComplete: React.PropTypes.func
+    view: validate(React.isValidElement),
+    transition: validate(x => isFunction(x) || isNumber(x)),
+    onComplete: validate(isFunction)
   },
   popView: {
-    transition: React.PropTypes.oneOfType([
-      React.PropTypes.func,
-      React.PropTypes.number
-    ]),
-    onComplete: React.PropTypes.func
+    transition: validate(x => isFunction(x) || isNumber(x)),
+    onComplete: validate(isFunction)
   },
   popToRootView: {
-    transition: React.PropTypes.oneOfType([
-      React.PropTypes.func,
-      React.PropTypes.number
-    ]),
-    onComplete: React.PropTypes.func
+    transition: validate(x => isFunction(x) || isNumber(x)),
+    onComplete: validate(isFunction)
   },
   setViews: {
-    views: React.PropTypes.arrayOf(
-      React.PropTypes.element
-    ).isRequired,
-    preserveState: React.PropTypes.bool,
-    transition: React.PropTypes.oneOfType([
-      React.PropTypes.func,
-      React.PropTypes.number
-    ]),
-    onComplete: React.PropTypes.func
+    views: validate(x => isArray(x) && x.reduce((valid, e) => {
+      return valid === false ? false : React.isValidElement(e)
+    }, true) === true),
+    preserveState: validate(isBool),
+    transition: validate(x => isFunction(x) || isNumber(x)),
+    onComplete: validate(isFunction)
   }
 }
 
@@ -65,7 +68,7 @@ function checkOptions (method, options) {
   const optionType = optionTypes[method]
   Object.keys(options).forEach(key => {
     if (optionType[key]) {
-      const e = optionType[key](options, key, method, 'prop')
+      const e = optionType[key](options, key, method)
       if (e) throw e
     }
   })