fix(ssr): fix v-show inline style rendering when style binding is arr…

…ay (#7814) fix #7813
vuejs · Mar 13, 2018 · 1a979c4 · 1a979c4
1 parent a6169d1
commit 1a979c4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/platforms/web/server/directives/show.js b/src/platforms/web/server/directives/show.js
@@ -3,6 +3,10 @@
 export default function show (node: VNodeWithData, dir: VNodeDirective) {
   if (!dir.value) {
     const style: any = node.data.style || (node.data.style = {})
-    style.display = 'none'
+    if (Array.isArray(style)) {
+      style.push({ display: 'none' })
+    } else {
+      style.display = 'none'
+    }
   }
 }
diff --git a/test/ssr/ssr-string.spec.js b/test/ssr/ssr-string.spec.js
@@ -267,6 +267,17 @@ describe('SSR: renderToString', () => {
     })
   })
 
+  it('v-show directive merge with style', done => {
+    renderVmWithOptions({
+      template: '<div :style="[{lineHeight: 1}]" v-show="false"><span>inner</span></div>'
+    }, res => {
+      expect(res).toContain(
+        '<div data-server-rendered="true" style="line-height:1;display:none;"><span>inner</span></div>'
+      )
+      done()
+    })
+  })
+
   it('v-show directive not passed to child', done => {
     renderVmWithOptions({
       template: '<foo v-show="false"></foo>',