From 7c745f447794aad5c95ea10b1fafb2cf0500e121 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Wed, 8 Jan 2020 17:22:28 -0800
Subject: [PATCH 1/2] fix: clear extra styles when hydrating/mounting element

---
 src/platforms/web/runtime/modules/style.js     | 12 ++++++++----
 test/unit/modules/vdom/patch/hydration.spec.js | 13 +++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/platforms/web/runtime/modules/style.js b/src/platforms/web/runtime/modules/style.js
index 4d2d39dd6ea..cb42919d8c7 100644
--- a/src/platforms/web/runtime/modules/style.js
+++ b/src/platforms/web/runtime/modules/style.js
@@ -1,6 +1,6 @@
 /* @flow */
 
-import { getStyle, normalizeStyleBinding } from 'web/util/style'
+import { getStyle, normalizeStyleBinding, parseStyleText } from 'web/util/style'
 import { cached, camelize, extend, isDef, isUndef, hyphenate } from 'shared/util'
 
 const cssVarRE = /^--/
@@ -44,7 +44,7 @@ const normalize = cached(function (prop) {
   }
 })
 
-function updateStyle (oldVnode: VNodeWithData, vnode: VNodeWithData) {
+function updateStyle (oldVnode: VNodeWithData, vnode: VNodeWithData, creating = false) {
   const data = vnode.data
   const oldData = oldVnode.data
 
@@ -60,7 +60,7 @@ function updateStyle (oldVnode: VNodeWithData, vnode: VNodeWithData) {
   const oldStyleBinding: any = oldData.normalizedStyle || oldData.style || {}
 
   // if static style exists, stylebinding already merged into it when doing normalizeStyleData
-  const oldStyle = oldStaticStyle || oldStyleBinding
+  let oldStyle = oldStaticStyle || oldStyleBinding
 
   const style = normalizeStyleBinding(vnode.data.style) || {}
 
@@ -73,6 +73,10 @@ function updateStyle (oldVnode: VNodeWithData, vnode: VNodeWithData) {
 
   const newStyle = getStyle(vnode, true)
 
+  if (creating && el.style.cssText) {
+    oldStyle = parseStyleText(el.style.cssText)
+  }
+
   for (name in oldStyle) {
     if (isUndef(newStyle[name])) {
       setProp(el, name, '')
@@ -88,6 +92,6 @@ function updateStyle (oldVnode: VNodeWithData, vnode: VNodeWithData) {
 }
 
 export default {
-  create: updateStyle,
+  create: (oldVNode, vnode) => updateStyle(oldVNode, vnode, true),
   update: updateStyle
 }
diff --git a/test/unit/modules/vdom/patch/hydration.spec.js b/test/unit/modules/vdom/patch/hydration.spec.js
index 930ad47cc81..e82a22487d8 100644
--- a/test/unit/modules/vdom/patch/hydration.spec.js
+++ b/test/unit/modules/vdom/patch/hydration.spec.js
@@ -372,6 +372,19 @@ describe('vdom patch: hydration', () => {
     }).then(done)
   })
 
+  it('should hydrate with correct inline styles', () => {
+    const dom = createMockSSRDOM('<div style="padding-left: 0px; padding-right: 3px"></div>')
+
+    const vm = new Vue({
+      data: {
+        style: { paddingLeft: '2px' }
+      },
+      template: `<div><div :style="style"></div></div>`
+    }).$mount(dom)
+
+    expect(vm.$el.innerHTML).toBe('<div style="padding-left: 2px;"></div>')
+  })
+
   it('should properly initialize dynamic class bindings for future updates', done => {
     const dom = createMockSSRDOM('<div class="foo bar"></div>')
 

From 10643b44ce193c09e1d34e12b51fe4e7e964add8 Mon Sep 17 00:00:00 2001
From: David Sanders <dsanders11@ucsbalum.com>
Date: Wed, 8 Jan 2020 19:10:25 -0800
Subject: [PATCH 2/2] fix: flow type annotations

---
 src/platforms/web/runtime/modules/style.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/platforms/web/runtime/modules/style.js b/src/platforms/web/runtime/modules/style.js
index cb42919d8c7..402f76e1efb 100644
--- a/src/platforms/web/runtime/modules/style.js
+++ b/src/platforms/web/runtime/modules/style.js
@@ -44,7 +44,7 @@ const normalize = cached(function (prop) {
   }
 })
 
-function updateStyle (oldVnode: VNodeWithData, vnode: VNodeWithData, creating = false) {
+function updateStyle (oldVnode: VNodeWithData, vnode: VNodeWithData, creating: boolean = false) {
   const data = vnode.data
   const oldData = oldVnode.data
 
@@ -92,6 +92,6 @@ function updateStyle (oldVnode: VNodeWithData, vnode: VNodeWithData, creating =
 }
 
 export default {
-  create: (oldVNode, vnode) => updateStyle(oldVNode, vnode, true),
+  create: (oldVNode: VNodeWithData, vnode: VNodeWithData) => updateStyle(oldVNode, vnode, true),
   update: updateStyle
 }