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/curvy-flies-exercise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: ensure correct context for action update/destroy functions
9 changes: 5 additions & 4 deletions packages/svelte/src/internal/client/dom/elements/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ import { deep_read_state, untrack } from '../../runtime.js';
export function action(dom, action, get_value) {
effect(() => {
var payload = untrack(() => action(dom, get_value?.()) || {});
var update = payload?.update;

if (get_value && update) {
if (get_value && payload?.update) {
var inited = false;

render_effect(() => {
Expand All @@ -25,13 +24,15 @@ export function action(dom, action, get_value) {
deep_read_state(value);

if (inited) {
/** @type {Function} */ (update)(value);
/** @type {Function} */ (payload.update)(value);
}
});

inited = true;
}

return payload?.destroy;
if (payload?.destroy) {
return () => /** @type {Function} */ (payload.destroy)();
}
});
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { ok, test } from '../../test';
import { flushSync, tick } from 'svelte';
import { log } from './log.js';

export default test({
html: `<button>0</button>`,

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

async test({ assert, target }) {
const btn = target.querySelector('button');
ok(btn);

flushSync(() => btn.click());
assert.deepEqual(log, ['update', 0, 1]);

flushSync(() => btn.click());
assert.deepEqual(log, ['update', 0, 1, 'destroy', 1]);
}
});
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,28 @@
<script>
import { log } from './log.js';

let count = $state(0);

/**
* @param {Element} _
* @param {number} count
*/
function action(_, count) {
return {
count,
/** @param {number} count */
update(count) {
log.push('update', this.count, (this.count = count));
},
destroy() {
log.push('destroy', this.count);
},
}
};
</script>

{#if count < 2}
<button use:action={count} onclick={() => count++}>
{count}
</button>
{/if}