Move flow-typed; Merge ownProps with stateProps for typecheck

Author: agentcooper

src/flow-typed/react-redux.js flow-typed/react-redux.js

@@ -17,7 +17,8 @@
     "start": "react-scripts start",
     "build": "react-scripts build",
     "eject": "react-scripts eject",
-    "flow": "flow"
+    "flow": "flow",
+    "flow:stop": "flow stop"
   },
   "eslintConfig": {
     "extends": "./node_modules/react-scripts/config/eslint.js"

src/flow-typed/redux.js flow-typed/redux.js

@@ -15,7 +15,7 @@ class App extends Component {
   render() {
     return (
       <Provider store={ store }>
-        <Counter />
+        <Counter text="some text" />
       </Provider>
     );
   }

package.json

@@ -18,20 +18,21 @@ type OwnProps = {
 
 type StateProps = {
   counter: number,
-};
+} & OwnProps;
 
 type DispatchProps = {
   increase: () => void,
   decrease: () => void,
 };
 
-type Props = OwnProps & StateProps & DispatchProps;
+type Props = StateProps & DispatchProps;
 
-const mapStateToProps = (state: State): StateProps => ({
+const mapStateToProps = (state: State, ownProps: OwnProps): StateProps => ({
   counter: state.ui.counter,
+  ...ownProps,
 });
 
-const mapDispatchToProps = (dispatch: Dispatch): DispatchProps => ({
+const mapDispatchToProps = (dispatch: Dispatch, ownProps: OwnProps): DispatchProps => ({
   increase: () => {
     dispatch(increase());
   },

src/App.js

@@ -1,12 +1,7 @@
 // @flow
 
-import { applyMiddleware, createStore } from 'redux';
-import thunk from 'redux-thunk';
+import { createStore } from 'redux';
 
 import app from './reducers';
 
-const createStoreWithMiddleware = applyMiddleware(
-  thunk,
-)(createStore);
-
-export default () => createStoreWithMiddleware(app);
+export default () => createStore(app);