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

hubvue · Jul 26, 2022 · 6b85ada · 6b85ada
1 parent a95554d
commit 6b85ada
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/packages/reactivity/__tests__/ref.spec.ts b/packages/reactivity/__tests__/ref.spec.ts
@@ -401,6 +401,16 @@ describe('reactivity/ref', () => {
     expect(spy2).toBeCalledTimes(1)
   })
 
+  test('ref is called as an argument to reactive, effectFn should only be triggered once', () => {
+    const obj = reactive(ref(1))
+    const spy1 = jest.fn(() => obj.value)
+
+    effect(spy1)
+
+    obj.value = 2
+    expect(spy1).toBeCalledTimes(2)
+  })
+
   test('ref should preserve value shallow/readonly-ness', () => {
     const original = {}
     const r = reactive(original)

diff --git a/packages/reactivity/src/reactive.ts b/packages/reactivity/src/reactive.ts
@@ -11,7 +11,7 @@ import {
   shallowCollectionHandlers,
   shallowReadonlyCollectionHandlers
 } from './collectionHandlers'
-import type { UnwrapRefSimple, Ref, RawSymbol } from './ref'
+import { UnwrapRefSimple, Ref, RawSymbol, isRef } from './ref'
 
 export const enum ReactiveFlags {
   SKIP = '__v_skip',
@@ -89,7 +89,7 @@ export type UnwrapNestedRefs<T> = T extends Ref ? T : UnwrapRefSimple<T>
 export function reactive<T extends object>(target: T): UnwrapNestedRefs<T>
 export function reactive(target: object) {
   // if trying to observe a readonly proxy, return the readonly version.
-  if (isReadonly(target)) {
+  if (isReadonly(target) || isRef(target)) {
     return target
   }
   return createReactiveObject(