theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(runtime-dom): fix behavior regression for v-show + style display binding

Browse Source 
fix #4768
This commit is contained in:
Evan You
2021-10-09 19:31:52 -04:00
parent 3ca83179d1
commit 3f38d599f5
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/runtime-dom/src/modules/style.ts
View File

@@ -5,14 +5,8 @@ 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
if (!next) {
el.removeAttribute('style')
} else if (isString(next)) {
if (prev !== next) {
style.cssText = next
}
} else {
const isCssString = isString(next)
if (next && !isCssString) {
for (const key in next) {
setStyle(style, key, next[key])
}
@@ -23,12 +17,21 @@ export function patchStyle(el: Element, prev: Style, next: 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 ('_vod' in el) {
style.display = currentDisplay
} else {
const currentDisplay = style.display
if (isCssString) {
if (prev !== next) {
style.cssText = next as string
}
} 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 ('_vod' in el) {
style.display = currentDisplay
}
}
}