Skip to content

Commit 70c3be8

Browse files
committed
fix: CSidebarNavLink: add fontIcon if in nav item
1 parent dffd928 commit 70c3be8

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/components/sidebar/CSidebarNavLink.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
>
88
<slot>
99
<CIcon v-if="icon" v-bind="computedIcon"/>
10+
<i v-if="fontIcon" :class="['c-sidebar-nav-icon', fontIcon]"/>
1011
{{name}}
1112
<CBadge
1213
v-if="badge"
@@ -20,7 +21,7 @@
2021
<CLink v-else>
2122
<slot>
2223
<CIcon v-if="icon" v-bind="computedIcon"/>
23-
<i v-if="fontIcon" :class="['c-sidebar-nav-icon', fontIcon]"></i>
24+
<i v-if="fontIcon" :class="['c-sidebar-nav-icon', fontIcon]"/>
2425
{{name}}
2526
<CBadge
2627
v-if="badge"
@@ -37,7 +38,7 @@ import CLink, { props as linkProps } from '../link/CLink'
3738
import CBadge from '../badge/CBadge'
3839
import CIcon from '@coreui/icons-vue/CIcon.vue'
3940
40-
const props = Object.assign(linkProps, {
41+
const props = Object.assign({}, linkProps, {
4142
name: String,
4243
icon: [String, Object],
4344
fontIcon: String,

src/components/sidebar/tests/__snapshots__/CSidebarNavLink.spec.js.snap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ exports[`CSidebarNavLink.vue renders correctly 1`] = `
1515
viewBox="0 0 64 64"
1616
xmlns="http://www.w3.org/2000/svg"
1717
/>
18+
19+
<!---->
1820
1921
test link
2022
@@ -44,6 +46,8 @@ exports[`CSidebarNavLink.vue renders correctly in label mode 1`] = `
4446
viewBox="0 0 64 64"
4547
xmlns="http://www.w3.org/2000/svg"
4648
/>
49+
50+
<!---->
4751
4852
test link
4953

0 commit comments

Comments
 (0)