Skip to content

Fixed interactive gridlines to take into account brush when drawing points on stacked area chart #2154

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

Open
SpencerWie wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed interactive gridlines to take into account brush when drawing points on stacked area chart #2154

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbb9ab6
Fixed interactive gridlines to take into account brush when drawing p…
SpencerWie Apr 20, 2018
ca59760
built new package to use libary
SpencerWie Apr 20, 2018
215083a
Revert "built new package to use libary"
SpencerWie Apr 20, 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
70 changes: 42 additions & 28 deletions src/models/stackedAreaChart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,35 +414,49 @@ nv.models.stackedAreaChart = function() {
return !series.disabled;
})
.forEach(function(series,i) {
pointIndex = nv.interactiveBisect(series.values, e.pointXValue, chart.x());
var point = series.values[pointIndex];
var pointYValue = chart.y()(point, pointIndex);
if (pointYValue != null && pointYValue > 0) {
stacked.highlightPoint(i, pointIndex, true);
atleastOnePoint = true;
}

// Draw at least one point if all values are zero.
if (i === (data.length - 1) && !atleastOnePoint) {
stacked.highlightPoint(i, pointIndex, true);
}
if (typeof point === 'undefined') return;
if (typeof singlePoint === 'undefined') singlePoint = point;
if (typeof pointXLocation === 'undefined') pointXLocation = chart.xScale()(chart.x()(point,pointIndex));

//If we are in 'expand' mode, use the stacked percent value instead of raw value.
var tooltipValue = (stacked.style() == 'expand') ? point.display.y : chart.y()(point,pointIndex);
allData.push({
key: series.key,
value: tooltipValue,
color: color(series,series.seriesIndex),
point: point

var extent = focus.brush.extent() !== null ? (focus.brush.empty() ? focus.xScale().domain() : focus.brush.extent()) : x.domain();
var currentValues = series.values.filter(function(d,i) {
// Checks if the x point is between the extents, handling case where extent[0] is greater than extent[1]
// (e.g. x domain is manually set to reverse the x-axis)
if(extent[0] <= extent[1]) {
return stacked.x()(d,i) >= extent[0] && stacked.x()(d,i) <= extent[1];
} else {
return stacked.x()(d,i) >= extent[1] && stacked.x()(d,i) <= extent[0];
}
});

if (showTotalInTooltip && stacked.style() != 'expand' && tooltipValue != null) {
valueSum += tooltipValue;
allNullValues = false;
};

if (currentValues.length > 0) {
pointIndex = nv.interactiveBisect(currentValues, e.pointXValue, chart.x());
var point = currentValues[pointIndex];
var pointYValue = chart.y()(point, pointIndex);
if (pointYValue != null && pointYValue > 0) {
stacked.highlightPoint(i, pointIndex, true);
atleastOnePoint = true;
}

// Draw at least one point if all values are zero.
if (i === (data.length - 1) && !atleastOnePoint) {
stacked.highlightPoint(i, pointIndex, true);
}
if (typeof point === 'undefined') return;
if (typeof singlePoint === 'undefined') singlePoint = point;
if (typeof pointXLocation === 'undefined') pointXLocation = chart.xScale()(chart.x()(point,pointIndex));

//If we are in 'expand' mode, use the stacked percent value instead of raw value.
var tooltipValue = (stacked.style() == 'expand') ? point.display.y : chart.y()(point,pointIndex);
allData.push({
key: series.key,
value: tooltipValue,
color: color(series,series.seriesIndex),
point: point
});

if (showTotalInTooltip && stacked.style() != 'expand' && tooltipValue != null) {
valueSum += tooltipValue;
allNullValues = false;
};
}
});

allData.reverse();
Expand Down