Skip to content

Commit 8f91648

Browse files
committed
support tag interpolation in non-root <style> elements (#1147)
1 parent 29a1569 commit 8f91648

File tree

5 files changed

+35
-3
lines changed

5 files changed

+35
-3
lines changed

src/generators/nodes/Element.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ export default class Element extends Node {
433433

434434
if (isVoidElementName(node.name)) return open + '>';
435435

436-
if (node.name === 'script' || node.name === 'style') {
436+
if (node.name === 'script') {
437437
return `${open}>${node.data}</${node.name}>`;
438438
}
439439

src/generators/server-side-rendering/visitors/Element.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export default function visitElement(
6868

6969
if (node.name === 'textarea' && textareaContents !== undefined) {
7070
generator.append(textareaContents);
71-
} else if (node.name === 'script' || node.name === 'style') {
71+
} else if (node.name === 'script') {
7272
generator.append(escape(node.data));
7373
} else {
7474
node.children.forEach((child: Node) => {

src/parse/state/tag.ts

+10-1
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,20 @@ export default function tag(parser: Parser) {
224224
);
225225
parser.read(/<\/textarea>/);
226226
element.end = parser.index;
227-
} else if (name === 'script' || name === 'style') {
227+
} else if (name === 'script') {
228228
// special case
229229
element.data = parser.readUntil(new RegExp(`</${name}>`));
230230
parser.eat(`</${name}>`, true);
231231
element.end = parser.index;
232+
} else if (name === 'style') {
233+
// special case
234+
element.children = readSequence(
235+
parser,
236+
() =>
237+
parser.template.slice(parser.index, parser.index + 8) === '</style>'
238+
);
239+
parser.read(/<\/style>/);
240+
element.end = parser.index;
232241
} else {
233242
parser.stack.push(element);
234243
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
export default {
2+
data: {
3+
color: 'red',
4+
},
5+
6+
html: `
7+
<div>
8+
<style>
9+
div {
10+
color: red;
11+
}
12+
</style>
13+
foo
14+
</div>`,
15+
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<div>
2+
<style>
3+
div {
4+
color: {{color}};
5+
}
6+
</style>
7+
foo
8+
</div>

0 commit comments

Comments
 (0)