example(rematch-tsx): fix type errors.

kktjs · Mar 12, 2021 · 0431042 · 0431042
1 parent f2a4433
commit 0431042
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/example/rematch-tsx/src/models/index.tsx b/example/rematch-tsx/src/models/index.tsx
@@ -1,5 +1,5 @@
 import { init, RematchRootState, RematchDispatch, Models } from '@rematch/core';
-import loadingPlugin, { ExtraModelsFromLoading } from "@rematch/loading";
+import loadingPlugin, { ExtraModelsFromLoading } from '@rematch/loading';
 import global from './global';
 import login from './login';
 
@@ -10,7 +10,7 @@ export interface RootModel extends Models<RootModel>, FullModel {
 
 type FullModel = ExtraModelsFromLoading<RootModel>;
 
-export const models: RootModel = { global } as RootModel;
+export const models = { global } as RootModel;
 export const store = init<RootModel, FullModel>({
   models,
   plugins: [loadingPlugin()],
@@ -19,5 +19,7 @@ export const store = init<RootModel, FullModel>({
 export const { dispatch } = store;
 
 export type Store = typeof store;
+// export type Dispatch = RootModel;
+// export type Dispatch = ReduxDispatch<RootModel>;
 export type Dispatch = RematchDispatch<RootModel>;
 export type RootState = RematchRootState<RootModel>;
diff --git a/example/rematch-tsx/src/pages/login/index.tsx b/example/rematch-tsx/src/pages/login/index.tsx
@@ -11,12 +11,13 @@ const mapState = ({ login, loading }: RootState) => ({
   account: login.userData,
 });
 
-const mapDispatch = (dispatch: Dispatch) => ({
+const mapDispatch: any = (dispatch: Dispatch) => ({
   submit: dispatch.login.submit,
 });
 
-type connectedProps = ReturnType<typeof mapState> & ReturnType<typeof mapDispatch>;
-type Props = connectedProps & DefaultProps;
+type StateProps = ReturnType<typeof mapState>;
+type DispatchProps = ReturnType<typeof mapDispatch>;
+type Props = StateProps & DispatchProps & DefaultProps;
 
 function Login(props: Props) {
   const { loading } = props;

diff --git a/example/rematch-tsx/src/routes/Controller.tsx b/example/rematch-tsx/src/routes/Controller.tsx
@@ -2,25 +2,26 @@ import React from 'react';
 import { Switch, Route } from 'react-router-dom';
 import { connect } from 'react-redux';
 import { Dispatch, RootState } from '../models';
+import { getRouterData } from '../routes/router';
 
-type connectedProps = ReturnType<typeof mapState> & ReturnType<typeof mapDispatch>;
-type Props = connectedProps &
-  typeof Controller.defaultProps & {
-    routerData: any;
+type StateProps = ReturnType<typeof mapState>;
+type DispatchProps = ReturnType<typeof mapDispatch>;
+type Props = StateProps &
+  DispatchProps & {
+    routerData: typeof getRouterData;
   };
 
 const mapState = ({ global }: RootState) => ({
   // token: global.token,
   // userData: global.userData,
 });
 
-const mapDispatch = (dispatch: Dispatch) => ({
+const mapDispatch: any = (dispatch: Dispatch) => ({
   // verify: dispatch.global.verify,
   // verify: global.verify,
 });
 
 class Controller extends React.PureComponent<Props> {
-  static defaultProps = {};
   componentDidMount() {
     // this.props.verify();
   }