Skip to content

Commit 7371f35

Browse files
wangzilingLeaderbotX400
authored andcommitted
fix: fix the unexpected joggle state when dialog component non-fixed (primefaces#6161)
1 parent 336c058 commit 7371f35

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

packages/primevue/src/dialog/Dialog.vue

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<Portal :appendTo="appendTo">
33
<div v-if="containerVisible" :ref="maskRef" :class="cx('mask')" :style="sx('mask', true, { position, modal })" @mousedown="onMaskMouseDown" @mouseup="onMaskMouseUp" v-bind="ptm('mask')">
4-
<transition name="p-dialog" @before-enter="onBeforeEnter" @enter="onEnter" @before-leave="onBeforeLeave" @leave="onLeave" @after-leave="onAfterLeave" appear v-bind="ptm('transition')">
4+
<transition name="p-dialog" @before-enter="onBeforeEnter" @enter="onEnter" @after-enter="onAfterEnter" @before-leave="onBeforeLeave" @leave="onLeave" @after-leave="onAfterLeave" appear v-bind="ptm('transition')">
55
<div v-if="visible" :ref="containerRef" v-focustrap="{ disabled: !modal }" :class="cx('root')" :style="sx('root')" role="dialog" :aria-labelledby="ariaLabelledById" :aria-modal="modal" v-bind="ptmi('root')">
66
<slot v-if="$slots.container" name="container" :closeCallback="close" :maximizeCallback="(event) => maximize(event)"></slot>
77
<template v-else>
@@ -149,14 +149,16 @@ export default {
149149
onEnter() {
150150
this.$emit('show');
151151
this.target = document.activeElement;
152-
this.focus();
153152
this.enableDocumentSettings();
154153
this.bindGlobalListeners();
155154
156155
if (this.autoZIndex) {
157156
ZIndex.set('modal', this.mask, this.baseZIndex + this.$primevue.config.zIndex.modal);
158157
}
159158
},
159+
onAfterEnter() {
160+
this.focus();
161+
},
160162
onBeforeLeave() {
161163
if (this.modal) {
162164
!this.isUnstyled && addClass(this.mask, 'p-overlay-mask-leave');

0 commit comments

Comments
 (0)