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.

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

Ensure if_block dependency is dirty to cancel outro #4634

Merged
merged 14 commits into from
Apr 23, 2020
Merged

Ensure if_block dependency is dirty to cancel outro #4634

Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
96537a7
Insure if_block dependency is dirty to update
Apr 5, 2020
c7328ff
only check dirty for transition_in
Apr 5, 2020
10ec911
test unrelated update does not cancel `if_block` outro
Apr 6, 2020
4b67469
fix tests
pushkine Apr 13, 2020
7541167
avoid empty checks
pushkine Apr 13, 2020
80e4f6b
avoid empty else
pushkine Apr 13, 2020
ab1f66d
Revert "avoid empty else"
pushkine Apr 13, 2020
a0d86dc
Merge branch 'master' into pr/4634
Conduitry Apr 20, 2020
bbb676a
tidy
Conduitry Apr 20, 2020
31b57f2
update js samples
Conduitry Apr 20, 2020
486a9ba
cancel outro before update
pushkine Apr 20, 2020
cffeb65
test
pushkine Apr 20, 2020
3057d9e
Revert "test"
pushkine Apr 21, 2020
1203b9e
Revert "cancel outro before update"
pushkine Apr 21, 2020
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
19 changes: 5 additions & 14 deletions src/compiler/compile/render_dom/wrappers/IfBlock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,26 +520,17 @@ export default class IfBlockWrapper extends Wrapper {
if (branch.dependencies.length > 0) {
const update_mount_node = this.get_update_mount_node(anchor);

const enter = dynamic
? b`
if (${name}) {
${name}.p(#ctx, #dirty);
${has_transitions && b`@transition_in(${name}, 1);`}
} else {
${name} = ${branch.block.name}(#ctx);
${name}.c();
${has_transitions && b`@transition_in(${name}, 1);`}
${name}.m(${update_mount_node}, ${anchor});
}
`
: b`
const enter = b`
if (!${name}) {
${name} = ${branch.block.name}(#ctx);
${name}.c();
${has_transitions && b`@transition_in(${name}, 1);`}
${name}.m(${update_mount_node}, ${anchor});
} else {
${has_transitions && b`@transition_in(${name}, 1);`}
${dynamic && b`${name}.p(#ctx, #dirty);`}
if (${block.renderer.dirty(branch.dependencies)}) {
${has_transitions && b`@transition_in(${name}, 1);`}
}
}
`;

Expand Down