Skip to content

Commit 2c184fd

Browse files
committed
revise createHoverText calling arguments
1 parent 0ac2420 commit 2c184fd

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

src/components/fx/hover.js

+12-11
Original file line numberDiff line numberDiff line change
@@ -205,15 +205,16 @@ exports.loneHover = function loneHover(hoverItems, opts) {
205205
};
206206
});
207207

208-
var fullOpts = {
208+
var rotateLabels = false;
209+
210+
var hoverLabel = createHoverText(pointsData, {
211+
gd: gd,
209212
hovermode: 'closest',
210-
rotateLabels: false,
213+
rotateLabels: rotateLabels,
211214
bgColor: opts.bgColor || Color.background,
212215
container: d3.select(opts.container),
213216
outerContainer: opts.outerContainer || opts.container
214-
};
215-
216-
var hoverLabel = createHoverText(pointsData, fullOpts, gd);
217+
});
217218

218219
// Fix vertical overlap
219220
var tooltipSpacing = 5;
@@ -240,7 +241,7 @@ exports.loneHover = function loneHover(hoverItems, opts) {
240241

241242
var scaleX = gd._fullLayout._invScaleX;
242243
var scaleY = gd._fullLayout._invScaleY;
243-
alignHoverText(hoverLabel, fullOpts.rotateLabels, scaleX, scaleY);
244+
alignHoverText(hoverLabel, rotateLabels, scaleX, scaleY);
244245

245246
return multiHover ? hoverLabel : hoverLabel.node();
246247
};
@@ -822,17 +823,16 @@ function _hover(gd, evt, subplot, noHoverEvent) {
822823
fullLayout.paper_bgcolor
823824
);
824825

825-
var labelOpts = {
826+
var hoverLabels = createHoverText(hoverData, {
827+
gd: gd,
826828
hovermode: hovermode,
827829
rotateLabels: rotateLabels,
828830
bgColor: bgColor,
829831
container: fullLayout._hoverlayer,
830832
outerContainer: fullLayout._paper.node(),
831833
commonLabelOpts: fullLayout.hoverlabel,
832834
hoverdistance: fullLayout.hoverdistance
833-
};
834-
835-
var hoverLabels = createHoverText(hoverData, labelOpts, gd);
835+
});
836836

837837
if(!helpers.isUnifiedHover(hovermode)) {
838838
hoverAvoidOverlaps(hoverLabels, rotateLabels ? 'xa' : 'ya', fullLayout);
@@ -870,7 +870,8 @@ function hoverDataKey(d) {
870870

871871
var EXTRA_STRING_REGEX = /<extra>([\s\S]*)<\/extra>/;
872872

873-
function createHoverText(hoverData, opts, gd) {
873+
function createHoverText(hoverData, opts) {
874+
var gd = opts.gd;
874875
var fullLayout = gd._fullLayout;
875876
var hovermode = opts.hovermode;
876877
var rotateLabels = opts.rotateLabels;

0 commit comments

Comments
 (0)