diff --git a/src/components/NcActionButton/NcActionButton.vue b/src/components/NcActionButton/NcActionButton.vue index d922084562..c5edaa9583 100644 --- a/src/components/NcActionButton/NcActionButton.vue +++ b/src/components/NcActionButton/NcActionButton.vue @@ -384,11 +384,6 @@ export default { ChevronRightIcon, ChevronLeftIcon, }, - setup() { - return { - isRtl, - } - }, mixins: [ActionTextMixin], inject: { @@ -462,6 +457,11 @@ export default { default: null, }, }, + setup() { + return { + isRtl, + } + }, computed: { /** diff --git a/src/components/NcActions/NcActions.vue b/src/components/NcActions/NcActions.vue index 318803265b..a203fa2675 100644 --- a/src/components/NcActions/NcActions.vue +++ b/src/components/NcActions/NcActions.vue @@ -1179,12 +1179,15 @@ export default { }, emits: [ + 'click', + 'blur', + 'focus', + + 'close', + 'closed', 'open', + 'opened', 'update:open', - 'close', - 'focus', - 'blur', - 'click', ], setup(props) { @@ -1471,10 +1474,17 @@ export default { /** * Called when popover is shown after the show delay */ - onOpen() { + onOpened() { this.$nextTick(() => { this.focusFirstAction(null) this.resizePopover() + + /** + * Event emitted when the popover menu is opened. + * + * This event is emitted after `update:open` was emitted and the opening transition finished. + */ + this.$emit('opened') }) }, @@ -1901,9 +1911,9 @@ export default { }, on: { show: this.openMenu, - 'apply-show': this.onOpen, + 'after-show': this.onOpened, hide: this.closeMenu, - 'apply-hide': this.onClosed, + 'after-hide': this.onClosed, }, }, [ diff --git a/src/components/NcAppNavigationNew/NcAppNavigationNew.vue b/src/components/NcAppNavigationNew/NcAppNavigationNew.vue index be7dc0d510..5fbde8a937 100644 --- a/src/components/NcAppNavigationNew/NcAppNavigationNew.vue +++ b/src/components/NcAppNavigationNew/NcAppNavigationNew.vue @@ -84,7 +84,7 @@ export default { validator(value) { return ['primary', 'secondary', 'tertiary'].indexOf(value) !== -1 }, - } + }, }, emits: ['click'], diff --git a/src/components/NcAvatar/NcAvatar.vue b/src/components/NcAvatar/NcAvatar.vue index ca7f791204..c602cace6e 100644 --- a/src/components/NcAvatar/NcAvatar.vue +++ b/src/components/NcAvatar/NcAvatar.vue @@ -153,8 +153,8 @@ export default {