Skip to content

Commit 3ec2525

Browse files
committed
Phenome: Fix simplified icon props
1 parent bb3d429 commit 3ec2525

2 files changed

Lines changed: 14 additions & 6 deletions

File tree

src/phenome/components/button.jsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ export default {
5353
iconF7,
5454
iconIfMd,
5555
iconIfIos,
56+
iconMd,
57+
iconIos,
5658
iconColor,
5759
iconSize,
5860
id,
@@ -62,16 +64,18 @@ export default {
6264
if (text) {
6365
textEl = (<span>{text}</span>);
6466
}
65-
if (icon || iconMaterial || iconIon || iconFa || iconF7 || iconIfMd || iconIfIos) {
67+
const mdThemeIcon = iconIfMd || iconMd;
68+
const iosThemeIcon = iconIfIos || iconIos;
69+
if (icon || iconMaterial || iconIon || iconFa || iconF7 || mdThemeIcon || iosThemeIcon) {
6670
iconEl = (
6771
<F7Icon
6872
material={iconMaterial}
6973
ion={iconIon}
7074
fa={iconFa}
7175
f7={iconF7}
7276
icon={icon}
73-
ifMd={iconIfMd}
74-
ifIos={iconIfIos}
77+
md={mdThemeIcon}
78+
ios={iosThemeIcon}
7579
color={iconColor}
7680
size={iconSize}
7781
/>

src/phenome/components/link.jsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ export default {
5252
iconF7,
5353
iconIfMd,
5454
iconIfIos,
55+
iconMd,
56+
iconIos,
5557
id,
5658
style,
5759
} = props;
@@ -72,7 +74,9 @@ export default {
7274
</span>
7375
);
7476
}
75-
if (icon || iconMaterial || iconIon || iconFa || iconF7 || (iconIfMd && self.$theme.md) || (iconIfIos && self.$theme.ios)) {
77+
const mdThemeIcon = iconIfMd || iconMd;
78+
const iosThemeIcon = iconIfIos || iconIos;
79+
if (icon || iconMaterial || iconIon || iconFa || iconF7 || mdThemeIcon || iosThemeIcon) {
7680
if (iconBadge) {
7781
iconBadgeEl = <F7Badge color={badgeColor}>{iconBadge}</F7Badge>;
7882
}
@@ -83,8 +87,8 @@ export default {
8387
fa={iconFa}
8488
ion={iconIon}
8589
icon={icon}
86-
ifMd={iconIfMd}
87-
ifIos={iconIfIos}
90+
md={mdThemeIcon}
91+
ios={iosThemeIcon}
8892
color={iconColor}
8993
size={iconSize}
9094
>{iconBadgeEl}</F7Icon>

0 commit comments

Comments
 (0)