@jetbrains/ring-ui-built 6.0.27 → 6.0.29

package/components/table/row.js

@@ -1,4 +1,4 @@
-import { _ as _defineProperty, a as _inherits, b as _createSuper, c as _classCallCheck, d as _assertThisInitialized, f as _createClass, g as _objectWithoutProperties, i as _extends } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { _ as _defineProperty, a as _inherits, b as _createClass, c as _objectWithoutProperties, e as _extends, f as _classCallCheck, g as _callSuper } from '../_helpers/_rollupPluginBabelHelpers.js';
 import 'core-js/modules/es.array.concat.js';
 import 'core-js/modules/es.array.map.js';
 import React, { PureComponent } from 'react';
@@ -28,32 +28,32 @@ import '../global/memoize.js';
 import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/es.map.js';
 import 'core-js/modules/es.object.to-string.js';
-import 'core-js/modules/web.dom-collections.iterator.js';
 import 'core-js/modules/es.weak-map.js';
+import 'core-js/modules/web.dom-collections.iterator.js';
 import '../global/prop-types.js';
 import '@jetbrains/icons/chevron-10px';
 import '../link/clickableLink.js';
 import '../global/controls-height.js';
 import '../_helpers/button__classes.js';
 import '../popup/popup.js';
-import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/es.object.entries.js';
 import 'core-js/modules/es.regexp.to-string.js';
+import 'core-js/modules/web.dom-collections.for-each.js';
 import 'react-dom';
 import '../global/schedule-raf.js';
 import '../global/dom.js';
-import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.array.filter.js';
-import 'core-js/modules/es.string.split.js';
+import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.set.js';
+import 'core-js/modules/es.string.split.js';
 import '../shortcuts/shortcuts.js';
 import '../shortcuts/core.js';
+import 'core-js/modules/es.array.find-index.js';
 import 'core-js/modules/es.array.includes.js';
-import 'core-js/modules/es.string.includes.js';
 import 'core-js/modules/es.array.slice.js';
 import 'core-js/modules/es.array.splice.js';
+import 'core-js/modules/es.string.includes.js';
 import 'core-js/modules/es.string.match.js';
-import 'core-js/modules/es.array.find-index.js';
 import 'combokeys';
 import '../global/sniffer.js';
 import 'sniffr';
@@ -64,7 +64,7 @@ import '../popup/popup.consts.js';
 import '../popup/popup.target.js';
 import 'core-js/modules/es.array.reduce.js';
 
-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 _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 DragHandle = function DragHandle(_ref) {
   var alwaysShowDragHandle = _ref.alwaysShowDragHandle,
     _ref$dragHandleTitle = _ref.dragHandleTitle,
@@ -84,46 +84,45 @@ DragHandle.propTypes = {
   dragHandleTitle: PropTypes.string
 };
 var Row = /*#__PURE__*/function (_PureComponent) {
-  _inherits(Row, _PureComponent);
-  var _super = _createSuper(Row);
   function Row() {
     var _this;
     _classCallCheck(this, Row);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _super.call.apply(_super, [this].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "id", getUID('table-row-'));
-    _defineProperty(_assertThisInitialized(_this), "onMouseEnter", function (e) {
+    _this = _callSuper(this, Row, [].concat(args));
+    _defineProperty(_this, "id", getUID('table-row-'));
+    _defineProperty(_this, "onMouseEnter", function (e) {
       var _this$props = _this.props,
         item = _this$props.item,
         onHover = _this$props.onHover;
       onHover(item, e);
     });
-    _defineProperty(_assertThisInitialized(_this), "onClick", function (e) {
+    _defineProperty(_this, "onClick", function (e) {
       var item = _this.props.item;
       _this.props.onClick(item, e);
       if (e.shiftKey) {
         _this.toggleSelection();
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "onCheckboxFocus", function () {
+    _defineProperty(_this, "onCheckboxFocus", function () {
       _this.props.onFocusRestore();
     });
-    _defineProperty(_assertThisInitialized(_this), "onCheckboxChange", function () {
+    _defineProperty(_this, "onCheckboxChange", function () {
       _this.toggleSelection();
     });
-    _defineProperty(_assertThisInitialized(_this), "onDoubleClick", function () {
+    _defineProperty(_this, "onDoubleClick", function () {
       var item = _this.props.item;
       _this.props.onDoubleClick(item);
     });
-    _defineProperty(_assertThisInitialized(_this), "row", void 0);
-    _defineProperty(_assertThisInitialized(_this), "rowRef", function (el) {
+    _defineProperty(_this, "row", void 0);
+    _defineProperty(_this, "rowRef", function (el) {
       _this.row = el;
     });
     return _this;
   }
-  _createClass(Row, [{
+  _inherits(Row, _PureComponent);
+  return _createClass(Row, [{
     key: "toggleSelection",
     value: function toggleSelection() {
       var _this$props2 = this.props,
@@ -140,7 +139,7 @@ var Row = /*#__PURE__*/function (_PureComponent) {
     value: function render() {
       var _this$props3 = this.props,
         item = _this$props3.item,
-        columns = _this$props3.columns,
+        columnProps = _this$props3.columns,
         selectable = _this$props3.selectable,
         selected = _this$props3.selected,
         showFocus = _this$props3.showFocus,
@@ -151,6 +150,7 @@ 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;
@@ -216,6 +216,8 @@ var Row = /*#__PURE__*/function (_PureComponent) {
           return onCollapse(item);
         }
       }));
+      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];
@@ -228,7 +230,12 @@ 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__*/React.createElement(Cell, {
+          colSpan: column.colSpan,
           key: column.id,
           className: cellClasses,
           "data-test": getDataTest(item, column)
@@ -247,7 +254,6 @@ var Row = /*#__PURE__*/function (_PureComponent) {
       }), cells);
     }
   }]);
-  return Row;
 }(PureComponent);
 _defineProperty(Row, "defaultProps", {
   selectable: true,
@@ -270,7 +276,7 @@ Row.propTypes = {
   className: PropTypes.string,
   metaColumnClassName: PropTypes.string,
   item: PropTypes.object.isRequired,
-  columns: PropTypes.array.isRequired,
+  columns: PropTypes.oneOfType([PropTypes.array, PropTypes.func]).isRequired,
   selectable: PropTypes.bool,
   showFocus: PropTypes.bool,
   draggable: PropTypes.bool,

package/components/table/selection-adapter.js

@@ -1,4 +1,4 @@
-import { l as _toConsumableArray } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { k as _toConsumableArray } from '../_helpers/_rollupPluginBabelHelpers.js';
 
 function selectionAdapter(getSelection) {
   return {

package/components/table/selection-shortcuts-hoc.js

@@ -1,14 +1,14 @@
-import { h as _objectSpread2, g as _objectWithoutProperties, a as _inherits, b as _createSuper, c as _classCallCheck, _ as _defineProperty, d as _assertThisInitialized, f as _createClass, i as _extends } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { d as _objectSpread2, c as _objectWithoutProperties, a as _inherits, b as _createClass, e as _extends, f as _classCallCheck, g as _callSuper, _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
 import 'core-js/modules/es.array.concat.js';
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import Selection from './selection.js';
+import 'core-js/modules/es.array.filter.js';
+import 'core-js/modules/es.array.index-of.js';
 import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/es.set.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
-import 'core-js/modules/es.array.filter.js';
-import 'core-js/modules/es.array.index-of.js';
 
 var _excluded = ["selection", "selectable", "onSelect", "shortcutsMap"],
   _excluded2 = ["selection", "selectable", "onSelect", "shortcuts"];
@@ -26,16 +26,14 @@ function extractPropTypes(_ref) {
 }
 function selectionShortcutsHOC(ComposedComponent) {
   var SelectionShortcuts = /*#__PURE__*/function (_PureComponent) {
-    _inherits(SelectionShortcuts, _PureComponent);
-    var _super = _createSuper(SelectionShortcuts);
     function SelectionShortcuts() {
       var _this;
       _classCallCheck(this, SelectionShortcuts);
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-      _this = _super.call.apply(_super, [this].concat(args));
-      _defineProperty(_assertThisInitialized(_this), "onUpPress", function () {
+      _this = _callSuper(this, SelectionShortcuts, [].concat(args));
+      _defineProperty(_this, "onUpPress", function () {
         var _this$props = _this.props,
           selection = _this$props.selection,
           onSelect = _this$props.onSelect;
@@ -45,7 +43,7 @@ function selectionShortcutsHOC(ComposedComponent) {
         }
         return false;
       });
-      _defineProperty(_assertThisInitialized(_this), "onDownPress", function () {
+      _defineProperty(_this, "onDownPress", function () {
         var _this$props2 = _this.props,
           selection = _this$props2.selection,
           onSelect = _this$props2.onSelect;
@@ -55,8 +53,8 @@ function selectionShortcutsHOC(ComposedComponent) {
         }
         return false;
       });
-      _defineProperty(_assertThisInitialized(_this), "shiftSelectionMode", void 0);
-      _defineProperty(_assertThisInitialized(_this), "onShiftKeyDown", function () {
+      _defineProperty(_this, "shiftSelectionMode", void 0);
+      _defineProperty(_this, "onShiftKeyDown", function () {
         var selection = _this.props.selection;
         if (selection.isSelected(selection.getFocused())) {
           _this.shiftSelectionMode = 'deletion';
@@ -64,14 +62,14 @@ function selectionShortcutsHOC(ComposedComponent) {
           _this.shiftSelectionMode = 'addition';
         }
       });
-      _defineProperty(_assertThisInitialized(_this), "shiftSelect", function (selection) {
+      _defineProperty(_this, "shiftSelect", function (selection) {
         if (_this.shiftSelectionMode === 'addition') {
           return selection.select();
         } else {
           return selection.deselect();
         }
       });
-      _defineProperty(_assertThisInitialized(_this), "onShiftUpPress", function (e) {
+      _defineProperty(_this, "onShiftUpPress", function (e) {
         e.preventDefault();
         var _this$props3 = _this.props,
           selectable = _this$props3.selectable,
@@ -88,7 +86,7 @@ function selectionShortcutsHOC(ComposedComponent) {
           onSelect === null || onSelect === void 0 || onSelect(newSelection);
         }
       });
-      _defineProperty(_assertThisInitialized(_this), "onShiftDownPress", function (e) {
+      _defineProperty(_this, "onShiftDownPress", function (e) {
         e.preventDefault();
         var _this$props4 = _this.props,
           selectable = _this$props4.selectable,
@@ -105,7 +103,7 @@ function selectionShortcutsHOC(ComposedComponent) {
           onSelect === null || onSelect === void 0 || onSelect(newSelection);
         }
       });
-      _defineProperty(_assertThisInitialized(_this), "onHomePress", function () {
+      _defineProperty(_this, "onHomePress", function () {
         var _this$props5 = _this.props,
           selection = _this$props5.selection,
           onSelect = _this$props5.onSelect;
@@ -115,7 +113,7 @@ function selectionShortcutsHOC(ComposedComponent) {
         }
         return false;
       });
-      _defineProperty(_assertThisInitialized(_this), "onEndPress", function () {
+      _defineProperty(_this, "onEndPress", function () {
         var _this$props6 = _this.props,
           selection = _this$props6.selection,
           onSelect = _this$props6.onSelect;
@@ -125,7 +123,7 @@ function selectionShortcutsHOC(ComposedComponent) {
         }
         return false;
       });
-      _defineProperty(_assertThisInitialized(_this), "onSpacePress", function () {
+      _defineProperty(_this, "onSpacePress", function () {
         var _this$props7 = _this.props,
           selectable = _this$props7.selectable,
           selection = _this$props7.selection,
@@ -136,14 +134,14 @@ function selectionShortcutsHOC(ComposedComponent) {
         onSelect === null || onSelect === void 0 || onSelect(selection.toggleSelection());
         return false;
       });
-      _defineProperty(_assertThisInitialized(_this), "onEscPress", function () {
+      _defineProperty(_this, "onEscPress", function () {
         var _this$props8 = _this.props,
           selection = _this$props8.selection,
           onSelect = _this$props8.onSelect;
         onSelect === null || onSelect === void 0 || onSelect(selection.reset());
         //this.restoreFocusWithoutScroll();
       });
-      _defineProperty(_assertThisInitialized(_this), "onCmdAPress", function () {
+      _defineProperty(_this, "onCmdAPress", function () {
         var _this$props9 = _this.props,
           selectable = _this$props9.selectable,
           selection = _this$props9.selection,
@@ -154,7 +152,7 @@ function selectionShortcutsHOC(ComposedComponent) {
         onSelect === null || onSelect === void 0 || onSelect(selection.selectAll());
         return false;
       });
-      _defineProperty(_assertThisInitialized(_this), "shortcutsMap", {
+      _defineProperty(_this, "shortcutsMap", {
         up: _this.onUpPress,
         down: _this.onDownPress,
         shift: _this.onShiftKeyDown,
@@ -169,7 +167,8 @@ function selectionShortcutsHOC(ComposedComponent) {
       });
       return _this;
     }
-    _createClass(SelectionShortcuts, [{
+    _inherits(SelectionShortcuts, _PureComponent);
+    return _createClass(SelectionShortcuts, [{
       key: "render",
       value: function render() {
         var _this$props10 = this.props,
@@ -186,7 +185,6 @@ function selectionShortcutsHOC(ComposedComponent) {
         }));
       }
     }]);
-    return SelectionShortcuts;
   }(PureComponent);
   SelectionShortcuts.propTypes = _objectSpread2(_objectSpread2({}, extractPropTypes(ComposedComponent)), {}, {
     selection: PropTypes.instanceOf(Selection).isRequired,

package/components/table/selection.js

@@ -1,10 +1,10 @@
-import { f as _createClass, l as _toConsumableArray, c as _classCallCheck, _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { b as _createClass, k as _toConsumableArray, f as _classCallCheck, _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
+import 'core-js/modules/es.array.filter.js';
+import 'core-js/modules/es.array.index-of.js';
 import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/es.set.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
-import 'core-js/modules/es.array.filter.js';
-import 'core-js/modules/es.array.index-of.js';
 
 var Selection = /*#__PURE__*/function () {
   function Selection() {
@@ -43,7 +43,7 @@ var Selection = /*#__PURE__*/function () {
     this._getKey = getKey;
     this._isItemSelectable = isItemSelectable;
   }
-  _createClass(Selection, [{
+  return _createClass(Selection, [{
     key: "_buildData",
     value: function _buildData(data) {
       return new Set(data);
@@ -251,7 +251,6 @@ var Selection = /*#__PURE__*/function () {
       }
     }
   }]);
-  return Selection;
 }();
 
 export { Selection as default };

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

@@ -15,7 +15,7 @@ declare class SmartTable<T extends SelectionItem> extends PureComponent<SmartTab
         data?: React.Validator<readonly SelectionItem[]> | undefined;
         loading?: React.Validator<boolean | null | undefined> | undefined;
         draggable?: React.Validator<boolean | null | undefined> | undefined;
-        columns?: React.Validator<readonly import("./header-cell").Column<SelectionItem>[]> | undefined;
+        columns?: React.Validator<readonly import("./header-cell").Column<SelectionItem>[] | ((item: SelectionItem | null) => readonly import("./header-cell").Column<SelectionItem>[])> | undefined;
         focused?: React.Validator<boolean | null | undefined> | undefined;
         isItemSelectable: PropTypes.Requireable<(...args: any[]) => any> | React.Validator<((item: SelectionItem) => boolean) | null | undefined>;
         innerRef?: React.Validator<React.Ref<HTMLTableRowElement> | undefined> | undefined;
@@ -26,6 +26,7 @@ declare class SmartTable<T extends SelectionItem> extends PureComponent<SmartTab
         onSort?: React.Validator<((params: import("./header-cell").SortParams) => void) | null | undefined> | undefined;
         sortKey?: React.Validator<string | null | undefined> | undefined;
         sortOrder?: React.Validator<boolean | null | undefined> | undefined;
+        maxColSpan?: React.Validator<number | null | undefined> | undefined;
         alwaysShowDragHandle?: React.Validator<boolean | null | undefined> | undefined;
         dragHandleTitle?: React.Validator<string | null | undefined> | undefined;
         onReorder?: React.Validator<((params: import("./table").ReorderParams<SelectionItem>) => void) | null | undefined> | undefined;

package/components/table/smart-table.js

@@ -1,4 +1,4 @@
-import { g as _objectWithoutProperties, _ as _defineProperty, h as _objectSpread2, a as _inherits, b as _createSuper, c as _classCallCheck, d as _assertThisInitialized, f as _createClass, i as _extends } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { c as _objectWithoutProperties, _ as _defineProperty, d as _objectSpread2, a as _inherits, b as _createClass, e as _extends, f as _classCallCheck, g as _callSuper } from '../_helpers/_rollupPluginBabelHelpers.js';
 import 'core-js/modules/es.array.concat.js';
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
@@ -16,14 +16,14 @@ import '../global/get-uid.js';
 import 'core-js/modules/es.regexp.to-string.js';
 import '../shortcuts/shortcuts.js';
 import '../shortcuts/core.js';
+import 'core-js/modules/es.array.find-index.js';
 import 'core-js/modules/es.array.includes.js';
-import 'core-js/modules/es.string.includes.js';
-import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.array.slice.js';
 import 'core-js/modules/es.array.splice.js';
+import 'core-js/modules/es.object.assign.js';
 import 'core-js/modules/es.regexp.exec.js';
+import 'core-js/modules/es.string.includes.js';
 import 'core-js/modules/es.string.match.js';
-import 'core-js/modules/es.array.find-index.js';
 import 'combokeys';
 import '../global/sniffer.js';
 import 'sniffr';
@@ -35,9 +35,9 @@ import '../loader/loader__core.js';
 import 'core-js/modules/es.array.fill.js';
 import 'core-js/modules/es.array.filter.js';
 import '../global/dom.js';
-import 'core-js/modules/es.string.split.js';
 import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/es.set.js';
+import 'core-js/modules/es.string.split.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import './header.js';
 import '../checkbox/checkbox.js';
@@ -85,22 +85,20 @@ var _ref = (_Table$propTypes = TableContainer.propTypes) !== null && _Table$prop
   _ref.onSelect;
   var restPropTypes = _objectWithoutProperties(_ref, ["selection", "onSelect"]);
 var SmartTable = /*#__PURE__*/function (_PureComponent) {
-  _inherits(SmartTable, _PureComponent);
-  var _super = _createSuper(SmartTable);
   function SmartTable() {
     var _this;
     _classCallCheck(this, SmartTable);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    _this = _super.call.apply(_super, [this].concat(args));
-    _defineProperty(_assertThisInitialized(_this), "state", {
+    _this = _callSuper(this, SmartTable, [].concat(args));
+    _defineProperty(_this, "state", {
       selection: new Selection({
         data: _this.props.data,
         isItemSelectable: _this.props.isItemSelectable
       })
     });
-    _defineProperty(_assertThisInitialized(_this), "onSelect", function (selection) {
+    _defineProperty(_this, "onSelect", function (selection) {
       _this.setState({
         selection
       });
@@ -108,7 +106,8 @@ var SmartTable = /*#__PURE__*/function (_PureComponent) {
     });
     return _this;
   }
-  _createClass(SmartTable, [{
+  _inherits(SmartTable, _PureComponent);
+  return _createClass(SmartTable, [{
     key: "UNSAFE_componentWillReceiveProps",
     value: function UNSAFE_componentWillReceiveProps(nextProps) {
       var data = nextProps.data,
@@ -136,7 +135,6 @@ var SmartTable = /*#__PURE__*/function (_PureComponent) {
       }));
     }
   }]);
-  return SmartTable;
 }(PureComponent);
 _defineProperty(SmartTable, "propTypes", _objectSpread2({
   onSelectionChange: PropTypes.func,

package/components/table/table.d.ts

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