From d37ded80b54fcfdd130a838369713f6f4963ba9a Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Fri, 22 Mar 2024 16:01:30 -0400 Subject: [PATCH] simplify --- .../src/internal/client/dom/blocks/await.js | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/packages/svelte/src/internal/client/dom/blocks/await.js b/packages/svelte/src/internal/client/dom/blocks/await.js index 34d7c9452d..b437c17389 100644 --- a/packages/svelte/src/internal/client/dom/blocks/await.js +++ b/packages/svelte/src/internal/client/dom/blocks/await.js @@ -9,7 +9,7 @@ import { set_current_reaction } from '../../runtime.js'; import { destroy_effect, pause_effect, render_effect } from '../../reactivity/effects.js'; -import { DESTROYED, INERT } from '../../constants.js'; +import { INERT } from '../../constants.js'; /** * @template V @@ -57,17 +57,6 @@ export function await_block(anchor, get_input, pending_fn, then_fn, catch_fn) { return effect; } - /** @param {import('#client').Effect} effect */ - function pause(effect) { - if ((effect.f & DESTROYED) !== 0) return; - const dom = effect.dom; - - pause_effect(effect, () => { - // TODO make this unnecessary - if (dom !== null) remove(dom); - }); - } - const branch = render_effect(() => { if (input === (input = get_input())) return; @@ -83,13 +72,13 @@ export function await_block(anchor, get_input, pending_fn, then_fn, catch_fn) { pending_effect = render_effect(() => pending_fn(anchor), true); } - if (then_effect) pause(then_effect); - if (catch_effect) pause(catch_effect); + if (then_effect) pause_effect(then_effect); + if (catch_effect) pause_effect(catch_effect); promise.then( (value) => { if (promise !== input) return; - if (pending_effect) pause(pending_effect); + if (pending_effect) pause_effect(pending_effect); if (then_fn) { then_effect = create_effect(then_fn, value); @@ -97,7 +86,7 @@ export function await_block(anchor, get_input, pending_fn, then_fn, catch_fn) { }, (error) => { if (promise !== input) return; - if (pending_effect) pause(pending_effect); + if (pending_effect) pause_effect(pending_effect); if (catch_fn) { catch_effect = create_effect(catch_fn, error); @@ -105,8 +94,8 @@ export function await_block(anchor, get_input, pending_fn, then_fn, catch_fn) { } ); } else { - if (pending_effect) pause(pending_effect); - if (catch_effect) pause(catch_effect); + if (pending_effect) pause_effect(pending_effect); + if (catch_effect) pause_effect(catch_effect); if (then_fn) { if (then_effect) {