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
13 changes: 13 additions & 0 deletions packages/alpinejs/src/directives/x-model.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,19 @@ directive('model', (el, { modifiers, expression }, { effect, cleanup }) => {

if (hasBlurModifier) {
listeners.push(on(el, 'blur', modifiers, syncValue))

// The browser fires "submit" before "blur", so if this input
// is inside a form, the model value would be stale when the
// submit handler runs. Register a pending update on the form
// so it can be flushed before submit handlers execute.
if (el.form) {
let syncCallback = () => syncValue({ target: el })

if (!el.form._x_pendingModelUpdates) el.form._x_pendingModelUpdates = []
el.form._x_pendingModelUpdates.push(syncCallback)

cleanup(() => el.form._x_pendingModelUpdates.splice(el.form._x_pendingModelUpdates.indexOf(syncCallback), 1))
}
}

if (hasEnterModifier) {
Expand Down
12 changes: 12 additions & 0 deletions packages/alpinejs/src/utils/on.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,18 @@ export default function on (el, event, modifiers, callback) {

if (modifiers.includes('self')) handler = wrapHandler(handler, (next, e) => { e.target === el && next(e) })

// Flush any pending model updates before submit handlers run
// (e.g. x-model.blur inputs that haven't synced yet).
if (event === 'submit') {
handler = wrapHandler(handler, (next, e) => {
if (e.target._x_pendingModelUpdates) {
e.target._x_pendingModelUpdates.forEach(fn => fn())
}

next(e)
})
}

// Handle :keydown and :keyup listeners.
// Handle :click and :auxclick listeners.
if (isKeyEvent(event) || isClickEvent(event)) {
Expand Down
18 changes: 18 additions & 0 deletions tests/cypress/integration/directives/x-model.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -642,3 +642,21 @@ test('x-model.enter.blur updates on enter OR blur (enter should work)',
}
)

test('x-model.blur syncs value before form submit handler runs',
html`
<div x-data="{ value: '', capturedValue: '' }">
<form @submit.prevent="capturedValue = value">
<input x-model.blur="value" type="text">
</form>
<span id="captured" x-text="capturedValue"></span>
</div>
`,
({ get }) => {
get('input').type('hello')
get('#captured').should(haveText(''))
// Submit the form without blurring the input first
get('form').then(([form]) => form.requestSubmit())
get('#captured').should(haveText('hello'))
}
)