Skip to content

fix(types): use correct type order for reducer schema - @rscotten #888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 21, 2020
Merged

fix(types): use correct type order for reducer schema - @rscotten #888

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dc08b0e
Merge pull request #5 from prescottprue/master
rscotten Feb 3, 2020
cda43dd
Merge pull request #6 from prescottprue/master
rscotten Mar 21, 2020
058cc03
Merge pull request #7 from rscotten/master
rscotten Mar 21, 2020
0673e3c
fixed type orders
rscotten Mar 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,12 +809,12 @@ export function firebaseConnect<ProfileType, TInner = {}>(
export function firebaseReducer<
UserType,
Schema extends Record<string, Record<string | number, string | number>>
>(state: any, action: any): FirebaseReducer.Reducer<Schema, UserType>
>(state: any, action: any): FirebaseReducer.Reducer<UserType, Schema>

export function makeFirebaseReducer<
Schema extends Record<string, Record<string | number, string | number>>,
UserType = {}
>(): (state: any, action: any) => FirebaseReducer.Reducer<Schema, UserType>
UserType = {},
Schema extends Record<string, Record<string | number, string | number>> = {}
>(): (state: any, action: any) => FirebaseReducer.Reducer<UserType, Schema>

/**
* React HOC that attaches/detaches Cloud Firestore listeners on mount/unmount
Expand Down Expand Up @@ -1037,7 +1037,9 @@ export interface ReduxFirestoreConfig {
preserveOnListenerError: null | object

// https://github.com/prescottprue/redux-firestore#onattemptcollectiondelete
onAttemptCollectionDelete: null | ((queryOption: any, dispatch: any, firebase: any) => void)
onAttemptCollectionDelete:
| null
| ((queryOption: any, dispatch: any, firebase: any) => void)

// https://github.com/prescottprue/redux-firestore#mergeordered
mergeOrdered: boolean
Expand Down Expand Up @@ -1128,8 +1130,8 @@ export interface Data<T extends FirestoreTypes.DocumentData> {

export namespace FirebaseReducer {
export interface Reducer<
Schema extends Record<string, Record<string | number, string | number>>,
ProfileType = {}
ProfileType = {},
Schema extends Record<string, Record<string | number, string | number>> = {}
> {
auth: AuthState
profile: Profile<ProfileType>
Expand Down