Merge pull request #4 from redux-observable/factory

feat(factories): dispatchOnMount() now expects factories

Author: benlesh

src/dispatchOnMount.js

@@ -3,7 +3,7 @@ import { Subscription } from 'rxjs/Subscription';
 
 const $$reduxObservableSubscription = '@@reduxObservableSubscription';
 
-export function dispatchOnMount(...toDispatch) {
+export function dispatchOnMount(...factories) {
   return (ComposedComponent) =>
     class DispatchOnMountComponent extends Component {
       static contextTypes = {
@@ -12,7 +12,7 @@ export function dispatchOnMount(...toDispatch) {
 
       componentDidMount() {
         this[$$reduxObservableSubscription] = new Subscription();
-        toDispatch.map(a => this.context.store.dispatch(a))
+        factories.map(factory => this.context.store.dispatch(factory(this.props)))
           .forEach(sub => sub && this[$$reduxObservableSubscription].add(sub));
       }
 
@@ -21,7 +21,7 @@ export function dispatchOnMount(...toDispatch) {
       }
 
       render() {
-        return (<ComposedComponent {...this.props}/>);
+        return (<ComposedComponent {...this.props} />);
       }
     };
 }

test/dispatchOnMount-spec.js

@@ -22,7 +22,7 @@ describe('dispatchOnMount', () => {
     };
     let store = createStore(reducer, applyMiddleware(reduxObservable()));
 
-    @dispatchOnMount(() => Observable.of({ type: 'TEST' }))
+    @dispatchOnMount(() => () => Observable.of({ type: 'TEST' }))
     class TestComponent extends Component {
     }
 
@@ -56,7 +56,7 @@ describe('dispatchOnMount', () => {
       };
     });
 
-    @dispatchOnMount(() => source1, () => source2)
+    @dispatchOnMount(() => () => source1, () => () => source2)
     class TestComponent extends Component {
     }
 
@@ -85,7 +85,7 @@ describe('dispatchOnMount', () => {
     let source1 = Observable.of({ type: 'SOURCE1' });
     let source2 = Observable.of({ type: 'SOURCE2' });
 
-    @dispatchOnMount(() => source1, () => source2)
+    @dispatchOnMount(() => () => source1, () => () => source2)
     class TestComponent extends Component {
     }
 
@@ -111,7 +111,7 @@ describe('dispatchOnMount', () => {
 
     let source2 = Observable.of({ type: 'SOURCE2' });
 
-    @dispatchOnMount({ type: 'PLAIN_ACTION' }, () => source2)
+    @dispatchOnMount(() => ({ type: 'PLAIN_ACTION' }), () => () => source2)
     class TestComponent extends Component {
     }
 
@@ -130,4 +130,34 @@ describe('dispatchOnMount', () => {
     // let's just be really sure we don't break the unsub in the componentWillUnmount
     expect(() => comp.componentWillUnmount()).not.to.throw();
   });
+
+  it('should accept factories that get invoked with props', () => {
+    let reducedActions = [];
+    let reducer = (state, action) => {
+      reducedActions.push(action);
+      return state;
+    };
+    let store = createStore(reducer, applyMiddleware(reduxObservable()));
+
+    @dispatchOnMount(
+      (props) => ({ type: 'PLAIN_ACTION', value: props.value }),
+      (props) => () => Observable.of({ type: 'SOURCE2', value: props.value }))
+    class TestComponent extends Component {
+    }
+
+    let comp = new TestComponent({ value: 'Bilbo Bagginses' });
+    // fake connection?
+    comp.context = { store };
+    comp.componentDidMount();
+
+    expect(reducedActions).to.deep.equal([
+      { type: '@@redux/INIT' },
+      { type: 'PLAIN_ACTION', value: 'Bilbo Bagginses' },
+      { type: 'SOURCE2', value: 'Bilbo Bagginses' }
+    ]);
+
+    // since plain actions don't return subscriptions, because they're not functions
+    // let's just be really sure we don't break the unsub in the componentWillUnmount
+    expect(() => comp.componentWillUnmount()).not.to.throw();
+  });
 });