@jetbrains/ring-ui-built 6.0.50 → 7.0.0-beta.1

package/components/select/select.js

@@ -510,11 +510,14 @@ var Select = /*#__PURE__*/function (_Component) {
           var nextSelection;
           if (!prevState.multipleMap[selected.key]) {
             nextSelection = currentSelection.concat(selected);
+            _this.props.onSelect && _this.props.onSelect(selected, event);
           } else {
             nextSelection = currentSelection.filter(function (item) {
               return item.key !== selected.key;
             });
+            _this.props.onDeselect && _this.props.onDeselect(selected);
           }
+          _this.props.onChange(nextSelection, event);
           var nextState = {
             filterValue: '',
             selected: nextSelection,
@@ -542,14 +545,6 @@ var Select = /*#__PURE__*/function (_Component) {
           }
           return _objectSpread2(_objectSpread2({}, prevState), nextState);
         }, function () {
-          if (_this.state.multipleMap[selected.key]) {
-            var _this$props$onSelect, _this$props;
-            (_this$props$onSelect = (_this$props = _this.props).onSelect) === null || _this$props$onSelect === void 0 || _this$props$onSelect.call(_this$props, selected, event);
-          } else {
-            var _this$props$onDeselec, _this$props2;
-            (_this$props$onDeselec = (_this$props2 = _this.props).onDeselect) === null || _this$props$onDeselec === void 0 || _this$props$onDeselec.call(_this$props2, selected);
-          }
-          _this.props.onChange(_this.state.selected, event);
           if (tryKeepOpen) {
             _this._redrawPopup();
           }
@@ -648,11 +643,11 @@ var Select = /*#__PURE__*/function (_Component) {
       var _this$state = this.state,
         showPopup = _this$state.showPopup,
         selected = _this$state.selected;
-      var _this$props3 = this.props,
-        onClose = _this$props3.onClose,
-        onOpen = _this$props3.onOpen,
-        onChange = _this$props3.onChange,
-        multiple = _this$props3.multiple;
+      var _this$props = this.props,
+        onClose = _this$props.onClose,
+        onOpen = _this$props.onOpen,
+        onChange = _this$props.onChange,
+        multiple = _this$props.multiple;
       if (prevState.showPopup && !showPopup) {
         onClose(selected);
       } else if (!prevState.showPopup && showPopup) {
@@ -794,9 +789,9 @@ var Select = /*#__PURE__*/function (_Component) {
   }, {
     key: "getToolbar",
     value: function getToolbar() {
-      var _this$props4 = this.props,
-        hint = _this$props4.hint,
-        renderBottomToolbar = _this$props4.renderBottomToolbar;
+      var _this$props2 = this.props,
+        hint = _this$props2.hint,
+        renderBottomToolbar = _this$props2.renderBottomToolbar;
       var _ref3 = this.state.addButton || {},
         prefix = _ref3.prefix,
         label = _ref3.label,
@@ -826,8 +821,8 @@ var Select = /*#__PURE__*/function (_Component) {
   }, {
     key: "getTopbar",
     value: function getTopbar() {
-      var _this$props$renderTop, _this$props5;
-      return (_this$props$renderTop = (_this$props5 = this.props).renderTopToolbar) === null || _this$props$renderTop === void 0 ? void 0 : _this$props$renderTop.call(_this$props5);
+      var _this$props$renderTop, _this$props3;
+      return (_this$props$renderTop = (_this$props3 = this.props).renderTopToolbar) === null || _this$props$renderTop === void 0 ? void 0 : _this$props$renderTop.call(_this$props3);
     }
   }, {
     key: "getFilterFn",
@@ -908,10 +903,10 @@ var Select = /*#__PURE__*/function (_Component) {
     key: "_getIcons",
     value: function _getIcons() {
       var selected = this.state.selected;
-      var _this$props6 = this.props,
-        disabled = _this$props6.disabled,
-        clear = _this$props6.clear,
-        hideArrow = _this$props6.hideArrow;
+      var _this$props4 = this.props,
+        disabled = _this$props4.disabled,
+        clear = _this$props4.clear,
+        hideArrow = _this$props4.hideArrow;
       var icons = [];
       var height = this.props.height || this.context;
       if (!Array.isArray(selected) && selected !== null && selected !== void 0 && selected.icon) {