From 5cf1574fdb36e14e342e3cbdd9733e0a1817a7cb Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Tue, 16 Jun 2020 17:20:36 +0300 Subject: fix popovers cutting off in notifications, port popover changes from chats mr --- src/components/popover/popover.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/components/popover/popover.js') diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js index 5881d266..f1abe3ad 100644 --- a/src/components/popover/popover.js +++ b/src/components/popover/popover.js @@ -10,6 +10,9 @@ const Popover = { // 'container' for using offsetParent as boundaries for either axis // or 'viewport' boundTo: Object, + // Takes a selector to use as a replacement for the parent container + // for getting boundaries for x an y axis + boundToSelector: String, // Takes a top/bottom/left/right object, how much space to leave // between boundary and popover element margin: Object, @@ -27,6 +30,11 @@ const Popover = { } }, methods: { + containerBoundingClientRect () { + const container = this.boundToSelector ? document.querySelector(this.boundToSelector) : this.$el.offsetParent + console.log('test', container) + return container.getBoundingClientRect() + }, updateStyles () { if (this.hidden) { this.styles = { @@ -45,7 +53,8 @@ const Popover = { // Minor optimization, don't call a slow reflow call if we don't have to const parentBounds = this.boundTo && (this.boundTo.x === 'container' || this.boundTo.y === 'container') && - this.$el.offsetParent.getBoundingClientRect() + this.containerBoundingClientRect() + const margin = this.margin || {} // What are the screen bounds for the popover? Viewport vs container -- cgit v1.2.3-70-g09d2 From 5a8a428c154984b953724214284c01f270af5eb8 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Tue, 16 Jun 2020 17:30:56 +0300 Subject: remove log whoops --- src/components/popover/popover.js | 1 - 1 file changed, 1 deletion(-) (limited to 'src/components/popover/popover.js') diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js index f1abe3ad..ded7066f 100644 --- a/src/components/popover/popover.js +++ b/src/components/popover/popover.js @@ -32,7 +32,6 @@ const Popover = { methods: { containerBoundingClientRect () { const container = this.boundToSelector ? document.querySelector(this.boundToSelector) : this.$el.offsetParent - console.log('test', container) return container.getBoundingClientRect() }, updateStyles () { -- cgit v1.2.3-70-g09d2 From 24e47eb604330a8858dac9761545e499f73be8c4 Mon Sep 17 00:00:00 2001 From: Shpuld Shpludson Date: Tue, 16 Jun 2020 15:12:44 +0000 Subject: Update popover.js --- src/components/popover/popover.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/components/popover/popover.js') diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js index ded7066f..a40a9195 100644 --- a/src/components/popover/popover.js +++ b/src/components/popover/popover.js @@ -1,4 +1,3 @@ - const Popover = { name: 'Popover', props: { @@ -31,7 +30,7 @@ const Popover = { }, methods: { containerBoundingClientRect () { - const container = this.boundToSelector ? document.querySelector(this.boundToSelector) : this.$el.offsetParent + const container = this.boundToSelector ? this.$el.closest(this.boundToSelector) : this.$el.offsetParent return container.getBoundingClientRect() }, updateStyles () { -- cgit v1.2.3-70-g09d2