@jetbrains/ring-ui-built 6.0.28 → 6.0.29

package/components/shortcuts/shortcuts.js

@@ -1,29 +1,28 @@
-import { _ as _defineProperty, a as _inherits, b as _createSuper, c as _classCallCheck, f as _createClass } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { _ as _defineProperty, a as _inherits, b as _createClass, f as _classCallCheck, g as _callSuper } from '../_helpers/_rollupPluginBabelHelpers.js';
 import 'core-js/modules/es.array.map.js';
 import { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import shortcuts from './core.js';
+import 'core-js/modules/es.array.concat.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.array.concat.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';
 
 var Shortcuts = /*#__PURE__*/function (_PureComponent) {
-  _inherits(Shortcuts, _PureComponent);
-  var _super = _createSuper(Shortcuts);
   function Shortcuts() {
     _classCallCheck(this, Shortcuts);
-    return _super.apply(this, arguments);
+    return _callSuper(this, Shortcuts, arguments);
   }
-  _createClass(Shortcuts, [{
+  _inherits(Shortcuts, _PureComponent);
+  return _createClass(Shortcuts, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       if (!this.props.disabled) {
@@ -76,7 +75,6 @@ var Shortcuts = /*#__PURE__*/function (_PureComponent) {
       return this.props.children || null;
     }
   }]);
-  return Shortcuts;
 }(PureComponent);
 _defineProperty(Shortcuts, "propTypes", {
   map: PropTypes.object.isRequired,

package/components/slider/slider.js

@@ -1,6 +1,6 @@
-import { k as _slicedToArray, h as _objectSpread2, l as _toConsumableArray } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.array.map.js';
+import { j as _slicedToArray, d as _objectSpread2, k as _toConsumableArray } from '../_helpers/_rollupPluginBabelHelpers.js';
 import 'core-js/modules/es.array.index-of.js';
+import 'core-js/modules/es.array.map.js';
 import React, { useRef, useState, useMemo, useCallback, useEffect, Fragment } from 'react';
 import classNames from 'classnames';
 import { isArray } from '../global/typescript-utils.js';
@@ -9,15 +9,15 @@ import getUID from '../global/get-uid.js';
 import { toRange, validateValue, calculateMarks, toPercent, calculateValue, adjustValues, HUNDRED } from './slider.utils.js';
 import 'prop-types';
 import '../shortcuts/core.js';
+import 'core-js/modules/es.array.concat.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.array.concat.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';

package/components/slider/slider.utils.js

@@ -1,9 +1,9 @@
-import { l as _toConsumableArray } from '../_helpers/_rollupPluginBabelHelpers.js';
-import 'core-js/modules/es.object.to-string.js';
-import 'core-js/modules/es.regexp.to-string.js';
+import { k as _toConsumableArray } from '../_helpers/_rollupPluginBabelHelpers.js';
+import 'core-js/modules/es.array.from.js';
 import 'core-js/modules/es.array.map.js';
 import 'core-js/modules/es.array.slice.js';
-import 'core-js/modules/es.array.from.js';
+import 'core-js/modules/es.object.to-string.js';
+import 'core-js/modules/es.regexp.to-string.js';
 import { isArray } from '../global/typescript-utils.js';
 
 var HUNDRED = 100;

package/components/storage/storage.js

@@ -1,14 +1,14 @@
 import LocalStorage from './storage__local.js';
 import FallbackStorage from './storage__fallback.js';
 import '../_helpers/_rollupPluginBabelHelpers.js';
+import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/es.promise.js';
-import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import '../alert-service/alert-service.js';
-import 'core-js/modules/es.array.map.js';
-import 'core-js/modules/es.array.filter.js';
 import 'core-js/modules/es.array.concat.js';
+import 'core-js/modules/es.array.filter.js';
+import 'core-js/modules/es.array.map.js';
 import 'react';
 import 'react-dom/client';
 import '../global/get-uid.js';
@@ -37,9 +37,9 @@ import 'core-js/modules/es.array.reduce.js';
 import 'core-js/modules/es.object.entries.js';
 import '../global/dom.js';
 import 'core-js/modules/es.object.assign.js';
-import 'core-js/modules/web.dom-collections.for-each.js';
-import 'core-js/modules/es.string.split.js';
 import 'core-js/modules/es.set.js';
+import 'core-js/modules/es.string.split.js';
+import 'core-js/modules/web.dom-collections.for-each.js';
 import '../button/button.js';
 import '@jetbrains/icons/chevron-10px';
 import '../link/clickableLink.js';
@@ -52,12 +52,12 @@ import '../popup/popup.js';
 import '../global/schedule-raf.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';
@@ -66,8 +66,8 @@ import '../popup/position.js';
 import 'core-js/modules/es.array.sort.js';
 import '../popup/popup.consts.js';
 import '../alert/container.js';
-import 'core-js/modules/es.reflect.delete-property.js';
 import 'core-js/modules/es.array.index-of.js';
+import 'core-js/modules/es.reflect.delete-property.js';
 import 'deep-equal';
 
 /**

package/components/storage/storage__fallback.js

@@ -1,11 +1,11 @@
-import { _ as _defineProperty, f as _createClass, c as _classCallCheck, e as _asyncToGenerator, j as _regeneratorRuntime } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { _ as _defineProperty, b as _createClass, f as _classCallCheck, h as _asyncToGenerator, i as _regeneratorRuntime } from '../_helpers/_rollupPluginBabelHelpers.js';
+import 'core-js/modules/es.array.concat.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.promise.js';
 import 'core-js/modules/es.reflect.delete-property.js';
-import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
-import 'core-js/modules/es.array.concat.js';
-import 'core-js/modules/es.array.index-of.js';
 import deepEqual from 'deep-equal';
 
 var DEFAULT_CHECK_DELAY = 3000;
@@ -38,7 +38,7 @@ var FallbackStorage = /*#__PURE__*/function () {
    * @return {Promise}
    * @private
    */
-  _createClass(FallbackStorage, [{
+  return _createClass(FallbackStorage, [{
     key: "_read",
     value: function _read() {
       var _this = this;
@@ -238,7 +238,6 @@ var FallbackStorage = /*#__PURE__*/function () {
       return undefined;
     }
   }]);
-  return FallbackStorage;
 }();
 _defineProperty(FallbackStorage, "DEFAULT_COOKIE_NAME", 'localStorage');
 _defineProperty(FallbackStorage, "DEFAULT_SESSION_COOKIE_NAME", 'sessionStorage');

package/components/storage/storage__local.js

@@ -1,12 +1,12 @@
-import { f as _createClass, c as _classCallCheck, _ as _defineProperty, e as _asyncToGenerator, j as _regeneratorRuntime } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { b as _createClass, f as _classCallCheck, _ as _defineProperty, h as _asyncToGenerator, i as _regeneratorRuntime } from '../_helpers/_rollupPluginBabelHelpers.js';
+import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/es.promise.js';
-import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 import alertService from '../alert-service/alert-service.js';
-import 'core-js/modules/es.array.map.js';
-import 'core-js/modules/es.array.filter.js';
 import 'core-js/modules/es.array.concat.js';
+import 'core-js/modules/es.array.filter.js';
+import 'core-js/modules/es.array.map.js';
 import 'react';
 import 'react-dom/client';
 import '../global/get-uid.js';
@@ -35,9 +35,9 @@ import 'core-js/modules/es.array.reduce.js';
 import 'core-js/modules/es.object.entries.js';
 import '../global/dom.js';
 import 'core-js/modules/es.object.assign.js';
-import 'core-js/modules/web.dom-collections.for-each.js';
-import 'core-js/modules/es.string.split.js';
 import 'core-js/modules/es.set.js';
+import 'core-js/modules/es.string.split.js';
+import 'core-js/modules/web.dom-collections.for-each.js';
 import '../button/button.js';
 import '@jetbrains/icons/chevron-10px';
 import '../link/clickableLink.js';
@@ -50,12 +50,12 @@ import '../popup/popup.js';
 import '../global/schedule-raf.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';
@@ -81,7 +81,7 @@ var LocalStorage = /*#__PURE__*/function () {
    * @param {string} name
    * @return {Promise}
    */
-  _createClass(LocalStorage, [{
+  return _createClass(LocalStorage, [{
     key: "get",
     value: function get(name) {
       var _this = this;
@@ -211,7 +211,6 @@ var LocalStorage = /*#__PURE__*/function () {
       return safePromise;
     }()
   }]);
-  return LocalStorage;
 }();
 
 export { LocalStorage as default };

package/components/tab-trap/tab-trap.js

@@ -1,17 +1,17 @@
-import { _ as _defineProperty, a as _inherits, b as _createSuper, c as _classCallCheck, d as _assertThisInitialized, l as _toConsumableArray, 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, k as _toConsumableArray } from '../_helpers/_rollupPluginBabelHelpers.js';
 import 'core-js/modules/es.array.concat.js';
 import 'core-js/modules/es.array.filter.js';
 import 'core-js/modules/es.object.to-string.js';
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { isNodeInVisiblePartOfPage } from '../global/dom.js';
+import 'core-js/modules/es.array.iterator.js';
 import 'core-js/modules/es.object.assign.js';
-import 'core-js/modules/web.dom-collections.for-each.js';
-import 'core-js/modules/es.regexp.exec.js';
-import 'core-js/modules/es.string.split.js';
 import 'core-js/modules/es.object.entries.js';
-import 'core-js/modules/es.array.iterator.js';
+import 'core-js/modules/es.regexp.exec.js';
 import 'core-js/modules/es.set.js';
+import 'core-js/modules/es.string.split.js';
+import 'core-js/modules/web.dom-collections.for-each.js';
 import 'core-js/modules/web.dom-collections.iterator.js';
 
 var modules_6dce58ae = {"light":"light_rui_2ac4","trapButton":"trapButton_rui_11f0"};
@@ -22,37 +22,35 @@ var FOCUSABLE_ELEMENTS = 'input, button, select, textarea, a[href], *[tabindex]:
  * @name TabTrap
  */
 var TabTrap = /*#__PURE__*/function (_Component) {
-  _inherits(TabTrap, _Component);
-  var _super = _createSuper(TabTrap);
   function TabTrap() {
     var _this;
     _classCallCheck(this, TabTrap);
     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), "previousFocusedNode", void 0);
-    _defineProperty(_assertThisInitialized(_this), "trapWithoutFocus", void 0);
-    _defineProperty(_assertThisInitialized(_this), "restoreFocus", function () {
-      var _assertThisInitialize = _assertThisInitialized(_this),
-        previousFocusedNode = _assertThisInitialize.previousFocusedNode;
+    _this = _callSuper(this, TabTrap, [].concat(args));
+    _defineProperty(_this, "previousFocusedNode", void 0);
+    _defineProperty(_this, "trapWithoutFocus", void 0);
+    _defineProperty(_this, "restoreFocus", function () {
+      var _this2 = _this,
+        previousFocusedNode = _this2.previousFocusedNode;
       if (previousFocusedNode instanceof HTMLElement && previousFocusedNode.focus && isNodeInVisiblePartOfPage(previousFocusedNode)) {
         previousFocusedNode.focus({
           preventScroll: true
         });
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "node", void 0);
-    _defineProperty(_assertThisInitialized(_this), "containerRef", function (node) {
+    _defineProperty(_this, "node", void 0);
+    _defineProperty(_this, "containerRef", function (node) {
       if (!node) {
         return;
       }
       _this.node = node;
     });
-    _defineProperty(_assertThisInitialized(_this), "focusElement", function () {
+    _defineProperty(_this, "focusElement", function () {
       var first = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-      var _assertThisInitialize2 = _assertThisInitialized(_this),
-        node = _assertThisInitialize2.node;
+      var _this3 = _this,
+        node = _this3.node;
       if (!node) {
         return;
       }
@@ -64,13 +62,13 @@ var TabTrap = /*#__PURE__*/function (_Component) {
         toBeFocused.focus();
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "focusFirst", function () {
+    _defineProperty(_this, "focusFirst", function () {
       return _this.focusElement(true);
     });
-    _defineProperty(_assertThisInitialized(_this), "focusLast", function () {
+    _defineProperty(_this, "focusLast", function () {
       return _this.focusElement(false);
     });
-    _defineProperty(_assertThisInitialized(_this), "focusLastIfEnabled", function (event) {
+    _defineProperty(_this, "focusLastIfEnabled", function (event) {
       if (_this.trapWithoutFocus) {
         return;
       }
@@ -83,7 +81,7 @@ var TabTrap = /*#__PURE__*/function (_Component) {
         _this.focusLast();
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "handleBlurIfWithoutFocus", function (event) {
+    _defineProperty(_this, "handleBlurIfWithoutFocus", function (event) {
       var _this$node;
       if (!_this.trapWithoutFocus) {
         return;
@@ -98,8 +96,8 @@ var TabTrap = /*#__PURE__*/function (_Component) {
       }
       _this.focusLast();
     });
-    _defineProperty(_assertThisInitialized(_this), "trapButtonNode", void 0);
-    _defineProperty(_assertThisInitialized(_this), "trapButtonRef", function (node) {
+    _defineProperty(_this, "trapButtonNode", void 0);
+    _defineProperty(_this, "trapButtonRef", function (node) {
       if (!node) {
         return;
       }
@@ -107,7 +105,8 @@ var TabTrap = /*#__PURE__*/function (_Component) {
     });
     return _this;
   }
-  _createClass(TabTrap, [{
+  _inherits(TabTrap, _Component);
+  return _createClass(TabTrap, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       this.previousFocusedNode = document.activeElement;
@@ -161,7 +160,6 @@ var TabTrap = /*#__PURE__*/function (_Component) {
       }));
     }
   }]);
-  return TabTrap;
 }(Component);
 _defineProperty(TabTrap, "propTypes", {
   children: PropTypes.node.isRequired,

package/components/table/cell.js

@@ -1,22 +1,21 @@
-import { _ as _defineProperty, a as _inherits, b as _createSuper, c as _classCallCheck, f as _createClass, i as _extends } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { _ as _defineProperty, a as _inherits, b as _createClass, e as _extends, f as _classCallCheck, g as _callSuper } from '../_helpers/_rollupPluginBabelHelpers.js';
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import joinDataTestAttributes from '../global/data-tests.js';
 import { m as modules_1db4bbca } from '../_helpers/table.js';
+import 'core-js/modules/es.array.concat.js';
 import 'core-js/modules/es.array.reduce.js';
-import 'core-js/modules/es.object.to-string.js';
 import 'core-js/modules/es.object.entries.js';
-import 'core-js/modules/es.array.concat.js';
+import 'core-js/modules/es.object.to-string.js';
 
 var Cell = /*#__PURE__*/function (_PureComponent) {
-  _inherits(Cell, _PureComponent);
-  var _super = _createSuper(Cell);
   function Cell() {
     _classCallCheck(this, Cell);
-    return _super.apply(this, arguments);
+    return _callSuper(this, Cell, arguments);
   }
-  _createClass(Cell, [{
+  _inherits(Cell, _PureComponent);
+  return _createClass(Cell, [{
     key: "render",
     value: function render() {
       var classes = classNames(modules_1db4bbca.cell, this.props.className);
@@ -26,7 +25,6 @@ var Cell = /*#__PURE__*/function (_PureComponent) {
       }), this.props.children);
     }
   }]);
-  return Cell;
 }(PureComponent);
 _defineProperty(Cell, "propTypes", {
   children: PropTypes.any,

package/components/table/disable-hover-hoc.js

@@ -1,4 +1,4 @@
-import { _ as _defineProperty, a as _inherits, b as _createSuper, c as _classCallCheck, d as _assertThisInitialized, f as _createClass, i as _extends } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { _ as _defineProperty, 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 'core-js/modules/es.array.includes.js';
 import React, { PureComponent } from 'react';
@@ -6,26 +6,24 @@ import React, { PureComponent } from 'react';
 function disableHoverHOC(ComposedComponent) {
   var _DisableHover;
   return _DisableHover = /*#__PURE__*/function (_PureComponent) {
-    _inherits(DisableHover, _PureComponent);
-    var _super = _createSuper(DisableHover);
     function DisableHover() {
       var _this;
       _classCallCheck(this, DisableHover);
       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, DisableHover, [].concat(args));
+      _defineProperty(_this, "state", {
         disabledHover: false
       });
-      _defineProperty(_assertThisInitialized(_this), "onMouseMove", function () {
+      _defineProperty(_this, "onMouseMove", function () {
         if (_this.state.disabledHover) {
           _this.setState({
             disabledHover: false
           });
         }
       });
-      _defineProperty(_assertThisInitialized(_this), "onKeyDown", function (e) {
+      _defineProperty(_this, "onKeyDown", function (e) {
         var metaKeys = [16, 17, 18, 19, 20, 91]; // eslint-disable-line @typescript-eslint/no-magic-numbers
         if (!_this.state.disabledHover && !metaKeys.includes(e.keyCode)) {
           _this.setState({
@@ -35,7 +33,8 @@ function disableHoverHOC(ComposedComponent) {
       });
       return _this;
     }
-    _createClass(DisableHover, [{
+    _inherits(DisableHover, _PureComponent);
+    return _createClass(DisableHover, [{
       key: "componentDidMount",
       value: function componentDidMount() {
         document.addEventListener('mousemove', this.onMouseMove);
@@ -55,7 +54,6 @@ function disableHoverHOC(ComposedComponent) {
         }));
       }
     }]);
-    return DisableHover;
   }(PureComponent), _defineProperty(_DisableHover, "propTypes", ComposedComponent.propTypes), _defineProperty(_DisableHover, "defaultProps", ComposedComponent.defaultProps), _DisableHover;
 }
 

package/components/table/header-cell.d.ts

@@ -10,6 +10,7 @@ export interface Column<T = never> {
     title?: ReactNode;
     getValue?: ((item: T, column: Column) => ReactNode) | null | undefined;
     getDataTest?: ((item: T, column: Column) => string) | null | undefined;
+    colSpan?: number;
 }
 export interface SortParams {
     column: Column;

package/components/table/header-cell.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 React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
@@ -18,25 +18,23 @@ 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 'core-js/modules/es.array.reduce.js';
 import 'core-js/modules/es.object.entries.js';
 
 var _excluded = ["className", "column", "onSort", "sortKey", "sortOrder", "data-test"];
 var HeaderCell = /*#__PURE__*/function (_PureComponent) {
-  _inherits(HeaderCell, _PureComponent);
-  var _super = _createSuper(HeaderCell);
   function HeaderCell() {
     var _this;
     _classCallCheck(this, HeaderCell);
     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), "sortable", void 0);
-    _defineProperty(_assertThisInitialized(_this), "sorted", void 0);
-    _defineProperty(_assertThisInitialized(_this), "onClick", function () {
+    _this = _callSuper(this, HeaderCell, [].concat(args));
+    _defineProperty(_this, "sortable", void 0);
+    _defineProperty(_this, "sorted", void 0);
+    _defineProperty(_this, "onClick", function () {
       if (_this.sortable) {
         var _this$props = _this.props,
           column = _this$props.column,
@@ -50,7 +48,8 @@ var HeaderCell = /*#__PURE__*/function (_PureComponent) {
     });
     return _this;
   }
-  _createClass(HeaderCell, [{
+  _inherits(HeaderCell, _PureComponent);
+  return _createClass(HeaderCell, [{
     key: "onChildrenClick",
     value: function onChildrenClick(e) {
       e.stopPropagation();
@@ -91,7 +90,6 @@ var HeaderCell = /*#__PURE__*/function (_PureComponent) {
       })));
     }
   }]);
-  return HeaderCell;
 }(PureComponent);
 _defineProperty(HeaderCell, "propTypes", {
   children: PropTypes.any,

package/components/table/header.d.ts

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

package/components/table/header.js

@@ -1,4 +1,4 @@
-import { _ as _defineProperty, a as _inherits, b as _createSuper, c as _classCallCheck, d as _assertThisInitialized, f as _createClass, i as _extends } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { _ as _defineProperty, 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 'core-js/modules/es.array.map.js';
 import React, { PureComponent } from 'react';
@@ -21,8 +21,8 @@ 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 '../global/composeRefs.js';
 import 'core-js/modules/web.dom-collections.for-each.js';
@@ -34,24 +34,24 @@ import 'core-js/modules/es.array.reduce.js';
 import 'core-js/modules/es.object.entries.js';
 
 var Header = /*#__PURE__*/function (_PureComponent) {
-  _inherits(Header, _PureComponent);
-  var _super = _createSuper(Header);
   function Header() {
     var _this;
     _classCallCheck(this, Header);
     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-header-'));
-    _defineProperty(_assertThisInitialized(_this), "onCheckboxFocus", function (event) {
+    _this = _callSuper(this, Header, [].concat(args));
+    _defineProperty(_this, "id", getUID('table-header-'));
+    _defineProperty(_this, "onCheckboxFocus", function (event) {
       event.currentTarget.blur();
     });
     return _this;
   }
-  _createClass(Header, [{
+  _inherits(Header, _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,
@@ -73,6 +73,7 @@ var Header = /*#__PURE__*/function (_PureComponent) {
         onChange: onCheckboxChange,
         onFocus: this.onCheckboxFocus
       }));
+      var colSpan = 0;
       return columns.map(function (column, index) {
         var columnStyle = widths[index] ? {
           width: widths[index]
@@ -84,9 +85,14 @@ var Header = /*#__PURE__*/function (_PureComponent) {
           sortOrder,
           style: columnStyle
         };
+        colSpan += column.colSpan || 1;
+        if (colSpan > (_this2.props.maxColSpan || Infinity)) {
+          return null;
+        }
         return /*#__PURE__*/React.createElement(HeaderCell, _extends({
           key: column.id,
-          "data-test": column.id
+          "data-test": column.id,
+          colSpan: column.colSpan
         }, props), index === 0 && (draggable || selectable) && metaColumn);
       });
     }
@@ -120,7 +126,6 @@ var Header = /*#__PURE__*/function (_PureComponent) {
       }, regularCells));
     }
   }]);
-  return Header;
 }(PureComponent);
 _defineProperty(Header, "propTypes", {
   caption: PropTypes.string,