From 9e6b48acc3aa9e753ebdc080ebc911ea871e3486 Mon Sep 17 00:00:00 2001 From: Josep M Sobrepere Date: Thu, 3 Sep 2020 22:32:01 +0200 Subject: [PATCH] chore(core-react-enhancer): tiny improvements --- packages/core/src/internal/react-enhancer.ts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/core/src/internal/react-enhancer.ts b/packages/core/src/internal/react-enhancer.ts index 3712fee..8dc3ea7 100644 --- a/packages/core/src/internal/react-enhancer.ts +++ b/packages/core/src/internal/react-enhancer.ts @@ -50,7 +50,6 @@ const reactEnhancer = (source$: Observable): BehaviorObservable => { let promise: any let error = EMPTY_VALUE - let valueResult: { type: "v"; payload: any } | undefined const getValue = () => { let timeoutToken if (error !== EMPTY_VALUE) { @@ -62,10 +61,10 @@ const reactEnhancer = (source$: Observable): BehaviorObservable => { } try { - const latest = (source$ as BehaviorObservable).getValue() - return valueResult && Object.is(valueResult.payload, latest) - ? valueResult - : (valueResult = { type: "v", payload: latest }) + return { + type: "v", + payload: (source$ as BehaviorObservable).getValue(), + } } catch (e) { if (promise) return promise @@ -74,11 +73,11 @@ const reactEnhancer = (source$: Observable): BehaviorObservable => { type: "s", payload: result .pipe( - filter((value) => value !== (SUSPENSE as any)), + filter((x) => x !== (SUSPENSE as any)), take(1), tap({ next(v) { - value = v + value = { type: "v", payload: v } }, error(e) { error = { type: "e", payload: e } @@ -92,12 +91,11 @@ const reactEnhancer = (source$: Observable): BehaviorObservable => { .catch(() => {}) .finally(() => { promise = undefined - valueResult = undefined }), } if (value !== EMPTY_VALUE) { - return (valueResult = { type: "v", payload: value }) + return value } if (error !== EMPTY_VALUE) {