From bc56db3b09338f704908754578bae85952a7decb Mon Sep 17 00:00:00 2001 From: Lee Chase Date: Thu, 27 Feb 2020 10:25:10 +0000 Subject: [PATCH] fix: interactive tooltip position on ie11 --- .../cv-overflow-menu/cv-overflow-menu.vue | 4 ++-- .../cv-tooltip/cv-interactive-tooltip.vue | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue b/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue index 7ef975865..f570abe95 100644 --- a/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue +++ b/packages/core/src/components/cv-overflow-menu/cv-overflow-menu.vue @@ -157,8 +157,8 @@ export default { if (this.open) { const menuPosition = this.$el.getBoundingClientRect(); return this.$nextTick(() => { - let pixelsScrolledX = window.scrollX || window.pageXOffset; - let pixelsScrolledY = window.scrollY || window.pageYOffset; + const pixelsScrolledX = window.scrollX || window.pageXOffset; + const pixelsScrolledY = window.scrollY || window.pageYOffset; if (this.flipMenu) { this.left = menuPosition.left + diff --git a/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue b/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue index 137e775a3..8094f3154 100644 --- a/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue +++ b/packages/core/src/components/cv-tooltip/cv-interactive-tooltip.vue @@ -119,28 +119,30 @@ export default { }, position() { const menuPosition = this.$refs.trigger.getBoundingClientRect(); + const pixelsScrolledX = window.scrollX || window.pageXOffset; + const pixelsScrolledY = window.scrollY || window.pageYOffset; if (this.direction === 'top' || this.direction === 'bottom') { this.left = menuPosition.left + 0.5 + (this.$refs.trigger.offsetWidth - this.$refs.popup.offsetWidth) / 2 + - window.scrollX; + pixelsScrolledX; if (this.direction === 'bottom') { - this.top = menuPosition.bottom + 10 + window.scrollY; + this.top = menuPosition.bottom + 10 + pixelsScrolledY; } else { - this.top = menuPosition.top - 15 - this.$refs.popup.offsetHeight + window.scrollY; + this.top = menuPosition.top - 15 - this.$refs.popup.offsetHeight + pixelsScrolledY; } } else { this.top = menuPosition.top + (this.$refs.trigger.offsetHeight - 0.5 - this.$refs.popup.offsetHeight) / 2 + - window.scrollY; + pixelsScrolledY; if (this.direction === 'left') { - this.left = menuPosition.left - 10 - this.$refs.popup.offsetWidth + window.scrollX; + this.left = menuPosition.left - 10 - this.$refs.popup.offsetWidth + pixelsScrolledX; } else { - this.left = menuPosition.right + 15 + window.scrollX; + this.left = menuPosition.right + 15 + pixelsScrolledX; } } },