From: cyx <30902641+Duncanxyz@users.noreply.github.com>
Date: Thu, 11 Jan 2024 09:11:35 +0000 (+0800)
Subject: fix(runtime-dom): unify behavior for v-show + style display binding (#10075)
X-Git-Tag: v3.4.9~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd419aec3cb615eaea8b2324356f38f4c0ff1fcc;p=thirdparty%2Fvuejs%2Fcore.git

fix(runtime-dom): unify behavior for v-show + style display binding (#10075)

close #10074
---

diff --git a/packages/runtime-dom/src/modules/style.ts b/packages/runtime-dom/src/modules/style.ts
index ce112ab87e..6341c8a120 100644
--- a/packages/runtime-dom/src/modules/style.ts
+++ b/packages/runtime-dom/src/modules/style.ts
@@ -7,6 +7,7 @@ type Style = string | Record<string, string | string[]> | null
 
 export function patchStyle(el: Element, prev: Style, next: Style) {
   const style = (el as HTMLElement).style
+  const currentDisplay = style.display
   const isCssString = isString(next)
   if (next && !isCssString) {
     if (prev && !isString(prev)) {
@@ -20,7 +21,6 @@ export function patchStyle(el: Element, prev: Style, next: Style) {
       setStyle(style, key, next[key])
     }
   } else {
-    const currentDisplay = style.display
     if (isCssString) {
       if (prev !== next) {
         // #9821
@@ -33,12 +33,12 @@ export function patchStyle(el: Element, prev: Style, next: Style) {
     } else if (prev) {
       el.removeAttribute('style')
     }
-    // indicates that the `display` of the element is controlled by `v-show`,
-    // so we always keep the current `display` value regardless of the `style`
-    // value, thus handing over control to `v-show`.
-    if (vShowOldKey in el) {
-      style.display = currentDisplay
-    }
+  }
+  // indicates that the `display` of the element is controlled by `v-show`,
+  // so we always keep the current `display` value regardless of the `style`
+  // value, thus handing over control to `v-show`.
+  if (vShowOldKey in el) {
+    style.display = currentDisplay
   }
 }