Skip to content

Commit f0a599c

Browse files
Merge pull request cerebral#38 from FWeinb/fix-type-order
refactor(overmind): switch order of Effects and State on ActionsCallb…
2 parents b3809f9 + 6e93e5c commit f0a599c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

packages/node_modules/overmind/src/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export interface Events {
9494
}
9595
}
9696

97-
export type ActionsCallback<Effects, State> = (
97+
export type ActionsCallback<State, Effects> = (
9898
action: TAction<State, Effects & { state: State }>
9999
) => any
100100

@@ -122,15 +122,15 @@ export default class App<
122122
[namespace: string]: ReactionsCallback<State, any>
123123
},
124124
Actions extends
125-
| ActionsCallback<Effects, State>
125+
| ActionsCallback<State, Effects>
126126
| {
127127
[namespace: string]: ActionsCallback<{}, {}>
128128
}
129129
> {
130130
private proxyStateTree: ProxyStateTree
131131
eventHub: EventEmitter<Events>
132132
devtools: Devtools
133-
actions: Actions extends ActionsCallback<Effects, State>
133+
actions: Actions extends ActionsCallback<State, Effects>
134134
? ReturnType<Actions>
135135
: Actions extends {
136136
[namespace: string]: ActionsCallback<{}, {}>
@@ -345,7 +345,7 @@ export default class App<
345345
private getActions(configuration, action) {
346346
const actions =
347347
typeof configuration.actions === 'function'
348-
? (configuration.actions as ActionsCallback<Effects, State>)(
348+
? (configuration.actions as ActionsCallback<State, Effects>)(
349349
action as TAction<State, Effects & { state: State }>
350350
)
351351
: (Object.keys(configuration.actions || {}).reduce(

packages/node_modules/overmind/src/views/react.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ export default class ReactApp<
3131
Reactions extends ReactionsCallback<State, any>,
3232
Actions extends
3333
| {
34-
[namespace: string]: ActionsCallback<Providers, State>
34+
[namespace: string]: ActionsCallback<State, Providers>
3535
}
36-
| ActionsCallback<Providers, State>
36+
| ActionsCallback<State, Providers>
3737
> extends App<State, Providers, Reactions, Actions> {
3838
connect = <
3939
Props,

0 commit comments

Comments
 (0)