feat: export useDispatch, useSelector and useStore from [email protected]

Author: sorrycc

packages/dva/package.json

@@ -39,7 +39,7 @@
     "history": "^4.7.2",
     "invariant": "^2.2.4",
     "isomorphic-fetch": "^2.2.1",
-    "react-redux": "^7.0.1",
+    "react-redux": "^7.1.0",
     "react-router-dom": "^4.3.1",
     "redux": "^4.0.1"
   },

packages/dva/src/index.js

@@ -2,7 +2,14 @@ import React from 'react';
 import invariant from 'invariant';
 import { createBrowserHistory, createMemoryHistory, createHashHistory } from 'history';
 import document from 'global/document';
-import { Provider, connect, connectAdvanced } from 'react-redux';
+import {
+  Provider,
+  connect,
+  connectAdvanced,
+  useSelector,
+  useDispatch,
+  useStore,
+} from 'react-redux';
 import { utils, create, saga } from 'dva-core';
 import * as router from 'react-router-dom';
 import * as routerRedux from 'connected-react-router';
@@ -105,7 +112,7 @@ function patchHistory(history) {
 
 export fetch from 'isomorphic-fetch';
 export dynamic from './dynamic';
-export { connect, connectAdvanced };
+export { connect, connectAdvanced, useSelector, useDispatch, useStore };
 export { router };
 export { saga };
 export { routerRedux };

packages/dva/test/index.e2e.js

@@ -1,9 +1,19 @@
 import React from 'react';
-import { render, fireEvent } from 'react-testing-library';
-import dva, { connect, createMemoryHistory, router, routerRedux } from '../dist/index';
+import { render, fireEvent, cleanup } from 'react-testing-library';
+import dva, {
+  connect,
+  useDispatch,
+  useSelector,
+  useStore,
+  createMemoryHistory,
+  router,
+  routerRedux,
+} from '../dist/index';
 
 const { Link, Switch, Route, Router } = router;
 
+afterEach(cleanup);
+
 test('normal', () => {
   const app = dva();
   app.model({
@@ -49,14 +59,51 @@ test('connect', () => {
     );
   });
   app.router(() => <App />);
-  app.start();
 
   const { getByTestId, getByText } = render(React.createElement(app.start()));
   expect(getByTestId('count').innerHTML).toEqual('0');
   fireEvent.click(getByText('add'));
   expect(getByTestId('count').innerHTML).toEqual('1');
 });
 
+test('hooks api: useDispatch, useSelector and useStore', () => {
+  const app = dva();
+  app.model({
+    namespace: 'count',
+    state: 0,
+    reducers: {
+      add(state) {
+        return state + 1;
+      },
+    },
+  });
+  const App = () => {
+    const dispatch = useDispatch();
+    const store = useStore();
+    const { count } = useSelector(state => ({ count: state.count }));
+    return (
+      <>
+        <div data-testid="count">{count}</div>
+        <div data-testid="state">{store.getState().count}</div>
+        <button
+          onClick={() => {
+            dispatch({ type: 'count/add' });
+          }}
+        >
+          add
+        </button>
+      </>
+    );
+  };
+  app.router(() => <App />);
+
+  const { getByTestId, getByText } = render(React.createElement(app.start()));
+  expect(getByTestId('count').innerHTML).toEqual('0');
+  fireEvent.click(getByText('add'));
+  expect(getByTestId('count').innerHTML).toEqual('1');
+  expect(getByTestId('state').innerHTML).toEqual('1');
+});
+
 test('navigate', async () => {
   const history = createMemoryHistory({
     initialEntries: ['/'],

packages/dva/yarn.lock

@@ -9,10 +9,10 @@
   dependencies:
     regenerator-runtime "^0.12.0"
 
-"@babel/runtime@^7.4.3":
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
-  integrity sha512-9lsJwJLxDh/T3Q3SZszfWOTkk3pHbkmH+3KY+zwIDmsNlxsumuhS2TH3NIpktU4kNvfzy+k3eLT7aTJSPTo0OA==
+"@babel/runtime@^7.4.5":
+  version "7.4.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
+  integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
   dependencies:
     regenerator-runtime "^0.13.2"
 
@@ -212,12 +212,12 @@ react-is@^16.8.6:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
   integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
 
-react-redux@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.0.1.tgz#321285e6c85c3586d11cc066ab33dc580da599fb"
-  integrity sha512-orSiI/QXtGiiJmf8lN/zVTx4hysFo/kGOsce28IUu/mu98AGemBwPTDzf64P4Vf/miRmevO8/w2RSw2awDd21w==
+react-redux@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.1.0.tgz#72af7cf490a74acdc516ea9c1dd80e25af9ea0b2"
+  integrity sha512-hyu/PoFK3vZgdLTg9ozbt7WF3GgX5+Yn3pZm5/96/o4UueXA+zj08aiSC9Mfj2WtD1bvpIb3C5yvskzZySzzaw==
   dependencies:
-    "@babel/runtime" "^7.4.3"
+    "@babel/runtime" "^7.4.5"
     hoist-non-react-statics "^3.3.0"
     invariant "^2.2.4"
     loose-envify "^1.4.0"