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(core): keep tooltip hidden if legend truncation is set to none #1471

Merged
merged 1 commit into from Dec 6, 2022
Merged

fix(core): keep tooltip hidden if legend truncation is set to none #1471

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 25 additions & 12 deletions packages/core/src/components/essentials/legend.ts
View file
Open in desktop
Expand Up @@ -402,7 +402,6 @@ export class Legend extends Component {

const addedLegendItemsText = svg.selectAll('div.legend-item p');

const self = this;
// Add an ID for the checkbox to use through `aria-labelledby`
addedLegendItemsText.attr('id', function (d, i) {
const elementToReference =
Expand Down Expand Up @@ -435,11 +434,7 @@ export class Legend extends Component {
const svg = this.getComponentContainer();
const options = this.getOptions();
const legendOptions = Tools.getProperty(options, 'legend');
const truncationThreshold = Tools.getProperty(
legendOptions,
'truncation',
'threshold'
);
const truncation = Tools.getProperty(legendOptions, 'truncation');

svg.selectAll('div.legend-item')
.on('mouseover', function (event) {
Expand All @@ -450,8 +445,12 @@ export class Legend extends Component {
const hoveredItem = select(this);
hoveredItem.select('div.checkbox').classed('hovered', true);

// Show tooltip if character length is greater than threshold & there is no truncation
const hoveredItemData = hoveredItem.datum() as any;
if (hoveredItemData.name.length > truncationThreshold) {
if (
hoveredItemData.name.length > truncation.threshold &&
truncation.type !== TruncationTypes.NONE
) {
self.services.events.dispatchEvent(Events.Tooltip.SHOW, {
event,
hoveredElement: hoveredItem,
Expand All @@ -460,9 +459,16 @@ export class Legend extends Component {
}
})
.on('mousemove', function (event) {
self.services.events.dispatchEvent(Events.Tooltip.MOVE, {
event,
});
// Emit tooltip move event only if tooltip is shown
const hoveredItemData = select(this).datum() as any;
if (
hoveredItemData.name.length > truncation.threshold &&
truncation.type !== TruncationTypes.NONE
) {
self.services.events.dispatchEvent(Events.Tooltip.MOVE, {
event,
});
}
})
.on('click', function () {
self.services.events.dispatchEvent(Events.Legend.ITEM_CLICK, {
Expand All @@ -478,7 +484,14 @@ export class Legend extends Component {
const hoveredItem = select(this);
hoveredItem.select('div.checkbox').classed('hovered', false);

self.services.events.dispatchEvent(Events.Tooltip.HIDE);
// Emit tooltip hide event only if tooltip is shown
const hoveredItemData = hoveredItem.datum() as any;
if (
hoveredItemData.name.length > truncation.threshold &&
truncation.type !== TruncationTypes.NONE
) {
self.services.events.dispatchEvent(Events.Tooltip.HIDE);
}

self.services.events.dispatchEvent(
Events.Legend.ITEM_MOUSEOUT,
Expand Down Expand Up @@ -525,7 +538,7 @@ export class Legend extends Component {
const hoveredItem = select(this);

const hoveredItemData = hoveredItem.datum() as any;
if (hoveredItemData.name.length > truncationThreshold) {
if (hoveredItemData.name.length > truncation.threshold) {
self.services.events.dispatchEvent(Events.Tooltip.SHOW, {
event,
hoveredElement: hoveredItem,
Expand Down