chore(core/useObservable): improve implementation

re-rxjs · Nov 11, 2020 · 611775e · 611775e
1 parent 4d9f5dd
commit 611775e
Showing 1 changed file with 6 additions and 11 deletions.
diff --git a/packages/core/src/internal/useObservable.ts b/packages/core/src/internal/useObservable.ts
@@ -34,24 +34,19 @@ export const useObservable = <O>(
     }, onError)
     if (err !== EMPTY_VALUE) return
 
-    const set = (value: O | (() => O)) => {
+    const set = (value: O) => {
       if (!Object.is(prevStateRef.current, value)) {
-        prevStateRef.current = value
-        if (typeof value === "function") {
-          setState(() => [(value as any)(), source$])
-        } else {
-          setState([value, source$])
-        }
+        setState([(prevStateRef.current = value), source$])
       }
     }
 
-    if (syncVal === EMPTY_VALUE) {
-      set(defaultValue)
-    }
+    if (syncVal === EMPTY_VALUE) set(defaultValue)
 
     const t = subscription
     subscription = source$.subscribe((value: O | typeof SUSPENSE) => {
-      set(value === SUSPENSE ? gV : value)
+      if (value === SUSPENSE) {
+        setState(gV as any)
+      } else set(value)
     }, onError)
     t.unsubscribe()