Skip to content

Hover label namelength #1822

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 6 commits into from
Jul 19, 2017
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
14 changes: 14 additions & 0 deletions src/components/fx/attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,20 @@ module.exports = {
family: extendFlat({}, fontAttrs.family, { arrayOk: true }),
size: extendFlat({}, fontAttrs.size, { arrayOk: true }),
color: extendFlat({}, fontAttrs.color, { arrayOk: true })
},
namelength: {
valType: 'integer',
min: -1,
arrayOk: true,
role: 'style',
description: [
'Sets the length (in number of characters) of the trace name in',
'the hover labels for this trace. -1 shows the whole name',
'regardless of length. 0-3 shows the first 0-3 characters, and',
'an integer >3 will show the whole name if it is less than that',
'many characters, but if it is longer, will truncate to',
'`namelength - 3` characters and add an ellipsis.'
].join(' ')
}
}
};
1 change: 1 addition & 0 deletions src/components/fx/calc.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module.exports = function calc(gd) {
fillFn(trace.hoverlabel.font.size, cd, 'hts');
fillFn(trace.hoverlabel.font.color, cd, 'htc');
fillFn(trace.hoverlabel.font.family, cd, 'htf');
fillFn(trace.hoverlabel.namelength, cd, 'hnl');
}
};

Expand Down
8 changes: 7 additions & 1 deletion src/components/fx/hover.js
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,12 @@ function createHoverText(hoverData, opts, gd) {
// strip out our pseudo-html elements from d.name (if it exists at all)
name = svgTextUtils.plainText(d.name || '');

if(name.length > 15) name = name.substr(0, 12) + '...';
var nameLength = Math.round(d.nameLength);

if(nameLength > -1 && name.length > nameLength) {
if(nameLength > 3) name = name.substr(0, nameLength - 3) + '...';
else name = name.substr(0, nameLength);
}
}

// used by other modules (initially just ternary) that
Expand Down Expand Up @@ -1061,6 +1066,7 @@ function cleanPoint(d, hovermode) {
fill('fontFamily', 'htf', 'hoverlabel.font.family');
fill('fontSize', 'hts', 'hoverlabel.font.size');
fill('fontColor', 'htc', 'hoverlabel.font.color');
fill('nameLength', 'hnl', 'hoverlabel.namelength');

d.posref = hovermode === 'y' ? (d.x0 + d.x1) / 2 : (d.y0 + d.y1) / 2;

Expand Down
1 change: 1 addition & 0 deletions src/components/fx/hoverlabel_defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ module.exports = function handleHoverLabelDefaults(contIn, contOut, coerce, opts

coerce('hoverlabel.bgcolor', opts.bgcolor);
coerce('hoverlabel.bordercolor', opts.bordercolor);
coerce('hoverlabel.namelength', opts.namelength);
Lib.coerceFont(coerce, 'hoverlabel.font', opts.font);
};
14 changes: 14 additions & 0 deletions src/components/fx/layout_attributes.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@ module.exports = {
dflt: constants.HOVERFONTSIZE
}),
color: extendFlat({}, fontAttrs.color)
},
namelength: {
valType: 'integer',
min: -1,
dflt: 15,
role: 'style',
description: [
'Sets the default length (in number of characters) of the trace name in',
'the hover labels for all traces. -1 shows the whole name',
'regardless of length. 0-3 shows the first 0-3 characters, and',
'an integer >3 will show the whole name if it is less than that',
'many characters, but if it is longer, will truncate to',
'`namelength - 3` characters and add an ellipsis.'
].join(' ')
}
}
};
2 changes: 1 addition & 1 deletion src/lib/coerce.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ exports.valObjects = {
'are coerced to the `dflt`.'
].join(' '),
requiredOpts: [],
otherOpts: ['dflt', 'min', 'max'],
otherOpts: ['dflt', 'min', 'max', 'arrayOk'],
coerceFunction: function(v, propOut, dflt, opts) {
if(v % 1 || !isNumeric(v) ||
(opts.min !== undefined && v < opts.min) ||
Expand Down
6 changes: 4 additions & 2 deletions test/jasmine/tests/fx_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ describe('Fx defaults', function() {
family: 'Roboto',
size: 40,
color: 'pink'
}
},
namelength: 15
});

expect(out.data[1].hoverlabel).toEqual({
Expand All @@ -158,7 +159,8 @@ describe('Fx defaults', function() {
family: 'Roboto',
size: 20,
color: 'red'
}
},
namelength: 15
});

expect(out.layout.annotations[0].hoverlabel).toEqual({
Expand Down
14 changes: 10 additions & 4 deletions test/jasmine/tests/hover_label_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,13 @@ describe('hover info on stacked subplots', function() {
});

describe('hover info on stacked subplots with shared y-axis', function() {
var mock = require('@mocks/stacked_subplots_shared_yaxis.json');
var mock = Lib.extendDeep(require('@mocks/stacked_subplots_shared_yaxis.json'));
mock.data[0].name = 'Who put the bomp in the bomp bah bomp bah bomp';
mock.data[0].hoverlabel = {namelength: -1};
mock.data[1].name = 'Who put the ram in the rama lama ding dong';
mock.data[1].hoverlabel = {namelength: [2, 4]};
mock.data[2].name = 'Who put the bop in the bop shoo bop shoo bop';
mock.layout.hoverlabel = {namelength: 10};

beforeEach(function(done) {
Plotly.plot(createGraphDiv(), mock.data, mock.layout).then(done);
Expand Down Expand Up @@ -727,11 +733,11 @@ describe('hover info on stacked subplots', function() {
expect(d3.selectAll('g.hovertext').size()).toEqual(3);
var textNodes = d3.selectAll('g.hovertext').selectAll('text');

expect(textNodes[0][0].innerHTML).toEqual('trace 0');
expect(textNodes[0][0].innerHTML).toEqual('Who put the bomp in the bomp bah bomp bah bomp');
expect(textNodes[0][1].innerHTML).toEqual('1');
expect(textNodes[1][0].innerHTML).toEqual('trace 1');
expect(textNodes[1][0].innerHTML).toEqual('Wh');
expect(textNodes[1][1].innerHTML).toEqual('2.1');
expect(textNodes[2][0].innerHTML).toEqual('trace 2');
expect(textNodes[2][0].innerHTML).toEqual('Who put...');
expect(textNodes[2][1].innerHTML).toEqual('3');
});
});
Expand Down