root
/
vue3-core
mirror of https://github.com/vuejs/core.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

refactor(reactivity): simplify the wrapping logic for returned values in array instrumentations (#11434)

This commit is contained in:
Tycho 2024-07-29 09:22:18 +08:00 committed by GitHub
parent 94fb2b8106
commit e28c58138c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,16 +54,14 @@ export const arrayInstrumentations: Record<string | symbol, Function> = <any>{
fn: (item: unknown, index: number, array: unknown[]) => unknown, fn: (item: unknown, index: number, array: unknown[]) => unknown,
thisArg?: unknown, thisArg?: unknown,
) { ) {
const result = apply(this, 'filter', fn, thisArg) return apply(this, 'filter', fn, thisArg, v => v.map(toReactive))
return isProxy(this) && !isShallow(this) ? result.map(toReactive) : result
}, },
find( find(
fn: (item: unknown, index: number, array: unknown[]) => boolean, fn: (item: unknown, index: number, array: unknown[]) => boolean,
thisArg?: unknown, thisArg?: unknown,
) { ) {
const result = apply(this, 'find', fn, thisArg) return apply(this, 'find', fn, thisArg, toReactive)
return isProxy(this) && !isShallow(this) ? toReactive(result) : result
}, },
findIndex( findIndex(
@ -77,8 +75,7 @@ export const arrayInstrumentations: Record<string | symbol, Function> = <any>{
fn: (item: unknown, index: number, array: unknown[]) => boolean, fn: (item: unknown, index: number, array: unknown[]) => boolean,
thisArg?: unknown, thisArg?: unknown,
) { ) {
const result = apply(this, 'findLast', fn, thisArg) return apply(this, 'findLast', fn, thisArg, toReactive)
return isProxy(this) && !isShallow(this) ? toReactive(result) : result
}, },
findLastIndex( findLastIndex(
@ -237,11 +234,14 @@ function apply(
method: ArrayMethods, method: ArrayMethods,
fn: (item: unknown, index: number, array: unknown[]) => unknown, fn: (item: unknown, index: number, array: unknown[]) => unknown,
thisArg?: unknown, thisArg?: unknown,
wrappedRetFn?: (result: any) => unknown,
) { ) {
const arr = shallowReadArray(self) const arr = shallowReadArray(self)
let needsWrap = false
let wrappedFn = fn let wrappedFn = fn
if (arr !== self) { if (arr !== self) {
if (!isShallow(self)) { needsWrap = !isShallow(self)
if (needsWrap) {
wrappedFn = function (this: unknown, item, index) { wrappedFn = function (this: unknown, item, index) {
return fn.call(this, toReactive(item), index, self) return fn.call(this, toReactive(item), index, self)
} }
@ -252,7 +252,8 @@ function apply(
} }
} }
// @ts-expect-error our code is limited to es2016 but user code is not // @ts-expect-error our code is limited to es2016 but user code is not
return arr[method](wrappedFn, thisArg) const result = arr[method](wrappedFn, thisArg)
return needsWrap && wrappedRetFn ? wrappedRetFn(result) : result
} }
// instrument reduce and reduceRight to take ARRAY_ITERATE dependency // instrument reduce and reduceRight to take ARRAY_ITERATE dependency

2
packages/runtime-core/src/helpers/renderList.ts
View File

@ -60,9 +60,9 @@ export function renderList(
let ret: VNodeChild[] let ret: VNodeChild[]
const cached = (cache && cache[index!]) as VNode[] | undefined const cached = (cache && cache[index!]) as VNode[] | undefined
const sourceIsArray = isArray(source) const sourceIsArray = isArray(source)
const sourceIsReactiveArray = sourceIsArray && isReactive(source)
if (sourceIsArray || isString(source)) { if (sourceIsArray || isString(source)) {
const sourceIsReactiveArray = sourceIsArray && isReactive(source)
if (sourceIsReactiveArray) { if (sourceIsReactiveArray) {
source = shallowReadArray(source) source = shallowReadArray(source)
} }