fix(reactivity): shallowReactive map "unwraps" the nested refs

packages/reactivity/__tests__/shallowReactive.spec.ts

@@ -123,6 +123,16 @@ describe('shallowReactive', () => {
  shallowSet.forEach(x => expect(isReactive(x)).toBe(false))
  })
 
+ test('Setting a reactive object on a shallowReactive map', () => {
+ const msg = ref('ads')
+ const bar = reactive({ msg })
+ const foo = shallowReactive(new Map([['foo1', bar]]))
+ foo.set('foo2', bar)
+
+ expect(isReactive(foo.get('foo2'))).toBe(true)
+ expect(isReactive(foo.get('foo1'))).toBe(true)
+ })
+
  // #1210
  test('onTrack on called on objectSpread', () => {
  const onTrackFn = vi.fn()

packages/reactivity/src/collectionHandlers.ts

@@ -66,8 +66,8 @@ function size(target: IterableCollections, isReadonly = false) {
  return Reflect.get(target, 'size', target)
 }
 
-function add(this: SetTypes, value: unknown) {
- value = toRaw(value)
+function add(this: SetTypes, value: unknown, isShallow = false) {
+ value = isShallow ? value : toRaw(value)
  const target = toRaw(this)
  const proto = getProto(target)
  const hadKey = proto.has.call(target, value)
@@ -78,8 +78,8 @@ function add(this: SetTypes, value: unknown) {
  return this
 }
 
-function set(this: MapTypes, key: unknown, value: unknown) {
- value = toRaw(value)
+function set(this: MapTypes, key: unknown, value: unknown, isShallow = false) {
+ value = isShallow ? value : toRaw(value)
  const target = toRaw(this)
  const { has, get } = getProto(target)
 
@@ -251,8 +251,12 @@ function createInstrumentations() {
  return size(this as unknown as IterableCollections)
  },
  has,
- add,
- set,
+ add(this: SetTypes, value: unknown) {
+ return add.call(this, value, true)
+ },
+ set(this: MapTypes, key: unknown, value: unknown) {
+ return set.call(this, key, value, true)
+ },
  delete: deleteEntry,
  clear,
  forEach: createForEach(false, true)