fix(reactivity): ref as a reactive parameter should return (#6358)

packages/reactivity/__tests__/reactive.spec.ts

@@ -314,6 +314,17 @@ describe('reactivity/reactive', () => {
     expect(isReactive(observed)).toBe(false)
   })
 
+  test('ref is called as an argument to reactive', () => {
+    const obj = reactive(ref(1))
+    const spy1 = vi.fn(() => obj.value)
+
+    effect(spy1)
+
+    obj.value = 2
+    expect(spy1).toBeCalledTimes(2)
+    expect(isReactive(obj)).toBe(true)
+  })
+
   test('hasOwnProperty edge case: Symbol values', () => {
     const key = Symbol()
     const obj = reactive({ [key]: 1 }) as { [key]?: 1 }

packages/reactivity/__tests__/shallowReactive.spec.ts

@@ -77,6 +77,17 @@ describe('shallowReactive', () => {
     expect(r.deep).toBe(deep)
   })
 
+  test('ref is called as an argument to shallowReactive', () => {
+    const obj = shallowReactive(ref(1))
+    const spy1 = vi.fn(() => obj.value)
+
+    effect(spy1)
+
+    obj.value = 2
+    expect(spy1).toBeCalledTimes(2)
+    expect(isReactive(obj)).toBe(true)
+  })
+
   describe('collections', () => {
     test('should be reactive', () => {
       const shallowSet = shallowReactive(new Set())

packages/reactivity/src/baseHandlers.ts

@@ -52,7 +52,7 @@
     protected readonly _isShallow = false,
   ) {}
 
   get(target: Target, key: string | symbol, receiver: object): any {
     const isReadonly = this._isReadonly,
       isShallow = this._isShallow
     if (key === ReactiveFlags.IS_REACTIVE) {
@@ -81,7 +81,7 @@
       // early return undefined
       return
     }
-
+    const rawTarget = toRaw(target)
     const targetIsArray = isArray(target)
 
     if (!isReadonly) {
@@ -107,7 +107,7 @@
       return res
     }
 
-    if (!isReadonly) {
+    if (!isReadonly && !isRef(rawTarget)) {
       track(target, TrackOpTypes.GET, key)
     }
 

packages/reactivity/src/reactive.ts

@@ -271,6 +271,7 @@ function createReactiveObject(
     }
     return target
   }
+
   // target is already a Proxy, return it.
   // exception: calling readonly() on a reactive object
   if (