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.

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

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

Merged
merged 4 commits into from
Apr 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions src/compiler/compile/render_dom/wrappers/Element/index.ts
Original file line number Diff line number Diff line change
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
24 changes: 16 additions & 8 deletions test/runtime/samples/template/_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,30 @@ export default {
// solo: 1,

html: `
<template>
<div>foo</div>
</template>
<template id="t1">
<div>foo</div>
</template>
<template id="t2">123</template>
`,

test({ assert, target }) {
const template = target.querySelector('template');


const template = target.querySelector('#t1');
assert.htmlEqual(template.innerHTML, `
<div>foo</div>
`);

<div>foo</div>
`);
const content = template.content.cloneNode(true);
const div = content.children[0];
assert.htmlEqual(div.outerHTML, `
<div>foo</div>
`);


const template2 = target.querySelector('#t2');
assert.equal(template2.childNodes.length, 0);
assert.equal(template2.content.childNodes.length, 1);
assert.equal(template2.content.firstChild.textContent, '123');
assert.htmlEqual(template2.innerHTML, '123');

}
};
5 changes: 3 additions & 2 deletions test/runtime/samples/template/main.svelte
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<template>
<template id="t1">
<div>foo</div>
</template>
</template>
<template id="t2">123</template>