Merge branch 'master' of https://github.com/salesforce-ux/design-system-react

Author: hikkitada

components/SLDSDropdownBase/index.jsx

@@ -30,7 +30,7 @@ module.exports = React.createClass( {
   propTypes : {
         onClick: PropTypes.func,
         onSelect: PropTypes.func.isRequired,
-        onUpdateHighlighted: PropTypes.func
+        onUpdateHighlighted: PropTypes.func,
     },
 
   getDefaultProps(){
@@ -54,6 +54,7 @@ module.exports = React.createClass( {
 
   getInitialState(){
     return {
+      triggerId:null,
       isOpen:false,
       isFocused:false,
       isClosing:false,
@@ -66,6 +67,8 @@ module.exports = React.createClass( {
   },
 
   componentDidMount () {
+    const id = React.findDOMNode(this.refs.button).getAttribute("data-reactid");
+    this.setState({triggerId:id});
     if(this.props.initialFocus){
       this.setFocus();
     }
@@ -74,6 +77,48 @@ module.exports = React.createClass( {
     }
   },
 
+  componentDidUpdate( prevProps, prevState) {
+
+    if(this.state.lastBlurredTimeStamp !== prevState.lastBlurredTimeStamp){
+      if(this.state.lastBlurredIndex === this.state.highlightedIndex){
+        this.handleClose();
+      }
+    }
+
+    if(this.state.isOpen && !prevState.isOpen){
+      this.state.isClosing = false;
+    }
+
+    if(this.state.selectedIndex !== prevState.selectedIndex){
+      this.handleClose();
+    }
+    else if(this.state.isFocused && !prevState.isFocused){
+      this.setState({isOpen:false});
+    }
+    else if(!this.state.isFocused && prevState.isFocused){
+      if(this.refs.list){
+        if(this.isMounted() && this.refs.list){
+          if(this.refs.list.getDOMNode().contains(document.activeElement)){
+            return;
+          }
+          this.setState({isOpen:false})
+        }
+      }
+    }
+    else if(this.state.isClosing && !prevState.isClosing){
+      setTimeout(()=>{
+        if(this.state.isClosing){
+          this.setState({isOpen:false});
+        }
+      },this.props.hoverCloseDelay);
+    }
+
+    if(this.props.value !== prevProps.value){
+      this.handleSelect(this.getIndexByValue(this.props.value));
+    }
+
+  },
+
   getIndexByValue(value){
     let foundIndex = -1;
     if(this.props.options && this.props.options.length){
@@ -163,9 +208,6 @@ module.exports = React.createClass( {
     return React.findDOMNode(this.refs.button);
   },
 
-  moveHighlight(delta) {
-  },
-
   handleKeyDown(event) {
     if (event.keyCode){
       if (event.keyCode === KEYS.ENTER ||
@@ -199,6 +241,7 @@ module.exports = React.createClass( {
 
   getPopoverContent() {
     return <List
+            triggerId={this.state.triggerId}
             ref='list'
             options={this.props.options}
             className={this.props.listClassName}
@@ -274,8 +317,10 @@ module.exports = React.createClass( {
       ]);
     return (
 
+
       <SLDSButton
         ref='button'
+        id={this.state.triggerId}
         aria-haspopup='true'
         label={this.props.label}
         className={this.props.className}
@@ -297,49 +342,7 @@ module.exports = React.createClass( {
       </SLDSButton>
 
     );
-  },
-
-  componentDidUpdate( prevProps, prevState) {
-
-    if(this.state.lastBlurredTimeStamp !== prevState.lastBlurredTimeStamp){
-      if(this.state.lastBlurredIndex === this.state.highlightedIndex){
-        this.handleClose();
-      }
-    }
-
-    if(this.state.isOpen && !prevState.isOpen){
-      this.state.isClosing = false;
-    }
-
-    if(this.state.selectedIndex !== prevState.selectedIndex){
-      this.handleClose();
-    }
-    else if(this.state.isFocused && !prevState.isFocused){
-      this.setState({isOpen:false});
-    }
-    else if(!this.state.isFocused && prevState.isFocused){
-      if(this.refs.list){
-        if(this.isMounted() && this.refs.list){
-          if(this.refs.list.getDOMNode().contains(document.activeElement)){
-            return;
-          }
-          this.setState({isOpen:false})
-        }
-      }
-    }
-    else if(this.state.isClosing && !prevState.isClosing){
-      setTimeout(()=>{
-        if(this.state.isClosing){
-          this.setState({isOpen:false});
-        }
-      },this.props.hoverCloseDelay);
-    }
-
-    if(this.props.value !== prevProps.value){
-      this.handleSelect(this.getIndexByValue(this.props.value));
-    }
-
-  },
+  }
 
 });
 

components/SLDSDropdownBase/list.jsx

@@ -163,7 +163,7 @@ module.exports = React.createClass({
           ref="scroll"
           className={"slds-dropdown__list slds-theme--"+this.props.theme}
           role="menu"
-          aria-labelledby={this.props.label}>
+          aria-labelledby={this.props.triggerId}>
           { this.getItems() }
         </ul>
       </div>

components/SLDSLookup/Menu/ActionItem/index.jsx

@@ -0,0 +1,47 @@
+/*
+   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";
+
+class DefaultFooter extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+
+  componentWillReceiveProps(nextProps){
+    if(nextProps.isActive !== this.props.isActive && nextProps.isActive === true) this.props.setFocus(this.props.id);
+  }
+
+  footerClick(){
+    console.log('=====> Lookup Footer Clicked');
+  }
+
+  render(){
+    let className = 'slds-button';
+    if(this.props.isActive) className += ' slds-theme--shade'
+
+      return (
+        <div className="slds-lookup__item" onClick={this.footerClick}>
+          <button id='newItem' tabIndex="-1" className={className}>
+            <Icon name='add' category="utility" size="x-small" className="slds-icon-text-default" />
+            {'New ' + this.props.type}
+          </button>
+        </div>
+      )
+  }
+}
+
+DefaultFooter.propTypes = {
+};
+
+DefaultFooter.defaultProps = {
+};
+
+module.exports = DefaultFooter;

components/SLDSLookup/Menu/DefaultFooter/index.jsx

@@ -0,0 +1,47 @@
+/*
+   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";
+
+class DefaultHeader extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+
+  componentWillReceiveProps(nextProps){
+    if(nextProps.isActive !== this.props.isActive && nextProps.isActive === true) this.props.setFocus(this.props.id);
+  }
+
+  headerClick(){
+    console.log('=====> Lookup Header Clicked');
+  }
+
+  render(){
+    let className = 'slds-button';
+    if(this.props.isActive) className += ' slds-theme--shade'
+
+      return (
+        <div className="slds-lookup__item" onClick={this.headerClick}>
+          <button id='searchRecords' tabIndex="-1" className={className}>
+            <Icon name='search' category="utility" size="x-small" className="slds-icon-text-default" />
+            {this.props.searchTerm ? '"' + this.props.searchTerm + '"' + ' in ' + this.props.type + 's': ' in ' + this.props.type + 's'}
+          </button>
+        </div>
+      )
+  }
+}
+
+DefaultHeader.propTypes = {
+};
+
+DefaultHeader.defaultProps = {
+};
+
+module.exports = DefaultHeader;

components/SLDSLookup/Menu/DefaultHeader/index.jsx

@@ -9,7 +9,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 import React, { Component } from 'react';
 import {Icon} from "../../../SLDSIcons";
-import {KEYS,EventUtil} from '../../../utils';
+import {EventUtil} from '../../../utils';
 
 class Item extends React.Component {
   constructor(props) {
@@ -33,10 +33,13 @@ class Item extends React.Component {
   }
 
   handleClick(e){
-    EventUtil.trapImmediate(e);
     return this.props.onSelect(this.props.id, this.props.data);
   }
 
+  handleMouseDown(e){
+    EventUtil.trapImmediate(e);
+  }
+
   //Scroll menu item based on up/down mouse keys (assumes all items are the same height)
   scrollFocus(){
     const height = React.findDOMNode(this).offsetHeight;
@@ -59,7 +62,7 @@ class Item extends React.Component {
           aria-disabled={this.props.isDisabled}
           role="option"
           onClick={this.handleClick.bind(this)}
-          onMouseDown={this.handleClick.bind(this)}>
+          onMouseDown={this.handleMouseDown.bind(this)}>
           <Icon name={this.props.type} />
           { this.boldSearchText(this.props.children.label) }
         </a>