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

Fix events repeatableAdded/Removed not working when used in DOM template #432

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix events repeatableAdded/Removed not working when used in DOM template #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc769a1
Fix events repeatableAdded/Removed not working when used in DOM templ…
j0ber May 14, 2021
6d67541
Fix events repeatableAdded/Removed in DOM template
j0ber Jun 22, 2021
f8600a3
Update unit tests
j0ber Jun 22, 2021
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
2 changes: 2 additions & 0 deletions src/FormulateGrouping.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,12 @@ export default {
// In this context we actually have data
this.context.model = this.context.model.filter((item, i) => i === index ? false : item)
this.context.rootEmit('repeatableRemoved', this.context.model)
this.context.rootEmit('repeatable-removed', this.context.model)
} else if (!Array.isArray(this.context.model) && this.items.length > this.context.minimum) {
// In this context the fields have never been touched (not "dirty")
this.context.model = (new Array(this.items.length - 1)).fill('').map((_i, idx) => this.setId({}, idx))
this.context.rootEmit('repeatableRemoved', this.context.model)
this.context.rootEmit('repeatable-removed', this.context.model)
}
// Otherwise, do nothing, we're at our minimum
},
Expand Down
1 change: 1 addition & 0 deletions src/inputs/FormulateInputGroup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ export default {
this.context.model = (new Array(this.totalItems + 1)).fill('').map(() => setId({}))
}
this.context.rootEmit('repeatableAdded', this.context.model)
this.context.rootEmit('repeatable-added', this.context.model)
},
groupItemContext (context, option, groupAttributes) {
const optionAttributes = { isGrouped: true }
Expand Down
10 changes: 6 additions & 4 deletions test/unit/FormulateInputGroup.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,8 @@ describe('FormulateInputGroup', () => {
value: [{ username: 'mermaid', email: '[email protected]' }, { username: 'blah', email: '[email protected]' }],
},
listeners: {
'repeatableRemoved': removeListener
'repeatableRemoved': removeListener,
'repeatable-removed': removeListener
},
slots: {
default: `
Expand All @@ -871,7 +872,7 @@ describe('FormulateInputGroup', () => {
await flushPromises()
wrapper.find('.formulate-input-group-repeatable-remove').trigger('click')
await flushPromises()
expect(removeListener.mock.calls.length).toBe(1)
expect(removeListener.mock.calls.length).toBe(2)
})

it('allows passing errors down into groups', async () => {
Expand All @@ -884,7 +885,8 @@ describe('FormulateInputGroup', () => {
value: [{}],
},
listeners: {
'repeatableAdded': addListener
'repeatableAdded': addListener,
'repeatable-added': addListener
},
slots: {
default: `
Expand All @@ -896,7 +898,7 @@ describe('FormulateInputGroup', () => {
await flushPromises()
wrapper.find('.formulate-input-group-add-more button').trigger('click')
await flushPromises()
expect(addListener.mock.calls.length).toBe(1)
expect(addListener.mock.calls.length).toBe(2)
})

it('ensures there are always a minimum number of items even if the model has fewer', async () => {
Expand Down