mirrors
/
vue3-core
mirror of https://mirror.osredm.com/root/vue3-core.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(reactivity): handle non-array arguments in reactive `concat` method (#11794) 

close #11792
This commit is contained in:
Tycho 2024-09-04 20:21:10 +08:00 committed by GitHub
parent 6402b98408
commit 475977a6f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/reactivity/__tests__/reactiveArray.spec.ts
View File

@ -303,19 +303,35 @@ describe('reactivity/reactive/Array', () => {
const a2 = reactive([{ val: 3 }]) const a2 = reactive([{ val: 3 }])
const a3 = [4, 5] const a3 = [4, 5]
let result = computed(() => a1.concat(a2, a3)) let result = computed(() => a1.concat(a2, a3, 6, { val: 7 }))
expect(result.value).toStrictEqual([1, { val: 2 }, { val: 3 }, 4, 5]) expect(result.value).toStrictEqual([
1,
{ val: 2 },
{ val: 3 },
4,
5,
6,
{ val: 7 },
])
expect(isReactive(result.value[1])).toBe(false) expect(isReactive(result.value[1])).toBe(false)
expect(isReactive(result.value[2])).toBe(true) expect(isReactive(result.value[2])).toBe(true)
expect(isReactive(result.value[6])).toBe(false)
a1.shift() a1.shift()
expect(result.value).toStrictEqual([{ val: 2 }, { val: 3 }, 4, 5]) expect(result.value).toStrictEqual([
{ val: 2 },
{ val: 3 },
4,
5,
6,
{ val: 7 },
])
a2.pop() a2.pop()
expect(result.value).toStrictEqual([{ val: 2 }, 4, 5]) expect(result.value).toStrictEqual([{ val: 2 }, 4, 5, 6, { val: 7 }])
a3.pop() a3.pop()
expect(result.value).toStrictEqual([{ val: 2 }, 4, 5]) expect(result.value).toStrictEqual([{ val: 2 }, 4, 5, 6, { val: 7 }])
}) })
test('entries', () => { test('entries', () => {

5
packages/reactivity/src/arrayInstrumentations.ts
View File

@ -2,6 +2,7 @@ import { TrackOpTypes } from './constants'
import { endBatch, pauseTracking, resetTracking, startBatch } from './effect' import { endBatch, pauseTracking, resetTracking, startBatch } from './effect'
import { isProxy, isShallow, toRaw, toReactive } from './reactive' import { isProxy, isShallow, toRaw, toReactive } from './reactive'
import { ARRAY_ITERATE_KEY, track } from './dep' import { ARRAY_ITERATE_KEY, track } from './dep'
import { isArray } from '@vue/shared'
/** /**
* Track array iteration and return: * Track array iteration and return:
@ -30,9 +31,9 @@ export const arrayInstrumentations: Record<string | symbol, Function> = <any>{
return iterator(this, Symbol.iterator, toReactive) return iterator(this, Symbol.iterator, toReactive)
}, },
concat(...args: unknown[][]) { concat(...args: unknown[]) {
return reactiveReadArray(this).concat( return reactiveReadArray(this).concat(
...args.map(x => reactiveReadArray(x)), ...args.map(x => (isArray(x) ? reactiveReadArray(x) : x)),
) )
}, },