@@ -81,27 +81,24 @@ export class HtmlDefaultBuilder {
81
81
const color = htmlColorFromFills ( node . strokes ) ;
82
82
const borderStyle = node . dashPattern . length > 0 ? "dotted" : "solid" ;
83
83
84
+ const consolidateBorders = ( border : number ) : string =>
85
+ [ `${ sliceNum ( border ) } px` , color , borderStyle ] . filter ( ( d ) => d ) . join ( " " ) ;
86
+
84
87
if ( "all" in commonBorder ) {
85
88
if ( commonBorder . all === 0 ) {
86
89
return this ;
87
90
}
88
91
const weight = commonBorder . all ;
89
92
this . addStyles (
90
- formatWithJSX (
91
- "border" ,
92
- this . isJSX ,
93
- [ `${ sliceNum ( weight ) } px` , color , borderStyle ]
94
- . filter ( ( d ) => d )
95
- . join ( " " )
96
- )
93
+ formatWithJSX ( "border" , this . isJSX , consolidateBorders ( weight ) )
97
94
) ;
98
95
} else {
99
96
if ( commonBorder . left !== 0 ) {
100
97
this . addStyles (
101
98
formatWithJSX (
102
99
"border-left" ,
103
100
this . isJSX ,
104
- ` ${ sliceNum ( commonBorder . left ) } px ${ color } ${ borderStyle } `
101
+ consolidateBorders ( commonBorder . left )
105
102
)
106
103
) ;
107
104
}
@@ -110,7 +107,7 @@ export class HtmlDefaultBuilder {
110
107
formatWithJSX (
111
108
"border-top" ,
112
109
this . isJSX ,
113
- ` ${ sliceNum ( commonBorder . top ) } px ${ color } ${ borderStyle } `
110
+ consolidateBorders ( commonBorder . top )
114
111
)
115
112
) ;
116
113
}
@@ -119,7 +116,7 @@ export class HtmlDefaultBuilder {
119
116
formatWithJSX (
120
117
"border-right" ,
121
118
this . isJSX ,
122
- ` ${ sliceNum ( commonBorder . right ) } px ${ color } ${ borderStyle } `
119
+ consolidateBorders ( commonBorder . right )
123
120
)
124
121
) ;
125
122
}
@@ -128,7 +125,7 @@ export class HtmlDefaultBuilder {
128
125
formatWithJSX (
129
126
"border-bottom" ,
130
127
this . isJSX ,
131
- ` ${ sliceNum ( commonBorder . bottom ) } px ${ color } ${ borderStyle } `
128
+ consolidateBorders ( commonBorder . bottom )
132
129
)
133
130
) ;
134
131
}
0 commit comments