Skip to content
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
32 changes: 32 additions & 0 deletions playwright/e2e/submit-form.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,3 +276,35 @@ test('An edited submission leaves out values the questions no longer offer', asy
String(options[1].id),
])
})

test('Enter in the last answer moves on to the submit button', async ({
page,
submitView,
}) => {
const form = await api(page.request, 'POST', '/forms')
await api(page.request, 'PATCH', `/forms/${form.id}`, {
keyValuePairs: { title: 'Enter form' },
})
await api(page.request, 'POST', `/forms/${form.id}/questions`, {
type: 'multiple_unique',
text: 'Favourite color',
}).then((question) =>
api(
page.request,
'POST',
`/forms/${form.id}/questions/${question.id}/options`,
{
optionTexts: ['Red', 'Blue'],
},
),
)
await api(page.request, 'POST', `/forms/${form.id}/questions`, {
type: 'short',
text: 'Your name',
})
await page.goto(`apps/forms/${form.hash}/submit`)

await submitView.fillText('Your name', 'Alice')
await submitView.getQuestion('Your name').getByRole('textbox').press('Enter')
await expect(submitView.submitButton).toBeFocused()
})
8 changes: 5 additions & 3 deletions src/views/Submit.vue
Original file line number Diff line number Diff line change
Expand Up @@ -932,7 +932,7 @@ export default defineComponent({
}

/**
* On Enter, focus next form-element
* On Enter, focus next form-element, skipping the button that clears the form
* Last form element is the submit button, the form submits on enter then
*
* @param event The fired event.
Expand All @@ -947,8 +947,10 @@ export default defineComponent({
(input) => input === (event.originalTarget ?? event.target),
)

// Focus next form element
formInputs[sourceInputIndex + 1]?.focus()
formInputs
.slice(sourceInputIndex + 1)
.find((input) => (input as HTMLButtonElement).type !== 'reset')
?.focus()
}

let invalidShown = false
Expand Down
Loading