0.0.5 lib build

salesforce · Sep 25, 2015 · 6b5f522 · 6b5f522
1 parent 0d5d660
commit 6b5f522
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/lib/SLDSPicklistBase/index.js b/lib/SLDSPicklistBase/index.js
@@ -44,9 +44,7 @@ module.exports = _react2['default'].createClass({
       modal: false,
       className: '',
       listClassName: '',
-      onClick: function onClick() {
-        console.log('onClick should be defined');
-      },
+      onClick: function onClick() {},
       onSelect: function onSelect(value) {
         console.log('onItemSelect should be defined');
       },
@@ -107,14 +105,21 @@ module.exports = _react2['default'].createClass({
   },
 
   handleClick: function handleClick(event) {
-    event.preventDefault();
-    event.stopPropagation();
-    this.setState({ isOpen: true });
-    if (this.props.onClick) {
-      this.props.onClick();
+    _utils.EventUtil.trap(event);
+    if (!this.state.isOpen) {
+      this.setState({ isOpen: true });
+      if (this.props.onClick) {
+        this.props.onClick();
+      }
+    } else {
+      this.handleClose();
     }
   },
 
+  handleMouseDown: function handleMouseDown(event) {
+    _utils.EventUtil.trapImmediate(event);
+  },
+
   handleBlur: function handleBlur(e) {
     this.setState({ isFocused: false });
   },
@@ -135,6 +140,7 @@ module.exports = _react2['default'].createClass({
     if (event.keyCode) {
       if (event.keyCode === _utils.KEYS.ENTER || event.keyCode === _utils.KEYS.SPACE || event.keyCode === _utils.KEYS.DOWN || event.keyCode === _utils.KEYS.UP) {
         _utils.EventUtil.trapEvent(event);
+
         this.setState({
           isOpen: true,
           highlightedIndex: 0
@@ -210,7 +216,7 @@ module.exports = _react2['default'].createClass({
     var className = this.state.currentSelectedItem ? 'slds-input--bare slds-hide' : 'slds-input--bare';
     return _react2['default'].createElement(
       'div',
-      { className: "slds-form-element  ignore-react-onclickoutside slds-theme--" + this.props.theme },
+      { className: "slds-form-element slds-theme--" + this.props.theme },
       _react2['default'].createElement(
         'div',
         { className: "slds-picklist slds-theme--" + this.props.theme },
@@ -227,6 +233,7 @@ module.exports = _react2['default'].createClass({
               onBlur: this.handleBlur,
               onFocus: this.handleFocus,
               onClick: this.handleClick,
+              onMouseDown: this.handleMouseDown,
               tabIndex: this.state.isOpen ? -1 : 0,
               onKeyDown: this.handleKeyDown },
             _react2['default'].createElement(
@@ -243,6 +250,7 @@ module.exports = _react2['default'].createClass({
   },
 
   componentDidUpdate: function componentDidUpdate(prevProps, prevState) {
+
     if (this.state.lastBlurredTimeStamp !== prevState.lastBlurredTimeStamp) {
       if (this.state.lastBlurredIndex === this.state.highlightedIndex) {
         this.handleClose();

diff --git a/lib/index.js b/lib/index.js
@@ -21,7 +21,12 @@ var _SLDSSettings = require('./SLDSSettings');
 
 var _SLDSSettings2 = _interopRequireDefault(_SLDSSettings);
 
+var _SLDSButton = require('./SLDSButton');
+
+var _SLDSButton2 = _interopRequireDefault(_SLDSButton);
+
 module.exports = {
   SLDSPicklistBase: _SLDSPicklistBase2['default'],
-  SLDSSettings: _SLDSSettings2['default']
+  SLDSSettings: _SLDSSettings2['default'],
+  SLDSButton: _SLDSButton2['default']
 };
diff --git a/lib/utils/EventUtil.js b/lib/utils/EventUtil.js
@@ -24,6 +24,13 @@ var EventUtil = {
 
   trap: function trap(event) {
     return EventUtil.trapEvent(event);
+  },
+
+  trapImmediate: function trapImmediate(event) {
+    if (event.nativeEvent) {
+      event.nativeEvent.stopImmediatePropagation();
+    }
+    EventUtil.trap(event);
   }
 
 };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "design-system-react",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Salesforce Lightning Design System React components",
   "scripts": {
     "start": "node server.js",