Skip to content

fix: reference the store directly in storeToRefs to ensure correct reactivity after HMR #2795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2024
+23 −3
Merged

fix: reference the store directly in storeToRefs to ensure correct reactivity after HMR #2795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions packages/pinia/__tests__/storeToRefs.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { describe, beforeEach, it, expect } from 'vitest'
import { computed, reactive, ref, ToRefs } from 'vue'
import { createPinia, defineStore, setActivePinia, storeToRefs } from '../src'
import { set } from 'vue-demi'

describe('storeToRefs', () => {
beforeEach(() => {
Expand Down Expand Up @@ -170,6 +171,25 @@ describe('storeToRefs', () => {
expect(refs.n.value).toBe(2)
})

it('keep reactivity', () => {
const store = defineStore('a', () => {
const n = ref(0)
const double = computed(() => n.value * 2)
return { n, double }
})()

const { double } = storeToRefs(store)

// Assuming HMR operation
set(
store,
'double',
computed(() => 1)
)

expect(double.value).toEqual(1)
})

tds(() => {
const store1 = defineStore('a', () => {
const n = ref(0)
Expand Down
6 changes: 3 additions & 3 deletions packages/pinia/src/storeToRefs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ export function storeToRefs<SS extends StoreGeneric>(
// @ts-expect-error: toRefs include methods and others
return toRefs(store)
} else {
store = toRaw(store)
const rawStore = toRaw(store)

const refs = {} as StoreToRefs<SS>
for (const key in store) {
const value = store[key]
for (const key in rawStore) {
const value = rawStore[key]
if (isRef(value) || isReactive(value)) {
// @ts-expect-error: the key is state or getter
refs[key] =
Expand Down