File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -62,13 +62,14 @@ export const Icon = React.createClass({
62
62
63
63
getDefaultProps ( ) {
64
64
return {
65
+ name :'' ,
65
66
category : 'standard' ,
66
67
} ;
67
68
} ,
68
69
69
70
render ( ) {
70
71
71
- const name = this . props . name . replace ( / _ / g, '-' ) ;
72
+ const name = this . props . name ? this . props . name . replace ( / _ / g, '-' ) : '' ;
72
73
const iconClassName = 'slds-icon-' + this . props . category + '-' + ( this . props . theme || name ) ;
73
74
const styles = this . props . category === 'action' ?{ padding :'.5rem' } :null ;
74
75
Original file line number Diff line number Diff line change @@ -320,7 +320,7 @@ class SLDSLookup extends React.Component {
320
320
let selectedItem = this . props . items [ this . state . selectedIndex ] . label ;
321
321
return < span tabIndex = "0" className = "slds-pill" ref = { 'pill-' + this . state . selectedIndex } onKeyDown = { this . handlePillKeyDown . bind ( this ) } >
322
322
< span className = "slds-pill__label" >
323
- < Icon category = { this . props . iconCategory } name = { this . props . iconName } className = { this . props . iconClasses } />
323
+ < Icon category = { this . props . iconCategory } name = { this . props . iconName ? this . props . iconName : this . props . type } className = { this . props . iconClasses } />
324
324
{ selectedItem }
325
325
</ span >
326
326
< SLDSButton
You can’t perform that action at this time.
0 commit comments