Skip to content

Fix x-on with both self and once #4152

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

Merged
calebporzio merged 2 commits into from
Apr 18, 2024
+49 −8
Merged

Fix x-on with both self and once #4152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dfd92d
Fix x-on with both self and once
bb Apr 17, 2024
b24facd
Fix x-on with both outside and once
bb Apr 18, 2024
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
3 changes: 2 additions & 1 deletion packages/alpinejs/src/utils/on.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ export default function on (el, event, modifiers, callback) {

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

if (modifiers.includes('away') || modifiers.includes('outside')) {
listenerTarget = document
Expand Down Expand Up @@ -65,6 +64,8 @@ export default function on (el, event, modifiers, callback) {
})
}

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

// Handle :keydown and :keyup listeners.
handler = wrapHandler(handler, (next, e) => {
if (isKeyEvent(event)) {
Expand Down
21 changes: 21 additions & 0 deletions tests/cypress/integration/directives/x-on.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,27 @@ test('.self modifier',
}
)

test(
".self.once modifiers",
html`
<div x-data="{ foo: 'bar' }">
<h1 x-on:click.self.once="foo = 'baz'" id="selfTarget">
content
<button>click</button>
content
</h1>
<span x-text="foo"></span>
</div>
`,
({ get }) => {
get("span").should(haveText("bar"));
get("button").click();
get("span").should(haveText("bar"));
get("h1").click();
get("span").should(haveText("baz"));
}
);

test('.prevent modifier',
html`
<div x-data="{}">
Expand Down