fix(v-show): v-show takes higher priority than style attribute (#3230)

fix #2757
This commit is contained in:
HcySunYang
2021-02-25 23:26:54 +08:00
committed by GitHub
parent 45fae9d308
commit 5ad4036e29
3 changed files with 72 additions and 3 deletions

View File

@@ -20,7 +20,8 @@ export const vShow: ObjectDirective<VShowElement> = {
}
},
updated(el, { value, oldValue }, { transition }) {
if (transition && value !== oldValue) {
if (!value === !oldValue) return
if (transition) {
if (value) {
transition.beforeEnter(el)
setDisplay(el, true)

View File

@@ -9,7 +9,14 @@ export function patchStyle(el: Element, prev: Style, next: Style) {
el.removeAttribute('style')
} else if (isString(next)) {
if (prev !== next) {
const current = style.display
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 {
for (const key in next) {