Skip to content

Commit

Permalink
support tag interpolation in non-root <style> elements (#1147)
Browse files Browse the repository at this point in the history
  • Loading branch information
Conduitry committed Feb 8, 2018
1 parent 29a1569 commit 8f91648
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/generators/nodes/Element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ export default class Element extends Node {

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

if (node.name === 'script' || node.name === 'style') {
if (node.name === 'script') {
return `${open}>${node.data}</${node.name}>`;
}

Expand Down
2 changes: 1 addition & 1 deletion src/generators/server-side-rendering/visitors/Element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default function visitElement(

if (node.name === 'textarea' && textareaContents !== undefined) {
generator.append(textareaContents);
} else if (node.name === 'script' || node.name === 'style') {
} else if (node.name === 'script') {
generator.append(escape(node.data));
} else {
node.children.forEach((child: Node) => {
Expand Down
11 changes: 10 additions & 1 deletion src/parse/state/tag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,20 @@ export default function tag(parser: Parser) {
);
parser.read(/<\/textarea>/);
element.end = parser.index;
} else if (name === 'script' || name === 'style') {
} else if (name === 'script') {
// special case
element.data = parser.readUntil(new RegExp(`</${name}>`));
parser.eat(`</${name}>`, true);
element.end = parser.index;
} else if (name === 'style') {
// special case
element.children = readSequence(
parser,
() =>
parser.template.slice(parser.index, parser.index + 8) === '</style>'
);
parser.read(/<\/style>/);
element.end = parser.index;
} else {
parser.stack.push(element);
}
Expand Down
15 changes: 15 additions & 0 deletions test/runtime/samples/non-root-style-interpolation/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
export default {
data: {
color: 'red',
},

html: `
<div>
<style>
div {
color: red;
}
</style>
foo
</div>`,
};
8 changes: 8 additions & 0 deletions test/runtime/samples/non-root-style-interpolation/main.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<div>
<style>
div {
color: {{color}};
}
</style>
foo
</div>

0 comments on commit 8f91648

Please sign in to comment.