Skip to content

Commit dd6293c

Browse files
authored
Merge pull request #7096 from nextcloud-libraries/fix/NcActions--focus-trap
fix(NcActions + NcEmojiPicker): no focus-trap when needed, extra focus-trap when not
2 parents 2cf1fb4 + 1e32ee2 commit dd6293c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/components/NcActions/NcActions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1773,7 +1773,7 @@ export default {
17731773
popoverBaseClass: 'action-item__popper',
17741774
popupRole: this.config.popupRole,
17751775
setReturnFocus: this.config.withFocusTrap ? this.$refs.triggerButton?.$el : undefined,
1776-
focusTrap: this.config.withFocusTrap,
1776+
noFocusTrap: !this.config.withFocusTrap,
17771777
'onUpdate:shown': this.toggleMenu,
17781778
onAfterShow: this.onOpened,
17791779
onAfterClose: this.onClosed,

src/components/NcEmojiPicker/NcEmojiPicker.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ This component allows the user to pick an emoji.
111111
v-model:shown="open"
112112
:container="container"
113113
popup-role="dialog"
114-
:focus-trap="false /* Handled manually to remove emoji buttons from TAB sequence */"
114+
:no-focus-trap="true /* Handled manually to remove emoji buttons from TAB sequence */"
115115
@after-show="afterShow"
116116
@after-hide="afterHide">
117117
<template #trigger="slotProps">

0 commit comments

Comments
 (0)