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

Merge pull request #5778 from jiverson/fix-dialog-popup 

fix: Dialog/Confirm re-focus original element on close
pull/5863/head
Tuğçe Küçükoğlu 2024-06-10 10:42:09 +03:00 committed by GitHub
parent 774139cf38 c7f9b9704f
commit fd623ad1e3
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
components/lib/confirmpopup/ConfirmPopup.vue
View File

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

6
components/lib/dialog/Dialog.vue
View File

@ -84,7 +84,8 @@ export default {
containerVisible: this.visible,
maximized: false,
focusableMax: null,
focusableClose: null
focusableClose: null,
focusElementOnHide: null,
};
},
watch: {
@ -139,6 +140,7 @@ export default {
},
onEnter() {
this.$emit('show');
this.focusElementOnHide = document.activeElement;
this.focus();
this.enableDocumentSettings();
this.bindGlobalListeners();
@ -154,6 +156,8 @@ export default {
},
onLeave() {
this.$emit('hide');
DomHandler.focus(this.focusElementOnHide);
this.focusElementOnHide = null;
this.focusableClose = null;
this.focusableMax = null;
},