fix: accept reactive with storeToRefs

Close #799
vuejs · Nov 19, 2021 · 3a2a334 · 3a2a334
1 parent 9e45c4f
commit 3a2a334
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/pinia/__tests__/storeToRefs.spec.ts b/packages/pinia/__tests__/storeToRefs.spec.ts
@@ -45,7 +45,7 @@ describe('storeToRefs', () => {
     expect(d.value).toBe('e')
   })
 
-  it.skip('setup store', () => {
+  it('setup store', () => {
     const store = defineStore('a', () => {
       return {
         a: ref<null | undefined>(null),
@@ -80,8 +80,8 @@ describe('storeToRefs', () => {
     expect(r.value).toEqual({ n: 2 })
     expect(store.r).toEqual({ n: 2 })
     store.r.n++
-    expect(r.value).toEqual({ n: 2 })
-    expect(store.r).toEqual({ n: 2 })
+    expect(r.value).toEqual({ n: 3 })
+    expect(store.r).toEqual({ n: 3 })
   })
 
   it('empty getters', () => {

diff --git a/packages/pinia/src/store.ts b/packages/pinia/src/store.ts
@@ -13,6 +13,7 @@ import {
   effectScope,
   EffectScope,
   ComputedRef,
+  toRaw,
   toRef,
   toRefs,
   Ref,
@@ -526,6 +527,9 @@ function createSetupStore<
     })
   } else {
     assign(store, setupStore)
+    // allows retrieving reactive objects with `storeToRefs()`. Must be called after assigning to the reactive object.
+    // https://github.com/posva/pinia/issues/799
+    assign(toRaw(store), setupStore)
   }
 
   // use this instead of a computed with setter to be able to create it anywhere