Skip to content

Add constraint info to parcats click/hover events #4211

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.

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
merged 2 commits into from
Sep 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/traces/parcats/calc.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,14 +86,15 @@ module.exports = function calc(gd, trace) {

// Build color generation function
function getMarkerColorInfo(index) {
var value;
var value, rawColor;
if(Lib.isArrayOrTypedArray(line.color)) {
value = line.color[index % line.color.length];
rawColor = value;
} else {
value = line.color;
}

return {color: markerColorscale(value), rawColor: value};
return {color: markerColorscale(value), rawColor: rawColor};
}

// Number of values and counts
Expand Down
57 changes: 52 additions & 5 deletions src/traces/parcats/parcats.js
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,10 @@ function mouseoverPath(d) {

// Emit hover event
var points = buildPointsArrayForPath(d);
d.parcatsViewModel.graphDiv.emit('plotly_hover', {points: points, event: d3.event});
var constraints = buildConstraintsForPath(d);
d.parcatsViewModel.graphDiv.emit('plotly_hover', {
points: points, event: d3.event, constraints: constraints
});

// Handle hover label
if(d.parcatsViewModel.hoverinfoItems.indexOf('none') === -1) {
Expand Down Expand Up @@ -503,7 +506,10 @@ function mouseoutPath(d) {
// Emit unhover event
if(d.parcatsViewModel.hoverinfoItems.indexOf('skip') === -1) {
var points = buildPointsArrayForPath(d);
d.parcatsViewModel.graphDiv.emit('plotly_unhover', {points: points, event: d3.event});
var constraints = buildConstraintsForPath(d);
d.parcatsViewModel.graphDiv.emit('plotly_unhover', {
points: points, event: d3.event, constraints: constraints
});
}
}
}
Expand All @@ -528,6 +534,30 @@ function buildPointsArrayForPath(d) {
return points;
}

/**
* Build constraints object for a path
*
* For use in click/hover events
* @param {PathViewModel} d
*/
function buildConstraintsForPath(d) {
var constraints = {};
var dimensions = d.parcatsViewModel.model.dimensions;

// dimensions
for(var i = 0; i < dimensions.length; i++) {
var dimension = dimensions[i];
var category = dimension.categories[d.model.categoryInds[i]];
constraints[dimension.containerInd] = category.categoryValue;
}

// color
if(d.model.rawColor !== undefined) {
constraints.color = d.model.rawColor;
}
return constraints;
}

/**
* Handle path click
* @param {PathViewModel} d
Expand All @@ -536,7 +566,10 @@ function clickPath(d) {
if(d.parcatsViewModel.hoverinfoItems.indexOf('skip') === -1) {
// hoverinfo it's skip, so interaction events aren't disabled
var points = buildPointsArrayForPath(d);
d.parcatsViewModel.graphDiv.emit('plotly_click', {points: points, event: d3.event});
var constraints = buildConstraintsForPath(d);
d.parcatsViewModel.graphDiv.emit('plotly_click', {
points: points, event: d3.event, constraints: constraints
});
}
}

Expand Down Expand Up @@ -672,6 +705,7 @@ function styleForColorHovermode(bandElement) {
function emitPointsEventCategoryHovermode(bandElement, eventName, event) {
// Get all bands in the current category
var bandViewModel = d3.select(bandElement).datum();
var categoryModel = bandViewModel.categoryViewModel.model;
var gd = bandViewModel.parcatsViewModel.graphDiv;
var bandSel = d3.select(bandElement.parentNode).selectAll('rect.bandrect');

Expand All @@ -684,7 +718,11 @@ function emitPointsEventCategoryHovermode(bandElement, eventName, event) {
});
});

gd.emit(eventName, {points: points, event: event});
var constraints = {};
constraints[categoryModel.dimensionInd] = categoryModel.categoryValue;
gd.emit(eventName, {
points: points, event: event, constraints: constraints
});
}

/**
Expand All @@ -697,6 +735,7 @@ function emitPointsEventCategoryHovermode(bandElement, eventName, event) {
*/
function emitPointsEventColorHovermode(bandElement, eventName, event) {
var bandViewModel = d3.select(bandElement).datum();
var categoryModel = bandViewModel.categoryViewModel.model;
var gd = bandViewModel.parcatsViewModel.graphDiv;
var paths = selectPathsThroughCategoryBandColor(bandViewModel);

Expand All @@ -706,7 +745,15 @@ function emitPointsEventColorHovermode(bandElement, eventName, event) {
Array.prototype.push.apply(points, buildPointsArrayForPath(pathViewModel));
});

gd.emit(eventName, {points: points, event: event});
var constraints = {};
constraints[categoryModel.dimensionInd] = categoryModel.categoryValue;
// color
if(bandViewModel.rawColor !== undefined) {
constraints.color = bandViewModel.rawColor;
}
gd.emit(eventName, {
points: points, event: event, constraints: constraints
});
}

/**
Expand Down
16 changes: 16 additions & 0 deletions test/jasmine/tests/parcats_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1190,6 +1190,10 @@ describe('Click events', function() {
{curveNumber: 0, pointNumber: 4},
{curveNumber: 0, pointNumber: 5},
{curveNumber: 0, pointNumber: 8}]);

// Check constraints
var constraints = clickData.constraints;
expect(constraints).toEqual({1: 'C'});
})
.catch(failTest)
.then(done);
Expand Down Expand Up @@ -1261,6 +1265,10 @@ describe('Click events', function() {
expect(pts).toEqual([
{curveNumber: 0, pointNumber: 5},
{curveNumber: 0, pointNumber: 8}]);

// Check constraints
var constraints = clickData.constraints;
expect(constraints).toEqual({0: 1, 1: 'C', 2: 11});
})
.catch(failTest)
.then(done);
Expand Down Expand Up @@ -1347,6 +1355,10 @@ describe('Click events with hoveron color', function() {
// Check points
expect(pts).toEqual([
{curveNumber: 0, pointNumber: 5}]);

// Check constraints
var constraints = clickData.constraints;
expect(constraints).toEqual({1: 'C', color: 1});
})
.catch(failTest)
.then(done);
Expand Down Expand Up @@ -1387,6 +1399,10 @@ describe('Click events with hoveron color', function() {
// Check points
expect(pts).toEqual([
{curveNumber: 0, pointNumber: 5}]);

// Check constraints
var constraints = clickData.constraints;
expect(constraints).toEqual({0: 1, 1: 'C', 2: 11, color: 1});
})
.catch(failTest)
.then(done);
Expand Down