Skip to content
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

Jump to bottom

Fix tooltip text overflow #41703

Merged
merged 11 commits into from
Aug 13, 2019
Merged

Fix tooltip text overflow #41703

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
559810b
Fix tooltip text overflow
markov00 Jul 22, 2019
fa2e046
Fix added spaces on td
markov00 Jul 22, 2019
cabd2ef
Add IE11 support
markov00 Jul 22, 2019
34c2582
Fix parsing css eui styles
markov00 Jul 31, 2019
33bb3d7
Apply euiTextOverflowWrap
markov00 Jul 31, 2019
b414741
Merge branch 'master' into fix_tooltip_overflow
markov00 Jul 31, 2019
1f60be5
Merge branch 'master' into fix_tooltip_overflow
markov00 Aug 7, 2019
c6ea03e
Merge branch 'master' into fix_tooltip_overflow
markov00 Aug 12, 2019
da74cc7
Add euiTextOverflowWrap to table td/th
markov00 Aug 12, 2019
e9f3120
Revert to overflow-wrap and word-wrap css
markov00 Aug 13, 2019
0ac76fa
Add text-align: left for IE11, add few comments
markov00 Aug 13, 2019
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
8 changes: 6 additions & 2 deletions src/legacy/ui/public/vis/components/tooltip/_hierarchical_tooltip.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@
</thead>
<tbody>
<tr class="visTooltip__value" ng-repeat="row in rows track by $index">
<td><span ng-bind-html="row.spacer"></span>{{row.field}}</td>
<td>{{row.bucket}}</td>
<td>
nickofthyme marked this conversation as resolved.
Show resolved Hide resolved
<div class="visTooltip__labelContainer"><span ng-bind-html="row.spacer"></span>{{row.field}}</div>
</td>
<td>
<div class="visTooltip__labelContainer">{{row.bucket}}
</td>
<td>{{row.metric}}</td>
</tr>
</tbody>
Expand Down
7 changes: 4 additions & 3 deletions src/legacy/ui/public/vis/components/tooltip/_pointseries_tooltip.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<table>
<tbody>
<tr ng-repeat="detail in details" >
<td class="visTooltip__label">{{detail.label}}</td>
<td class="visTooltip__label">
<div class="visTooltip__labelContainer">{{detail.label}}</div>
cchaos marked this conversation as resolved.
Show resolved Hide resolved
</td>
<td class="visTooltip__value">
{{detail.value}}
<span ng-if="detail.percent"> ({{detail.percent}})</span>
<div class="visTooltip__valueContainer">{{detail.value}}<span ng-if="detail.percent"> ({{detail.percent}})</span></div>
</td>
</tr>
</tbody>
Expand Down
7 changes: 7 additions & 0 deletions src/legacy/ui/public/vis/components/tooltip/_tooltip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
td,
th {
padding: $euiSizeXS;
overflow-wrap: break-word;
word-wrap: break-word;
}
}
}
Expand All @@ -41,6 +43,11 @@
margin-top: $euiSizeS;
}
}
.visTooltip__labelContainer,
.visTooltip__valueContainer {
overflow-wrap: break-word;
word-wrap: break-word;
}

.visTooltip__headerIcon {
flex: 0 0 auto;
Expand Down
41 changes: 41 additions & 0 deletions src/legacy/ui/public/vis/components/tooltip/tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,14 @@ import _ from 'lodash';
import { Binder } from '../../../binder';
import { positionTooltip } from './position_tooltip';
import $ from 'jquery';
import theme from '@elastic/eui/dist/eui_theme_light.json';

let allContents = [];

const tooltipColumnPadding = Number(theme.euiSizeXS.split('px')[0]) * 2;
nickofthyme marked this conversation as resolved.
Show resolved Hide resolved
const tooltipTableMargin = Number(theme.euiSizeS.split('px')[0]) * 2;
const tooltipMaxWidth = Number(theme.euiSizeXL.split('px')[0]) * 10;

/**
* Add tooltip and listeners to visualization elements
*
Expand Down Expand Up @@ -97,6 +102,42 @@ Tooltip.prototype.show = function () {
left: placement.left,
top: placement.top
});
const tooltipColumns = $tooltip.find('tbody > tr:nth-of-type(1) > td').length;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like a lot of match and element targeting. I'd suggest highly commenting on what is going on so others can follow in case anything needs to be adjusted.

if (tooltipColumns === 2) {
// on pointseries tooltip
const tooltipWidth = $tooltip.outerWidth();
const valueColumn = $tooltip.find('tr:nth-of-type(1) > td:nth-child(2)');
if (valueColumn.length !== 1) {
return;
}
const valueColumnSize = valueColumn.outerWidth();
const isGratherThanHalf = valueColumnSize > tooltipWidth / 2;
const containerMaxWidth = isGratherThanHalf
? tooltipWidth / 2 - tooltipTableMargin - tooltipColumnPadding * 2
: tooltipWidth - valueColumnSize - tooltipTableMargin - tooltipColumnPadding;

$tooltip.find('.visTooltip__labelContainer').css({
'max-width': containerMaxWidth,
});
if (isGratherThanHalf && tooltipWidth === tooltipMaxWidth) {
$tooltip.find('.visTooltip__valueContainer').css({
'max-width': containerMaxWidth,
});
}
} else if(tooltipColumns === 3) {
// on hierarchical tooltip
const tooltipWidth = $tooltip.outerWidth();
const valueColumn = $tooltip.find('tr:nth-of-type(1) > td:nth-child(3)');
if (valueColumn.length !== 1) {
return;
}
const valueColumnSize = valueColumn.outerWidth();
const containerMaxWidth = (tooltipWidth - valueColumnSize - tooltipTableMargin) / 2 - tooltipColumnPadding;

$tooltip.find('.visTooltip__labelContainer').css({
'max-width': containerMaxWidth
});
}
};

/**
Expand Down