mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Tolltip thweak to not require the passing in of the parent

Browse source
This commit is contained in:
wmwragg 2016-09-04 07:41:48 +01:00
parent c2d8067523
commit 5417385c83
2 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/views/rooms/RoomTooltip.js
View file

@ -25,9 +25,6 @@ module.exports = React.createClass({
displayName: 'RoomTooltip',
propTypes: {
// The 'parent' can either be a React component or a DOM element
parent: React.PropTypes.object.isRequired,
// The tooltip is derived from either the room name or a label
room: React.PropTypes.object,
label: React.PropTypes.string,
@ -83,19 +80,11 @@ module.exports = React.createClass({
if (this.props.left) { style.left = this.props.left; }
if (this.props.right) { style.right = this.props.right; }
var parent;
if (this._isDOMElement(this.props.parent)) {
parent = this.props.parent;
} else if (this._isReactComponent(this.props.parent)) {
parent = ReactDOM.findDOMNode(this.props.parent);
} else {
parent = null;
}
// If a parent exists, add the parent's position to the tooltips, so it's correctly
// positioned, also taking into account any window zoom
// NOTE: The additional 6 pixels for the left position, is to take account of the
// tooltips chevron
var parent = ReactDOM.findDOMNode(this).parentElement;
if (parent) {
style.top = (+style.top || 0) + parent.getBoundingClientRect().top + window.pageYOffset;
style.left = (+style.left || 0) + 6 + parent.getBoundingClientRect().right + window.pageXOffset;