Merge pull request #5 from sfdc-matrix/picklistModalIssue

Fix Picklist in Modal + EventUtil for Testing

Author: ivansfdc

components/SLDSPicklistBase/index.jsx

@@ -261,7 +261,12 @@ module.exports = React.createClass( {
           this.setState({isOpen:false})
         }
       }
-    }
+      /* resolve a double click issue with the modal */
+    } else if (this.props.modal && this.state.isFocused && prevState.isFocused) {
+          if (!this.state.isOpen) {
+              this.setState({isOpen : true});
+          }
+      }
 
 
     if(this.props.value !== prevProps.value){

components/SLDSPicklistBase/list-item.jsx

@@ -90,7 +90,7 @@ module.exports = React.createClass({
           this.props.onMoveFocus(-1);
         }
       }
-      else if(event.keyCode === KEYS.ENTER || 
+      else if(event.keyCode === KEYS.ENTER ||
           event.keyCode === KEYS.SPACE ){
         EventUtil.trapEvent(event);
         if(this.props.onSelect){
@@ -116,7 +116,9 @@ module.exports = React.createClass({
   },
 
   handleBlur(e) {
-    if(this.props.onBlur){
+    if (this.props.onBlur &&
+        this.refs.link.getDOMNode() !== e.target) {
+
       this.props.onBlur(this.props.index, e.relatedTarget);
     }
   },
@@ -130,15 +132,15 @@ module.exports = React.createClass({
 
   render () {
     return (
-      <li 
+      <li
 
         className={"slds-dropdown__item slds-has-icon slds-has-icon--left slds-theme--"+this.props.theme}
         onMouseDown={this.handleMouseDown}
         tabIndex={-1}>
           <a id={'menu-0-'+this.props.index}
             href=''
             ref='link'
-            className='slds-truncate' 
+            className='slds-truncate'
             onClick={this.handleClick}
             onMouseDown={this.handleMouseDown}
             onKeyDown={this.handleKeyDown}

components/utils/EventUtil.js

@@ -16,8 +16,12 @@ const EventUtil = {
   trapEvent(event){
     event.preventDefault();
     event.stopPropagation();
-    if(event.nativeEvent){
+    
+    if(event.nativeEvent && event.nativeEvent.preventDefault){
       event.nativeEvent.preventDefault();
+    }
+
+    if (event.nativeEvent && event.nativeEvent.stopPropagation){
       event.nativeEvent.stopPropagation();
     }
   },
@@ -27,12 +31,12 @@ const EventUtil = {
   },
 
   trapImmediate(event){
-    if(event.nativeEvent){
+    if(event.nativeEvent && event.nativeEvent.stopImmediatePropagation){
       event.nativeEvent.stopImmediatePropagation();
     }
     EventUtil.trap(event);
   }
 
 };
 
-module.exports = EventUtil;
+module.exports = EventUtil;