@jetbrains/ring-ui 6.0.49 → 6.0.50

package/components/select/select.js

@@ -620,13 +620,10 @@ export default class Select extends Component {
                 let nextSelection;
                 if (!prevState.multipleMap[selected.key]) {
                     nextSelection = currentSelection.concat(selected);
-                    this.props.onSelect && this.props.onSelect(selected, event);
                 }
                 else {
                     nextSelection = currentSelection.filter(item => item.key !== selected.key);
-                    this.props.onDeselect && this.props.onDeselect(selected);
                 }
-                this.props.onChange(nextSelection, event);
                 const nextState = {
                     filterValue: '',
                     selected: nextSelection,
@@ -648,6 +645,13 @@ export default class Select extends Component {
                 }
                 return { ...prevState, ...nextState };
             }, () => {
+                if (this.state.multipleMap[selected.key]) {
+                    this.props.onSelect?.(selected, event);
+                }
+                else {
+                    this.props.onDeselect?.(selected);
+                }
+                this.props.onChange(this.state.selected, event);
                 if (tryKeepOpen) {
                     this._redrawPopup();
                 }

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

@@ -45,6 +45,7 @@ export class Table extends PureComponent {
         remoteSelection: false,
         isDisabledSelectionVisible: () => false,
         getCheckboxTooltip: () => undefined,
+        RowComponent: Row,
         //TODO: change to false in 7.0
         wideFirstColumn: true
     };
@@ -110,7 +111,7 @@ export class Table extends PureComponent {
         window.scrollTo(scrollX, scrollY);
     };
     render() {
-        const { data, selection, columns, caption, getItemKey, selectable, focused, isItemSelectable, getItemLevel, getItemClassName, getMetaColumnClassName, getItemDataTest, draggable, alwaysShowDragHandle, dragHandleTitle, loading, onSort, sortKey, sortOrder, loaderClassName, stickyHeader, stickyHeaderOffset, isItemCollapsible, isParentCollapsible, isItemCollapsed, onItemCollapse, onItemExpand, isDisabledSelectionVisible, getCheckboxTooltip, onItemDoubleClick, onItemClick, renderEmpty, maxColSpan } = this.props;
+        const { data, selection, columns, caption, getItemKey, selectable, focused, isItemSelectable, getItemLevel, getItemClassName, getMetaColumnClassName, getItemDataTest, draggable, alwaysShowDragHandle, dragHandleTitle, loading, onSort, sortKey, sortOrder, loaderClassName, stickyHeader, stickyHeaderOffset, isItemCollapsible, isParentCollapsible, isItemCollapsed, onItemCollapse, onItemExpand, isDisabledSelectionVisible, getCheckboxTooltip, onItemDoubleClick, onItemClick, renderEmpty, maxColSpan, RowComponent } = this.props;
         // NOTE: Do not construct new object per render because it causes all rows rerendering
         const headerProps = {
             caption, selectable, draggable,
@@ -155,7 +156,7 @@ export class Table extends PureComponent {
                 return null;
             }
             const { ref, ...restProps } = props;
-            const row = (<Row innerRef={ref} level={getItemLevel(value)} item={value} showFocus={selection.isFocused(value)} autofocus={selection.isFocused(value)} focused={focused && selection.isFocused(value)} selectable={selectable && isItemSelectable(value)} selected={selectable && selection.isSelected(value)} onFocus={this.onRowFocus} onSelect={this.onRowSelect} onDoubleClick={onItemDoubleClick} onClick={onItemClick} collapsible={isItemCollapsible(value)} parentCollapsible={isParentCollapsible(value)} collapsed={isItemCollapsed(value)} onCollapse={onItemCollapse} onExpand={onItemExpand} showDisabledSelection={isDisabledSelectionVisible(value)} checkboxTooltip={getCheckboxTooltip(value)} className={classNames(getItemClassName(value), { [style.draggingRow]: isDragged })} metaColumnClassName={getMetaColumnClassName(value)} draggable={draggable} alwaysShowDragHandle={alwaysShowDragHandle} dragHandleTitle={dragHandleTitle} columns={columns} data-test={getItemDataTest(value)} maxColSpan={maxColSpan} {...restProps} key={restProps.key ?? getItemKey(value)}/>);
+            const row = (<RowComponent innerRef={ref} level={getItemLevel(value)} item={value} showFocus={selection.isFocused(value)} autofocus={selection.isFocused(value)} focused={focused && selection.isFocused(value)} selectable={selectable && isItemSelectable(value)} selected={selectable && selection.isSelected(value)} onFocus={this.onRowFocus} onSelect={this.onRowSelect} onDoubleClick={onItemDoubleClick} onClick={onItemClick} collapsible={isItemCollapsible(value)} parentCollapsible={isParentCollapsible(value)} collapsed={isItemCollapsed(value)} onCollapse={onItemCollapse} onExpand={onItemExpand} showDisabledSelection={isDisabledSelectionVisible(value)} checkboxTooltip={getCheckboxTooltip(value)} className={classNames(getItemClassName(value), { [style.draggingRow]: isDragged })} metaColumnClassName={getMetaColumnClassName(value)} draggable={draggable} alwaysShowDragHandle={alwaysShowDragHandle} dragHandleTitle={dragHandleTitle} columns={columns} data-test={getItemDataTest(value)} maxColSpan={maxColSpan} {...restProps} key={restProps.key ?? getItemKey(value)}/>);
             return isDragged
                 ? (<table style={{ ...props.style }} className={style.draggingTable}>
             <tbody>{row}</tbody>

package/package.json

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