@rio-cloud/rio-uikit 0.16.0-beta-4 → 0.16.1-beta-2

package/lib/components/pager/Pager.js

@@ -0,0 +1,114 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _excluded = ["title", "label", "alignRight", "variant", "disabled", "onClick", "className"];
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var Pager = function Pager(props) {
+  var title = props.title,
+      label = props.label,
+      alignRight = props.alignRight,
+      variant = props.variant,
+      disabled = props.disabled,
+      onClick = props.onClick,
+      className = props.className,
+      remainingProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      isHover = _useState2[0],
+      setIsHover = _useState2[1];
+
+  var handleEnter = function handleEnter() {
+    return !disabled && setIsHover(true);
+  };
+
+  var handleLeave = function handleLeave() {
+    return !disabled && setIsHover(false);
+  };
+
+  var isCompactVariant = variant === Pager.VARIANT_COMPACT;
+  var wrapperClassesBase = (0, _classnames.default)('Pager', 'bg-white', 'border', 'display-flex justify-space-between align-items-center', isHover && 'border-color-highlight', alignRight && 'flex-row-reverse', disabled && 'pointer-events-none', 'cursor-pointer user-select-none');
+  var iconClassesBase = (0, _classnames.default)('rioplyph', disabled ? 'text-color-light' : 'text-color-darker', isHover && 'text-color-highlight');
+  var titleClassesBase = (0, _classnames.default)(disabled ? 'text-color-light' : 'text-color-darker', isHover && 'text-color-highlight'); // The compact version has a slightly different markup and different classes for the
+  // individual parts, hence we extend the base classes
+
+  if (isCompactVariant) {
+    var wrapperClassesCompact = (0, _classnames.default)(wrapperClassesBase, 'rounded-circle', 'padding-y-5 padding-x-15', 'width-auto', className);
+    var iconClassesCompact = (0, _classnames.default)(iconClassesBase, alignRight ? 'rioglyph-chevron-left margin-right-5' : 'rioglyph-chevron-right margin-left-5', 'text-size-10');
+    return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, remainingProps, {
+      className: wrapperClassesCompact,
+      onMouseEnter: handleEnter,
+      onMouseLeave: handleLeave,
+      onClick: onClick
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      className: "display-flex flex-1-1 flex-column ".concat(alignRight ? 'align-items-end' : '')
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: titleClassesBase
+    }, title)), /*#__PURE__*/_react.default.createElement("span", {
+      className: iconClassesCompact
+    }));
+  }
+
+  var wrapperClassesFull = (0, _classnames.default)(wrapperClassesBase, 'rounded', 'padding-y-15 padding-x-20', 'width-100pct', className);
+  var iconClassesFull = (0, _classnames.default)(iconClassesBase, alignRight ? 'rioglyph-arrow-left margin-right-10' : 'rioglyph-arrow-right margin-left-10', 'text-size-200pct');
+  var titleClassesFull = (0, _classnames.default)(titleClassesBase, alignRight && 'text-right', 'text-size-16 text-medium');
+  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, remainingProps, {
+    className: wrapperClassesFull,
+    onMouseEnter: handleEnter,
+    onMouseLeave: handleLeave,
+    onClick: onClick
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "display-flex flex-1-1 flex-column ".concat(alignRight ? 'align-items-end' : '')
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "text-color-gray line-height-16"
+  }, label), /*#__PURE__*/_react.default.createElement("div", {
+    className: titleClassesFull
+  }, title)), /*#__PURE__*/_react.default.createElement("div", {
+    className: "text-size-12"
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    className: iconClassesFull
+  })));
+};
+
+Pager.VARIANT_FULL = 'full';
+Pager.VARIANT_COMPACT = 'compact';
+Pager.defaultProps = {
+  variant: Pager.VARIANT_FULL,
+  alignRight: false,
+  disabled: false
+};
+Pager.propTypes = {
+  title: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]).isRequired,
+  label: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
+  alignRight: _propTypes.default.bool,
+  variant: _propTypes.default.oneOf([Pager.VARIANT_FULL, Pager.VARIANT_COMPACT, 'full', 'compact']),
+  disabled: _propTypes.default.bool,
+  onClick: _propTypes.default.func,
+  className: _propTypes.default.string
+};
+var _default = Pager;
+exports.default = _default;

package/lib/components/selects/Select.js

@@ -67,7 +67,7 @@ var Select = /*#__PURE__*/function (_Component) {
       isOpen: false,
       selectedItem: null,
       isFilterActive: false,
-      filterValue: null,
+      filterValue: '',
       filteredOptions: props.options,
       itemDOMValues: [],
       focusedItemIndex: DEFAULT_FOCUSED_ITEM_INDEX,
@@ -173,12 +173,12 @@ var Select = /*#__PURE__*/function (_Component) {
       if (!selectedItem) {
         // render a placeholder or if there is none render a non-breaking space " "
         return placeholder ? /*#__PURE__*/_react.default.createElement("span", {
-          className: 'placeholder'
+          className: "placeholder"
         }, placeholder) : "\xA0";
       }
 
       return /*#__PURE__*/_react.default.createElement("span", null, selectedItem.icon && /*#__PURE__*/_react.default.createElement("span", {
-        className: 'margin-right-5'
+        className: "margin-right-5"
       }, selectedItem.icon), !this.props.showSelectedItemIcon && selectedItem.label);
     }
   }, {
@@ -207,7 +207,7 @@ var Select = /*#__PURE__*/function (_Component) {
         className: clearButtonClassNames,
         onClick: clearSelectedItem
       }, /*#__PURE__*/_react.default.createElement("span", {
-        className: 'clearButtonIcon rioglyph rioglyph-remove-sign'
+        className: "clearButtonIcon rioglyph rioglyph-remove-sign"
       }));
     }
   }, {
@@ -236,26 +236,26 @@ var Select = /*#__PURE__*/function (_Component) {
       bsSize === 'sm' && 'input-sm', bsSize === 'lg' && 'input-lg', disabled && 'disabled');
 
       var selectedOption = /*#__PURE__*/_react.default.createElement("span", {
-        className: 'width-100pct display-flex'
+        className: "width-100pct display-flex"
       }, label && /*#__PURE__*/_react.default.createElement("span", {
-        className: 'text-color-dark margin-right-5'
-      }, label, ':'), this.getSeletedItemLabel(selectedItem, placeholder));
+        className: "text-color-dark margin-right-5"
+      }, label, ":"), this.getSeletedItemLabel(selectedItem, placeholder));
 
       return /*#__PURE__*/_react.default.createElement("button", {
-        type: 'button',
+        type: "button",
         id: id,
         name: name,
         className: classnames,
-        "data-toggle": 'dropdown',
+        "data-toggle": "dropdown",
         tabIndex: tabIndex,
-        "aria-haspopup": 'true',
+        "aria-haspopup": "true",
         "aria-expanded": isOpen,
         onClick: this.onToggle,
         ref: function ref(node) {
           return _this4.refToggle = node;
         }
       }, useFilter && isOpen && this.renderFilterInput(), selectedOptionText ? selectedOptionText : selectedOption, this.renderClearButton(), /*#__PURE__*/_react.default.createElement("span", {
-        className: 'caret'
+        className: "caret"
       }));
     }
   }, {
@@ -263,7 +263,7 @@ var Select = /*#__PURE__*/function (_Component) {
     value: function renderDropdownMenu() {
       var _this5 = this;
 
-      //console.log('keyboardUsed=' + this.state.keyboardUsed)
+      // console.log('keyboardUsed=' + this.state.keyboardUsed)
       var _this$props4 = this.props,
           pullRight = _this$props4.pullRight,
           autoDropDirection = _this$props4.autoDropDirection,
@@ -279,7 +279,7 @@ var Select = /*#__PURE__*/function (_Component) {
         });
       } else if (this.state.keyboardUsed) {
         focusedItemIndex = 0;
-      } //console.log('focusedItemIndex=' + focusedItemIndex);
+      } // console.log('focusedItemIndex=' + focusedItemIndex);
 
 
       return /*#__PURE__*/_react.default.createElement(_BaseDropdownMenu.BaseDropdownMenu, {
@@ -302,7 +302,7 @@ var Select = /*#__PURE__*/function (_Component) {
     value: function renderFilterInput() {
       var inputClasses = (0, _classnames.default)('select-filter-input', (this.state.isFilterActive || this.state.filterValue) && 'select-filter-input-active');
       return /*#__PURE__*/_react.default.createElement("input", {
-        type: 'text',
+        type: "text",
         className: inputClasses,
         autoFocus: true,
         onChange: this.handleFilterChange,
@@ -400,11 +400,15 @@ var Select = /*#__PURE__*/function (_Component) {
   }, {
     key: "closeMenu",
     value: function closeMenu() {
+      var _this7 = this;
+
       if (this.state.isOpen) {
         this.setState(function () {
           return {
             isOpen: false,
             isFilterActive: false,
+            filterValue: '',
+            filteredOptions: _this7.props.options,
             keyboardUsed: false,
             focusedItemIndex: DEFAULT_FOCUSED_ITEM_INDEX
           };

package/lib/components/table/TableSettingsColumnButtons.js

@@ -19,7 +19,7 @@ var TableSettingsColumnButtons = function TableSettingsColumnButtons(props) {
       columnDetails = props.columnDetails,
       columnOrder = props.columnOrder,
       openColumnsDetails = props.openColumnsDetails,
-      columnSearchValue = props.columnSearchValue,
+      disabled = props.disabled,
       onMoveColumn = props.onMoveColumn,
       onOpenDetails = props.onOpenDetails;
   var navButtonBase = (0, _classnames.default)('btn btn-muted btn-icon-only btn-sm');
@@ -28,7 +28,7 @@ var TableSettingsColumnButtons = function TableSettingsColumnButtons(props) {
   var toggleIconClassNames = (0, _classnames.default)('rioglyph', openColumnsDetails[column] ? 'rioglyph-remove' : 'rioglyph-width');
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "table-settings-item-item-buttons"
-  }, !columnSearchValue && /*#__PURE__*/_react.default.createElement("div", {
+  }, !disabled && /*#__PURE__*/_react.default.createElement("div", {
     className: columnUpClasses,
     onClick: function onClick(event) {
       event.preventDefault();
@@ -36,8 +36,8 @@ var TableSettingsColumnButtons = function TableSettingsColumnButtons(props) {
       onMoveColumn(column, index - 1, true);
     }
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: 'rioglyph rioglyph-arrow-up'
-  })), !columnSearchValue && /*#__PURE__*/_react.default.createElement("div", {
+    className: "rioglyph rioglyph-arrow-up"
+  })), !disabled && /*#__PURE__*/_react.default.createElement("div", {
     className: columnDownClasses,
     onClick: function onClick(event) {
       event.preventDefault();
@@ -45,7 +45,7 @@ var TableSettingsColumnButtons = function TableSettingsColumnButtons(props) {
       onMoveColumn(column, index + 1, true);
     }
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: 'rioglyph rioglyph-arrow-down'
+    className: "rioglyph rioglyph-arrow-down"
   })), columnDetails && /*#__PURE__*/_react.default.createElement("div", {
     className: navButtonBase,
     onClick: function onClick() {
@@ -74,7 +74,8 @@ TableSettingsColumnButtons.propTypes = {
   index: _propTypes.default.number.isRequired,
   columnOrder: _propTypes.default.arrayOf(_propTypes.default.string).isRequired,
   openColumnsDetails: _propTypes.default.object.isRequired,
-  columnSearchValue: _propTypes.default.string,
+  disabled: _propTypes.default.bool,
+  columnDetails: _propTypes.default.object,
   onMoveColumn: _propTypes.default.func,
   onOpenDetails: _propTypes.default.func
 };

package/lib/components/table/TableSettingsColumnDetails.js

@@ -2,26 +2,12 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TableSettingsColumnDetails = void 0;
 
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
@@ -29,96 +15,66 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _Slider = _interopRequireDefault(require("../slider/Slider"));
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-var TableSettingsColumnDetails = /*#__PURE__*/function (_Component) {
-  (0, _inherits2.default)(TableSettingsColumnDetails, _Component);
-
-  var _super = _createSuper(TableSettingsColumnDetails);
-
-  function TableSettingsColumnDetails(props) {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, TableSettingsColumnDetails);
-    _this = _super.call(this, props);
-    _this.handleColumnWidthChange = _this.handleColumnWidthChange.bind((0, _assertThisInitialized2.default)(_this));
-    _this.handleWidthInputChange = _this.handleWidthInputChange.bind((0, _assertThisInitialized2.default)(_this));
-    _this.handleResetColumnWidth = _this.handleResetColumnWidth.bind((0, _assertThisInitialized2.default)(_this));
-    return _this;
-  }
-
-  (0, _createClass2.default)(TableSettingsColumnDetails, [{
-    key: "handleWidthInputChange",
-    value: function handleWidthInputChange(event) {
-      var parsedValue = event.target.value ? parseInt(event.target.value, 10) : 0;
-      var max = this.props.maxWidth || this.props.maxColumnWidth;
-      var value = Math.min(parsedValue, max);
-      this.props.onColumnWidthChange(this.props.column, value);
-    }
-  }, {
-    key: "handleColumnWidthChange",
-    value: function handleColumnWidthChange(value) {
-      this.props.onColumnWidthChange(this.props.column, value);
-    }
-  }, {
-    key: "handleResetColumnWidth",
-    value: function handleResetColumnWidth() {
-      this.props.onResetColumnWidth(this.props.column);
-    }
-  }, {
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-          _this$props$width = _this$props.width,
-          width = _this$props$width === void 0 ? 0 : _this$props$width,
-          _this$props$defaultWi = _this$props.defaultWidth,
-          defaultWidth = _this$props$defaultWi === void 0 ? 0 : _this$props$defaultWi,
-          maxWidth = _this$props.maxWidth,
-          maxColumnWidth = _this$props.maxColumnWidth;
-      var resetWidthButtonClassNames = (0, _classnames.default)('btn', 'btn-muted', 'btn-icon-only', 'btn-sm', 'margin-left-10', width === defaultWidth && 'disabled');
-      return /*#__PURE__*/_react.default.createElement("div", {
-        className: 'table-settings-item-body'
-      }, /*#__PURE__*/_react.default.createElement(_Slider.default, {
-        className: "margin-bottom-0",
-        value: width,
-        minValue: 0,
-        maxValue: maxWidth || maxColumnWidth,
-        step: 1,
-        onChange: this.handleColumnWidthChange
-      }), /*#__PURE__*/_react.default.createElement("div", {
-        className: resetWidthButtonClassNames,
-        role: "button",
-        onClick: this.handleResetColumnWidth
-      }, /*#__PURE__*/_react.default.createElement("span", {
-        className: 'rioglyph rioglyph-revert'
-      })), /*#__PURE__*/_react.default.createElement("div", {
-        className: 'column-width-input'
-      }, /*#__PURE__*/_react.default.createElement("div", {
-        className: 'input-group'
-      }, /*#__PURE__*/_react.default.createElement("input", {
-        className: 'form-control text-right padding-right-5 no-controls',
-        type: 'number',
-        value: width || '',
-        min: 0,
-        max: maxWidth || maxColumnWidth,
-        onChange: this.handleWidthInputChange
-      }), /*#__PURE__*/_react.default.createElement("div", {
-        className: 'input-group-addon'
-      }, 'px'))));
-    }
-  }]);
-  return TableSettingsColumnDetails;
-}(_react.Component);
+var TableSettingsColumnDetails = function TableSettingsColumnDetails(props) {
+  var _props$width = props.width,
+      width = _props$width === void 0 ? 0 : _props$width,
+      _props$defaultWidth = props.defaultWidth,
+      defaultWidth = _props$defaultWidth === void 0 ? 0 : _props$defaultWidth,
+      maxWidth = props.maxWidth,
+      maxColumnWidth = props.maxColumnWidth,
+      column = props.column,
+      onColumnWidthChange = props.onColumnWidthChange,
+      onResetColumnWidth = props.onResetColumnWidth;
+
+  var handleWidthInputChange = function handleWidthInputChange(event) {
+    var parsedValue = event.target.value ? parseInt(event.target.value, 10) : 0;
+    var max = maxWidth || maxColumnWidth;
+    var value = Math.min(parsedValue, max);
+    onColumnWidthChange(column, value);
+  };
+
+  var handleColumnWidthChange = function handleColumnWidthChange(value) {
+    return onColumnWidthChange(column, value);
+  };
+
+  var handleResetColumnWidth = function handleResetColumnWidth() {
+    return onResetColumnWidth(column);
+  };
+
+  var resetWidthButtonClassNames = (0, _classnames.default)('btn', 'btn-muted', 'btn-icon-only', 'btn-sm', 'margin-left-10', width === defaultWidth && 'disabled');
+  return /*#__PURE__*/_react.default.createElement("div", {
+    className: "table-settings-item-body"
+  }, /*#__PURE__*/_react.default.createElement(_Slider.default, {
+    className: "margin-bottom-0",
+    value: width,
+    minValue: 0,
+    maxValue: maxWidth || maxColumnWidth,
+    step: 1,
+    onChange: handleColumnWidthChange
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: resetWidthButtonClassNames,
+    role: "button",
+    onClick: handleResetColumnWidth
+  }, /*#__PURE__*/_react.default.createElement("span", {
+    className: "rioglyph rioglyph-revert"
+  })), /*#__PURE__*/_react.default.createElement("div", {
+    className: "column-width-input"
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "input-group"
+  }, /*#__PURE__*/_react.default.createElement("input", {
+    className: "form-control text-right padding-right-5 no-controls",
+    type: "number",
+    value: width || '',
+    min: 0,
+    max: maxWidth || maxColumnWidth,
+    onChange: handleWidthInputChange
+  }), /*#__PURE__*/_react.default.createElement("div", {
+    className: "input-group-addon"
+  }, "px"))));
+};
 
 exports.TableSettingsColumnDetails = TableSettingsColumnDetails;
 TableSettingsColumnDetails.defaultProps = {
-  //alias: '',
   onColumnWidthChange: function onColumnWidthChange() {
     return undefined;
   },
@@ -132,7 +88,6 @@ TableSettingsColumnDetails.propTypes = {
   defaultWidth: _propTypes.default.number,
   maxWidth: _propTypes.default.number,
   maxColumnWidth: _propTypes.default.number.isRequired,
-  //alias: PropTypes.string,
   onColumnWidthChange: _propTypes.default.func,
   onResetColumnWidth: _propTypes.default.func
 };

package/lib/components/table/TableSettingsDialog.js

@@ -9,8 +9,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -43,7 +41,7 @@ var _mapValues = _interopRequireDefault(require("lodash/fp/mapValues"));
 
 var _some = _interopRequireDefault(require("lodash/fp/some"));
 
-var _arrayMove = _interopRequireDefault(require("../../utils/arrayMove"));
+var _sortable = require("@dnd-kit/sortable");
 
 var _Dialog = _interopRequireDefault(require("../dialog/Dialog"));
 
@@ -55,6 +53,8 @@ var _TableSettingsListContainer = require("./TableSettingsListContainer");
 
 var _TableSettingsListItem = require("./TableSettingsListItem");
 
+var _tableSettingsPropTypes = require("./tableSettingsPropTypes");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -87,7 +87,7 @@ var TableSettingsDialog = /*#__PURE__*/function (_PureComponent) {
       hasChanged: false,
       movedColumn: false,
       columnsDetails: props.columnsDetails,
-      columnLabelStrings: [],
+      columnLabelStrings: {},
       updateColumnLabelStrings: true,
       openColumnsDetails: {}
     };
@@ -401,16 +401,23 @@ var TableSettingsDialog = /*#__PURE__*/function (_PureComponent) {
     }
   }, {
     key: "handleSortEnd",
-    value: function handleSortEnd(_ref) {
-      var oldIndex = _ref.oldIndex,
-          newIndex = _ref.newIndex;
+    value: function handleSortEnd(event) {
+      var active = event.active,
+          over = event.over;
+
+      if (active.id === over.id) {
+        return;
+      }
+
       var _this$props7 = this.props,
           immediateChange = _this$props7.immediateChange,
           onColumnChange = _this$props7.onColumnChange;
       var _this$state4 = this.state,
           columnOrder = _this$state4.columnOrder,
           hiddenColumns = _this$state4.hiddenColumns;
-      var newColumnOrder = (0, _arrayMove.default)(columnOrder, oldIndex, newIndex);
+      var oldIndex = columnOrder.indexOf(active.id);
+      var newIndex = columnOrder.indexOf(over.id);
+      var newColumnOrder = (0, _sortable.arrayMove)(columnOrder, oldIndex, newIndex);
       this.setState(function () {
         return {
           columnOrder: newColumnOrder,
@@ -427,7 +434,7 @@ var TableSettingsDialog = /*#__PURE__*/function (_PureComponent) {
     key: "renderNotFoundMessage",
     value: function renderNotFoundMessage(message) {
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: 'text-center text-color-gray'
+        className: "text-center text-color-gray"
       }, message);
     }
   }, {
@@ -445,7 +452,6 @@ var TableSettingsDialog = /*#__PURE__*/function (_PureComponent) {
           columnOrder = _this$state5.columnOrder,
           _this$state5$hiddenCo = _this$state5.hiddenColumns,
           hiddenColumns = _this$state5$hiddenCo === void 0 ? [] : _this$state5$hiddenCo,
-          movedColumn = _this$state5.movedColumn,
           columnSearchValue = _this$state5.columnSearchValue,
           columnsDetails = _this$state5.columnsDetails,
           openColumnsDetails = _this$state5.openColumnsDetails,
@@ -457,13 +463,11 @@ var TableSettingsDialog = /*#__PURE__*/function (_PureComponent) {
         disabledColumns: disabledColumns,
         columnOrder: columnOrder,
         hiddenColumns: hiddenColumns,
-        movedColumn: movedColumn,
         columnSearchValue: columnSearchValue,
         columnsDetails: columnsDetails,
         columnLabelStrings: columnLabelStrings,
         openColumnsDetails: openColumnsDetails,
         updateColumnLabelStrings: updateColumnLabelStrings,
-        notFoundMessage: notFoundMessage,
         onMoveColumn: this.moveColumnToIndex,
         onOpenDetails: this.handleOpenColumnsDetails,
         onColumnWidthChange: this.handleColumnWidthChange,
@@ -479,27 +483,24 @@ var TableSettingsDialog = /*#__PURE__*/function (_PureComponent) {
           return _this2.contentRef = node;
         }
       }, /*#__PURE__*/_react.default.createElement("div", {
-        className: 'table-settings-search'
+        className: "table-settings-search"
       }, /*#__PURE__*/_react.default.createElement("div", {
-        className: 'input-group width-100pct'
+        className: "input-group width-100pct"
       }, /*#__PURE__*/_react.default.createElement("span", {
-        className: 'input-group-addon'
+        className: "input-group-addon"
       }, /*#__PURE__*/_react.default.createElement("span", {
-        className: 'rioglyph rioglyph-search'
+        className: "rioglyph rioglyph-search"
       })), /*#__PURE__*/_react.default.createElement(_ClearableInput.default, {
         value: columnSearchValue,
         onChange: this.handleSearchChange,
         placeholder: searchPlaceholder
       }))), /*#__PURE__*/_react.default.createElement("div", {
-        className: 'table-settings-body'
-      }, hasItems ? /*#__PURE__*/_react.default.createElement(_TableSettingsListContainer.TableSettingsListContainerSortable, (0, _extends2.default)({
+        className: "table-settings-body"
+      }, hasItems ? /*#__PURE__*/_react.default.createElement(_TableSettingsListContainer.TableSettingsListContainer, {
         items: columnOrder,
         onSortEnd: this.handleSortEnd,
-        lockAxis: 'y',
-        useDragHandle: true,
-        helperClass: 'table-settings-item shadow-smooth-to-bottom z-index-max',
-        isSortable: !(0, _isNil.default)(columnSearchValue) && !(0, _isEmpty.default)(columnSearchValue)
-      }, itemProps)) : this.renderNotFoundMessage(notFoundMessage)));
+        itemProps: _objectSpread({}, itemProps)
+      }) : this.renderNotFoundMessage(notFoundMessage)));
     }
   }, {
     key: "renderTableSettingsDialogFooter",
@@ -570,13 +571,6 @@ TableSettingsDialog.defaultProps = {
   notFoundMessage: '',
   autoLabel: ''
 };
-
-var columnsDetailsPropTypes = _propTypes.default.objectOf(_propTypes.default.shape({
-  width: _propTypes.default.number,
-  defaultWidth: _propTypes.default.number,
-  maxWidth: _propTypes.default.number
-}));
-
 TableSettingsDialog.propTypes = {
   show: _propTypes.default.bool.isRequired,
   title: _propTypes.default.node.isRequired,
@@ -591,8 +585,8 @@ TableSettingsDialog.propTypes = {
   // hide a sorted column will result in an error, so disable at least one important fallback column
   // or the sorted column (fallback column recommended)
   disabledColumns: _propTypes.default.arrayOf(_propTypes.default.string).isRequired,
-  columnsDetails: columnsDetailsPropTypes,
-  defaultColumnDetails: columnsDetailsPropTypes,
+  columnsDetails: _tableSettingsPropTypes.columnsDetailsPropTypes,
+  defaultColumnDetails: _tableSettingsPropTypes.columnsDetailsPropTypes,
   autoLabel: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),
   // TODO Document this prop
   applyButtonText: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.node]),