Skip to content

[FIX] Popover position #11113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 5 commits into from
Jun 13, 2018
Merged

[FIX] Popover position #11113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b4c22d
Fix popover to precompute target position
tassoevan Jun 12, 2018
3300a3f
Merge branch 'develop' into popover-appearance-position-fix
tassoevan Jun 13, 2018
14bd682
Add comment for clarity
tassoevan Jun 13, 2018
303e69b
Show popover only after rendered into DOM tree
tassoevan Jun 13, 2018
76c2c4c
Fix popover size computation by hiding it using CSS visibility
tassoevan Jun 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/rocketchat-ui/client/views/app/popover.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template name="popover">
<div class="rc-popover rc-popover--{{popoverClass}}" data-popover="popover" style="display:block;">
<div class="rc-popover rc-popover--{{popoverClass}}" data-popover="popover" style="display: block; visibility: hidden;">
<div class="rc-popover__content {{#if isSafariIos}}rc-popover__content--safariIos{{/if}}">
{{#if template}}
{{> Template.dynamic template=template data=data}}
Expand Down
17 changes: 12 additions & 5 deletions packages/rocketchat-ui/client/views/app/popover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ import { hide, leave } from 'meteor/rocketchat:lib';

this.popover = {
renderedPopover: null,
open(config) {
this.renderedPopover = Blaze.renderWithData(Template.popover, config, document.body);
open({ currentTarget, ...config }) {
// Popover position must be computed as soon as possible, avoiding DOM changes over currentTarget
const data = {
targetRect: currentTarget && currentTarget.getBoundingClientRect && currentTarget.getBoundingClientRect(),
...config
};
this.renderedPopover = Blaze.renderWithData(Template.popover, data, document.body);
},
close() {
if (!this.renderedPopover) {
Expand Down Expand Up @@ -52,8 +57,8 @@ Template.popover.onRendered(function() {
const customCSSProperties = typeof this.data.customCSSProperties === 'function' ? this.data.customCSSProperties() : this.data.customCSSProperties;

const mousePosition = typeof this.data.mousePosition === 'function' ? this.data.mousePosition() : this.data.mousePosition || {
x: this.data.currentTarget.getBoundingClientRect()[horizontalDirection === 'left'? 'right' : 'left'],
y: this.data.currentTarget.getBoundingClientRect()[verticalDirection]
x: this.data.targetRect[horizontalDirection === 'left'? 'right' : 'left'],
y: this.data.targetRect[verticalDirection]
};
const offsetWidth = offsetHorizontal * (horizontalDirection === 'left' ? 1 : -1);
const offsetHeight = offsetVertical * (verticalDirection === 'bottom' ? 1 : -1);
Expand All @@ -62,7 +67,7 @@ Template.popover.onRendered(function() {
popoverContent.style.top = `${ position.top }px`;
popoverContent.style.left = `${ position.left }px`;
} else {
const clientHeight = this.data.currentTarget.clientHeight;
const clientHeight = this.data.targetRect.height;
const popoverWidth = popoverContent.offsetWidth;
const popoverHeight = popoverContent.offsetHeight;
const windowWidth = window.innerWidth;
Expand Down Expand Up @@ -122,6 +127,8 @@ Template.popover.onRendered(function() {
$(window).on('resize', position);
position();
this.position = position;

this.firstNode.style.visibility = 'visible';
});

Template.popover.onDestroyed(function() {
Expand Down