From 5f309f40e0127c95b31485a4199e0d92e368285f Mon Sep 17 00:00:00 2001 From: Vladimir Erokhov Date: Tue, 19 Dec 2023 10:57:29 +0600 Subject: [PATCH] fix(#5236): Fixed bug --- .../src/canopsis-next/src/bootstrap/plugins.js | 13 +++++-------- .../plugins/vuetify/components/v-menu/v-menu.vue | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/community/sources/webcore/src/canopsis-next/src/bootstrap/plugins.js b/community/sources/webcore/src/canopsis-next/src/bootstrap/plugins.js index b5cef24d5e7..7f538af6e6e 100644 --- a/community/sources/webcore/src/canopsis-next/src/bootstrap/plugins.js +++ b/community/sources/webcore/src/canopsis-next/src/bootstrap/plugins.js @@ -57,30 +57,26 @@ export const bootstrapApplicationPlugins = (Vue) => { placeholderStyle: false, disabled: false, popoverProps: { - nudgeWidth: 200, - closeOnContentClick: false, - transition: 'fade-transition', - offsetOverflow: true, - offsetX: true, - maxWidth: 500, openOnHover: true, + transition: 'fade-transition', attach: '.modals-wrapper', + offsetOverflow: true, }, }, dsCalendarEvent: { popoverProps: { - offsetY: true, openOnHover: true, transition: 'fade-transition', attach: '.modals-wrapper', + offsetOverflow: true, }, }, dsCalendarEventPlaceholder: { popoverProps: { - offsetY: true, openOnHover: true, transition: 'fade-transition', attach: '.modals-wrapper', + offsetOverflow: true, }, }, dsCalendarEventTimePlaceholder: { @@ -88,6 +84,7 @@ export const bootstrapApplicationPlugins = (Vue) => { openOnHover: true, transition: 'fade-transition', attach: '.modals-wrapper', + offsetOverflow: true, }, }, }, diff --git a/community/sources/webcore/src/canopsis-next/src/plugins/vuetify/components/v-menu/v-menu.vue b/community/sources/webcore/src/canopsis-next/src/plugins/vuetify/components/v-menu/v-menu.vue index bc4afa6a485..e7c517b8d06 100644 --- a/community/sources/webcore/src/canopsis-next/src/plugins/vuetify/components/v-menu/v-menu.vue +++ b/community/sources/webcore/src/canopsis-next/src/plugins/vuetify/components/v-menu/v-menu.vue @@ -22,6 +22,20 @@ export default { }, }, methods: { + /** + * We've added offsetOverflow to condition + * + * @param menuWidth + * @return {string} + */ + calcLeft(menuWidth) { + return `${ + this.isAttached && !this.offsetOverflow + ? this.computedLeft + : this.calcXOverflow(this.computedLeft, menuWidth) + }px`; + }, + calcScrollPosition() { const $el = this.$refs.content; const activeTile = $el.querySelector('.v-list__tile--active');