@jetbrains/ring-ui-built 6.0.49 → 6.0.50

package/components/select/select.js

@@ -510,14 +510,11 @@ 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,
@@ -545,6 +542,14 @@ 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();
           }
@@ -643,11 +648,11 @@ var Select = /*#__PURE__*/function (_Component) {
       var _this$state = this.state,
         showPopup = _this$state.showPopup,
         selected = _this$state.selected;
-      var _this$props = this.props,
-        onClose = _this$props.onClose,
-        onOpen = _this$props.onOpen,
-        onChange = _this$props.onChange,
-        multiple = _this$props.multiple;
+      var _this$props3 = this.props,
+        onClose = _this$props3.onClose,
+        onOpen = _this$props3.onOpen,
+        onChange = _this$props3.onChange,
+        multiple = _this$props3.multiple;
       if (prevState.showPopup && !showPopup) {
         onClose(selected);
       } else if (!prevState.showPopup && showPopup) {
@@ -789,9 +794,9 @@ var Select = /*#__PURE__*/function (_Component) {
   }, {
     key: "getToolbar",
     value: function getToolbar() {
-      var _this$props2 = this.props,
-        hint = _this$props2.hint,
-        renderBottomToolbar = _this$props2.renderBottomToolbar;
+      var _this$props4 = this.props,
+        hint = _this$props4.hint,
+        renderBottomToolbar = _this$props4.renderBottomToolbar;
       var _ref3 = this.state.addButton || {},
         prefix = _ref3.prefix,
         label = _ref3.label,
@@ -821,8 +826,8 @@ var Select = /*#__PURE__*/function (_Component) {
   }, {
     key: "getTopbar",
     value: function getTopbar() {
-      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);
+      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);
     }
   }, {
     key: "getFilterFn",
@@ -903,10 +908,10 @@ var Select = /*#__PURE__*/function (_Component) {
     key: "_getIcons",
     value: function _getIcons() {
       var selected = this.state.selected;
-      var _this$props4 = this.props,
-        disabled = _this$props4.disabled,
-        clear = _this$props4.clear,
-        hideArrow = _this$props4.hideArrow;
+      var _this$props6 = this.props,
+        disabled = _this$props6.disabled,
+        clear = _this$props6.clear,
+        hideArrow = _this$props6.hideArrow;
       var icons = [];
       var height = this.props.height || this.context;
       if (!Array.isArray(selected) && selected !== null && selected !== void 0 && selected.icon) {

package/components/table/simple-table.d.ts

@@ -45,6 +45,7 @@ declare class SimpleTable<T extends SelectionItem> extends PureComponent<SimpleT
         loaderClassName?: import("react").Validator<string | null | undefined> | undefined;
         stickyHeaderOffset?: import("react").Validator<string | null | undefined> | undefined;
         renderEmpty?: import("react").Validator<(() => import("react").ReactNode) | null | undefined> | undefined;
+        RowComponent?: import("react").Validator<typeof import("./row-with-focus-sensor").default | null | undefined> | undefined;
         shortcuts?: import("react").Validator<import("../shortcuts/core").ShortcutsMap | null | undefined> | undefined;
     };
     static defaultProps: {

package/components/table/smart-table.d.ts

@@ -49,6 +49,7 @@ declare class SmartTable<T extends SelectionItem> extends PureComponent<SmartTab
         loaderClassName?: import("react").Validator<string | null | undefined> | undefined;
         stickyHeaderOffset?: import("react").Validator<string | null | undefined> | undefined;
         renderEmpty?: import("react").Validator<(() => import("react").ReactNode) | null | undefined> | undefined;
+        RowComponent?: import("react").Validator<typeof import("./row-with-focus-sensor").default | null | undefined> | undefined;
         selectable?: import("react").Validator<boolean | null | undefined> | undefined;
         shortcuts?: import("react").Validator<import("../shortcuts/core").ShortcutsMap | null | undefined> | undefined;
         onSelectionChange: PropTypes.Requireable<(...args: any[]) => any>;

package/components/table/table.d.ts

@@ -8,6 +8,7 @@ import { FocusSensorAddProps, FocusSensorProps } from '../global/focus-sensor-ho
 import { SelectionItem } from './selection';
 import { SelectionShortcutsAddProps, SelectionShortcutsProps } from './selection-shortcuts-hoc';
 import { DisableHoverAddProps, DisableHoverProps } from './disable-hover-hoc';
+import Row from './row-with-focus-sensor';
 import { Column, SortParams } from './header-cell';
 export interface ReorderParams<T> {
     data: T[];
@@ -49,6 +50,7 @@ export interface TableProps<T extends SelectionItem> extends FocusSensorAddProps
     caption?: string | null | undefined;
     stickyHeaderOffset?: string | undefined;
     renderEmpty?: (() => ReactNode) | null | undefined;
+    RowComponent: typeof Row;
 }
 /**
  * Interactive table with selection and keyboard navigation support.
@@ -79,6 +81,7 @@ export declare class Table<T extends SelectionItem> extends PureComponent<TableP
         remoteSelection: boolean;
         isDisabledSelectionVisible: () => boolean;
         getCheckboxTooltip: () => undefined;
+        RowComponent: typeof Row;
         wideFirstColumn: boolean;
     };
     state: {

package/components/table/table.js

@@ -220,7 +220,8 @@ var Table = /*#__PURE__*/function (_PureComponent) {
         onItemDoubleClick = _this$props4.onItemDoubleClick,
         onItemClick = _this$props4.onItemClick,
         renderEmpty = _this$props4.renderEmpty,
-        maxColSpan = _this$props4.maxColSpan;
+        maxColSpan = _this$props4.maxColSpan,
+        RowComponent = _this$props4.RowComponent;
       // NOTE: Do not construct new object per render because it causes all rows rerendering
       var headerProps = {
         caption,
@@ -281,7 +282,7 @@ var Table = /*#__PURE__*/function (_PureComponent) {
         }
         var ref = props.ref,
           restProps = _objectWithoutProperties(props, _excluded);
-        var row = /*#__PURE__*/createElement(RowWithFocusSensorCallbacks, _objectSpread2(_objectSpread2({
+        var row = /*#__PURE__*/createElement(RowComponent, _objectSpread2(_objectSpread2({
           innerRef: ref,
           level: getItemLevel(value),
           item: value,
@@ -402,6 +403,7 @@ _defineProperty(Table, "defaultProps", {
   getCheckboxTooltip: function getCheckboxTooltip() {
     return undefined;
   },
+  RowComponent: RowWithFocusSensorCallbacks,
   //TODO: change to false in 7.0
   wideFirstColumn: true
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui-built",
-  "version": "6.0.49",
+  "version": "6.0.50",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",