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.

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

Jump to bottom

chore(useVModel): unified value #1568

Merged
merged 1 commit into from May 5, 2022
Merged

chore(useVModel): unified value #1568

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 29 additions & 7 deletions packages/core/useVModel/index.test.ts
View file
Open in desktop
Expand Up @@ -105,32 +105,54 @@ describe('useVModel', () => {
})

it('should work with user define defaultValue', () => {
const props = {
const props: Record<string, unknown> = {
...defaultProps(),
data: undefined as string | undefined,
a: 0,
b: '',
c: false,
d: null,
e: undefined,
}
const emitMock = vitest.fn()

const data = useVModel(props, 'data', emitMock, { defaultValue: 'default-data' })
const dataA = useVModel(props, 'a', emitMock)
const dataB = useVModel(props, 'b', emitMock)
const dataC = useVModel(props, 'c', emitMock)
const dataA = useVModel(props, 'a', emitMock, { defaultValue: 'default-data' })
const dataB = useVModel(props, 'b', emitMock, { defaultValue: 'default-data' })
const dataC = useVModel(props, 'c', emitMock, { defaultValue: 'default-data' })
const dataD = useVModel(props, 'd', emitMock, { defaultValue: 'default-data' })
const dataE = useVModel(props, 'e', emitMock, { defaultValue: 'default-data' })

expect(data.value).toBe('default-data')
expect(dataA.value).toBe(0)
expect(dataB.value).toBe('')
expect(dataC.value).toBe(false)
expect(dataD.value).toBe(null)
expect(dataE.value).toBe('default-data')
})

it('should work with user define defaultValue with passive', () => {
const props = {
const props: Record<string, unknown> = {
...defaultProps(),
a: 0,
b: '',
c: false,
d: null as string | null,
e: undefined as string | undefined,
}
const emitMock = vitest.fn()
const data = useVModel(props, 'data', emitMock, { passive: true, defaultValue: 'default-data' })

const data = useVModel(props, 'data', emitMock, { defaultValue: 'default-data', passive: true })
const dataA = useVModel(props, 'a', emitMock, { defaultValue: 'default-data', passive: true })
const dataB = useVModel(props, 'b', emitMock, { defaultValue: 'default-data', passive: true })
const dataC = useVModel(props, 'c', emitMock, { defaultValue: 'default-data', passive: true })
const dataD = useVModel(props, 'd', emitMock, { defaultValue: 'default-data', passive: true })
const dataE = useVModel(props, 'e', emitMock, { defaultValue: 'default-data', passive: true })

expect(data.value).toBe('default-data')
expect(dataA.value).toBe(0)
expect(dataB.value).toBe('')
expect(dataC.value).toBe(false)
expect(dataD.value).toBe(null)
expect(dataE.value).toBe('default-data')
})
})
6 changes: 4 additions & 2 deletions packages/core/useVModel/index.ts
View file
Open in desktop
Expand Up @@ -70,8 +70,10 @@ export function useVModel<P extends object, K extends keyof P, Name extends stri

event = eventName || event || `update:${key}`

const getValue = () => isDef(props[key!]) ? props[key!] : defaultValue
Copy link
Member Author

Choose a reason for hiding this comment

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

Or we can determine if the property exists in the object and thus determine if the default value is obtained

  const getValue = () => Object.hasOwnProperty.call(props, key!) ? props[key!] : defaultValue


if (passive) {
const proxy = ref<P[K]>(props[key!] ?? defaultValue!)
const proxy = ref<P[K]>(getValue()!)

watch(() => props[key!], v => proxy.value = v as UnwrapRef<P[K]>)

Expand All @@ -87,7 +89,7 @@ export function useVModel<P extends object, K extends keyof P, Name extends stri
else {
return computed<P[K]>({
get() {
return isDef(props[key!]) ? props[key!] : defaultValue!
return getValue()!
},
set(value) {
_emit(event, value)
Expand Down