Skip to content

[stable8] fix(NcModal): use useTrapStackControl for pausing other focus traps #7085

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

Closed
wants to merge 1 commit into from
Closed

[stable8] fix(NcModal): use useTrapStackControl for pausing other focus traps #7085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 5 additions & 10 deletions src/components/NcModal/NcModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ import Timer from '../../utils/Timer.js'
import Close from 'vue-material-design-icons/Close.vue'
import Pause from 'vue-material-design-icons/Pause.vue'
import Play from 'vue-material-design-icons/Play.vue'
import { useTrapStackControl } from '../../composables/useTrapStackControl.js'

export default {
name: 'NcModal',
Expand Down Expand Up @@ -574,7 +575,6 @@ export default {
playing: false,
slideshowTimeout: null,
focusTrap: null,
externalFocusTrapStack: [],
randId: GenRandomId(),
internalShow: true,
}
Expand Down Expand Up @@ -657,6 +657,10 @@ export default {
},
},

created() {
useTrapStackControl(() => this.showModal)
},

beforeMount() {
window.addEventListener('keydown', this.handleKeydown)
},
Expand Down Expand Up @@ -864,11 +868,6 @@ export default {
setReturnFocus: this.setReturnFocus,
}

// Deactivate other focus traps to unlock modal elements
this.externalFocusTrapStack = [...options.trapStack]
for (const trap of this.externalFocusTrapStack) {
trap.deactivate()
}
// Init focus trap
this.focusTrap = createFocusTrap([contentContainer, ...this.additionalTrapElements], options)
this.focusTrap.activate()
Expand All @@ -879,10 +878,6 @@ export default {
}
this.focusTrap?.deactivate()
this.focusTrap = null
for (const trap of this.externalFocusTrapStack) {
trap.activate()
}
this.externalFocusTrapStack = []
},

},
Expand Down