Skip to content

Commit 09348e6

Browse files
joshblacktw15egan
andauthored
feat(icons): re-enable SVGO optimizations for icons (#5814)
* feat(icons): re-enable SVGO optimizations for icons * fix(icon-build-helpers): flip back disabled plugin * chore(project): update snapshots Co-authored-by: TJ Egan <tw15egan@gmail.com>
1 parent 4faba3f commit 09348e6

File tree

22 files changed

+80
-116
lines changed

22 files changed

+80
-116
lines changed

packages/icon-build-helpers/src/builders/vanilla/svgo.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ const plugins = [
181181
removeRasterImages: false,
182182
},
183183
{
184-
mergePaths: false,
184+
mergePaths: true,
185185
},
186186
{
187-
convertShapeToPath: false,
187+
convertShapeToPath: true,
188188
},
189189
{
190190
sortAttrs: true,

packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion-test.js.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ exports[`Accordion should render 1`] = `
5858
width={16}
5959
xmlns="http://www.w3.org/2000/svg"
6060
>
61-
<polygon
62-
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
61+
<path
62+
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
6363
/>
6464
</svg>
6565
</Icon>
@@ -129,8 +129,8 @@ exports[`Accordion should render 1`] = `
129129
width={16}
130130
xmlns="http://www.w3.org/2000/svg"
131131
>
132-
<polygon
133-
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
132+
<path
133+
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
134134
/>
135135
</svg>
136136
</Icon>
@@ -200,8 +200,8 @@ exports[`Accordion should render 1`] = `
200200
width={16}
201201
xmlns="http://www.w3.org/2000/svg"
202202
>
203-
<polygon
204-
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
203+
<path
204+
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
205205
/>
206206
</svg>
207207
</Icon>

packages/react/src/components/Accordion/__tests__/__snapshots__/Accordion.Skeleton-test.js.snap

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ exports[`AccordionSkeleton should render 1`] = `
3636
width={16}
3737
xmlns="http://www.w3.org/2000/svg"
3838
>
39-
<polygon
40-
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
39+
<path
40+
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
4141
/>
4242
</svg>
4343
</Icon>
@@ -139,8 +139,8 @@ exports[`AccordionSkeleton should render 1`] = `
139139
width={16}
140140
xmlns="http://www.w3.org/2000/svg"
141141
>
142-
<polygon
143-
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
142+
<path
143+
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
144144
/>
145145
</svg>
146146
</Icon>
@@ -194,8 +194,8 @@ exports[`AccordionSkeleton should render 1`] = `
194194
width={16}
195195
xmlns="http://www.w3.org/2000/svg"
196196
>
197-
<polygon
198-
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
197+
<path
198+
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
199199
/>
200200
</svg>
201201
</Icon>
@@ -249,8 +249,8 @@ exports[`AccordionSkeleton should render 1`] = `
249249
width={16}
250250
xmlns="http://www.w3.org/2000/svg"
251251
>
252-
<polygon
253-
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
252+
<path
253+
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
254254
/>
255255
</svg>
256256
</Icon>

packages/react/src/components/Accordion/__tests__/__snapshots__/AccordionItem-test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ exports[`AccordionItem should render 1`] = `
5151
width={16}
5252
xmlns="http://www.w3.org/2000/svg"
5353
>
54-
<polygon
55-
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
54+
<path
55+
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
5656
/>
5757
</svg>
5858
</Icon>

packages/react/src/components/DataTable/__tests__/__snapshots__/DataTable-test.js.snap

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2047,10 +2047,10 @@ exports[`DataTable should render 1`] = `
20472047
<path
20482048
d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
20492049
/>
2050-
<polygon
2050+
<path
2051+
d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
20512052
data-icon-path="inner-path"
20522053
fill="none"
2053-
points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
20542054
/>
20552055
</svg>
20562056
</Icon>
@@ -2114,10 +2114,10 @@ exports[`DataTable should render 1`] = `
21142114
<path
21152115
d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
21162116
/>
2117-
<polygon
2117+
<path
2118+
d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
21182119
data-icon-path="inner-path"
21192120
fill="none"
2120-
points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
21212121
/>
21222122
</svg>
21232123
</Icon>
@@ -2181,10 +2181,10 @@ exports[`DataTable should render 1`] = `
21812181
<path
21822182
d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
21832183
/>
2184-
<polygon
2184+
<path
2185+
d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
21852186
data-icon-path="inner-path"
21862187
fill="none"
2187-
points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
21882188
/>
21892189
</svg>
21902190
</Icon>
@@ -2329,8 +2329,8 @@ exports[`DataTable should render 1`] = `
23292329
width={16}
23302330
xmlns="http://www.w3.org/2000/svg"
23312331
>
2332-
<polygon
2333-
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
2332+
<path
2333+
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
23342334
/>
23352335
</svg>
23362336
</Icon>
@@ -3020,10 +3020,10 @@ exports[`DataTable sticky header should render 1`] = `
30203020
<path
30213021
d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
30223022
/>
3023-
<polygon
3023+
<path
3024+
d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
30243025
data-icon-path="inner-path"
30253026
fill="none"
3026-
points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
30273027
/>
30283028
</svg>
30293029
</Icon>
@@ -3087,10 +3087,10 @@ exports[`DataTable sticky header should render 1`] = `
30873087
<path
30883088
d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
30893089
/>
3090-
<polygon
3090+
<path
3091+
d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
30913092
data-icon-path="inner-path"
30923093
fill="none"
3093-
points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
30943094
/>
30953095
</svg>
30963096
</Icon>
@@ -3154,10 +3154,10 @@ exports[`DataTable sticky header should render 1`] = `
31543154
<path
31553155
d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
31563156
/>
3157-
<polygon
3157+
<path
3158+
d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
31583159
data-icon-path="inner-path"
31593160
fill="none"
3160-
points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
31613161
/>
31623162
</svg>
31633163
</Icon>
@@ -3302,8 +3302,8 @@ exports[`DataTable sticky header should render 1`] = `
33023302
width={16}
33033303
xmlns="http://www.w3.org/2000/svg"
33043304
>
3305-
<polygon
3306-
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
3305+
<path
3306+
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
33073307
/>
33083308
</svg>
33093309
</Icon>

packages/react/src/components/DataTable/__tests__/__snapshots__/TableBatchAction-test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ exports[`DataTable.TableBatchAction should render 1`] = `
6161
<path
6262
d="M16,2C8.4,2,2,8.4,2,16s6.4,14,14,14s14-6.4,14-14S23.6,2,16,2z M24,17h-7v7h-2v-7H8v-2h7V8h2v7h7V17z"
6363
/>
64-
<polygon
64+
<path
65+
d="M24 17L17 17 17 24 15 24 15 17 8 17 8 15 15 15 15 8 17 8 17 15 24 15z"
6566
data-icon-path="inner-path"
6667
fill="none"
67-
points="24,17 17,17 17,24 15,24 15,17 8,17 8,15 15,15 15,8 17,8 17,15 24,15"
6868
/>
6969
</svg>
7070
</Icon>

packages/react/src/components/DataTable/__tests__/__snapshots__/TableExpandRow-test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ exports[`DataTable.TableExpandRow should render 1`] = `
5858
width={16}
5959
xmlns="http://www.w3.org/2000/svg"
6060
>
61-
<polygon
62-
points="11,8 6,13 5.3,12.3 9.6,8 5.3,3.7 6,3"
61+
<path
62+
d="M11 8L6 13 5.3 12.3 9.6 8 5.3 3.7 6 3z"
6363
/>
6464
</svg>
6565
</Icon>

packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarMenu-test.js.snap

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,8 @@ exports[`DataTable.TableToolbarMenu should render 1`] = `
9595
width={16}
9696
xmlns="http://www.w3.org/2000/svg"
9797
>
98-
<polygon
99-
points="13,7 12.3,6.3 8.5,10.1 8.5,1 7.5,1 7.5,10.1 3.7,6.3 3,7 8,12"
100-
/>
10198
<path
102-
d="M13,12v2H3v-2H2v2l0,0c0,0.6,0.4,1,1,1h10c0.6,0,1-0.4,1-1l0,0v-2H13z"
99+
d="M13 7L12.3 6.3 8.5 10.1 8.5 1 7.5 1 7.5 10.1 3.7 6.3 3 7 8 12zM13 12v2H3v-2H2v2l0 0c0 .6.4 1 1 1h10c.6 0 1-.4 1-1l0 0v-2H13z"
103100
/>
104101
<title>
105102
Add

packages/react/src/components/DataTable/__tests__/__snapshots__/TableToolbarSearch-test.js.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ exports[`DataTable.TableToolbarSearch should render 1`] = `
103103
width={16}
104104
xmlns="http://www.w3.org/2000/svg"
105105
>
106-
<polygon
107-
points="24 9.4 22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4"
106+
<path
107+
d="M24 9.4L22.6 8 16 14.6 9.4 8 8 9.4 14.6 16 8 22.6 9.4 24 16 17.4 22.6 24 24 22.6 17.4 16 24 9.4z"
108108
/>
109109
</svg>
110110
</Icon>

packages/react/src/components/Dropdown/__snapshots__/Dropdown-test.js.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ exports[`Dropdown should render 1`] = `
150150
width={16}
151151
xmlns="http://www.w3.org/2000/svg"
152152
>
153-
<polygon
154-
points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
153+
<path
154+
d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
155155
/>
156156
<title>
157157
Open menu
@@ -457,8 +457,8 @@ exports[`Dropdown should render custom item components 1`] = `
457457
width={16}
458458
xmlns="http://www.w3.org/2000/svg"
459459
>
460-
<polygon
461-
points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
460+
<path
461+
d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
462462
/>
463463
<title>
464464
Close menu
@@ -786,8 +786,8 @@ exports[`Dropdown should render with strings as items 1`] = `
786786
width={16}
787787
xmlns="http://www.w3.org/2000/svg"
788788
>
789-
<polygon
790-
points="8,11 3,6 3.7,5.3 8,9.6 12.3,5.3 13,6"
789+
<path
790+
d="M8 11L3 6 3.7 5.3 8 9.6 12.3 5.3 13 6z"
791791
/>
792792
<title>
793793
Close menu

0 commit comments

Comments
 (0)