Fix merge errors

Author: donnieberg

components/SLDSLookup/Menu/index.js

@@ -39,7 +39,7 @@ class Menu extends React.Component {
     return this.props.items.filter(this.filter, this).map((c, i) => {
       //isActive means it is aria-activedescendant
       const isActive = this.props.focusIndex === i + 1 ? true : false;
-      const id = 'item-'+i;
+      const id = c.id;
       return <Item
       key={id}
       id={id}

components/SLDSLookup/index.jsx

@@ -25,8 +25,7 @@ class SLDSLookup extends React.Component {
     super(props);
 
     //Dynamically assign ids to list items to reference for focusing and selecting items
-    //this.props.items.map((item, index) => { return item.id = 'item-' + index; })
-
+    this.modifyItems();
 
     this.state = {
       searchTerm: '',
@@ -240,6 +239,14 @@ class SLDSLookup extends React.Component {
     );
   }
 
+  modifyItems () {
+    this.props.items.map((item, index) => { return item.id = 'item-' + index; })
+  }
+
+  componentWillReceiveProps (newProps) {
+    this.modifyItems();
+  }
+
   render(){
     let inputClasses = this.state.selectedIndex === null ? 'slds-input':'slds-input slds-hide';
     let componentClasses = this.state.selectedIndex === null ? "slds-lookup ignore-react-onclickoutside":"slds-lookup ignore-react-onclickoutside slds-has-selection";

demo/pages/HomePage/ButtonGroupSection.jsx

@@ -27,6 +27,10 @@ module.exports = React.createClass( {
     return {};
   },
 
+  handleOnSelect(){
+    console.log('onSelect triggered');
+  },
+
   render() {
 
     return (
@@ -47,9 +51,9 @@ module.exports = React.createClass( {
                   <SLDSButton label='Save' variant='neutral' />
 
                 <SLDSDropdownBase
-                    label='More Options' 
-                    variant='icon' 
-                    iconName='down' 
+                    label='More Options'
+                    variant='icon'
+                    iconName='down'
                     iconVariant='border-filled'
                     options={[
                       {label:'A Option Option Super Super Long',value:'A0'},

demo/pages/HomePage/LookupBaseDynamicSection.jsx

@@ -49,8 +49,8 @@ module.exports = React.createClass( {
     console.log('New search term: ', newValue);
   },
 
-  selectItem(item){
-    console.log(item + ' Selected');
+  handleItemSelect(item){
+    console.log(item);
   },
 
   render() {
@@ -66,6 +66,7 @@ module.exports = React.createClass( {
                   onChange={this.onChange}
                   onItemSelect={this.selectItem}
                   onNewItem={this.newItem}
+                  onItemSelect={this.handleItemSelect}
                   onSearchRecords={this.searchRecords}
                 />
               </div>