Clean up code

Author: donnieberg

components/SLDSLookup/Menu/Item/index.jsx

@@ -41,6 +41,7 @@ class Item extends React.Component {
     return this.props.onSelect(this.props.id);
   }
 
+  //Scroll menu item based on up/down mouse keys (assumes all items are the same height)
   scrollFocus(){
     const height = React.findDOMNode(this).offsetHeight;
     if(height && this.props.handleItemFocus){
@@ -62,7 +63,7 @@ class Item extends React.Component {
           href={this.props.href}
           id={id}
           tabIndex="-1"
-          aria-disabled={this.props.disabled}
+          aria-disabled={this.props.isDisabled}
           role="option"
           onClick={this.handleClick.bind(this)}
           onMouseDown={this.handleClick.bind(this)}>
@@ -76,11 +77,14 @@ class Item extends React.Component {
 
 Item.propTypes = {
   id: React.PropTypes.string,
+  href: React.PropTypes.string,
+  searchTerm: React.PropTypes.string,
+  isActive: React.PropTypes.bool,
+  isDisabled: React.PropTypes.bool,
   setFocus: React.PropTypes.func,
   scrollFocus: React.PropTypes.func,
-  isActive: React.PropTypes.bool,
   onSelect: React.PropTypes.func,
-  searchTerm: React.PropTypes.string,
+handleItemFocus: React.PropTypes.func,
 };
 
 Item.defaultProps = {

components/SLDSLookup/Menu/index.js

@@ -17,6 +17,7 @@ class Menu extends React.Component {
     this.state = {};
   }
 
+  //Set filtered list length in parent to determine active indexes for aria-activedescendent
   componentDidUpdate(prevProps, prevState){
     let list = React.findDOMNode(this.refs.list).children.length;
     this.props.getListLength(list);
@@ -26,6 +27,7 @@ class Menu extends React.Component {
     return this.props.filterWith(this.props.searchTerm, item);
   }
 
+  //Scroll menu up/down when using mouse keys
   handleItemFocus (itemIndex, itemHeight) {
     if(this.refs.list){
       React.findDOMNode(this.refs.list).scrollTop = itemIndex * itemHeight;
@@ -51,17 +53,17 @@ class Menu extends React.Component {
   renderSearchDetails(){
     return(
       <button className="slds-button">
-        <Icon name="search" category="utility" size="x-small" className="slds-icon-text-default" />
-        {this.props.searchTerm ? '"' + this.props.searchTerm + '"' : ""} in {this.props.type}
+      <Icon name="search" category="utility" size="x-small" className="slds-icon-text-default" />
+      {this.props.searchTerm ? '"' + this.props.searchTerm + '"' : ""} in {this.props.type}
       </button>
     );
   }
 
   renderAddItem(){
     return(
       <button className="slds-button" onClick={this.props.addItem} onMouseDown={this.props.addItem}>
-        <Icon name="add" category="utility" size="x-small" className="slds-icon-text-default" />
-        New {this.props.type}
+      <Icon name="add" category="utility" size="x-small" className="slds-icon-text-default" />
+      New {this.props.type}
       </button>
     );
   }
@@ -90,14 +92,16 @@ class Menu extends React.Component {
 
 Menu.propTypes = {
   searchTerm: React.PropTypes.string,
-  filterWith: React.PropTypes.func,
-  onSelect: React.PropTypes.func,
   label: React.PropTypes.string,
+  type: React.PropTypes.string,
+  listLength: React.PropTypes.number,
+  focusIndex: React.PropTypes.number,
   items: React.PropTypes.array,
+  onSelect: React.PropTypes.func,
+  addItem: React.PropTypes.func,
+  filterWith: React.PropTypes.func,
   setFocus: React.PropTypes.func,
   getListLength: React.PropTypes.func,
-  listLength: React.PropTypes.number,
-  focusIndex: React.PropTypes.number,
 };
 
 Menu.defaultProps = {

components/SLDSLookup/index.jsx

@@ -1,15 +1,16 @@
 /*
-Copyright (c) 2015, salesforce.com, inc. All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+   Copyright (c) 2015, salesforce.com, inc. All rights reserved.
+   Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+   Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+   Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+   Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   */
 
 import React, { Component } from 'react';
 import Menu from './Menu';
-import {Icon, InputIcon, ButtonIcon} from "./../SLDSIcons";
+import {Icon, InputIcon} from "./../SLDSIcons";
+import SLDSButton from '../SLDSButton';
 import {KEYS,EventUtil} from '../utils';
 import escapeRegExp from 'lodash.escaperegexp';
 
@@ -59,9 +60,7 @@ class SLDSLookup extends React.Component {
   }
 
   getListLength(qty){
-    if(qty !== this.state.listLength){
-      this.setState({listLength:qty});
-    }
+    if(qty !== this.state.listLength) this.setState({listLength:qty});
   }
 
   //=================================================
@@ -82,7 +81,7 @@ class SLDSLookup extends React.Component {
   }
 
   //=================================================
-  // Basic Event Listeners on Input
+  // Event Listeners on Input
   handleClose() {
     this.setState({
       isOpen:false,
@@ -127,7 +126,6 @@ class SLDSLookup extends React.Component {
         EventUtil.trapImmediate(event);
         this.decreaseIndex();
       }
-
       //If user hits enter/space key, select current activedescendant item
       else if((event.keyCode === KEYS.ENTER || event.keyCode === KEYS.SPACE) && this.state.focusIndex !== null){
         EventUtil.trapImmediate(event);
@@ -152,25 +150,25 @@ class SLDSLookup extends React.Component {
         focusIndex={this.state.focusIndex}
         addItem={this.props.addItem}
         type={this.props.type}
-        />;
-    }else{
-      return null;
+      />;
     }
   }
 
   renderSelectedItem(){
     return (
       <div className="slds-pill">
         <a href="#" className="slds-pill__label">
-          <span>
-            <Icon name="account" />
-            {this.props.items[this.state.selectedIndex].label}
-          </span>
+          <Icon name={this.props.type} />
+          {this.props.items[this.state.selectedIndex].label}
         </a>
-        <button className="slds-button slds-button--icon-bare" onClick={this.handleDeleteSelected.bind(this)} ref="clearSelectedItemButton">
-          <ButtonIcon name="close" />
-          <span className="slds-assistive-text">Remove</span>
-        </button>
+        <SLDSButton
+          label='Remove'
+          variant='icon'
+          iconName='close'
+          iconSize='medium'
+          onClick={this.handleDeleteSelected.bind(this)}
+          ref="clearSelectedItemButton"
+        />
       </div>
     );
   }
@@ -203,7 +201,8 @@ class SLDSLookup extends React.Component {
               onBlur={this.handleBlur.bind(this)}
               onClick={this.handleClick.bind(this)}
               onKeyDown={this.handleKeyDown.bind(this)}
-              value={this.state.searchTerm} />
+              value={this.state.searchTerm}
+            />
           </div>
 
           {this.renderMenu()}
@@ -217,13 +216,20 @@ class SLDSLookup extends React.Component {
 SLDSLookup.propTypes = {
   items: React.PropTypes.array,
   label: React.PropTypes.string,
+  type: React.PropTypes.string,
+  addItem: React.PropTypes.func,
+  filterWith: React.PropTypes.func,
+  onItemSelect: React.PropTypes.func,
 };
 
 SLDSLookup.defaultProps = {
   filterWith: defaultFilter,
   onItemSelect: function(item){
-  //console.log('onItemSelect should be defined');
-  }
+    //console.log('onItemSelect should be defined');
+  },
+  addItem: function(item){
+    //console.log('onItemSelect should be defined');
+  },
 };
 
 module.exports = SLDSLookup;

components/SLDSModal/index.jsx

@@ -11,7 +11,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 import React from 'react';
 import SLDSButton from '../SLDSButton';
-import {Icon} from '../SLDSIcons';
 import {EventUtil} from '../utils';
 import SLDSSettings from '../SLDSSettings';
 import cx from 'classnames';

demo/code-snippets/SLDSLookupPage.txt

@@ -1,4 +1,12 @@
 
-const items = ["Paddy's Pub", "Tyrell Corp", "Paper St. Soap Company"];
+const items = [
+  {label:'Paddy\'s Pub'},
+  {label:'Tyrell Corp'},
+  {label:'Paper St. Soap Company'},
+  {label:'Nakatomi Investments'},
+  {label:'Acme Landscaping'},
+  {label:'Acme Construction'}
+];
+
+<SLDSLookup items={items} label="Accounts" type="account" />
 
-<SLDSLookup items={items} label="Contacts" />

demo/pages/HomePage/LookupBaseSection.jsx

@@ -36,11 +36,6 @@ module.exports = React.createClass( {
     return {};
   },
 
-  addItem(){
-    alert('Add item clicked');
-  },
-
-
   render() {
     return (
 
@@ -57,7 +52,7 @@ module.exports = React.createClass( {
               </PrismCode>
 
               <div className="slds-p-vertical--large">
-                <SLDSLookup items={items} label="Accounts" type="account" addItem={this.addItem} />
+                <SLDSLookup items={items} label="Accounts" type="account" />
               </div>
 
             </div>

demo/pages/HomePage/index.jsx

@@ -59,15 +59,15 @@ module.exports = React.createClass( {
         </div>
         <main className='stage-main slds-grid slds-wrap slds-grow' role='main'>
           <div className='region region--main slds-grow slds-size--1-of-1 slds-medium-size--1-of-2 slds-large-size--8-of-12 slds-col-rule--right slds-p-around--large'>
-            <LookupBaseSection />
 
             <ButtonSection />
 
+            <LookupBaseSection />
+
             <PicklistBaseSection />
 
             <ModalSection />
 
-
             <DatePickerSingleSelectSection />
 
             <IconSection />