@@ -205,18 +205,16 @@ exports.loneHover = function loneHover(hoverItems, opts) {
205
205
} ;
206
206
} ) ;
207
207
208
- var container3 = d3 . select ( opts . container ) ;
209
- var outerContainer3 = opts . outerContainer ? d3 . select ( opts . outerContainer ) : container3 ;
208
+ var rotateLabels = false ;
210
209
211
- var fullOpts = {
210
+ var hoverLabel = createHoverText ( pointsData , {
211
+ gd : gd ,
212
212
hovermode : 'closest' ,
213
- rotateLabels : false ,
213
+ rotateLabels : rotateLabels ,
214
214
bgColor : opts . bgColor || Color . background ,
215
- container : container3 ,
216
- outerContainer : outerContainer3
217
- } ;
218
-
219
- var hoverLabel = createHoverText ( pointsData , fullOpts , gd ) ;
215
+ container : d3 . select ( opts . container ) ,
216
+ outerContainer : opts . outerContainer || opts . container
217
+ } ) ;
220
218
221
219
// Fix vertical overlap
222
220
var tooltipSpacing = 5 ;
@@ -243,7 +241,7 @@ exports.loneHover = function loneHover(hoverItems, opts) {
243
241
244
242
var scaleX = gd . _fullLayout . _invScaleX ;
245
243
var scaleY = gd . _fullLayout . _invScaleY ;
246
- alignHoverText ( hoverLabel , fullOpts . rotateLabels , scaleX , scaleY ) ;
244
+ alignHoverText ( hoverLabel , rotateLabels , scaleX , scaleY ) ;
247
245
248
246
return multiHover ? hoverLabel : hoverLabel . node ( ) ;
249
247
} ;
@@ -657,7 +655,6 @@ function _hover(gd, evt, subplot, noHoverEvent) {
657
655
var spikelineOpts = {
658
656
fullLayout : fullLayout ,
659
657
container : fullLayout . _hoverlayer ,
660
- outerContainer : fullLayout . _paperdiv ,
661
658
event : evt
662
659
} ;
663
660
var oldspikepoints = gd . _spikepoints ;
@@ -826,17 +823,16 @@ function _hover(gd, evt, subplot, noHoverEvent) {
826
823
fullLayout . paper_bgcolor
827
824
) ;
828
825
829
- var labelOpts = {
826
+ var hoverLabels = createHoverText ( hoverData , {
827
+ gd : gd ,
830
828
hovermode : hovermode ,
831
829
rotateLabels : rotateLabels ,
832
830
bgColor : bgColor ,
833
831
container : fullLayout . _hoverlayer ,
834
- outerContainer : fullLayout . _paperdiv ,
832
+ outerContainer : fullLayout . _paper . node ( ) ,
835
833
commonLabelOpts : fullLayout . hoverlabel ,
836
834
hoverdistance : fullLayout . hoverdistance
837
- } ;
838
-
839
- var hoverLabels = createHoverText ( hoverData , labelOpts , gd ) ;
835
+ } ) ;
840
836
841
837
if ( ! helpers . isUnifiedHover ( hovermode ) ) {
842
838
hoverAvoidOverlaps ( hoverLabels , rotateLabels ? 'xa' : 'ya' , fullLayout ) ;
@@ -874,7 +870,8 @@ function hoverDataKey(d) {
874
870
875
871
var EXTRA_STRING_REGEX = / < e x t r a > ( [ \s \S ] * ) < \/ e x t r a > / ;
876
872
877
- function createHoverText ( hoverData , opts , gd ) {
873
+ function createHoverText ( hoverData , opts ) {
874
+ var gd = opts . gd ;
878
875
var fullLayout = gd . _fullLayout ;
879
876
var hovermode = opts . hovermode ;
880
877
var rotateLabels = opts . rotateLabels ;
@@ -894,7 +891,7 @@ function createHoverText(hoverData, opts, gd) {
894
891
var ya = c0 . ya ;
895
892
var axLetter = hovermode . charAt ( 0 ) ;
896
893
var t0 = c0 [ axLetter + 'Label' ] ;
897
- var outerContainerBB = outerContainer . node ( ) . getBoundingClientRect ( ) ;
894
+ var outerContainerBB = outerContainer . getBoundingClientRect ( ) ;
898
895
var outerTop = outerContainerBB . top ;
899
896
var outerWidth = outerContainerBB . width ;
900
897
var outerHeight = outerContainerBB . height ;
0 commit comments