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): infinite loops when pushing a variable to a custom proxy of reactive array #9750

Closed
wants to merge 8 commits into from
15 changes: 15 additions & 0 deletions packages/reactivity/__tests__/reactiveArray.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,5 +209,20 @@ describe('reactivity/reactive/Array', () => {
expect(index).toBe(2)
expect(observed.lastSearched).toBe(6)
})

test('add a proxy to a reactive array', () => {
const reactiveArray: number[] = reactive([])
const proxyArray = new Proxy(reactiveArray, {})
proxyArray.push(1)
expect(proxyArray.includes(1)).toBe(true)
})

test('toRaw on array using reactive as prototype', () => {
const original = reactive([])
const obj = Object.create(original)
const raw = toRaw(obj)
expect(raw).toBe(obj)
expect(raw).not.toBe(toRaw(original))
})
})
})
35 changes: 26 additions & 9 deletions packages/reactivity/src/baseHandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ import { warn } from './warning'

const isNonTrackableKeys = /*#__PURE__*/ makeMap(`__proto__,__v_isRef,__isVue`)

// skip the comparsion between receiver and proxy of the target
// which leads to infinite loops in some cases (#9742)
let forceToRaw = false

function enableForceToRaw() {
forceToRaw = true
}

function stopForceToRaw() {
forceToRaw = false
}

const builtInSymbols = new Set(
/*#__PURE__*/
Object.getOwnPropertyNames(Symbol)
Expand All @@ -52,7 +64,9 @@ function createArrayInstrumentations() {
// values
;(['includes', 'indexOf', 'lastIndexOf'] as const).forEach(key => {
instrumentations[key] = function (this: unknown[], ...args: unknown[]) {
enableForceToRaw()
const arr = toRaw(this) as any
stopForceToRaw()
for (let i = 0, l = this.length; i < l; i++) {
track(arr, TrackOpTypes.GET, i + '')
}
Expand All @@ -71,7 +85,9 @@ function createArrayInstrumentations() {
;(['push', 'pop', 'shift', 'unshift', 'splice'] as const).forEach(key => {
instrumentations[key] = function (this: unknown[], ...args: unknown[]) {
pauseTracking()
enableForceToRaw()
const res = (toRaw(this) as any)[key].apply(this, args)
stopForceToRaw()
resetTracking()
return res
}
Expand Down Expand Up @@ -102,15 +118,16 @@ class BaseReactiveHandler implements ProxyHandler<Target> {
return shallow
} else if (
key === ReactiveFlags.RAW &&
receiver ===
(isReadonly
? shallow
? shallowReadonlyMap
: readonlyMap
: shallow
? shallowReactiveMap
: reactiveMap
).get(target)
(forceToRaw ||
receiver ===
(isReadonly
? shallow
? shallowReadonlyMap
: readonlyMap
: shallow
? shallowReactiveMap
: reactiveMap
).get(target))
) {
return target
}
Expand Down