use setState in patchState; remove isInitialized check; improve test …

…case with callback
ngrx · Nov 17, 2020 · 2c2fc55 · 2c2fc55
1 parent 887e074
commit 2c2fc55
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/modules/component-store/spec/component-store.spec.ts b/modules/component-store/spec/component-store.spec.ts
@@ -569,11 +569,13 @@ describe('Component Store', () => {
     it(
       'with a value based on the previous state',
       marbles((m) => {
-        componentStore.patchState(() => ({ value2: { foo: 'fooBar' } }));
+        componentStore.patchState((state) => ({
+          value2: { foo: `${state.value2.foo}2` },
+        }));
 
         m.expect(componentStore.state$).toBeObservable(
           m.hot('s', {
-            s: { ...INIT_STATE, value2: { foo: 'fooBar' } },
+            s: { ...INIT_STATE, value2: { foo: 'bar2' } },
           })
         );
       })

diff --git a/modules/component-store/src/component-store.ts b/modules/component-store/src/component-store.ts
@@ -166,17 +166,17 @@ export class ComponentStore<T extends object> implements OnDestroy {
   patchState(
     partialStateOrUpdaterFn: Partial<T> | ((state: T) => Partial<T>)
   ): void {
-    if (!this.isInitialized) {
-      throw new Error(this.notInitializedErrorMessage);
-    }
+    this.setState((state) => {
+      const patchedState =
+        typeof partialStateOrUpdaterFn === 'function'
+          ? partialStateOrUpdaterFn(state)
+          : partialStateOrUpdaterFn;
 
-    const updaterFn = (state: T) => ({
-      ...state,
-      ...(typeof partialStateOrUpdaterFn === 'function'
-        ? partialStateOrUpdaterFn(state)
-        : partialStateOrUpdaterFn),
+      return {
+        ...state,
+        ...patchedState,
+      };
     });
-    this.updater(updaterFn)();
   }
 
   protected get(): T;