vertumnus
/
primevue-mirror
mirror of https://github.com/primefaces/primevue.git
1
0
Fork 0
Code Packages Releases Activity

Merge pull request #6142 from clemvnt/fix/dialog-focus 

Dialog: Cherry pick 're-focus original element on close' fix to v4
pull/6171/head
Tuğçe Küçükoğlu 2024-08-01 15:22:32 +03:00 committed by GitHub
parent 655798b33a e3a52f689e
commit e70a844997
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/primevue/src/confirmpopup/ConfirmPopup.vue
View File

@ -78,7 +78,8 @@ export default {
visible: false,
confirmation: null,
autoFocusAccept: null,
autoFocusReject: null
autoFocusReject: null,
target: null
};
},
target: null,
@ -175,6 +176,8 @@ export default {
this.autoFocusAccept = this.confirmation.defaultFocus === undefined || this.confirmation.defaultFocus === 'accept' ? true : false;
this.autoFocusReject = this.confirmation.defaultFocus === 'reject' ? true : false;
this.target = document.activeElement;
this.bindOutsideClickListener();
this.bindScrollListener();
this.bindResizeListener();
@ -188,6 +191,9 @@ export default {
this.autoFocusAccept = null;
this.autoFocusReject = null;
DomHandler.focus(this.target);
this.target = null;
this.unbindOutsideClickListener();
this.unbindScrollListener();
this.unbindResizeListener();

6
packages/primevue/src/dialog/Dialog.vue
View File

@ -91,7 +91,8 @@ export default {
containerVisible: this.visible,
maximized: false,
focusableMax: null,
focusableClose: null
focusableClose: null,
target: null,
};
},
watch: {
@ -147,6 +148,7 @@ export default {
},
onEnter() {
this.$emit('show');
this.target = document.activeElement;
this.focus();
this.enableDocumentSettings();
this.bindGlobalListeners();
@ -162,6 +164,8 @@ export default {
},
onLeave() {
this.$emit('hide');
DomHandler.focus(this.target);
this.target = null;
this.focusableClose = null;
this.focusableMax = null;
},