fix(reactivity): ensure readonly refs can be replaced with new refs in reactive objec...

fix #5307

diff --git a/packages/reactivity/__tests__/readonly.spec.ts b/packages/reactivity/__tests__/readonly.spec.ts
index 4462061b3a9b5dd882908cb88453e4f7f78dc9c4..73030c5b997d6f858f7e3cfdf2e2a39e5288c5f3 100644 (file)
--- a/packages/reactivity/__tests__/readonly.spec.ts
+++ b/packages/reactivity/__tests__/readonly.spec.ts
@@ -476,7 +476,7 @@ describe('reactivity/readonly', () => {
     expect(isReadonly(rr.foo)).toBe(true)
   })
 
-  test('attemptingt to write to a readonly ref nested in a reactive object should fail', () => {
+  test('attemptingt to write plain value to a readonly ref nested in a reactive object should fail', () => {
     const r = ref(false)
     const ror = readonly(r)
     const obj = reactive({ ror })
@@ -486,4 +486,15 @@ describe('reactivity/readonly', () => {
 
     expect(obj.ror).toBe(false)
   })
+  test('replacing a readonly ref nested in a reactive object with a new ref', () => {
+    const r = ref(false)
+    const ror = readonly(r)
+    const obj = reactive({ ror })
+    try {
+      obj.ror = ref(true) as unknown as boolean
+    } catch (e) {}
+
+    expect(obj.ror).toBe(true)
+    expect(toRaw(obj).ror).not.toBe(ror) // ref successfully replaced
+  })
 })

diff --git a/packages/reactivity/src/baseHandlers.ts b/packages/reactivity/src/baseHandlers.ts
index eed9dc8509f7c7cbbb688db66c865165d80aa317..8ad8e57171ffffae0c044ca57f6f433c2d99c535 100644 (file)
--- a/packages/reactivity/src/baseHandlers.ts
+++ b/packages/reactivity/src/baseHandlers.ts
@@ -150,7 +150,7 @@ function createSetter(shallow = false) {
     receiver: object
   ): boolean {
     let oldValue = (target as any)[key]
-    if (isReadonly(oldValue) && isRef(oldValue)) {
+    if (isReadonly(oldValue) && isRef(oldValue) && !isRef(value)) {
       return false
     }
     if (!shallow && !isReadonly(value)) {