Merge pull request #121 from TriPSs/master

Accept props that are empty (For Redux mapStateToProps)
ericclemmons · Nov 23, 2016 · 2a89a98 · 2a89a98
2 parents abf9744 + cc0b304
commit 2a89a98
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@ _book
 dist
 node_modules
 npm-debug.log
+.idea
diff --git a/src/Resolver.js b/src/Resolver.js
@@ -149,7 +149,7 @@ export default class Resolver extends React.Component {
 
     Object.keys(resolve).forEach(name => {
       // Ignore existing supplied props or existing resolved values
-      if (!props.hasOwnProperty(name) && !nextState.resolved.hasOwnProperty(name)) {
+      if (!nextState.resolved.hasOwnProperty(name)) {
         const factory = resolve[name];
         const value = factory(props);
         const isPromise = (