@rio-cloud/rio-uikit 0.16.0-beta-3 → 0.16.1-beta-1

package/lib/components/filepicker/FilePicker.js

@@ -73,7 +73,7 @@ var FilePicker = function FilePicker(props) {
     var getRootProps = _ref.getRootProps,
         getInputProps = _ref.getInputProps,
         isDragActive = _ref.isDragActive;
-    return showDropzone && /*#__PURE__*/_react.default.createElement("div", getRootProps(), /*#__PURE__*/_react.default.createElement("input", getInputProps()), children && children({
+    return /*#__PURE__*/_react.default.createElement("div", getRootProps(), /*#__PURE__*/_react.default.createElement("input", getInputProps()), showDropzone && children && children({
       isDragActive: isDragActive
     }));
   }));

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]),

package/lib/components/table/TableSettingsDialogFooter.js

@@ -29,36 +29,36 @@ var TableSettingsDialogFooter = function TableSettingsDialogFooter(props) {
       onApplyChanges = props.onApplyChanges;
   var restButtonClassNames = (0, _classnames.default)('btn', 'btn-link', !hasChanged && 'disabled');
   return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
-    className: 'pull-left'
+    className: "pull-left"
   }, !isResetAll && /*#__PURE__*/_react.default.createElement("div", {
     className: restButtonClassNames,
     onClick: onResetColumnChanges
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: 'rioglyph rioglyph-revert text-size-xs margin-right-10'
+    className: "rioglyph rioglyph-revert text-size-xs margin-right-10"
   }), resetButtonText), isResetAll && /*#__PURE__*/_react.default.createElement("div", {
-    className: 'btn-group'
+    className: "btn-group"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: 'btn btn-icon-only btn-default margin-right-5 btn-outline',
+    className: "btn btn-icon-only btn-default margin-right-5 btn-outline",
     onClick: onCancelResetColumnChanges
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: 'rioglyph rioglyph-remove'
+    className: "rioglyph rioglyph-remove"
   })), /*#__PURE__*/_react.default.createElement("div", {
-    className: 'btn btn-primary btn-icon-only',
+    className: "btn btn-primary btn-icon-only",
     onClick: onConfirmResetColumnChanges
   }, /*#__PURE__*/_react.default.createElement("span", {
-    className: 'rioglyph rioglyph-ok'
+    className: "rioglyph rioglyph-ok"
   })))), immediateChange ? /*#__PURE__*/_react.default.createElement("div", {
-    className: 'pull-right'
+    className: "pull-right"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: 'btn btn-default',
+    className: "btn btn-default",
     onClick: onHide
   }, closeButtonText)) : /*#__PURE__*/_react.default.createElement("div", {
-    className: 'pull-right'
+    className: "pull-right"
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: 'btn btn-default',
+    className: "btn btn-default",
     onClick: onDiscardChanges
   }, cancelButtonText), /*#__PURE__*/_react.default.createElement("div", {
-    className: 'btn btn-primary',
+    className: "btn btn-primary",
     onClick: onApplyChanges
   }, applyButtonText)));
 };
@@ -96,5 +96,7 @@ TableSettingsDialogFooter.propTypes = {
   onHide: _propTypes.default.func,
   onResetColumnChanges: _propTypes.default.func,
   onDiscardChanges: _propTypes.default.func,
-  onApplyChanges: _propTypes.default.func
+  onApplyChanges: _propTypes.default.func,
+  onConfirmResetColumnChanges: _propTypes.default.func,
+  onCancelResetColumnChanges: _propTypes.default.func
 };

package/lib/components/table/TableSettingsListContainer.js

@@ -2,47 +2,82 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+var _typeof = require("@babel/runtime/helpers/typeof");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TableSettingsListContainerSortable = exports.TableSettingsListContainer = void 0;
+exports.TableSettingsListContainer = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _react = _interopRequireDefault(require("react"));
+var _core = require("@dnd-kit/core");
 
-var _reactSortableHoc = require("react-sortable-hoc");
+var _sortable = require("@dnd-kit/sortable");
+
+var _modifiers = require("@dnd-kit/modifiers");
 
 var _TableSettingsListItem = _interopRequireDefault(require("./TableSettingsListItem"));
 
-var _excluded = ["items", "columnOrder", "onSortEnd", "lockAxis", "helperClass", "columnSearchValue", "isSortable"];
+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; }
 
+/* eslint-disable new-cap */
+
+/* eslint-disable no-unused-vars */
 var TableSettingsListContainer = function TableSettingsListContainer(props) {
   var items = props.items,
-      columnOrder = props.columnOrder,
       onSortEnd = props.onSortEnd,
-      lockAxis = props.lockAxis,
-      helperClass = props.helperClass,
-      columnSearchValue = props.columnSearchValue,
-      isSortable = props.isSortable,
-      remainingProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+      itemProps = props.itemProps;
+
+  var _useState = (0, _react.useState)(null),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      activeDraggedColumn = _useState2[0],
+      setActiveDraggedColumn = _useState2[1];
+
+  var sensors = (0, _core.useSensors)((0, _core.useSensor)(_core.PointerSensor), (0, _core.useSensor)(_core.KeyboardSensor, {
+    coordinateGetter: _sortable.sortableKeyboardCoordinates
+  }));
+  var handleDragStart = (0, _react.useCallback)(function (event) {
+    setActiveDraggedColumn(event.active.id);
+  }, []);
+  var handleDragEnd = (0, _react.useCallback)(function (event) {
+    setActiveDraggedColumn(null);
+    onSortEnd(event);
+  }, []);
+  var activeClass = 'table-settings-item shadow-smooth-to-bottom z-index-max';
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: 'table-settings-items-container'
+    className: "table-settings-items-container"
+  }, /*#__PURE__*/_react.default.createElement(_core.DndContext, {
+    modifiers: [_modifiers.restrictToVerticalAxis],
+    onDragStart: handleDragStart,
+    onDragEnd: handleDragEnd
+  }, /*#__PURE__*/_react.default.createElement(_sortable.SortableContext, {
+    items: items,
+    sensors: sensors,
+    collisionDetection: _core.closestCenter,
+    strategy: _sortable.rectSortingStrategy
   }, items.map(function (column, index) {
     return /*#__PURE__*/_react.default.createElement(_TableSettingsListItem.default, (0, _extends2.default)({
       key: column,
       index: index,
-      value: column,
+      column: column,
       orderIndex: index,
-      columnOrder: columnOrder,
-      columnSearchValue: columnSearchValue,
-      disabled: isSortable
-    }, remainingProps));
-  }));
+      className: activeDraggedColumn === column ? activeClass : ''
+    }, itemProps));
+  }))));
 };
 
 exports.TableSettingsListContainer = TableSettingsListContainer;
-var TableSettingsListContainerSortable = (0, _reactSortableHoc.SortableContainer)(TableSettingsListContainer);
-exports.TableSettingsListContainerSortable = TableSettingsListContainerSortable;
+TableSettingsListContainer.propTypes = {
+  items: _propTypes.default.arrayOf(_propTypes.default.string),
+  onSortEnd: _propTypes.default.func,
+  itemProps: _propTypes.default.object
+};