11import { select } from 'd3-selection' ;
2+ import type { FullAxis , FullLayout , GraphDiv } from '../../types/core' ;
23import Registry from '../registry.js' ;
34import { allowAutoMargin , autoMargin , doAutoMargin , previousPromises , style } from '../plots/plots.js' ;
45import { ensureSingle , ensureSingleById , isBottomAnchor , isLeftAnchor , isMiddleAnchor , isRightAnchor , isTopAnchor , pushUnique , syncOrAsync } from '../lib/index.js' ;
@@ -21,7 +22,7 @@ var SVG_TEXT_ANCHOR_START = 'start';
2122var SVG_TEXT_ANCHOR_MIDDLE = 'middle' ;
2223var SVG_TEXT_ANCHOR_END = 'end' ;
2324
24- export var layoutStyles = function ( gd ?: any ) : any {
25+ export var layoutStyles = function ( gd : GraphDiv ) : any {
2526 return syncOrAsync ( [ doAutoMargin , lsInner ] , gd ) ;
2627} ;
2728
@@ -40,8 +41,8 @@ function overlappingDomain(xDomain?: any, yDomain?: any, domains?: any): any {
4041 return false ;
4142}
4243
43- function lsInner ( gd ?: any ) : any {
44- var fullLayout : any = gd . _fullLayout ;
44+ function lsInner ( gd : GraphDiv ) : any {
45+ var fullLayout = gd . _fullLayout ;
4546 var gs = fullLayout . _size ;
4647 var pad = gs . p ;
4748 var axList = Axes . list ( gd , '' , true ) ;
@@ -400,9 +401,9 @@ function findCounterAxisLineWidth(ax?: any, side?: any, counterAx?: any, axList?
400401 return 0 ;
401402}
402403
403- export var drawMainTitle = function ( gd ?: any ) : any {
404+ export var drawMainTitle = function ( gd : GraphDiv ) : any {
404405 var title : any = gd . _fullLayout . title ;
405- var fullLayout : any = gd . _fullLayout ;
406+ var fullLayout = gd . _fullLayout ;
406407 var textAnchor = getMainTitleTextAnchor ( fullLayout ) ;
407408 var dy = getMainTitleDy ( fullLayout ) ;
408409 var y = getMainTitleY ( fullLayout , dy ) ;
@@ -623,14 +624,14 @@ function getMainTitleDy(fullLayout?: any): any {
623624 return dy ;
624625}
625626
626- export var doTraceStyle = function ( gd ?: any ) : any {
627+ export var doTraceStyle = function ( gd : GraphDiv ) : any {
627628 var calcdata = gd . calcdata ;
628629 var editStyleCalls = [ ] ;
629630 var i ;
630631
631632 for ( i = 0 ; i < calcdata . length ; i ++ ) {
632633 var cd = calcdata [ i ] ;
633- var cd0 = cd [ 0 ] || { } ;
634+ var cd0 : any = cd [ 0 ] || { } ;
634635 var trace : any = cd0 . trace || { } ;
635636 var _module = trace . _module || { } ;
636637
@@ -660,23 +661,23 @@ export var doTraceStyle = function(gd?: any): any {
660661 return previousPromises ( gd ) ;
661662} ;
662663
663- export var doColorBars = function ( gd ?: any ) : any {
664+ export var doColorBars = function ( gd : GraphDiv ) : any {
664665 Registry . getComponentMethod ( 'colorbar' , 'draw' ) ( gd ) ;
665666 return previousPromises ( gd ) ;
666667} ;
667668
668- export var layoutReplot = function ( gd ?: any ) : any {
669+ export var layoutReplot = function ( gd : GraphDiv ) : any {
669670 var layout = gd . layout ;
670671 gd . layout = undefined ;
671672 return Registry . call ( '_doPlot' , gd , '' , layout ) ;
672673} ;
673674
674- export var doLegend = function ( gd ?: any ) : any {
675+ export var doLegend = function ( gd : GraphDiv ) : any {
675676 Registry . getComponentMethod ( 'legend' , 'draw' ) ( gd ) ;
676677 return previousPromises ( gd ) ;
677678} ;
678679
679- export var doTicksRelayout = function ( gd ?: any ) : any {
680+ export var doTicksRelayout = function ( gd : GraphDiv ) : any {
680681 Axes . draw ( gd , 'redraw' ) ;
681682
682683 if ( gd . _fullLayout . _hasOnlyLargeSploms ) {
@@ -689,8 +690,8 @@ export var doTicksRelayout = function(gd?: any): any {
689690 return previousPromises ( gd ) ;
690691} ;
691692
692- export var doModeBar = function ( gd ?: any ) : any {
693- var fullLayout : any = gd . _fullLayout ;
693+ export var doModeBar = function ( gd : GraphDiv ) : any {
694+ var fullLayout = gd . _fullLayout ;
694695
695696 Registry . getComponentMethod ( 'modebar' , 'manage' ) ( gd ) ;
696697
@@ -702,8 +703,8 @@ export var doModeBar = function(gd?: any): any {
702703 return previousPromises ( gd ) ;
703704} ;
704705
705- export var doCamera = function ( gd ?: any ) : any {
706- var fullLayout : any = gd . _fullLayout ;
706+ export var doCamera = function ( gd : GraphDiv ) : any {
707+ var fullLayout = gd . _fullLayout ;
707708 var sceneIds = fullLayout . _subplots . gl3d ;
708709
709710 for ( var i = 0 ; i < sceneIds . length ; i ++ ) {
@@ -714,8 +715,8 @@ export var doCamera = function(gd?: any): any {
714715 }
715716} ;
716717
717- export var drawData = function ( gd ?: any ) : any {
718- var fullLayout : any = gd . _fullLayout ;
718+ export var drawData = function ( gd : GraphDiv ) : any {
719+ var fullLayout = gd . _fullLayout ;
719720
720721 clearGlCanvases ( gd ) ;
721722
@@ -743,8 +744,8 @@ export var drawData = function(gd?: any): any {
743744 return previousPromises ( gd ) ;
744745} ;
745746
746- export var redrawReglTraces = function ( gd ?: any ) : any {
747- var fullLayout : any = gd . _fullLayout ;
747+ export var redrawReglTraces = function ( gd : GraphDiv ) : any {
748+ var fullLayout = gd . _fullLayout ;
748749
749750 if ( fullLayout . _has ( 'regl' ) ) {
750751 var fullData = gd . _fullData ;
@@ -786,7 +787,7 @@ export var redrawReglTraces = function(gd?: any): any {
786787 }
787788} ;
788789
789- export var doAutoRangeAndConstraints = function ( gd ?: any ) : any {
790+ export var doAutoRangeAndConstraints = function ( gd : GraphDiv ) : any {
790791 var axList = Axes . list ( gd , '' , true ) ;
791792 var ax ;
792793
@@ -818,7 +819,7 @@ export var doAutoRangeAndConstraints = function(gd?: any): any {
818819 enforceAxisConstraints ( gd ) ;
819820} ;
820821
821- export var finalDraw = function ( gd ?: any ) : any {
822+ export var finalDraw = function ( gd : GraphDiv ) : any {
822823 // TODO: rangesliders really belong in marginPushers but they need to be
823824 // drawn after data - can we at least get the margin pushing part separated
824825 // out and done earlier?
@@ -830,7 +831,7 @@ export var finalDraw = function(gd?: any): any {
830831 Registry . getComponentMethod ( 'rangeselector' , 'draw' ) ( gd ) ;
831832} ;
832833
833- export var drawMarginPushers = function ( gd ?: any ) : any {
834+ export var drawMarginPushers = function ( gd : GraphDiv ) : any {
834835 Registry . getComponentMethod ( 'legend' , 'draw' ) ( gd ) ;
835836 Registry . getComponentMethod ( 'rangeselector' , 'draw' ) ( gd ) ;
836837 Registry . getComponentMethod ( 'sliders' , 'draw' ) ( gd ) ;
0 commit comments