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

Jump to bottom

[fix] textContent should not be set for <template> element. #7297

Merged
merged 4 commits into from Apr 16, 2022
Merged

[fix] textContent should not be set for <template> element. #7297

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
403c966
[fix] textContent should not be set for <template> element.
lidlanca Feb 21, 2022
257732e
tidy - name convetion. minor refactor extract "is template" check to …
lidlanca Feb 21, 2022
babadec
test template with text content
lidlanca Feb 26, 2022
f5eb70b
update html in test
lidlanca Feb 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/compiler/compile/render_dom/wrappers/Element/index.ts
View file
Open in desktop
Expand Up @@ -288,8 +288,12 @@ export default class ElementWrapper extends Wrapper {
}

// insert static children with textContent or innerHTML
// skip textcontent for <template>. append nodes to TemplateElement.content instead
const can_use_textcontent = this.can_use_textcontent();
lidlanca marked this conversation as resolved.
Show resolved Hide resolved
if (!this.node.namespace && (this.can_use_innerhtml || can_use_textcontent) && this.fragment.nodes.length > 0) {
const is_template = this.node.name === 'template';
const is_template_with_text_content = is_template && can_use_textcontent;

if (!is_template_with_text_content && !this.node.namespace && (this.can_use_innerhtml || can_use_textcontent) && this.fragment.nodes.length > 0) {
if (this.fragment.nodes.length === 1 && this.fragment.nodes[0].node.type === 'Text') {
block.chunks.create.push(
b`${node}.textContent = ${string_literal((this.fragment.nodes[0] as TextWrapper).data)};`
Expand Down Expand Up @@ -320,7 +324,7 @@ export default class ElementWrapper extends Wrapper {
this.fragment.nodes.forEach((child: Wrapper) => {
child.render(
block,
this.node.name === 'template' ? x`${node}.content` : node,
is_template ? x`${node}.content` : node,
nodes
);
});
Expand Down