From 958dd679f145339cd336cc8cc37a19169cef2c18 Mon Sep 17 00:00:00 2001 From: Alex Dilley Date: Sat, 12 Oct 2019 16:26:21 +0100 Subject: [PATCH] fix: class directives combined with spread attrs (SSR) --- src/compiler/compile/render_ssr/handlers/Element.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compiler/compile/render_ssr/handlers/Element.ts b/src/compiler/compile/render_ssr/handlers/Element.ts index 146324f2a4..3efead01c3 100644 --- a/src/compiler/compile/render_ssr/handlers/Element.ts +++ b/src/compiler/compile/render_ssr/handlers/Element.ts @@ -111,7 +111,8 @@ export default function(node: Element, renderer: Renderer, options: RenderOption args.push(`{ ${quote_name_if_necessary(attribute.name)}: ${snip(attribute.chunks[0])} }`); } else if (attribute.name === 'class' && class_expression) { // Add class expression - args.push(`{ ${quote_name_if_necessary(attribute.name)}: [\`${stringify_class_attribute(attribute)}\`, \`\${${class_expression}}\`].join(' ').trim() }`); + add_class_attribute = false; + args.push(`{ ${quote_name_if_necessary(attribute.name)}: [\`${stringify_class_attribute(attribute)}\`, ${class_expression}].join(' ').trim() }`); } else { args.push(`{ ${quote_name_if_necessary(attribute.name)}: \`${attribute.name === 'class' ? stringify_class_attribute(attribute) : stringify_attribute(attribute, true)}\` }`); }