Skip to content

fix: improve how transitions are handled on mount #10157

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
merged 1 commit into from
Jan 11, 2024
Merged

fix: improve how transitions are handled on mount #10157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/slow-wombats-reply.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: improve how transitions are handled on mount
16 changes: 7 additions & 9 deletions packages/svelte/src/internal/client/runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,11 +1012,10 @@ export function mutate_store(store, expression, new_value) {

/**
* @param {import('./types.js').ComputationSignal} signal
* @param {import('./types.js').ComputationSignal} root
* @param {boolean} inert
* @returns {void}
*/
export function mark_subtree_inert(signal, root, inert, visited_blocks = new Set()) {
export function mark_subtree_inert(signal, inert, visited_blocks = new Set()) {
const flags = signal.f;
const is_already_inert = (flags & INERT) !== 0;
if (is_already_inert !== inert) {
Expand All @@ -1031,23 +1030,22 @@ export function mark_subtree_inert(signal, root, inert, visited_blocks = new Set
const type = block.t;
if (type === IF_BLOCK) {
const condition_effect = block.e;
const root_block = root.b?.p;
if (condition_effect !== null && root_block?.t === IF_BLOCK) {
mark_subtree_inert(condition_effect, root, inert);
if (condition_effect !== null && block !== current_block) {
mark_subtree_inert(condition_effect, inert);
}
const consequent_effect = block.ce;
if (consequent_effect !== null) {
mark_subtree_inert(consequent_effect, root, inert, visited_blocks);
mark_subtree_inert(consequent_effect, inert, visited_blocks);
}
const alternate_effect = block.ae;
if (alternate_effect !== null) {
mark_subtree_inert(alternate_effect, root, inert, visited_blocks);
mark_subtree_inert(alternate_effect, inert, visited_blocks);
}
} else if (type === EACH_BLOCK) {
const items = block.v;
for (let { e: each_item_effect } of items) {
if (each_item_effect !== null) {
mark_subtree_inert(each_item_effect, root, inert, visited_blocks);
mark_subtree_inert(each_item_effect, inert, visited_blocks);
}
}
}
Expand All @@ -1057,7 +1055,7 @@ export function mark_subtree_inert(signal, root, inert, visited_blocks = new Set
if (references !== null) {
let i;
for (i = 0; i < references.length; i++) {
mark_subtree_inert(references[i], root, inert, visited_blocks);
mark_subtree_inert(references[i], inert, visited_blocks);
}
}
}
Expand Down
38 changes: 24 additions & 14 deletions packages/svelte/src/internal/client/transitions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,33 +482,43 @@ export function bind_transition(dom, get_transition_fn, props_fn, direction, glo
// @ts-ignore
dom.__animate = true;
}

let foo = false;
/** @type {import('./types.js').Block | null} */
let transition_block = block;
while (transition_block !== null) {
main: while (transition_block !== null) {
if (is_transition_block(transition_block)) {
if (transition_block.t === EACH_ITEM_BLOCK) {
// Lazily apply the each block transition
transition_block.r = each_item_transition;
transition_block.a = each_item_animate;
transition_block = transition_block.p;
} else if (transition_block.t === AWAIT_BLOCK && transition_block.n /* pending */) {
can_show_intro_on_mount = false;
can_show_intro_on_mount = true;
} else if (transition_block.t === IF_BLOCK) {
transition_block.r = if_block_transition;
if (can_show_intro_on_mount) {
/** @type {import('./types.js').Block | null} */
let if_block = transition_block;
while (if_block.t === IF_BLOCK) {
// If we have an if block parent that is currently falsy then
// we can show the intro on mount as long as that block is mounted
if (if_block.e !== null && !if_block.v) {
can_show_intro_on_mount = true;
break main;
}
if_block = if_block.p;
}
}
}
if (!can_apply_lazy_transitions && can_show_intro_on_mount) {
can_show_intro_on_mount = transition_block.e === null;
can_show_intro_on_mount = transition_block.e !== null;
foo = true;
}
if (!can_show_intro_on_mount || !global) {
if (can_show_intro_on_mount || !global) {
can_apply_lazy_transitions = true;
}
} else if (
!can_apply_lazy_transitions &&
transition_block.t === ROOT_BLOCK &&
(transition_block.e !== null || transition_block.i)
) {
can_show_intro_on_mount = false;
} else if (transition_block.t === ROOT_BLOCK && !can_apply_lazy_transitions) {
can_show_intro_on_mount = transition_block.e !== null || transition_block.i;
}
transition_block = transition_block.p;
}
Expand Down Expand Up @@ -540,7 +550,7 @@ export function bind_transition(dom, get_transition_fn, props_fn, direction, glo

transition = create_transition(dom, init, direction, transition_effect);
const is_intro = direction === 'in';
const show_intro = !can_show_intro_on_mount && (is_intro || direction === 'both');
const show_intro = can_show_intro_on_mount && (is_intro || direction === 'both');

if (show_intro) {
transition.p = transition.i();
Expand Down Expand Up @@ -602,7 +612,7 @@ export function trigger_transitions(transitions, target_direction, from) {
transition.c();
}
transition.d.inert = false;
mark_subtree_inert(effect, effect, false);
mark_subtree_inert(effect, false);
} else if (target_direction === 'key') {
if (direction === 'key') {
transition.p = transition.i(/** @type {DOMRect} */ (from));
Expand All @@ -614,7 +624,7 @@ export function trigger_transitions(transitions, target_direction, from) {
outros.push(transition.o);
}
transition.d.inert = true;
mark_subtree_inert(effect, effect, true);
mark_subtree_inert(effect, true);
}
}
if (outros.length > 0) {
Expand Down