fix lint, fix error in propType handling - triggered warning all the …

…time
cellog · Mar 25, 2017 · 91f047f · 91f047f
1 parent 71679cb
commit 91f047f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-redux-saga-router",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "elegant powerful routing based on the simplicity of storing url as state",
   "main": "lib/index.js",
   "directories": {

diff --git a/src/Toggle.jsx b/src/Toggle.jsx
@@ -64,8 +64,8 @@ export default (isActive, loaded = () => true, componentLoadingMap = {}, debug =
     loadingComponent: null
   }
 
-  function Toggle({ component: Component = defaults.component, else: ElseComponent = defaults.else,
-      loadingComponent: Loading = defaults.loadingComponent, children, ...props }) {
+  function Toggle({ component: Component = defaults.component, else: ElseComponent = defaults.else, // eslint-disable-line
+      loadingComponent: Loading = defaults.loadingComponent, children, ...props }) {  // eslint-disable-line
     const useProps = { ...props }
     const map = ['component', 'loadingComponent', 'else']
     map.forEach((item) => {
@@ -110,7 +110,7 @@ export default (isActive, loaded = () => true, componentLoadingMap = {}, debug =
     [names.component]: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
     [names.loadingComponent]: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
     loading: (props, propName, componentName) => {
-      if (!Object.hasOwnProperty.call(props, 'loadingComponent')) {
+      if (Object.hasOwnProperty.call(props, 'loading') && !Object.hasOwnProperty.call(props, 'loadingComponent')) {
         if (!componentLoadingMap.loadingComponent) {
           console.warn(`${propName} in ${componentName} should be loadingComponent for react-redux-saga-router`)
         }