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

fix(runtime-dom): style patching shoud always preserve v-show display property

Browse Source 
close #4424
This commit is contained in:
Evan You 2021-09-07 12:25:00 -04:00
parent b8653d390a
commit d534515836
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,18 +5,12 @@ type Style = string | Record<string, string | string[]> | null
export function patchStyle(el: Element, prev: Style, next: Style) { export function patchStyle(el: Element, prev: Style, next: Style) {
const style = (el as HTMLElement).style const style = (el as HTMLElement).style
const currentDisplay = style.display
if (!next) { if (!next) {
el.removeAttribute('style') el.removeAttribute('style')
} else if (isString(next)) { } else if (isString(next)) {
if (prev !== next) { if (prev !== next) {
const current = style.display
style.cssText = next style.cssText = next
// 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 = current
}
} }
} else { } else {
for (const key in next) { for (const key in next) {
@ -30,6 +24,12 @@ 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
}
} }
const importantRE = /\s*!important$/ const importantRE = /\s*!important$/