react-rx 3.0.0-1 → 3.0.0-2

package/dist/cjs/useObservable.d.ts

@@ -1,4 +1,4 @@
 import { Observable } from 'rxjs';
-export declare function useObservable<T>(observable: Observable<T>): T | undefined;
-export declare function useObservable<T>(observable: Observable<T>, initialValue: T): T;
-export declare function useObservable<T>(observable: Observable<T>, initialValue: () => T): T;
+export declare function useObservable<ObservableType extends Observable<any>>(observable: ObservableType, initialValue?: UnboxObservable<ObservableType> | (() => UnboxObservable<ObservableType>)): UnboxObservable<ObservableType>;
+declare type UnboxObservable<T> = T extends Observable<infer U> ? U : never;
+export {};

package/dist/es2015/useObservable.d.ts

@@ -1,4 +1,4 @@
 import { Observable } from 'rxjs';
-export declare function useObservable<T>(observable: Observable<T>): T | undefined;
-export declare function useObservable<T>(observable: Observable<T>, initialValue: T): T;
-export declare function useObservable<T>(observable: Observable<T>, initialValue: () => T): T;
+export declare function useObservable<ObservableType extends Observable<any>>(observable: ObservableType, initialValue?: UnboxObservable<ObservableType> | (() => UnboxObservable<ObservableType>)): UnboxObservable<ObservableType>;
+declare type UnboxObservable<T> = T extends Observable<infer U> ? U : never;
+export {};

package/dist/esm/useObservable.d.ts

@@ -1,4 +1,4 @@
 import { Observable } from 'rxjs';
-export declare function useObservable<T>(observable: Observable<T>): T | undefined;
-export declare function useObservable<T>(observable: Observable<T>, initialValue: T): T;
-export declare function useObservable<T>(observable: Observable<T>, initialValue: () => T): T;
+export declare function useObservable<ObservableType extends Observable<any>>(observable: ObservableType, initialValue?: UnboxObservable<ObservableType> | (() => UnboxObservable<ObservableType>)): UnboxObservable<ObservableType>;
+declare type UnboxObservable<T> = T extends Observable<infer U> ? U : never;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-rx",
-  "version": "3.0.0-1",
+  "version": "3.0.0-2",
   "description": "React + RxJS = <3",
   "keywords": [
     "action",

package/src/useObservable.ts

@@ -29,10 +29,10 @@ function getOrCreateStore<T>(inputObservable: Observable<T>, initialValue: T) {
   return cache.get(inputObservable)!
 }
 
-export function useObservable<T>(observable: Observable<T>): T | undefined
-export function useObservable<T>(observable: Observable<T>, initialValue: T): T
-export function useObservable<T>(observable: Observable<T>, initialValue: () => T): T
-export function useObservable<T>(observable: Observable<T>, initialValue?: T | (() => T)) {
+export function useObservable<ObservableType extends Observable<any>>(
+  observable: ObservableType,
+  initialValue?: UnboxObservable<ObservableType> | (() => UnboxObservable<ObservableType>),
+): UnboxObservable<ObservableType> {
   /**
    * Store the initialValue in a ref, as we don't want a changed `initialValue` to trigger a re-subscription.
    * But we also don't want the initialValue to be stale if the observable changes.
@@ -47,7 +47,7 @@ export function useObservable<T>(observable: Observable<T>, initialValue?: T | (
   }, [initialValue])
 
   const [getSnapshot, subscribe] = useMemo<
-    [() => T, Parameters<typeof useSyncExternalStore>[0]]
+    [() => UnboxObservable<ObservableType>, Parameters<typeof useSyncExternalStore>[0]]
   >(() => {
     const store = getOrCreateStore(observable, initialValueRef.current)
     if (store.subscription.closed) {
@@ -86,5 +86,7 @@ export function useObservable<T>(observable: Observable<T>, initialValue?: T | (
     }
   }, [observable])
 
-  return useSyncExternalStore(subscribe, getSnapshot)
+  return useSyncExternalStore<UnboxObservable<ObservableType>>(subscribe, getSnapshot)
 }
+
+type UnboxObservable<T> = T extends Observable<infer U> ? U : never