Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 300fc61

Browse filesBrowse files
authored
Merge pull request coreui#106 from coreui/dev-v2.5.7-nav-icon-fix
v2.5.7
2 parents 3a3ee13 + 15904e8 commit 300fc61
Copy full SHA for 300fc61

File tree

Expand file treeCollapse file tree

4 files changed

+33
-5
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+33
-5
lines changed

‎CHANGELOG.md

Copy file name to clipboardExpand all lines: CHANGELOG.md
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
### [@coreui/react](https://coreui.io/) changelog
22

3+
##### `v2.5.7`
4+
- fix(SidebarNav): add missing alternative icon config object
5+
36
##### `v2.5.6`
47
- fix(SidebarNav): navigate to route on AppSideBarNav parent menu click - thanx @regimani #98
58

‎package.json

Copy file name to clipboardExpand all lines: package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/react",
3-
"version": "2.5.6",
3+
"version": "2.5.7",
44
"description": "CoreUI React Bootstrap 4 components",
55
"license": "MIT",
66
"author": {

‎src/SidebarNav.md

Copy file name to clipboardExpand all lines: src/SidebarNav.md
+11Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,17 @@ router | inject `react-router-dom@5` object | _mandatory for @coreui/react ^2.5.
5555
},
5656
```
5757

58+
- item.icon: string (css class string for <i> tag)
59+
```json5
60+
icon: 'icon-speedometer' // css class string for <i> tag
61+
```
62+
- item.icon: { class, innerText, attributes }
63+
(v2.5.7 up alternative icon config object)
64+
```json5
65+
icon: { class: 'material-icons', innerText: 'insert_emoticon', attributes: { title: 'smiley' }}
66+
```
67+
---
68+
5869
__React Router Link `url`__
5970

6071
`url: string` - a string representation of the Link location, created by concatenating the location’s pathname, search, and hash properties.

‎src/SidebarNav2.js

Copy file name to clipboardExpand all lines: src/SidebarNav2.js
+18-4Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class AppSidebarNav2 extends Component {
130130

131131
// nav dropdown
132132
navDropdown(item, key) {
133-
const classIcon = classNames('nav-icon', item.icon);
133+
const itemIcon = this.navIcon(item)
134134
const attributes = this.getAttribs(item.attributes);
135135
const classes = classNames('nav-link', 'nav-dropdown-toggle', item.class, attributes.class, attributes.className);
136136
delete attributes.class;
@@ -148,8 +148,7 @@ class AppSidebarNav2 extends Component {
148148
to={item.url || ''}
149149
{...attributes}
150150
onClick={(e) => this.handleClick(e, item)}>
151-
<i className={classIcon}/>
152-
{item.name}{this.navBadge(item.badge)}
151+
{itemIcon}{item.name}{this.navBadge(item.badge)}
153152
</NavLink>
154153
<ul className="nav-dropdown-items">
155154
{this.navList(item.children)}
@@ -169,11 +168,26 @@ class AppSidebarNav2 extends Component {
169168
);
170169
}
171170

171+
navIcon(item) {
172+
const icon = item.icon;
173+
const iconObject = (typeof icon === 'object' && (icon !== null)) ? {iconClass: icon.class, iconClassName: icon.className, ...icon} : { iconClass: icon };
174+
const {iconClass, iconClassName, innerText, img, attributes} = iconObject;
175+
const iconAttr = {...attributes};
176+
delete iconAttr.class;
177+
delete iconAttr.className;
178+
delete iconAttr.img;
179+
const iconImg = img && img.src ? img : null;
180+
const iconInner = innerText || null;
181+
const classIcon = classNames('nav-icon', iconClass, iconClassName);
182+
const iconComponent = iconImg ? <img {...iconAttr} className={classIcon} src={iconImg.src} /> : <i {...iconAttr} className={classIcon}>{iconInner}</i>
183+
return (iconComponent)
184+
}
185+
172186
// nav link
173187
navLink(item, key, classes) {
174188
const ref = React.createRef();
175189
const url = item.url || '';
176-
const itemIcon = <i className={classes.icon} />
190+
const itemIcon = this.navIcon(item)
177191
const itemBadge = this.navBadge(item.badge)
178192
const attributes = this.getAttribs(item.attributes)
179193
classes.link = classNames(classes.link, attributes.class, attributes.className)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.