Export AppDispatch to clean up Redux types

mhoran · Feb 21, 2024 · a43da7e · a43da7e
1 parent 41b2b4e
commit a43da7e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/src/lib/weechat/action_transformer.ts b/src/lib/weechat/action_transformer.ts
@@ -1,4 +1,4 @@
-import { StoreState } from '../../store';
+import { AppDispatch, StoreState } from '../../store';
 
 type KeyFn<T> = (t: T) => string;
 type MapFn<A, B> = (a: A) => A | B;
@@ -53,10 +53,7 @@ export const transformToReduxAction = (data: WeechatResponse<unknown>) => {
       const object = data.objects[0] as WeechatObject<{ full_name: string }[]>;
       const fullName = object.content[0].full_name;
 
-      return (
-        dispatch: (action: object) => void,
-        getState: () => StoreState
-      ) => {
+      return (dispatch: AppDispatch, getState: () => StoreState) => {
         const state: StoreState = getState();
         const buffer = Object.values(state.buffers).find(
           (buffer: WeechatBuffer) => buffer.full_name == fullName
@@ -76,10 +73,7 @@ export const transformToReduxAction = (data: WeechatResponse<unknown>) => {
       >;
       const line = object.content[0];
 
-      return (
-        dispatch: (action: object) => void,
-        getState: () => StoreState
-      ) => {
+      return (dispatch: AppDispatch, getState: () => StoreState) => {
         const state: StoreState = getState();
         const { date, date_printed, ...restLine } = line;
 
@@ -152,10 +146,7 @@ export const transformToReduxAction = (data: WeechatResponse<unknown>) => {
     case 'hotlist': {
       const object = data.objects[0] as WeechatObject<WeechatHotlist[]>;
 
-      return (
-        dispatch: (action: object) => void,
-        getState: () => StoreState
-      ) => {
+      return (dispatch: AppDispatch, getState: () => StoreState) => {
         const state: StoreState = getState();
 
         dispatch({

diff --git a/src/lib/weechat/connection.ts b/src/lib/weechat/connection.ts
@@ -1,13 +1,11 @@
 import { WeeChatProtocol } from './parser';
 import { transformToReduxAction } from './action_transformer';
-import { StoreState } from '../../store';
-import { ThunkDispatch } from 'redux-thunk';
-import { AnyAction } from 'redux';
+import { AppDispatch } from '../../store';
 
 const protocol = new WeeChatProtocol();
 
 export default class WeechatConnection {
-  dispatch: ThunkDispatch<StoreState, undefined, AnyAction>;
+  dispatch: AppDispatch;
   hostname: string;
   password: string;
   ssl: boolean = true;
@@ -19,7 +17,7 @@ export default class WeechatConnection {
   reconnect: boolean;
 
   constructor(
-    dispatch: ThunkDispatch<StoreState, undefined, AnyAction>,
+    dispatch: AppDispatch,
     host: string,
     password: string,
     ssl: boolean,

diff --git a/src/store/index.ts b/src/store/index.ts
@@ -32,6 +32,8 @@ export type StoreState = {
   nicklists: NicklistState;
 };
 
+export type AppDispatch = typeof store.dispatch;
+
 const initialState: AppState = {
   connected: false,
   currentBufferId: null