fix(reactivity): retain readonly proxies when setting as reactive property
fix #4986
This commit is contained in:
parent
820a143457
commit
d145128ab4
@ -465,4 +465,13 @@ describe('reactivity/readonly', () => {
|
||||
'Set operation on key "randomProperty" failed: target is readonly.'
|
||||
).toHaveBeenWarned()
|
||||
})
|
||||
|
||||
// #4986
|
||||
test('setting a readonly object as a property of a reactive object should retain readonly proxy', () => {
|
||||
const r = readonly({})
|
||||
const rr = reactive({}) as any
|
||||
rr.foo = r
|
||||
expect(rr.foo).toBe(r)
|
||||
expect(isReadonly(rr.foo)).toBe(true)
|
||||
})
|
||||
})
|
||||
|
@ -7,7 +7,8 @@ import {
|
||||
readonlyMap,
|
||||
reactiveMap,
|
||||
shallowReactiveMap,
|
||||
shallowReadonlyMap
|
||||
shallowReadonlyMap,
|
||||
isReadonly
|
||||
} from './reactive'
|
||||
import { TrackOpTypes, TriggerOpTypes } from './operations'
|
||||
import {
|
||||
@ -146,7 +147,7 @@ function createSetter(shallow = false) {
|
||||
receiver: object
|
||||
): boolean {
|
||||
let oldValue = (target as any)[key]
|
||||
if (!shallow) {
|
||||
if (!shallow && !isReadonly(value)) {
|
||||
value = toRaw(value)
|
||||
oldValue = toRaw(oldValue)
|
||||
if (!isArray(target) && isRef(oldValue) && !isRef(value)) {
|
||||
|
Loading…
Reference in New Issue
Block a user