Skip to content

fix(reactivity): readonly object should not track on 'has' and 'ownKeys' #2002

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

fix(reactivity): readonly object should not track on 'has' and 'ownKeys' #2002

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 24 additions & 14 deletions packages/reactivity/src/baseHandlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const arrayInstrumentations: Record<string, Function> = {}
}
})

function createGetter(isReadonly = false, shallow = false) {
function createGetter(isReadonly = false, isShallow = false) {
return function get(target: Target, key: string | symbol, receiver: object) {
if (key === ReactiveFlags.IS_REACTIVE) {
return !isReadonly
Expand Down Expand Up @@ -82,7 +82,7 @@ function createGetter(isReadonly = false, shallow = false) {
track(target, TrackOpTypes.GET, key)
}

if (shallow) {
if (isShallow) {
return res
}

Expand All @@ -106,15 +106,15 @@ function createGetter(isReadonly = false, shallow = false) {
const set = /*#__PURE__*/ createSetter()
const shallowSet = /*#__PURE__*/ createSetter(true)

function createSetter(shallow = false) {
function createSetter(isShallow = false) {
return function set(
target: object,
key: string | symbol,
value: unknown,
receiver: object
): boolean {
const oldValue = (target as any)[key]
if (!shallow) {
if (!isShallow) {
value = toRaw(value)
if (!isArray(target) && isRef(oldValue) && !isRef(value)) {
oldValue.value = value
Expand Down Expand Up @@ -151,17 +151,27 @@ function deleteProperty(target: object, key: string | symbol): boolean {
return result
}

function has(target: object, key: string | symbol): boolean {
const result = Reflect.has(target, key)
if (!isSymbol(key) || !builtInSymbols.has(key)) {
track(target, TrackOpTypes.HAS, key)
const has = /*#__PURE__*/ createHas()
const readonlyHas = /*#__PURE__*/ createHas(true)

function createHas(isReadonly = false) {
return function has(target: object, key: string | symbol): boolean {
const result = Reflect.has(target, key)
if (!isSymbol(key) || !builtInSymbols.has(key)) {
!isReadonly && track(target, TrackOpTypes.HAS, key)
}
return result
}
return result
}

function ownKeys(target: object): (string | number | symbol)[] {
track(target, TrackOpTypes.ITERATE, ITERATE_KEY)
return Reflect.ownKeys(target)
const ownKeys = /*#__PURE__*/ createOwnKeys()
const readonlyOwnKeys = /*#__PURE__*/ createOwnKeys(true)

function createOwnKeys(isReadonly = false) {
return function ownKeys(target: object): (string | number | symbol)[] {
!isReadonly && track(target, TrackOpTypes.ITERATE, ITERATE_KEY)
return Reflect.ownKeys(target)
}
}

export const mutableHandlers: ProxyHandler<object> = {
Expand All @@ -174,8 +184,8 @@ export const mutableHandlers: ProxyHandler<object> = {

export const readonlyHandlers: ProxyHandler<object> = {
get: readonlyGet,
has,
ownKeys,
has: readonlyHas,
ownKeys: readonlyOwnKeys,
set(target, key) {
if (__DEV__) {
console.warn(
Expand Down