Skip to content

Commit 76521e7

Browse files
committed
fix: Strip symbol only when trim_icon_prefix is set
1 parent fccdc42 commit 76521e7

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

src/libs/generateAlipayComponent.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ export const generateAlipayComponent = (data: XmlData, config: Config) => {
2626

2727
data.svg.symbol.forEach((item) => {
2828
const iconId = item.$.id;
29-
const iconIdAfterTrim = (
30-
config.trim_icon_prefix
31-
? iconId.replace(new RegExp(`^${config.trim_icon_prefix}(.+?)$`), '$1')
32-
: iconId
33-
).replace(/^[-_]?(.+?)$/, '$1');
29+
const iconIdAfterTrim = config.trim_icon_prefix
30+
? iconId.replace(
31+
new RegExp(`^${config.trim_icon_prefix}(.+?)$`),
32+
(_, value) => value.replace(/^[-_]?(.+?)$/, '$1')
33+
)
34+
: iconId;
3435

3536
names.push(iconIdAfterTrim);
3637
svgTemplates.push(

src/libs/generateBaiduComponent.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ export const generateBaiduComponent = (data: XmlData, config: Config) => {
2626

2727
data.svg.symbol.forEach((item) => {
2828
const iconId = item.$.id;
29-
const iconIdAfterTrim = (
30-
config.trim_icon_prefix
31-
? iconId.replace(new RegExp(`^${config.trim_icon_prefix}(.+?)$`), '$1')
32-
: iconId
33-
).replace(/^[-_]?(.+?)$/, '$1');
29+
const iconIdAfterTrim = config.trim_icon_prefix
30+
? iconId.replace(
31+
new RegExp(`^${config.trim_icon_prefix}(.+?)$`),
32+
(_, value) => value.replace(/^[-_]?(.+?)$/, '$1')
33+
)
34+
: iconId;
3435

3536
names.push(iconIdAfterTrim);
3637
svgTemplates.push(

src/libs/generateWechatComponent.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,12 @@ export const generateWechatComponent = (data: XmlData, config: Config) => {
2727

2828
data.svg.symbol.forEach((item) => {
2929
const iconId = item.$.id;
30-
const iconIdAfterTrim = (
31-
config.trim_icon_prefix
32-
? iconId.replace(new RegExp(`^${config.trim_icon_prefix}(.+?)$`), '$1')
33-
: iconId
34-
).replace(/^[-_]?(.+?)$/, '$1');
30+
const iconIdAfterTrim = config.trim_icon_prefix
31+
? iconId.replace(
32+
new RegExp(`^${config.trim_icon_prefix}(.+?)$`),
33+
(_, value) => value.replace(/^[-_]?(.+?)$/, '$1')
34+
)
35+
: iconId;
3536

3637
names.push(iconIdAfterTrim);
3738
svgTemplates.push(

0 commit comments

Comments
 (0)