mirror of https://github.com/vuejs/core.git
fix(reactivity): should not trigger when setting value to same proxy (#2904)
This commit is contained in:
parent
4f26835dac
commit
c61e767422
|
@ -6,7 +6,8 @@ import {
|
||||||
TrackOpTypes,
|
TrackOpTypes,
|
||||||
TriggerOpTypes,
|
TriggerOpTypes,
|
||||||
DebuggerEvent,
|
DebuggerEvent,
|
||||||
markRaw
|
markRaw,
|
||||||
|
shallowReactive
|
||||||
} from '../src/index'
|
} from '../src/index'
|
||||||
import { ITERATE_KEY } from '../src/effect'
|
import { ITERATE_KEY } from '../src/effect'
|
||||||
|
|
||||||
|
@ -811,4 +812,24 @@ describe('reactivity/effect', () => {
|
||||||
expect(dummy).toBe(0)
|
expect(dummy).toBe(0)
|
||||||
expect(record).toBeUndefined()
|
expect(record).toBeUndefined()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('should trigger once effect when set the equal proxy', () => {
|
||||||
|
const obj = reactive({ foo: 1 })
|
||||||
|
const observed: any = reactive({ obj })
|
||||||
|
const fnSpy = jest.fn(() => observed.obj)
|
||||||
|
|
||||||
|
effect(fnSpy)
|
||||||
|
|
||||||
|
observed.obj = obj
|
||||||
|
expect(fnSpy).toHaveBeenCalledTimes(1)
|
||||||
|
|
||||||
|
const obj2 = reactive({ foo: 1 })
|
||||||
|
const observed2: any = shallowReactive({ obj2 })
|
||||||
|
const fnSpy2 = jest.fn(() => observed2.obj2)
|
||||||
|
|
||||||
|
effect(fnSpy2)
|
||||||
|
|
||||||
|
observed2.obj2 = obj2
|
||||||
|
expect(fnSpy2).toHaveBeenCalledTimes(1)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
|
@ -146,9 +146,10 @@ function createSetter(shallow = false) {
|
||||||
value: unknown,
|
value: unknown,
|
||||||
receiver: object
|
receiver: object
|
||||||
): boolean {
|
): boolean {
|
||||||
const oldValue = (target as any)[key]
|
let oldValue = (target as any)[key]
|
||||||
if (!shallow) {
|
if (!shallow) {
|
||||||
value = toRaw(value)
|
value = toRaw(value)
|
||||||
|
oldValue = toRaw(oldValue)
|
||||||
if (!isArray(target) && isRef(oldValue) && !isRef(value)) {
|
if (!isArray(target) && isRef(oldValue) && !isRef(value)) {
|
||||||
oldValue.value = value
|
oldValue.value = value
|
||||||
return true
|
return true
|
||||||
|
|
Loading…
Reference in New Issue