@@ -54,14 +54,18 @@ const calcThickness = (thickness, size) => {
54
54
return thickness . toString ( ) . includes ( "%" ) ? ( value * size ) / 100 : value ;
55
55
} ;
56
56
57
- export default ( options ) => ( {
58
- ...options ,
59
- thickness : calcThickness ( options . thickness , options . size ) ,
60
- emptyThickness : calcThickness ( options . emptyThickness , options . size ) ,
61
- globalThickness : calcThickness ( options . thickness , options . size ) ,
62
- dot : { ...dotParser ( options . dot ) , size : calcThickness ( dotParser ( options . dot ) . size , options . size ) } ,
63
- globalDot : { ...dotParser ( options . globalDot ) , size : calcThickness ( dotParser ( options . globalDot ) . size , options . size ) } ,
64
- dash : dashParser ( options . dash ) ,
65
- lineMode : lineModeParser ( options ) ,
66
- animation : animationParser ( options . animation ) ,
67
- } ) ;
57
+ export default ( options ) => {
58
+ const dot = dotParser ( options . dot ) ;
59
+ const globalDot = dotParser ( options . globalDot ) ;
60
+ return {
61
+ ...options ,
62
+ thickness : calcThickness ( options . thickness , options . size ) ,
63
+ emptyThickness : calcThickness ( options . emptyThickness , options . size ) ,
64
+ globalThickness : calcThickness ( options . globalThickness , options . size ) ,
65
+ dot : { ...dot , size : calcThickness ( dot . size , options . size ) } ,
66
+ globalDot : { ...globalDot , size : calcThickness ( globalDot . size , options . size ) } ,
67
+ dash : dashParser ( options . dash ) ,
68
+ lineMode : lineModeParser ( options ) ,
69
+ animation : animationParser ( options . animation ) ,
70
+ } ;
71
+ } ;
0 commit comments