Skip to content
Open
Show file tree
Hide file tree
Changes from 3 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
12 changes: 11 additions & 1 deletion src/traces/bar/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,17 @@ function handleText(traceIn, traceOut, layout, coerce, textposition, opts) {
if(moduleHasSelected) coerce('selected.textfont.color');
if(moduleHasUnselected) coerce('unselected.textfont.color');
if(moduleHasConstrain) coerce('constraintext');
if(moduleHasCliponaxis) coerce('cliponaxis');
if(moduleHasCliponaxis) {
if(traceOut.text && textposition === 'outside') {
// When `textposition` is `'outside'`, bar labels are very frequently clipped
// since text is not included in autorange calculations.
// So we set `cliponaxis` to `false` by default in that case to prevent clipping;
// otherwise we use the normal default for `cliponaxis`, which is `true`.
coerce('cliponaxis', false);
} else {
coerce('cliponaxis');
}
}
if(moduleHasTextangle) coerce('textangle');

coerce('texttemplate');
Expand Down
Binary file modified test/image/baselines/zz-pattern_bars-path.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions test/jasmine/tests/bar_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,46 @@ describe('Bar.supplyDefaults', function() {
expect(traceOut.insidetextfont.size).toBe(20);
});

it('should set cliponaxis to false when text has value and textposition is outside', function() {
traceIn = {
y: [1, 2, 3],
text: ['A', 'B', 'C'],
textposition: 'outside'
};
supplyDefaults(traceIn, traceOut, defaultColor, {});
expect(traceOut.cliponaxis).toBe(false);
});

it('should set cliponaxis to default (true) when text is not provided', function() {
traceIn = {
y: [1, 2, 3],
textposition: 'outside'
};
supplyDefaults(traceIn, traceOut, defaultColor, {});
expect(traceOut.cliponaxis).toBe(true);
});

it('should set cliponaxis to default (true) when textposition is not outside', function() {
traceIn = {
y: [1, 2, 3],
text: ['A', 'B', 'C'],
textposition: 'inside'
};
supplyDefaults(traceIn, traceOut, defaultColor, {});
expect(traceOut.cliponaxis).toBe(true);
});

it('should respect explicit cliponaxis setting even with text and outside position', function() {
traceIn = {
y: [1, 2, 3],
text: ['A', 'B', 'C'],
textposition: 'outside',
cliponaxis: true
};
supplyDefaults(traceIn, traceOut, defaultColor, {});
expect(traceOut.cliponaxis).toBe(true);
});

it('should inherit layout.calendar', function() {
traceIn = {
x: [1, 2, 3],
Expand Down
Loading