Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(reactivity): call array subclass methods #3624

Merged
merged 3 commits into from
Jul 15, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions packages/reactivity/__tests__/reactiveArray.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,4 +171,45 @@ describe('reactivity/reactive/Array', () => {
expect(original.indexOf(ref)).toBe(1)
})
})

describe('Array subclasses', () => {
class SubArray<T> extends Array<T> {
lastPushed: undefined | T
lastSearched: undefined | T

push(item: T) {
this.lastPushed = item
return super.push(item)
}

indexOf(searchElement: T, fromIndex?: number | undefined): number {
this.lastSearched = searchElement
return super.indexOf(searchElement, fromIndex)
}
}

test('calls correct mutation method on Array subclass', () => {
const subArray = new SubArray(4, 5, 6)
const observed = reactive(subArray)

subArray.push(7)
expect(subArray.lastPushed).toBe(7)
observed.push(9)
expect(observed.lastPushed).toBe(9)
})

test('calls correct identity-sensitive method on Array subclass', () => {
const subArray = new SubArray(4, 5, 6)
const observed = reactive(subArray)
let index

index = subArray.indexOf(4)
expect(index).toBe(0)
expect(subArray.lastSearched).toBe(4)

index = observed.indexOf(6)
expect(index).toBe(2)
expect(observed.lastSearched).toBe(6)
})
})
})
8 changes: 4 additions & 4 deletions packages/reactivity/src/baseHandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ const arrayInstrumentations: Record<string, Function> = {}
;(['includes', 'indexOf', 'lastIndexOf'] as const).forEach(key => {
const method = Array.prototype[key] as any
arrayInstrumentations[key] = function(this: unknown[], ...args: unknown[]) {
const arr = toRaw(this)
const arr = toRaw(this) as any
TheDro marked this conversation as resolved.
Show resolved Hide resolved
for (let i = 0, l = this.length; i < l; i++) {
track(arr, TrackOpTypes.GET, i + '')
}
// we run the method using the original args first (which may be reactive)
const res = method.apply(arr, args)
const res = arr[key].apply(this, args)
if (res === -1 || res === false) {
// if that didn't work, run it again using raw values.
return method.apply(arr, args.map(toRaw))
Expand All @@ -65,10 +65,10 @@ const arrayInstrumentations: Record<string, Function> = {}
// instrument length-altering mutation methods to avoid length being tracked
// which leads to infinite loops in some cases (#2137)
;(['push', 'pop', 'shift', 'unshift', 'splice'] as const).forEach(key => {
const method = Array.prototype[key] as any
arrayInstrumentations[key] = function(this: unknown[], ...args: unknown[]) {
pauseTracking()
const res = method.apply(this, args)
const arr = toRaw(this) as any
const res = arr[key].apply(this, args)
resetTracking()
return res
}
Expand Down