Merge pull request #49 from salesforce-ux/im-fix-lookup-focus

ivansfdc · ivansfdc · commit 12a830506fd0 · 2015-11-03T16:27:37.000-08:00
Fixed focus in SLDSLookup
diff --git a/components/SLDSLookup/index.jsx b/components/SLDSLookup/index.jsx
@@ -47,10 +47,10 @@ class SLDSLookup extends React.Component {
 
   componentDidUpdate(prevProps, prevState){
     let lookup = this.props.type + 'Lookup';
-    if(prevState.selectedIndex && !this.state.selectIndex){
+    if(!isNaN(parseInt(prevState.selectedIndex)) && isNaN(parseInt(this.state.selectedIndex))){
       if(this.refs[lookup]) React.findDOMNode(this.refs[lookup]).focus();
     }
-    else if(!prevState.selectedIndex && this.state.selectedIndex){
+    else if(isNaN(parseInt(prevState.selectedIndex)) && !isNaN(parseInt(this.state.selectedIndex))){
       let selectedItem = 'pill-' + this.state.selectedIndex;
       if(this.refs[selectedItem]) React.findDOMNode(this.refs[selectedItem]).focus();
     }

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,10 @@ class SLDSLookup extends React.Component {`
`47`	`47`
`48`	`48`	`componentDidUpdate(prevProps, prevState){`
`49`	`49`	`let lookup = this.props.type + 'Lookup';`
`50`		`- if(prevState.selectedIndex && !this.state.selectIndex){`
	`50`	`+ if(!isNaN(parseInt(prevState.selectedIndex)) && isNaN(parseInt(this.state.selectedIndex))){`
`51`	`51`	`if(this.refs[lookup]) React.findDOMNode(this.refs[lookup]).focus();`
`52`	`52`	`}`
`53`		`- else if(!prevState.selectedIndex && this.state.selectedIndex){`
	`53`	`+ else if(isNaN(parseInt(prevState.selectedIndex)) && !isNaN(parseInt(this.state.selectedIndex))){`
`54`	`54`	`let selectedItem = 'pill-' + this.state.selectedIndex;`
`55`	`55`	`if(this.refs[selectedItem]) React.findDOMNode(this.refs[selectedItem]).focus();`
`56`	`56`	`}`