Merge pull request #217 from joelmertanen/allow-es6-objects

Allow mapDispatchToTarget to be an ES6 module
angular-redux · May 13, 2019 · d11849e · d11849e
2 parents 0d5d2a5 + edef178
commit d11849e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/components/connector.js b/src/components/connector.js
@@ -15,7 +15,7 @@ export default function Connector(store) {
 
     let finalMapStateToTarget = mapStateToTarget || defaultMapStateToTarget;
 
-    const finalMapDispatchToTarget = isPlainObject(mapDispatchToTarget) ?
+    const finalMapDispatchToTarget = isObject(mapDispatchToTarget) && !isFunction(mapDispatchToTarget) ?
       wrapActionCreators(mapDispatchToTarget) :
       mapDispatchToTarget || defaultMapDispatchToTarget;
 
@@ -25,7 +25,7 @@ export default function Connector(store) {
       );
 
     invariant(
-      isPlainObject(finalMapDispatchToTarget) || isFunction(finalMapDispatchToTarget),
+      isObject(finalMapDispatchToTarget) || isFunction(finalMapDispatchToTarget),
       'mapDispatchToTarget must be a plain Object or a Function. Instead received %s.', finalMapDispatchToTarget
       );
 

diff --git a/test/components/connector.spec.js b/test/components/connector.spec.js
@@ -114,6 +114,16 @@ describe('Connector', () => {
     expect(receivedDispatch).toBe(store.dispatch);
   });
 
+  it('Should allow ES6 modules', () => {
+    // The tests are run in Node, so we are unable to use actual ES6 modules. We get quite
+    // close by emulating it
+    class FakeModule {
+      prop() {}
+    };
+    const fakeModule = new FakeModule();
+    expect(() => connect(() => ({}), fakeModule)(targetObj)).toNotThrow();
+  });
+
   it('Should provide state slice, bound actions and previous state slice to target (function)', () => {
     const targetFunc = sinon.spy();