From 3bf08f4296896f5095a6d13d10521a7d94b82bca Mon Sep 17 00:00:00 2001 From: Simon He <13917107469@163.com> Date: Sat, 3 Dec 2022 21:51:06 +0800 Subject: [PATCH] refactor: tidy up compile/render_dom --- .../render_dom/wrappers/Element/index.ts | 21 ++++++++----------- .../render_dom/wrappers/shared/is_dynamic.ts | 11 ++++------ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts index 8d0429879e..de286472c7 100644 --- a/src/compiler/compile/render_dom/wrappers/Element/index.ts +++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts @@ -221,10 +221,8 @@ export default class ElementWrapper extends Wrapper { this.event_handlers = this.node.handlers.map(event_handler => new EventHandler(event_handler, this)); - if (node.intro || node.outro) { - if (node.intro) block.add_intro(node.intro.is_local); - if (node.outro) block.add_outro(node.outro.is_local); - } + if (node.intro) block.add_intro(node.intro.is_local); + if (node.outro) block.add_outro(node.outro.is_local); if (node.animation) { block.add_animation(); @@ -326,20 +324,19 @@ export default class ElementWrapper extends Wrapper { ${this.var}.p(#ctx, #dirty); } } else if (${previous_tag}) { - ${ - has_transitions - ? b` + ${has_transitions + ? b` @group_outros(); @transition_out(${this.var}, 1, 1, () => { ${this.var} = null; }); @check_outros(); ` - : b` + : b` ${this.var}.d(1); ${this.var} = null; ` - } + } } ${previous_tag} = ${tag}; `); @@ -681,9 +678,9 @@ export default class ElementWrapper extends Wrapper { function ${handler}(${params}) { ${binding_group.bindings.map(b => b.handler.mutation)} ${Array.from(dependencies) - .filter(dep => dep[0] !== '$') - .filter(dep => !contextual_dependencies.has(dep)) - .map(dep => b`${this.renderer.invalidate(dep)};`)} + .filter(dep => dep[0] !== '$') + .filter(dep => !contextual_dependencies.has(dep)) + .map(dep => b`${this.renderer.invalidate(dep)};`)} } `); diff --git a/src/compiler/compile/render_dom/wrappers/shared/is_dynamic.ts b/src/compiler/compile/render_dom/wrappers/shared/is_dynamic.ts index 01283943d4..965a3d5960 100644 --- a/src/compiler/compile/render_dom/wrappers/shared/is_dynamic.ts +++ b/src/compiler/compile/render_dom/wrappers/shared/is_dynamic.ts @@ -2,11 +2,8 @@ import { Var } from '../../../../interfaces'; import { is_reserved_keyword } from '../../../utils/reserved_keywords'; export default function is_dynamic(variable: Var) { - if (variable) { - if (variable.mutated || variable.reassigned) return true; // dynamic internal state - if (!variable.module && variable.writable && variable.export_name) return true; // writable props - if (is_reserved_keyword(variable.name)) return true; - } - - return false; + if (!variable) return false; + if (variable.mutated || variable.reassigned) return true; // dynamic internal state + if (!variable.module && variable.writable && variable.export_name) return true; // writable props + if (is_reserved_keyword(variable.name)) return true; }