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): unwrap ref types as props of arrays #1859

Merged
merged 5 commits into from
Aug 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
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
13 changes: 13 additions & 0 deletions packages/reactivity/__tests__/ref.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,19 @@ describe('reactivity/ref', () => {
expect((arr[1] as Ref).value).toBe(3)
})

it('should unwrap ref types as props of arrays', () => {
const arr = [ref(0)]
const symbolKey = Symbol('')
arr['' as any] = ref(1)
arr[symbolKey as any] = ref(2)
const arrRef = ref(arr).value
expect(isRef(arrRef[0])).toBe(true)
expect(isRef(arrRef['' as any])).toBe(false)
expect(isRef(arrRef[symbolKey as any])).toBe(false)
expect(arrRef['' as any]).toBe(1)
expect(arrRef[symbolKey as any]).toBe(2)
})

it('should keep tuple types', () => {
const tuple: [number, string, { a: number }, () => number, Ref<number>] = [
0,
Expand Down
13 changes: 9 additions & 4 deletions packages/reactivity/src/baseHandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,10 @@ function createGetter(isReadonly = false, shallow = false) {

const res = Reflect.get(target, key, receiver)

const keyIsSymbol = isSymbol(key)
if (
isSymbol(key)
? builtInSymbols.has(key)
keyIsSymbol
? builtInSymbols.has(key as symbol)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reusing the result of isSymbol(key) will disable type guard, so have to add as manually 😣

: key === `__proto__` || key === `__v_isRef`
) {
return res
Expand All @@ -80,8 +81,12 @@ function createGetter(isReadonly = false, shallow = false) {
}

if (isRef(res)) {
// ref unwrapping, only for Objects, not for Arrays.
return targetIsArray ? res : res.value
// ref unwrapping - does not apply for Array + integer key.
const shouldUnwrap =
!targetIsArray ||
keyIsSymbol ||
'' + parseInt(key as string, 10) !== key
return shouldUnwrap ? res.value : res
}

if (isObject(res)) {
Expand Down