Skip to content

Fix useObservable state generic inference #176

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 1 commit into from
Feb 16, 2020
Merged

Fix useObservable state generic inference #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 7 additions & 14 deletions src/use-observable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,13 @@ import useConstant from 'use-constant'

import { RestrictArray } from './type'

export type InputFactory<State, Inputs = undefined> = Inputs extends undefined
? (state$: Observable<State>) => Observable<State>
: (inputs$: Observable<RestrictArray<Inputs>>, state$: Observable<State>) => Observable<State>

export function useObservable<State>(inputFactory: InputFactory<State>): State | null
export function useObservable<State>(inputFactory: InputFactory<State>, initialState: State): State
export function useObservable<State, Inputs>(
inputFactory: InputFactory<State, Inputs>,
initialState: State,
inputs: RestrictArray<Inputs>,
): State

export type InputFactory<State> = (state$: Observable<State>) => Observable<State>;
export type InputFactoryWithInputs<State, Inputs> = (inputs$: Observable<RestrictArray<Inputs>>, state$: Observable<State>) => Observable<State>;
export function useObservable<State>(inputFactory: InputFactory<State>): State | null;
export function useObservable<State>(inputFactory: InputFactory<State>, initialState: State): State;
export function useObservable<State, Inputs>(inputFactory: InputFactoryWithInputs<State, Inputs>, initialState: State, inputs: RestrictArray<Inputs>): State;
export function useObservable<State, Inputs extends ReadonlyArray<any>>(
inputFactory: InputFactory<State, Inputs>,
inputFactory: InputFactoryWithInputs<State, Inputs>,
initialState?: State,
inputs?: RestrictArray<Inputs>,
): State | null {
Expand All @@ -38,7 +31,7 @@ export function useObservable<State, Inputs extends ReadonlyArray<any>>(
state$: Observable<State | undefined>,
) => Observable<State>)(inputs$, state$) as BehaviorSubject<State>
} else {
output$ = (inputFactory as (state$: Observable<State | undefined>) => Observable<State>)(
output$ = (inputFactory as unknown as (state$: Observable<State | undefined>) => Observable<State>)(
state$,
) as BehaviorSubject<State>
}
Expand Down