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
5 changes: 5 additions & 0 deletions .changeset/tame-spies-drum.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: improve event handling compatibility with delegation
10 changes: 9 additions & 1 deletion packages/svelte/src/internal/client/render.js
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,15 @@ export function event(event_name, dom, handler, capture, passive) {
capture,
passive
};
const target_handler = handler;
/**
* @this {EventTarget}
*/
function target_handler(/** @type {Event} */ event) {
handle_event_propagation(dom, event);
if (!event.cancelBubble) {
return handler.call(this, event);
}
}
dom.addEventListener(event_name, target_handler, options);
// @ts-ignore
if (dom === document.body || dom === window || dom === document) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { flushSync } from 'svelte';
import { test } from '../../test';
import { log } from './log.js';

export default test({
before_test() {
log.length = 0;
},

async test({ assert, target }) {
const [b1] = target.querySelectorAll('button');

flushSync(() => {
b1?.click();
});

await Promise.resolve();
assert.deepEqual(log, ['clicked button']);
}
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/** @type {any[]} */
export const log = [];
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<script>
import { log } from './log.js';
</script>
<div on:click={(e) => { log.push('clicked div') }}>
<button onclick={(e) => { log.push('clicked button'); e.stopPropagation() }}>
Button
</button>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { flushSync } from 'svelte';
import { test } from '../../test';
import { log } from './log.js';

export default test({
before_test() {
log.length = 0;
},

async test({ assert, target }) {
const [b1] = target.querySelectorAll('button');

flushSync(() => {
b1?.click();
});

await Promise.resolve();
assert.deepEqual(log, ['clicked button']);
}
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/** @type {any[]} */
export const log = [];
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<script>
import { log } from './log.js';
const action = () => {}
</script>
<div use:action onclick={() => log.push('clicked container')} onkeydown={() => {}}>
<div use:action onclick={(e) => { log.push('clicked div 1') }}>
<div onclick={(e) => { log.push('clicked div 2') }}>
<button onclick={(e) => { log.push('clicked button'); e.stopPropagation() }}>
Button
</button>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { flushSync } from 'svelte';
import { test } from '../../test';
import { log } from './log.js';

export default test({
before_test() {
log.length = 0;
},

async test({ assert, target }) {
const [b1] = target.querySelectorAll('button');

flushSync(() => {
b1?.click();
});

await Promise.resolve();
assert.deepEqual(log, [
'clicked button',
'clicked div 2',
'clicked div 1',
'clicked container'
]);
}
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/** @type {any[]} */
export const log = [];
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<script>
import { log } from './log.js';
const action = () => {}
</script>
<div use:action onclick={() => log.push('clicked container')} onkeydown={() => {}}>
<div use:action onclick={(e) => { log.push('clicked div 1') }}>
<div onclick={(e) => { log.push('clicked div 2') }}>
<button onclick={(e) => { log.push('clicked button') }}>
Button
</button>
</div>
</div>
</div>