Skip to content

Commit d8267ab

Browse files
committed
feat: Add config property unit
1 parent 72c060e commit d8267ab

File tree

18 files changed

+32
-14
lines changed

18 files changed

+32
-14
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ npx iconfont-init
3434
"save_dir": "./src/components/iconfont",
3535
"generate_mode": "all-in-one",
3636
"trim_icon_prefix": "icon",
37+
"unit": "px",
3738
"default_icon_size": 18,
3839
"summary_component_name": "Icon"
3940
}
@@ -70,6 +71,9 @@ npx iconfont-init
7071

7172
注意,这个选项只针对 `<Icon />` 组件有效
7273

74+
### unit
75+
图标的单位,默认是网页常用单位`px`即像素,也推荐您在手机网页中使用自适应的`rem`单位。
76+
7377
### default_icon_size
7478
我们将为每个生成的图标组件加入默认的字体大小,当然,你也可以通过传入props的方式改变这个size值。
7579

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-iconfont-cli",
3-
"version": "0.0.1",
3+
"version": "0.1.0",
44
"main": "index.js",
55
"keywords": [
66
"iconfont",

scripts/config/all-in-one-js.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"generate_mode": "all-in-one",
55
"save_dir": "./snapshots/all-in-one-js",
66
"trim_icon_prefix": "icon",
7+
"unit": "px",
78
"default_icon_size": 14,
89
"summary_component_name": "Icon"
910
}

scripts/config/all-in-one-ts.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"generate_mode": "all-in-one",
55
"save_dir": "./snapshots/all-in-one-ts",
66
"trim_icon_prefix": "icon",
7+
"unit": "rem",
78
"default_icon_size": 16,
89
"summary_component_name": "Icon"
910
}

scripts/config/depends-on-js.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"generate_mode": "depends-on",
55
"save_dir": "./snapshots/depends-on-js",
66
"trim_icon_prefix": "icon",
7+
"unit": "rem",
78
"default_icon_size": 18,
89
"summary_component_name": "IconFont"
910
}

scripts/config/depends-on-ts.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"generate_mode": "depends-on",
55
"save_dir": "./snapshots/depends-on-ts",
66
"trim_icon_prefix": "icon",
7+
"unit": "px",
78
"default_icon_size": 20,
89
"summary_component_name": "CustomIcon"
910
}

snapshots/all-in-one-js/Icon.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const Icon = ({ color, name, size, ...rest }) => {
1010
switch (name) {
1111
case 'alipay':
1212
return (
13-
<svg viewBox="0 0 1024 1024" width={size} height={size} {...rest}>
13+
<svg viewBox="0 0 1024 1024" width={size + 'px'} height={size + 'px'} {...rest}>
1414
<path
1515
d="M192 692.736c0-69.632 51.2-106.496 88.064-111.104 111.104-18.432 264.192 74.24 264.192 74.24-69.632 88.064-166.912 134.144-241.152 134.144-65.024-4.608-111.104-41.472-111.104-97.28z"
1616
fill={getIconColor(color, 0, '#5B8BD4')}
@@ -23,7 +23,7 @@ const Icon = ({ color, name, size, ...rest }) => {
2323
);
2424
case 'user':
2525
return (
26-
<svg viewBox="0 0 1024 1024" width={size} height={size} {...rest}>
26+
<svg viewBox="0 0 1024 1024" width={size + 'px'} height={size + 'px'} {...rest}>
2727
<path
2828
d="M518.07603918 6.737455c-174.95658274 0-316.73174462 141.77516188-316.73174465 316.73174464 0 82.95355218 32.42729765 159.11999552 84.46179858 214.92511241 16.59071043 18.09895683 35.44379047 33.93554407 55.80511691 47.5097617 50.5262545 33.93554407 111.61023382 53.54274731 176.46482916 53.5427473s126.69269785-19.60720323 176.46482915-53.5427473c20.36132644-13.57421762 39.21440646-29.41080486 55.80511691-47.5097617C803.13460934 482.58919514 834.80778381 406.42275179 834.80778381 323.46919964c0-174.95658274-141.77516188-316.73174462-316.73174463-316.73174464z m166.66122752 501.491929c-22.62369604 20.36132644-49.01800811 36.95203687-77.67468975 47.50976169-27.90255844 10.55772482-58.06748652 16.59071043-88.98653777 16.59071044s-61.83810252-6.03298562-88.98653779-16.59071044c-28.65668166-11.31184801-55.0509937-27.14843525-77.67468975-47.50976169C300.88855716 462.98199189 269.21538268 396.61915017 269.21538268 323.46919964c0-137.25042267 111.61023382-248.86065649 248.8606565-248.86065651s248.86065649 111.61023382 248.86065648 248.86065651c0 73.14995053-31.67317446 139.51279228-82.19942896 184.76018436z"
2929
fill={getIconColor(color, 0, '#263238')}
@@ -36,7 +36,7 @@ const Icon = ({ color, name, size, ...rest }) => {
3636
);
3737
case 'setup':
3838
return (
39-
<svg viewBox="0 0 1024 1024" width={size} height={size} {...rest}>
39+
<svg viewBox="0 0 1024 1024" width={size + 'px'} height={size + 'px'} {...rest}>
4040
<path
4141
d="M720.36316 371.018l-56.188-172.934c-4.654-14.322-20.036-22.16-34.358-17.506l-78.07 25.366c-7.25 2.356-15.224 0.726-20.912-4.346a256.276 256.276 0 0 0-41.218-29.96c-6.576-3.842-10.58-10.922-10.58-18.538V71.03c0-15.058-12.208-27.266-27.266-27.266h-181.834c-15.058 0-27.266 12.208-27.266 27.266v82.114c0 7.614-4.002 14.69-10.576 18.534a256.258 256.258 0 0 0-41.168 29.934c-5.69 5.074-13.664 6.704-20.916 4.348l-78.12-25.382c-14.322-4.654-29.704 3.184-34.356 17.506L1.34316 371.016c-4.654 14.322 3.184 29.704 17.506 34.356l78.05 25.36c7.252 2.356 12.754 8.364 14.366 15.816a253.468 253.468 0 0 0 15.718 48.46c3.072 6.984 2.162 15.076-2.322 21.248l-48.22 66.37c-8.852 12.182-6.15 29.234 6.032 38.084l147.108 106.882c12.182 8.852 29.234 6.15 38.086-6.032l48.188-66.326c4.484-6.17 11.894-9.538 19.484-8.776 8.404 0.844 16.926 1.284 25.552 1.284 8.604 0 17.104-0.44 25.486-1.28 7.588-0.76 14.998 2.606 19.48 8.776l48.184 66.32c8.852 12.182 25.902 14.884 38.086 6.032l147.108-106.882c12.182-8.852 14.882-25.902 6.032-38.084l-48.176-66.308c-4.486-6.174-5.394-14.268-2.32-21.252a253.424 253.424 0 0 0 15.75-48.544c1.612-7.454 7.114-13.46 14.368-15.816l77.968-25.334c14.322-4.65 22.16-20.032 17.506-34.352z m-359.472 120.706c-54.924 0-99.448-44.524-99.448-99.448s44.524-99.448 99.448-99.448 99.448 44.524 99.448 99.448-44.526 99.448-99.448 99.448z"
4242
fill={getIconColor(color, 0, '#5B6EA2')}

snapshots/all-in-one-ts/Icon.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const Icon: FunctionComponent<Props> = ({ color, name, size, ...rest }) => {
1919
switch (name) {
2020
case 'alipay':
2121
return (
22-
<svg viewBox="0 0 1024 1024" width={size} height={size} {...rest}>
22+
<svg viewBox="0 0 1024 1024" width={size + 'rem'} height={size + 'rem'} {...rest}>
2323
<path
2424
d="M192 692.736c0-69.632 51.2-106.496 88.064-111.104 111.104-18.432 264.192 74.24 264.192 74.24-69.632 88.064-166.912 134.144-241.152 134.144-65.024-4.608-111.104-41.472-111.104-97.28z"
2525
fill={getIconColor(color, 0, '#5B8BD4')}
@@ -32,7 +32,7 @@ const Icon: FunctionComponent<Props> = ({ color, name, size, ...rest }) => {
3232
);
3333
case 'user':
3434
return (
35-
<svg viewBox="0 0 1024 1024" width={size} height={size} {...rest}>
35+
<svg viewBox="0 0 1024 1024" width={size + 'rem'} height={size + 'rem'} {...rest}>
3636
<path
3737
d="M518.07603918 6.737455c-174.95658274 0-316.73174462 141.77516188-316.73174465 316.73174464 0 82.95355218 32.42729765 159.11999552 84.46179858 214.92511241 16.59071043 18.09895683 35.44379047 33.93554407 55.80511691 47.5097617 50.5262545 33.93554407 111.61023382 53.54274731 176.46482916 53.5427473s126.69269785-19.60720323 176.46482915-53.5427473c20.36132644-13.57421762 39.21440646-29.41080486 55.80511691-47.5097617C803.13460934 482.58919514 834.80778381 406.42275179 834.80778381 323.46919964c0-174.95658274-141.77516188-316.73174462-316.73174463-316.73174464z m166.66122752 501.491929c-22.62369604 20.36132644-49.01800811 36.95203687-77.67468975 47.50976169-27.90255844 10.55772482-58.06748652 16.59071043-88.98653777 16.59071044s-61.83810252-6.03298562-88.98653779-16.59071044c-28.65668166-11.31184801-55.0509937-27.14843525-77.67468975-47.50976169C300.88855716 462.98199189 269.21538268 396.61915017 269.21538268 323.46919964c0-137.25042267 111.61023382-248.86065649 248.8606565-248.86065651s248.86065649 111.61023382 248.86065648 248.86065651c0 73.14995053-31.67317446 139.51279228-82.19942896 184.76018436z"
3838
fill={getIconColor(color, 0, '#263238')}
@@ -45,7 +45,7 @@ const Icon: FunctionComponent<Props> = ({ color, name, size, ...rest }) => {
4545
);
4646
case 'setup':
4747
return (
48-
<svg viewBox="0 0 1024 1024" width={size} height={size} {...rest}>
48+
<svg viewBox="0 0 1024 1024" width={size + 'rem'} height={size + 'rem'} {...rest}>
4949
<path
5050
d="M720.36316 371.018l-56.188-172.934c-4.654-14.322-20.036-22.16-34.358-17.506l-78.07 25.366c-7.25 2.356-15.224 0.726-20.912-4.346a256.276 256.276 0 0 0-41.218-29.96c-6.576-3.842-10.58-10.922-10.58-18.538V71.03c0-15.058-12.208-27.266-27.266-27.266h-181.834c-15.058 0-27.266 12.208-27.266 27.266v82.114c0 7.614-4.002 14.69-10.576 18.534a256.258 256.258 0 0 0-41.168 29.934c-5.69 5.074-13.664 6.704-20.916 4.348l-78.12-25.382c-14.322-4.654-29.704 3.184-34.356 17.506L1.34316 371.016c-4.654 14.322 3.184 29.704 17.506 34.356l78.05 25.36c7.252 2.356 12.754 8.364 14.366 15.816a253.468 253.468 0 0 0 15.718 48.46c3.072 6.984 2.162 15.076-2.322 21.248l-48.22 66.37c-8.852 12.182-6.15 29.234 6.032 38.084l147.108 106.882c12.182 8.852 29.234 6.15 38.086-6.032l48.188-66.326c4.484-6.17 11.894-9.538 19.484-8.776 8.404 0.844 16.926 1.284 25.552 1.284 8.604 0 17.104-0.44 25.486-1.28 7.588-0.76 14.998 2.606 19.48 8.776l48.184 66.32c8.852 12.182 25.902 14.884 38.086 6.032l147.108-106.882c12.182-8.852 14.882-25.902 6.032-38.084l-48.176-66.308c-4.486-6.174-5.394-14.268-2.32-21.252a253.424 253.424 0 0 0 15.75-48.544c1.612-7.454 7.114-13.46 14.368-15.816l77.968-25.334c14.322-4.65 22.16-20.032 17.506-34.352z m-359.472 120.706c-54.924 0-99.448-44.524-99.448-99.448s44.524-99.448 99.448-99.448 99.448 44.524 99.448 99.448-44.526 99.448-99.448 99.448z"
5151
fill={getIconColor(color, 0, '#5B6EA2')}

snapshots/depends-on-js/IconAlipay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { getIconColor } from './helper';
88
// And then regenerate icons by using cli command.
99
const IconAlipay = ({ size, color, ...rest }) => {
1010
return (
11-
<svg viewBox="0 0 1024 1024" width={size} height={size} {...rest}>
11+
<svg viewBox="0 0 1024 1024" width={size + 'rem'} height={size + 'rem'} {...rest}>
1212
<path
1313
d="M192 692.736c0-69.632 51.2-106.496 88.064-111.104 111.104-18.432 264.192 74.24 264.192 74.24-69.632 88.064-166.912 134.144-241.152 134.144-65.024-4.608-111.104-41.472-111.104-97.28z"
1414
fill={getIconColor(color, 0, '#5B8BD4')}

snapshots/depends-on-js/IconSetup.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { getIconColor } from './helper';
88
// And then regenerate icons by using cli command.
99
const IconSetup = ({ size, color, ...rest }) => {
1010
return (
11-
<svg viewBox="0 0 1024 1024" width={size} height={size} {...rest}>
11+
<svg viewBox="0 0 1024 1024" width={size + 'rem'} height={size + 'rem'} {...rest}>
1212
<path
1313
d="M720.36316 371.018l-56.188-172.934c-4.654-14.322-20.036-22.16-34.358-17.506l-78.07 25.366c-7.25 2.356-15.224 0.726-20.912-4.346a256.276 256.276 0 0 0-41.218-29.96c-6.576-3.842-10.58-10.922-10.58-18.538V71.03c0-15.058-12.208-27.266-27.266-27.266h-181.834c-15.058 0-27.266 12.208-27.266 27.266v82.114c0 7.614-4.002 14.69-10.576 18.534a256.258 256.258 0 0 0-41.168 29.934c-5.69 5.074-13.664 6.704-20.916 4.348l-78.12-25.382c-14.322-4.654-29.704 3.184-34.356 17.506L1.34316 371.016c-4.654 14.322 3.184 29.704 17.506 34.356l78.05 25.36c7.252 2.356 12.754 8.364 14.366 15.816a253.468 253.468 0 0 0 15.718 48.46c3.072 6.984 2.162 15.076-2.322 21.248l-48.22 66.37c-8.852 12.182-6.15 29.234 6.032 38.084l147.108 106.882c12.182 8.852 29.234 6.15 38.086-6.032l48.188-66.326c4.484-6.17 11.894-9.538 19.484-8.776 8.404 0.844 16.926 1.284 25.552 1.284 8.604 0 17.104-0.44 25.486-1.28 7.588-0.76 14.998 2.606 19.48 8.776l48.184 66.32c8.852 12.182 25.902 14.884 38.086 6.032l147.108-106.882c12.182-8.852 14.882-25.902 6.032-38.084l-48.176-66.308c-4.486-6.174-5.394-14.268-2.32-21.252a253.424 253.424 0 0 0 15.75-48.544c1.612-7.454 7.114-13.46 14.368-15.816l77.968-25.334c14.322-4.65 22.16-20.032 17.506-34.352z m-359.472 120.706c-54.924 0-99.448-44.524-99.448-99.448s44.524-99.448 99.448-99.448 99.448 44.524 99.448 99.448-44.526 99.448-99.448 99.448z"
1414
fill={getIconColor(color, 0, '#5B6EA2')}

0 commit comments

Comments
 (0)