@jetbrains/ring-ui-built 6.0.60 → 6.0.62

package/components/table/header.d.ts

@@ -14,7 +14,6 @@ export interface HeaderProps {
     sortOrder: boolean;
     caption?: string | null | undefined;
     checkboxDisabled?: boolean | undefined;
-    maxColSpan?: number;
 }
 declare module 'react-waypoint' {
     namespace Waypoint {
@@ -51,7 +50,7 @@ export default class Header extends PureComponent<HeaderProps> {
     };
     id: string;
     onCheckboxFocus: (event: SyntheticEvent<HTMLElement>) => void;
-    createCells(widths?: never[]): (import("react").JSX.Element | null)[];
+    createCells(widths?: never[]): import("react").JSX.Element[];
     render(): import("react").JSX.Element;
 }
 export type HeaderAttrs = JSX.LibraryManagedAttributes<typeof Header, HeaderProps>;

package/components/table/header.js

@@ -54,7 +54,6 @@ var Header = /*#__PURE__*/function (_PureComponent) {
   return _createClass(Header, [{
     key: "createCells",
     value: function createCells() {
-      var _this2 = this;
       var widths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       var _this$props = this.props,
         selectable = _this$props.selectable,
@@ -77,7 +76,6 @@ var Header = /*#__PURE__*/function (_PureComponent) {
           onFocus: this.onCheckboxFocus
         })
       });
-      var colSpan = 0;
       return columns.map(function (column, index) {
         var columnStyle = widths[index] ? {
           width: widths[index]
@@ -89,13 +87,8 @@ var Header = /*#__PURE__*/function (_PureComponent) {
           sortOrder,
           style: columnStyle
         };
-        colSpan += column.colSpan || 1;
-        if (colSpan > (_this2.props.maxColSpan || Infinity)) {
-          return null;
-        }
         return /*#__PURE__*/jsx(HeaderCell, _objectSpread2(_objectSpread2({
-          "data-test": column.id,
-          colSpan: column.colSpan
+          "data-test": column.id
         }, props), {}, {
           children: index === 0 && (draggable || selectable) && metaColumn
         }), column.id);

package/components/table/row.d.ts

@@ -6,7 +6,6 @@ import { SelectionItem } from './selection';
 export interface RowProps<T extends SelectionItem> extends Omit<HTMLAttributes<HTMLTableRowElement>, 'onClick' | 'onDoubleClick' | 'onSelect'>, FocusSensorAddProps<HTMLTableRowElement> {
     item: T;
     columns: readonly Column<T>[] | ((item: T) => readonly Column<T>[]);
-    maxColSpan?: number;
     selectable: boolean;
     showFocus: boolean;
     draggable: boolean;

package/components/table/row.js

@@ -66,7 +66,7 @@ import '../popup/popup.target.js';
 import 'core-js/modules/es.array.reduce.js';
 import 'memoize-one';
 
-var _excluded = ["item", "columns", "selectable", "selected", "showFocus", "draggable", "alwaysShowDragHandle", "dragHandleTitle", "level", "collapsible", "parentCollapsible", "collapsed", "maxColSpan", "onCollapse", "onExpand", "showDisabledSelection", "onSelect", "checkboxTooltip", "innerRef", "focused", "autofocus", "onFocusReset", "onFocusRestore", "onHover", "className", "metaColumnClassName", "data-test"];
+var _excluded = ["item", "columns", "selectable", "selected", "showFocus", "draggable", "alwaysShowDragHandle", "dragHandleTitle", "level", "collapsible", "parentCollapsible", "collapsed", "onCollapse", "onExpand", "showDisabledSelection", "onSelect", "checkboxTooltip", "innerRef", "focused", "autofocus", "onFocusReset", "onFocusRestore", "onHover", "className", "metaColumnClassName", "data-test"];
 var DragHandle = function DragHandle(_ref) {
   var alwaysShowDragHandle = _ref.alwaysShowDragHandle,
     _ref$dragHandleTitle = _ref.dragHandleTitle,
@@ -153,7 +153,6 @@ var Row = /*#__PURE__*/function (_PureComponent) {
         collapsible = _this$props3.collapsible,
         parentCollapsible = _this$props3.parentCollapsible,
         collapsed = _this$props3.collapsed,
-        maxColSpan = _this$props3.maxColSpan,
         onCollapse = _this$props3.onCollapse,
         onExpand = _this$props3.onExpand,
         showDisabledSelection = _this$props3.showDisabledSelection;
@@ -223,7 +222,6 @@ var Row = /*#__PURE__*/function (_PureComponent) {
         })]
       });
       var columns = typeof columnProps === 'function' ? columnProps(item) : columnProps;
-      var colSpan = 0;
       var cells = columns.map(function (column, index) {
         var getValue = column.getValue || function () {
           return item[column.id];
@@ -236,10 +234,6 @@ var Row = /*#__PURE__*/function (_PureComponent) {
           [modules_1db4bbca.cellRight]: column.rightAlign
         }, column.className);
         var showMetaColumn = draggable || selectable || collapsible || showDisabledSelection || !!level;
-        colSpan += column.colSpan || 1;
-        if (colSpan > (maxColSpan || Infinity)) {
-          return null;
-        }
         return /*#__PURE__*/jsxs(Cell, {
           colSpan: column.colSpan,
           className: cellClasses,

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

@@ -22,7 +22,6 @@ declare class SimpleTable<T extends SelectionItem> extends PureComponent<SimpleT
         onSort?: import("react").Validator<((params: import("./header-cell").SortParams) => void) | null | undefined> | undefined;
         sortKey?: import("react").Validator<string | null | undefined> | undefined;
         sortOrder?: import("react").Validator<boolean | null | undefined> | undefined;
-        maxColSpan?: import("react").Validator<number | null | undefined> | undefined;
         alwaysShowDragHandle?: import("react").Validator<boolean | null | undefined> | undefined;
         dragHandleTitle?: import("react").Validator<string | null | undefined> | undefined;
         onReorder?: import("react").Validator<((params: import("./table").ReorderParams<SelectionItem>) => void) | null | undefined> | undefined;

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

@@ -26,7 +26,6 @@ declare class SmartTable<T extends SelectionItem> extends PureComponent<SmartTab
         onSort?: import("react").Validator<((params: import("./header-cell").SortParams) => void) | null | undefined> | undefined;
         sortKey?: import("react").Validator<string | null | undefined> | undefined;
         sortOrder?: import("react").Validator<boolean | null | undefined> | undefined;
-        maxColSpan?: import("react").Validator<number | null | undefined> | undefined;
         alwaysShowDragHandle?: import("react").Validator<boolean | null | undefined> | undefined;
         dragHandleTitle?: import("react").Validator<string | null | undefined> | undefined;
         onReorder?: import("react").Validator<((params: import("./table").ReorderParams<SelectionItem>) => void) | null | undefined> | undefined;

package/components/table/table.d.ts

@@ -18,7 +18,6 @@ export interface ReorderParams<T> {
 export interface TableProps<T extends SelectionItem> extends FocusSensorAddProps<HTMLTableRowElement>, SelectionShortcutsAddProps<T>, DisableHoverAddProps {
     data: readonly T[];
     columns: readonly Column<T>[] | ((item: T | null) => readonly Column<T>[]);
-    maxColSpan?: number;
     isItemSelectable: (item: T) => boolean;
     loading: boolean;
     onSort: (params: SortParams) => void;

package/components/table/table.js

@@ -220,20 +220,19 @@ var Table = /*#__PURE__*/function (_PureComponent) {
         onItemDoubleClick = _this$props4.onItemDoubleClick,
         onItemClick = _this$props4.onItemClick,
         renderEmpty = _this$props4.renderEmpty,
-        maxColSpan = _this$props4.maxColSpan,
         RowComponent = _this$props4.RowComponent;
       // NOTE: Do not construct new object per render because it causes all rows rerendering
+      var columnsArray = typeof columns === 'function' ? columns(null) : columns;
       var headerProps = {
         caption,
         selectable,
         draggable,
-        columns: typeof columns === 'function' ? columns(null) : columns,
+        columns: columnsArray,
         onSort,
         sortKey,
         sortOrder,
         sticky: stickyHeader,
-        topStickOffset: stickyHeaderOffset,
-        maxColSpan: this.props.maxColSpan
+        topStickOffset: stickyHeaderOffset
       };
       var selectedSize = selection.getSelected().size;
       var allSelectedSize = selection.selectAll().getSelected().size;
@@ -256,7 +255,7 @@ var Table = /*#__PURE__*/function (_PureComponent) {
           props = _ref3.props;
         var empty = /*#__PURE__*/jsx("tr", {
           children: /*#__PURE__*/jsx("td", {
-            colSpan: _this2.props.columns.length || 1,
+            colSpan: columnsArray.length || 1,
             className: modules_1db4bbca.tableMessage,
             children: renderEmpty ? renderEmpty() : null
           })
@@ -310,8 +309,7 @@ var Table = /*#__PURE__*/function (_PureComponent) {
           alwaysShowDragHandle: alwaysShowDragHandle,
           dragHandleTitle: dragHandleTitle,
           columns: columns,
-          "data-test": getItemDataTest(value),
-          maxColSpan: maxColSpan
+          "data-test": getItemDataTest(value)
         }, restProps), {}, {
           key: (_restProps$key = restProps.key) !== null && _restProps$key !== void 0 ? _restProps$key : getItemKey(value)
         }));

package/components/tooltip/tooltip.js

@@ -158,7 +158,13 @@ var Tooltip = /*#__PURE__*/function (_Component) {
       var _this3 = this;
       if (this.containerNode != null) {
         this.listeners.add(this.containerNode, 'mouseover', this.tryToShowPopup);
-        this.listeners.add(this.containerNode, 'mouseout', this.hidePopup);
+        this.listeners.add(this.containerNode, 'mouseout', function (ev) {
+          var _this3$popup;
+          if (ev.relatedTarget && (_this3$popup = _this3.popup) !== null && _this3$popup !== void 0 && (_this3$popup = _this3$popup.container) !== null && _this3$popup !== void 0 && _this3$popup.contains(ev.relatedTarget)) {
+            return;
+          }
+          _this3.hidePopup();
+        });
       }
       this.listeners.add(document, 'scroll', function () {
         return scheduleScroll(_this3.hidePopup);
@@ -202,6 +208,7 @@ var Tooltip = /*#__PURE__*/function (_Component) {
               [modules_cd5e45a9.long]: long
             }),
             attached: false,
+            onMouseOut: this.hidePopup,
             top: 4,
             dontCloseOnAnchorClick: true,
             ref: this.popupRef

package/package.json

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