Skip to content
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.

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

fix: only call onchange once for array mutations #15073

Merged
merged 3 commits into from
Jan 21, 2025
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
12 changes: 10 additions & 2 deletions packages/svelte/src/internal/client/proxy.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ import {
object_prototype
} from '../shared/utils.js';
import { check_ownership, widen_ownership } from './dev/ownership.js';
import { source, set, state } from './reactivity/sources.js';
import { source, set, state, batch_onchange } from './reactivity/sources.js';
import { STATE_SYMBOL, STATE_SYMBOL_METADATA } from './constants.js';
import { UNINITIALIZED } from '../../constants.js';
import * as e from './errors.js';
import { get_stack } from './dev/tracing.js';
import { tracing_mode_flag } from '../flags/index.js';

const array_methods = ['push', 'pop', 'shift', 'unshift', 'splice', 'reverse', 'sort'];

/**
* @template T
* @param {T} value
Expand Down Expand Up @@ -168,7 +170,13 @@ export function proxy(value, options, parent = null, prev) {
return v === UNINITIALIZED ? undefined : v;
}

return Reflect.get(target, prop, receiver);
v = Reflect.get(target, prop, receiver);

if (is_proxied_array && array_methods.includes(/** @type {string} */ (prop))) {
return batch_onchange(v);
}

return v;
},

getOwnPropertyDescriptor(target, prop) {
Expand Down
36 changes: 35 additions & 1 deletion packages/svelte/src/internal/client/reactivity/sources.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,32 @@ export function set_inspect_effects(v) {
inspect_effects = v;
}

/** @type {null | Set<() => void>} */
let onchange_batch = null;

/**
* @param {Function} fn
*/
export function batch_onchange(fn) {
// @ts-expect-error
return function (...args) {
let previous_onchange_batch = onchange_batch;

try {
onchange_batch = new Set();

// @ts-expect-error
return fn.apply(this, args);
} finally {
for (const onchange of /** @type {Set<() => void>} */ (onchange_batch)) {
onchange();
}

onchange_batch = previous_onchange_batch;
}
};
}

/**
* @template V
* @param {V} v
Expand Down Expand Up @@ -191,7 +217,15 @@ export function internal_set(source, value) {
var old_value = source.v;
source.v = value;
source.wv = increment_write_version();
untrack(() => source.o?.onchange?.());

var onchange = source.o?.onchange;
if (onchange) {
if (onchange_batch) {
onchange_batch.add(onchange);
} else {
onchange();
}
}

if (DEV && tracing_mode_flag) {
source.updated = get_stack('UpdatedAt');
Expand Down
Loading