Skip to content

Fix issues with focus trap on modal #3020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 2 commits into from
Aug 12, 2022
Merged

Fix issues with focus trap on modal #3020

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
303e07b
Disable focus trap on click outside
juliusknorr Aug 12, 2022
98098ff
Allow to add additional trap elements to the focus trap
juliusknorr Aug 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/components/Modal/Modal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,14 @@ export default {
type: Boolean,
default: true,
},

/**
* Additional elements to add to the focus trap
*/
additionalTrapElements: {
type: Array,
default: () => [],
},
},

emits: [
Expand Down Expand Up @@ -505,6 +513,12 @@ export default {
}
}
},
additionalTrapElements(elements) {
if (this.focusTrap) {
const contentContainer = this.$refs.mask
this.focusTrap.updateContainerElements([contentContainer, ...elements])
}
},
},

beforeMount() {
Expand Down Expand Up @@ -661,7 +675,9 @@ export default {
const contentContainer = this.$refs.mask
// wait until all children are mounted and available in the DOM before focusTrap can be added
this.$nextTick(() => {
this.focusTrap = createFocusTrap(contentContainer)
this.focusTrap = createFocusTrap(contentContainer, {
allowOutsideClick: true,
})
this.focusTrap.activate()
})
},
Expand Down