fix: CSidebarNavItem: do not render icon if prop is undefined #133

woothu · woothu · commit 5fd72b05def8 · 2020-07-27T08:48:45.000+02:00
diff --git a/src/template/CSidebarNavItem.js b/src/template/CSidebarNavItem.js
@@ -44,7 +44,7 @@ const CSidebarNavItem = props => {
           {...routerLinkProps}
           {...rest}
         >
-          { icon && isValidElement(icon) ? icon : <CIcon {...iconProps(icon)}/> }
+          { icon && (isValidElement(icon) ? icon : <CIcon {...iconProps(icon)}/>) }
           { fontIcon && <i className={`c-sidebar-nav-icon ${fontIcon}`}/>}
           {name}
           { badge && <CBadge {...{...badge, text: null}}>{badge.text}</CBadge>}

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ const CSidebarNavItem = props => {`
`44`	`44`	`{...routerLinkProps}`
`45`	`45`	`{...rest}`
`46`	`46`	`>`
`47`		`- { icon && isValidElement(icon) ? icon : <CIcon {...iconProps(icon)}/> }`
	`47`	`+ { icon && (isValidElement(icon) ? icon : <CIcon {...iconProps(icon)}/>) }`
`48`	`48`	{ fontIcon && <i className={`c-sidebar-nav-icon ${fontIcon}`}/>}
`49`	`49`	`{name}`
`50`	`50`	`{ badge && <CBadge {...{...badge, text: null}}>{badge.text}</CBadge>}`