msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

get most tests passing

Browse Source
pull/3419/head
Richard Harris 6 years ago
parent 55287e5f73
commit d4c63df131
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File

15
src/compiler/compile/render_ssr/handlers/Element.ts
Unescape View File

@ -31,7 +31,7 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
const class_expression_list = node.classes.map(class_directive => { const class_expression_list = node.classes.map(class_directive => {
const { expression, name } = class_directive; const { expression, name } = class_directive;
const snippet = expression ? expression.node : x`#ctx.${name}`; const snippet = expression ? expression.node : x`#ctx.${name}`;
return x`${snippet} ? "${name}" : ""`; return x`${snippet} ? "${name}".replace(/,/g, ' ') : ""`;
}); });
if (node.needs_manual_style_scoping) { if (node.needs_manual_style_scoping) {
class_expression_list.push(x`"${node.component.stylesheet.id}"`); class_expression_list.push(x`"${node.component.stylesheet.id}"`);
@ -41,6 +41,8 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
class_expression_list.length > 0 && class_expression_list.length > 0 &&
class_expression_list.reduce((lhs, rhs) => x`${lhs} + ' ' + ${rhs}`); class_expression_list.reduce((lhs, rhs) => x`${lhs} + ' ' + ${rhs}`);
let add_class_attribute = !!class_expression;
if (node.attributes.some(attr => attr.is_spread)) { if (node.attributes.some(attr => attr.is_spread)) {
// TODO dry this out // TODO dry this out
const args = []; const args = [];
@ -62,6 +64,7 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
args.push(x`{ ${attribute.name}: ${(attribute.chunks[0] as Expression).node} || null }`); args.push(x`{ ${attribute.name}: ${(attribute.chunks[0] as Expression).node} || null }`);
} else if (attribute.name === 'class' && class_expression) { } else if (attribute.name === 'class' && class_expression) {
// Add class expression // Add class expression
add_class_attribute = false;
args.push(x`{ ${attribute.name}: [${get_attribute_value(attribute)}, ${class_expression}].join(' ').trim() }`); args.push(x`{ ${attribute.name}: [${get_attribute_value(attribute)}, ${class_expression}].join(' ').trim() }`);
} else { } else {
args.push(x`{ ${attribute.name}: ${get_attribute_value(attribute)} }`); args.push(x`{ ${attribute.name}: ${get_attribute_value(attribute)} }`);
@ -69,9 +72,8 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
} }
}); });
renderer.add_expression(x`@spread([${args}], ${class_expression});`); renderer.add_expression(x`@spread([${args}], ${add_class_attribute && class_expression});`);
} else { } else {
let add_class_attribute = !!class_expression;
node.attributes.forEach(attribute => { node.attributes.forEach(attribute => {
const name = attribute.name.toLowerCase(); const name = attribute.name.toLowerCase();
if (name === 'value' && node.name.toLowerCase() === 'textarea') { if (name === 'value' && node.name.toLowerCase() === 'textarea') {
@ -100,9 +102,10 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
renderer.add_string(`"`); renderer.add_string(`"`);
} }
}); });
if (add_class_attribute) { }
renderer.add_expression(x`@add_classes([${class_expression}].join(' ').trim())`);
} if (add_class_attribute) {
renderer.add_expression(x`@add_classes([${class_expression}].join(' ').trim())`);
} }
node.bindings.forEach(binding => { node.bindings.forEach(binding => {

Write Preview
Loading…
Cancel
Save