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

fix(VItemGroup): use valueComparator when updating value #15395

Merged
merged 1 commit into from Jul 7, 2022
Merged

fix(VItemGroup): use valueComparator when updating value #15395

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
4 changes: 2 additions & 2 deletions packages/vuetify/src/components/VItemGroup/VItemGroup.ts
View file
Open in desktop
Expand Up @@ -219,7 +219,7 @@ export const BaseItemGroup = mixins(
? this.internalValue
: []
const internalValue = defaultValue.slice()
const index = internalValue.findIndex(val => val === value)
const index = internalValue.findIndex(val => this.valueComparator(val, value))

if (
this.mandatory &&
Expand All @@ -245,7 +245,7 @@ export const BaseItemGroup = mixins(
this.internalValue = internalValue
},
updateSingle (value: any) {
const isSame = value === this.internalValue
const isSame = this.valueComparator(this.internalValue, value)

if (this.mandatory && isSame) return

Expand Down
29 changes: 29 additions & 0 deletions packages/vuetify/src/components/VItemGroup/__tests__/VItemGroup.spec.ts
View file
Open in desktop
Expand Up @@ -217,6 +217,18 @@ describe('VItemGroup', () => {
wrapper.vm.updateSingle('foo')
expect(wrapper.vm.internalValue).toBeUndefined()

// Toggling on and off object references
wrapper.vm.updateSingle({ foo: 'foo' })
expect(wrapper.vm.internalValue).toEqual({ foo: 'foo' })
wrapper.vm.updateSingle({ foo: 'foo' })
expect(wrapper.vm.internalValue).toBeUndefined()

// Toggling on and off with custom comparator
wrapper.setProps({ valueComparator: (a: any, b: any) => a?.startsWith(b?.[0]), value: 'foo' })
expect(wrapper.vm.internalValue).toBe('foo')
wrapper.vm.updateSingle('foobar')
expect(wrapper.vm.internalValue).toBeUndefined()

wrapper.setProps({ mandatory: true })

// Toggling off single mandatory
Expand All @@ -237,6 +249,12 @@ describe('VItemGroup', () => {
wrapper.vm.updateMultiple('foo')
expect(wrapper.vm.internalValue).toEqual([])

// Toggling on and off object references
wrapper.vm.updateMultiple({ foo: 'foo' })
expect(wrapper.vm.internalValue).toEqual([{ foo: 'foo' }])
wrapper.vm.updateMultiple({ foo: 'foo' })
expect(wrapper.vm.internalValue).toEqual([])

wrapper.setProps({ mandatory: true })

// Toggling off single mandatory
Expand All @@ -256,6 +274,17 @@ describe('VItemGroup', () => {
expect(wrapper.vm.internalValue).toEqual(['foo', 'bar', 'fizz'])
})

it('should update a multiple item group with a custom comparator', () => {
const wrapper = mountFunction({
propsData: { multiple: true },
})

wrapper.setProps({ valueComparator: (a: any, b: any) => a?.startsWith(b?.[0]), value: ['foo'] })
expect(wrapper.vm.internalValue).toEqual(['foo'])
wrapper.vm.updateMultiple('foobar')
expect(wrapper.vm.internalValue).toEqual([])
})

it('should update value if mandatory and dynamic items', async () => {
const wrapper = mountFunction({
propsData: {
Expand Down