Skip to content

Skip over placeholder calc traces in bar set positions #1369

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

Merged
merged 1 commit into from
Feb 10, 2017
Merged

Skip over placeholder calc traces in bar set positions #1369

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/traces/bar/set_positions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ module.exports = function setPositions(gd, plotinfo) {
fullTrace.visible === true &&
Registry.traceIs(fullTrace, 'bar') &&
fullTrace.xaxis === xa._id &&
fullTrace.yaxis === ya._id
fullTrace.yaxis === ya._id &&
!calcTraces[i][0].placeholder
) {
if(fullTrace.orientation === 'h') {
calcTracesHorizontal.push(calcTraces[i]);
Expand Down
29 changes: 18 additions & 11 deletions test/jasmine/tests/bar_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,23 @@ describe('Bar.setPositions', function() {
expect(Axes.getAutoRange(xa)).toBeCloseToArray([-0.5, 2.5], undefined, '(xa.range)');
expect(Axes.getAutoRange(ya)).toBeCloseToArray([-1.11, 1.11], undefined, '(ya.range)');
});

it('should skip placeholder trace in position computations', function() {
var gd = mockBarPlot([{
x: [1, 2, 3],
y: [2, 1, 2]
}, {
x: [null],
y: [null]
}]);

expect(gd.calcdata[0][0].t.barwidth).toEqual(0.8);

expect(gd.calcdata[1][0].x).toBe(false);
expect(gd.calcdata[1][0].y).toBe(false);
expect(gd.calcdata[1][0].placeholder).toBe(true);
expect(gd.calcdata[1][0].t.barwidth).toBeUndefined();
});
});

describe('A bar plot', function() {
Expand Down Expand Up @@ -1231,18 +1248,8 @@ function mockBarPlot(dataWithoutTraceType, layout) {
calcdata: []
};

// call Bar.supplyDefaults
Plots.supplyDefaults(gd);

// call Bar.calc
gd._fullData.forEach(function(fullTrace) {
var cd = Bar.calc(gd, fullTrace);

cd[0].t = {};
cd[0].trace = fullTrace;

gd.calcdata.push(cd);
});
Plots.doCalcdata(gd);

var plotinfo = {
xaxis: gd._fullLayout.xaxis,
Expand Down