Skip to content

Ensure empty candlestick traces don't lead to autotyped 'category' x-axis #1359

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 3 commits into from
Feb 8, 2017
Merged

Ensure empty candlestick traces don't lead to autotyped 'category' x-axis #1359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fbb460
ensure empty candlestick trace don't lead to autotyped 'category' x-axis
etpinard Feb 7, 2017
3a30ef2
robustify is-candlestick check in setAutoType
etpinard Feb 8, 2017
f2c4799
rm useless logic
etpinard Feb 8, 2017
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
7 changes: 5 additions & 2 deletions src/plots/cartesian/axis_defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,13 @@ function getBoxPosLetter(trace) {
}

function isBoxWithoutPositionCoords(trace, axLetter) {
var posLetter = getBoxPosLetter(trace);
var posLetter = getBoxPosLetter(trace),
isBox = Registry.traceIs(trace, 'box'),
isCandlestick = Registry.traceIs(trace._fullInput || {}, 'candlestick');

return (
Registry.traceIs(trace, 'box') &&
isBox &&
!isCandlestick &&
axLetter === posLetter &&
trace[posLetter] === undefined &&
trace[posLetter + '0'] === undefined
Expand Down
2 changes: 1 addition & 1 deletion src/traces/candlestick/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = {
moduleType: 'trace',
name: 'candlestick',
basePlotModule: require('../../plots/cartesian'),
categories: ['cartesian', 'showLegend'],
categories: ['cartesian', 'showLegend', 'candlestick'],
meta: {
description: [
'The candlestick is a style of financial chart describing',
Expand Down
7 changes: 7 additions & 0 deletions test/jasmine/tests/finance_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,13 @@ describe('finance charts defaults:', function() {
expect(fullTrace.xcalendar).toBe(i < 2 ? 'hebrew' : 'julian');
});
});

it('should make empty candlestick traces autotype to *linear* (as opposed to real box traces)', function() {
var trace0 = { type: 'candlestick' };
var out = _supply([trace0], { xaxis: {} });

expect(out._fullLayout.xaxis.type).toEqual('linear');
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Before this patch, this assertions resulted in 'category'.

});
});

describe('finance charts calc transforms:', function() {
Expand Down