Merge pull request #9 from salesforce-ux/lookups-refactor

Lookups refactor

Author: ivansfdc

components/SLDSLookup/Body/index.js components/SLDSLookup/Menu/Item/index.jsxcomponents/SLDSLookup/Body/index.js renamed to components/SLDSLookup/Menu/Item/index.jsx

@@ -8,13 +8,12 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 */
 
 import React, { Component } from 'react';
-import {Icon} from "../../SLDSIcons";
+import {Icon} from "../../../SLDSIcons";
+import {KEYS,EventUtil} from '../../../utils';
 
 class Item extends React.Component {
   constructor(props) {
     super(props);
-    this.id = this.props.id || `item-${Item.globalIdx++}-${this.props.idx}`;
-
   }
 
   boldSearchText(children) {
@@ -26,83 +25,44 @@ class Item extends React.Component {
     });
   }
 
-  selectedItem(e) {
+  handleClick(e){
     e.preventDefault();
     if(e.nativeEvent){
       e.nativeEvent.preventDefault();
       e.nativeEvent.stopImmediatePropagation();
     }
-    return this.props.selectedItem(this.props.idx, this);
-  }
-
-  getClassName(cls) {
-    return classNames(this.props.className, cls);
+    return this.props.onSelect(this.props.index);
   }
 
-  render() {
+  render(){
     let className = 'slds-lookup__item';
-    if(this.props.isSelected) className += ' slds-is-selected';
-    const tabIndex = this.props.idx === 0 ? 0 : -1;
+
+    //TODO: make isActive styles into a class??
+    let styles = {};
+    if(this.props.isActive) className += ' slds-theme--shade';
+
 
     return (
-      <li key={this.id}  { ...this.props } className={className} role="presentation" tabIndex={tabIndex} style={{whiteSpace: 'nowrap'}} >
-        <a href={ this.props.href } onClick={this.selectedItem.bind(this)} onMouseDown={this.selectedItem.bind(this)} tabIndex="-1" aria-disabled={ this.props.disabled } role="option">
+      //IMPORTANT: id is used to set lookup's input's aria-activedescendant
+      <li
+        className={className}
+        style={styles}
+        role="presentaion">
+        <a
+          href={this.props.href}
+          id={this.props.id}
+          tabIndex="-1"
+          aria-disabled={this.props.disabled}
+          role="option"
+          onClick={this.handleClick.bind(this)}
+          onMouseDown={this.handleClick.bind(this)}>
           <Icon name="account" />
           { this.boldSearchText(this.props.children) }
         </a>
       </li>
-    );
+    )
   }
-}
-Item.globalIdx = 0;
-
-
-module.exports = React.createClass({
-
-  displayName: "SLDSLookup",
-
-  getInitialState: function(){
-    return {currentSelectedIndex: null};
-  },
-
-  getDefaultProps: function(){
-    return {
-    };
-  },
-
-  selectedItem: function(idx, item) {
-    console.log(this.props.selectedItem);
-    if(this.props.selectedItem) this.props.selectedItem(item);
-    this.setState({currentSelectedIndex: idx});
-  },
-
-  filter: function(item) {
-    return this.props.filterWith(this.props.searchTerm, item);
-  },
-
-  items: function() {
-    return this.props.items.filter(this.filter, this).map((c, i) => {
-      const isSelected = (i === this.state.currentSelectedIndex);
-      return <Item key={i} isSelected={isSelected} idx={i} searchTerm={this.props.searchTerm} selectedItem={this.selectedItem}>{c}</Item>
-    });
-  },
-
-  render: function() {
-    return (
-      <div 
-        className="ignore-react-onclickoutside"
-        style={{
-          position:'inherit',
-          float:'inherit'
-        }}
-        role="listbox">
-        <ul className="slds-lookup__list" role="presentation">
-          {this.items()}
-        </ul>
-      </div>
-    );
-  },
-
 
+}
 
-});
+module.exports = Item;

components/SLDSLookup/Menu/index.js

@@ -0,0 +1,45 @@
+/*
+   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 {Icon} from "../../SLDSIcons";
+import {KEYS} from '../../utils';
+import Item from './Item';
+
+class Menu extends React.Component {
+  constructor(props){
+    super(props);
+    this.state = {};
+  }
+
+  filter(item){
+    return this.props.filterWith(this.props.searchTerm, item);
+  }
+
+  renderItems(){
+    return this.props.items.filter(this.filter, this).map((c, i) => {
+      //isActive means it is aria-activedescendant
+      const isActive = this.props.activeIndex === i ? true : false;
+      return <Item key={i} id={'item-' + i} index={i} isActive={isActive} onSelect={this.props.onSelect} searchTerm={this.props.searchTerm}>{c}</Item>
+    });
+  }
+
+  render(){
+    return (
+      <div
+      className="ignore-react-onclickoutside slds-lookup__menu"
+      role="listbox">
+      <ul className="slds-lookup__list" role="presentation" ref="list">
+      {this.renderItems()}
+      </ul>
+      </div>
+    )
+  }
+}
+module.exports = Menu;