@luminati-io/uikit 3.4.16 → 3.5.0

package/dist/umd/uikit.development.js

@@ -37853,28 +37853,31 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   defaultContextValue: () => (/* binding */ defaultContextValue),
 /* harmony export */   useTableContext: () => (/* binding */ useTableContext)
 /* harmony export */ });
-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! prop-types */ "prop-types");
-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react */ "react");
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var react_table__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react-table */ "react-table");
-/* harmony import */ var react_table__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react_table__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _layout__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../layout */ "./src/layout/index.js");
-/* harmony import */ var _theme__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../theme */ "./src/theme.js");
-/* harmony import */ var _typography__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../typography */ "./src/typography/index.js");
-/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../util */ "./src/util/index.js");
-/* harmony import */ var _editable_columns__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./editable_columns */ "./src/table/editable_columns.js");
-/* harmony import */ var _pinned_columns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./pinned_columns */ "./src/table/pinned_columns.js");
-/* harmony import */ var _expandable_rows__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./expandable_rows */ "./src/table/expandable_rows.js");
-/* harmony import */ var _select_rows__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./select_rows */ "./src/table/select_rows.js");
-/* harmony import */ var _row_menu__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./row_menu */ "./src/table/row_menu.js");
-/* harmony import */ var _order_logic__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./order_logic */ "./src/table/order_logic.js");
+/* harmony import */ var lodash_omit__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! lodash/omit */ "./node_modules/lodash/omit.js");
+/* harmony import */ var lodash_omit__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(lodash_omit__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! prop-types */ "prop-types");
+/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react */ "react");
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var react_table__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react-table */ "react-table");
+/* harmony import */ var react_table__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react_table__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _layout__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../layout */ "./src/layout/index.js");
+/* harmony import */ var _theme__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../theme */ "./src/theme.js");
+/* harmony import */ var _typography__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../typography */ "./src/typography/index.js");
+/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../util */ "./src/util/index.js");
+/* harmony import */ var _editable_columns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./editable_columns */ "./src/table/editable_columns.js");
+/* harmony import */ var _pinned_columns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./pinned_columns */ "./src/table/pinned_columns.js");
+/* harmony import */ var _expandable_rows__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./expandable_rows */ "./src/table/expandable_rows.js");
+/* harmony import */ var _select_rows__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./select_rows */ "./src/table/select_rows.js");
+/* harmony import */ var _row_menu__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./row_menu */ "./src/table/row_menu.js");
+/* harmony import */ var _order_logic__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./order_logic */ "./src/table/order_logic.js");
 // LICENSE_CODE ZON
 
 
 /*jslint react:true*/
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["data", "columnsSort", "pageSize", "pageSizes", "children", "stateManager", "hooks", "NoDataComp", "LoadingComp", "ExpandHandleComp", "noDataText", "loadingText", "isLoading", "onPageChange", "manualPagination", "totalCount", "paginateExpandedRows", "getHeaderProps", "getColumnProps", "getRowProps", "getCellProps", "getFooterProps", "selectedRowIds", "canOrderColumns", "rowActions"];
+
+var _excluded = ["data", "pageSize", "pageSizes", "children", "stateManager", "hooks", "NoDataComp", "LoadingComp", "ExpandHandleComp", "noDataText", "loadingText", "isLoading", "onPageChange", "manualPagination", "totalCount", "paginateExpandedRows", "getHeaderProps", "getColumnProps", "getRowProps", "getCellProps", "getFooterProps", "selectedRowIds", "canOrderColumns", "rowActions", "onColumnSortChanged"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -37910,48 +37913,37 @@ var defaultPropGetter = function defaultPropGetter() {
   return {};
 };
 var defaultContextValue = {};
-var TableContext = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createContext(defaultContextValue);
+var TableContext = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createContext(defaultContextValue);
 TableContext.displayName = 'TableContext';
 var Cell = function Cell(props) {
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_typography__WEBPACK_IMPORTED_MODULE_5__.Paragraph, {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement(_typography__WEBPACK_IMPORTED_MODULE_6__.Paragraph, {
     variant: "sm",
     color: "gray-11-50"
   }, String(props.value));
 };
 var Provider = function Provider(props) {
-  var defaultColumn = (0,react__WEBPACK_IMPORTED_MODULE_1__.useMemo)(function () {
+  var defaultColumn = (0,react__WEBPACK_IMPORTED_MODULE_2__.useMemo)(function () {
     return {
       minWidth: 100,
       Cell: Cell
     };
   }, []);
-  var _props$data = props.data,
-    data = _props$data === void 0 ? [] : _props$data,
-    _props$columnsSort = props.columnsSort,
-    columnsSort = _props$columnsSort === void 0 ? {} : _props$columnsSort,
+  var data = props.data,
     pageSize = props.pageSize,
-    _props$pageSizes = props.pageSizes,
-    pageSizes = _props$pageSizes === void 0 ? [5, 10, 20, 30] : _props$pageSizes,
+    pageSizes = props.pageSizes,
     children = props.children,
     stateManager = props.stateManager,
-    _props$hooks = props.hooks,
-    hooks = _props$hooks === void 0 ? [] : _props$hooks,
+    hooks = props.hooks,
     NoDataComp = props.NoDataComp,
     LoadingComp = props.LoadingComp,
-    _props$ExpandHandleCo = props.ExpandHandleComp,
-    ExpandHandleComp = _props$ExpandHandleCo === void 0 ? _expandable_rows__WEBPACK_IMPORTED_MODULE_9__.ExpandHandle : _props$ExpandHandleCo,
-    _props$noDataText = props.noDataText,
-    noDataText = _props$noDataText === void 0 ? 'No data' : _props$noDataText,
-    _props$loadingText = props.loadingText,
-    loadingText = _props$loadingText === void 0 ? 'Loading...' : _props$loadingText,
-    _props$isLoading = props.isLoading,
-    isLoading = _props$isLoading === void 0 ? false : _props$isLoading,
+    ExpandHandleComp = props.ExpandHandleComp,
+    noDataText = props.noDataText,
+    loadingText = props.loadingText,
+    isLoading = props.isLoading,
     onPageChange = props.onPageChange,
-    _props$manualPaginati = props.manualPagination,
-    manualPagination = _props$manualPaginati === void 0 ? false : _props$manualPaginati,
+    manualPagination = props.manualPagination,
     totalCount = props.totalCount,
-    _props$paginateExpand = props.paginateExpandedRows,
-    paginateExpandedRows = _props$paginateExpand === void 0 ? false : _props$paginateExpand,
+    paginateExpandedRows = props.paginateExpandedRows,
     _props$getHeaderProps = props.getHeaderProps,
     getHeaderProps = _props$getHeaderProps === void 0 ? defaultPropGetter : _props$getHeaderProps,
     _props$getColumnProps = props.getColumnProps,
@@ -37963,18 +37955,18 @@ var Provider = function Provider(props) {
     _props$getFooterProps = props.getFooterProps,
     getFooterProps = _props$getFooterProps === void 0 ? defaultPropGetter : _props$getFooterProps,
     selectedRowIds = props.selectedRowIds,
-    _props$canOrderColumn = props.canOrderColumns,
-    canOrderColumns = _props$canOrderColumn === void 0 ? false : _props$canOrderColumn,
+    canOrderColumns = props.canOrderColumns,
     rowActions = props.rowActions,
+    onColumnSortChanged = props.onColumnSortChanged,
     rest = _objectWithoutProperties(props, _excluded);
-  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(0),
+  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_2__.useState)(0),
     _useState2 = _slicedToArray(_useState, 2),
     pageCount = _useState2[0],
     setPageCount = _useState2[1];
-  var hiddenColumns = (stateManager === null || stateManager === void 0 ? void 0 : stateManager.get('hiddenColumns')) || props.hiddenColumns;
-  var pinnedColumns = (stateManager === null || stateManager === void 0 ? void 0 : stateManager.get('pinnedColumns')) || props.pinnedColumns;
-  var columnOrder = (stateManager === null || stateManager === void 0 ? void 0 : stateManager.get('columnOrder')) || props.columnOrder;
-  var initialState = assign({}, pageSize && {
+  var hiddenColumns = (0,_util__WEBPACK_IMPORTED_MODULE_7__.firstDefined)(stateManager === null || stateManager === void 0 ? void 0 : stateManager.get('hiddenColumns'), props.hiddenColumns);
+  var pinnedColumns = (0,_util__WEBPACK_IMPORTED_MODULE_7__.firstDefined)(stateManager === null || stateManager === void 0 ? void 0 : stateManager.get('pinnedColumns'), props.pinnedColumns);
+  var columnOrder = (0,_util__WEBPACK_IMPORTED_MODULE_7__.firstDefined)(stateManager === null || stateManager === void 0 ? void 0 : stateManager.get('columnOrder'), props.columnOrder);
+  var initialState = assign({}, props.initialState, pageSize && {
     pageSize: pageSize
   }, hiddenColumns && {
     hiddenColumns: hiddenColumns
@@ -37985,7 +37977,8 @@ var Provider = function Provider(props) {
   }, selectedRowIds && {
     selectedRowIds: selectedRowIds
   });
-  var table = react_table__WEBPACK_IMPORTED_MODULE_2__.useTable.apply(void 0, [_objectSpread({
+  var columnSort = (0,_util__WEBPACK_IMPORTED_MODULE_7__.firstDefined)(props.columnSort, props.columnsSort);
+  var table = react_table__WEBPACK_IMPORTED_MODULE_3__.useTable.apply(void 0, [_objectSpread({
     data: data,
     defaultColumn: defaultColumn,
     initialState: initialState,
@@ -38001,14 +37994,14 @@ var Provider = function Provider(props) {
     getCellProps: getCellProps,
     getFooterProps: getFooterProps,
     ExpandHandleComp: ExpandHandleComp
-  }, rest), useCanHideColumns, react_table__WEBPACK_IMPORTED_MODULE_2__.useExpanded, _expandable_rows__WEBPACK_IMPORTED_MODULE_9__.useExpandHandle, react_table__WEBPACK_IMPORTED_MODULE_2__.usePagination, props.fullWidth ? react_table__WEBPACK_IMPORTED_MODULE_2__.useFlexLayout : react_table__WEBPACK_IMPORTED_MODULE_2__.useBlockLayout, react_table__WEBPACK_IMPORTED_MODULE_2__.useResizeColumns, react_table__WEBPACK_IMPORTED_MODULE_2__.useColumnOrder, _pinned_columns__WEBPACK_IMPORTED_MODULE_8__.usePinnedColumns, _editable_columns__WEBPACK_IMPORTED_MODULE_7__.useEditableColumns, react_table__WEBPACK_IMPORTED_MODULE_2__.useRowSelect, _select_rows__WEBPACK_IMPORTED_MODULE_10__.useSelectRows].concat(_toConsumableArray(rowActions !== null && rowActions !== void 0 && rowActions.length ? [_row_menu__WEBPACK_IMPORTED_MODULE_11__.useRowMenu] : []), _toConsumableArray(hooks)));
+  }, lodash_omit__WEBPACK_IMPORTED_MODULE_0___default()(rest, 'initialState', 'hiddenColumns', 'pinnedColumns', 'columnOrder', 'columnSort', 'columnsSort')), useCanHideColumns, react_table__WEBPACK_IMPORTED_MODULE_3__.useExpanded, _expandable_rows__WEBPACK_IMPORTED_MODULE_10__.useExpandHandle, react_table__WEBPACK_IMPORTED_MODULE_3__.usePagination, props.fullWidth ? react_table__WEBPACK_IMPORTED_MODULE_3__.useFlexLayout : react_table__WEBPACK_IMPORTED_MODULE_3__.useBlockLayout, react_table__WEBPACK_IMPORTED_MODULE_3__.useResizeColumns, react_table__WEBPACK_IMPORTED_MODULE_3__.useColumnOrder, _pinned_columns__WEBPACK_IMPORTED_MODULE_9__.usePinnedColumns, _editable_columns__WEBPACK_IMPORTED_MODULE_8__.useEditableColumns, react_table__WEBPACK_IMPORTED_MODULE_3__.useRowSelect, _select_rows__WEBPACK_IMPORTED_MODULE_11__.useSelectRows].concat(_toConsumableArray(rowActions !== null && rowActions !== void 0 && rowActions.length ? [_row_menu__WEBPACK_IMPORTED_MODULE_12__.useRowMenu] : []), _toConsumableArray(hooks)));
   var _table$state = table.state,
     pageIndex = _table$state.pageIndex,
     _pageSize = _table$state.pageSize;
-  (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
+  (0,react__WEBPACK_IMPORTED_MODULE_2__.useEffect)(function () {
     stateManager === null || stateManager === void 0 || stateManager.onStateChange(table.state);
   }, [table.state]);
-  (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
+  (0,react__WEBPACK_IMPORTED_MODULE_2__.useEffect)(function () {
     if (!manualPagination) return;
     setPageCount(calcPageCount(totalCount, _pageSize));
     onPageChange === null || onPageChange === void 0 || onPageChange({
@@ -38018,9 +38011,10 @@ var Provider = function Provider(props) {
   }, [manualPagination, totalCount, pageIndex, _pageSize]);
   var _LoadingComp = useComp(loadingText, LoadingComp);
   var _NoDataComp = useComp(noDataText, NoDataComp);
-  var orderLogic = (0,_order_logic__WEBPACK_IMPORTED_MODULE_12__.useOrderLogic)(table);
+  var orderLogic = (0,_order_logic__WEBPACK_IMPORTED_MODULE_13__.useOrderLogic)(table);
   var value = _objectSpread(_objectSpread({
-    columnsSort: columnsSort
+    columnSort: columnSort,
+    onColumnSortChanged: onColumnSortChanged
   }, table), {}, {
     canOrderColumns: canOrderColumns,
     orderLogic: orderLogic,
@@ -38028,17 +38022,17 @@ var Provider = function Provider(props) {
     NoDataComp: _NoDataComp,
     rowActions: rowActions
   });
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(TableContext.Provider, {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement(TableContext.Provider, {
     value: value
   }, children);
 };
 Provider.displayName = 'Table.Provider';
 Provider.defaultProps = {
   data: [],
-  columnsSort: {},
+  columnSort: {},
   pageSizes: [5, 10, 20, 30],
   hooks: [],
-  ExpandHandleComp: _expandable_rows__WEBPACK_IMPORTED_MODULE_9__.ExpandHandle,
+  ExpandHandleComp: _expandable_rows__WEBPACK_IMPORTED_MODULE_10__.ExpandHandle,
   noDataText: 'No data',
   loadingText: 'Loading...',
   isLoading: false,
@@ -38053,66 +38047,69 @@ Provider.defaultProps = {
   canOrderColumns: false
 };
 Provider.propTypes = {
-  columns: prop_types__WEBPACK_IMPORTED_MODULE_0___default().arrayOf(prop_types__WEBPACK_IMPORTED_MODULE_0___default().shape({
-    id: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().string).isRequired,
-    accessor: prop_types__WEBPACK_IMPORTED_MODULE_0___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_0___default().string), (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func)]),
-    type: prop_types__WEBPACK_IMPORTED_MODULE_0___default().oneOf(['string', 'number']),
-    Header: prop_types__WEBPACK_IMPORTED_MODULE_0___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_0___default().node), (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func)]).isRequired,
-    Cell: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
-    Footer: prop_types__WEBPACK_IMPORTED_MODULE_0___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_0___default().node), (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func)]),
-    can_sort: prop_types__WEBPACK_IMPORTED_MODULE_0___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool), (prop_types__WEBPACK_IMPORTED_MODULE_0___default().number)]),
-    on_sort: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
-    disableHiding: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-    width: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().number),
-    minWidth: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().number),
-    maxWidth: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().number),
-    disableResizing: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-    disablePinning: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-    canEdit: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-    className: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().string)
+  columns: prop_types__WEBPACK_IMPORTED_MODULE_1___default().arrayOf(prop_types__WEBPACK_IMPORTED_MODULE_1___default().shape({
+    id: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().string).isRequired,
+    accessor: prop_types__WEBPACK_IMPORTED_MODULE_1___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_1___default().string), (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func)]),
+    type: prop_types__WEBPACK_IMPORTED_MODULE_1___default().oneOf(['string', 'number']),
+    Header: prop_types__WEBPACK_IMPORTED_MODULE_1___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_1___default().node), (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func)]),
+    Cell: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func),
+    Footer: prop_types__WEBPACK_IMPORTED_MODULE_1___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_1___default().node), (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func)]),
+    // can_sort: PT.oneOfType([PT.bool, PT.number]),
+    // on_sort: PT.func,
+    canSort: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+    disableHiding: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+    width: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().number),
+    minWidth: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().number),
+    maxWidth: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().number),
+    disableResizing: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+    disablePinning: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+    canEdit: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+    className: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().string)
   })),
-  data: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().array),
-  columnsSort: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().object),
-  pageSize: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().number),
-  pageSizes: prop_types__WEBPACK_IMPORTED_MODULE_0___default().arrayOf((prop_types__WEBPACK_IMPORTED_MODULE_0___default().number)),
-  manualPagination: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  totalCount: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().number),
-  paginateExpandedRows: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  onPageChange: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
-  isLoading: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  hiddenColumns: prop_types__WEBPACK_IMPORTED_MODULE_0___default().arrayOf((prop_types__WEBPACK_IMPORTED_MODULE_0___default().string)),
-  pinnedColumns: prop_types__WEBPACK_IMPORTED_MODULE_0___default().arrayOf((prop_types__WEBPACK_IMPORTED_MODULE_0___default().string)),
-  fullWidth: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  disableHiding: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  disableResizing: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  disablePinning: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  canEdit: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  hideHeader: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  hideFooter: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  getHeaderProps: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
-  getColumnProps: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
-  getRowProps: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
-  getCellProps: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
-  getFooterProps: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
-  noDataText: prop_types__WEBPACK_IMPORTED_MODULE_0___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_0___default().string), (prop_types__WEBPACK_IMPORTED_MODULE_0___default().node), (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func)]),
-  loadingText: prop_types__WEBPACK_IMPORTED_MODULE_0___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_0___default().string), (prop_types__WEBPACK_IMPORTED_MODULE_0___default().node), (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func)]),
-  renderRowSubComponent: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
-  rowDensity: prop_types__WEBPACK_IMPORTED_MODULE_0___default().oneOf(['busy_bee', 'diamond_hand', 'white_spaced']),
-  onRowClick: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
-  stickyHeader: prop_types__WEBPACK_IMPORTED_MODULE_0___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool), (prop_types__WEBPACK_IMPORTED_MODULE_0___default().object)]),
-  scrollTarget: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().any),
-  className: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().string),
-  onSelectRows: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().func),
-  canOrderColumns: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  rowActions: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().array),
-  scrollable: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().bool),
-  scrollHeight: (prop_types__WEBPACK_IMPORTED_MODULE_0___default().string)
+  data: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().array),
+  // columnsSort: PT.object,
+  columnSort: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().object),
+  onColumnSortChanged: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func),
+  pageSize: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().number),
+  pageSizes: prop_types__WEBPACK_IMPORTED_MODULE_1___default().arrayOf((prop_types__WEBPACK_IMPORTED_MODULE_1___default().number)),
+  manualPagination: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  totalCount: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().number),
+  paginateExpandedRows: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  onPageChange: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func),
+  isLoading: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  hiddenColumns: prop_types__WEBPACK_IMPORTED_MODULE_1___default().arrayOf((prop_types__WEBPACK_IMPORTED_MODULE_1___default().string)),
+  pinnedColumns: prop_types__WEBPACK_IMPORTED_MODULE_1___default().arrayOf((prop_types__WEBPACK_IMPORTED_MODULE_1___default().string)),
+  fullWidth: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  disableHiding: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  disableResizing: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  disablePinning: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  canEdit: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  hideHeader: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  hideFooter: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  getHeaderProps: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func),
+  getColumnProps: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func),
+  getRowProps: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func),
+  getCellProps: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func),
+  getFooterProps: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func),
+  noDataText: prop_types__WEBPACK_IMPORTED_MODULE_1___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_1___default().string), (prop_types__WEBPACK_IMPORTED_MODULE_1___default().node), (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func)]),
+  loadingText: prop_types__WEBPACK_IMPORTED_MODULE_1___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_1___default().string), (prop_types__WEBPACK_IMPORTED_MODULE_1___default().node), (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func)]),
+  renderRowSubComponent: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func),
+  rowDensity: prop_types__WEBPACK_IMPORTED_MODULE_1___default().oneOf(['busy_bee', 'diamond_hand', 'white_spaced']),
+  onRowClick: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func),
+  stickyHeader: prop_types__WEBPACK_IMPORTED_MODULE_1___default().oneOfType([(prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool), (prop_types__WEBPACK_IMPORTED_MODULE_1___default().object)]),
+  scrollTarget: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().any),
+  className: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().string),
+  onSelectRows: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().func),
+  canOrderColumns: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  rowActions: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().array),
+  scrollable: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().bool),
+  scrollHeight: (prop_types__WEBPACK_IMPORTED_MODULE_1___default().string)
 };
 var calcPageCount = function calcPageCount(totalCount, pageSize) {
   return Math.ceil(totalCount / pageSize);
 };
 var useTableContext = function useTableContext() {
-  return (0,react__WEBPACK_IMPORTED_MODULE_1__.useContext)(TableContext);
+  return (0,react__WEBPACK_IMPORTED_MODULE_2__.useContext)(TableContext);
 };
 
 // can hide columns
@@ -38122,25 +38119,25 @@ var useCanHideColumns = function useCanHideColumns(hooks) {
     var disableHiding = instance.disableHiding,
       flatHeaders = instance.flatHeaders;
     flatHeaders.forEach(function (header) {
-      header.canHide = (0,_util__WEBPACK_IMPORTED_MODULE_6__.firstDefined)(header.disableHiding === true ? false : undefined, disableHiding === true ? false : undefined, true);
+      header.canHide = (0,_util__WEBPACK_IMPORTED_MODULE_7__.firstDefined)(header.disableHiding === true ? false : undefined, disableHiding === true ? false : undefined, true);
     });
   });
 };
 useCanHideColumns.pluginName = 'useCanHideColumns';
 var useComp = function useComp(text, Comp) {
-  return (0,react__WEBPACK_IMPORTED_MODULE_1__.useMemo)(function () {
+  return (0,react__WEBPACK_IMPORTED_MODULE_2__.useMemo)(function () {
     if (Comp) return Comp;
     if (!text || typeof text != 'string' || text.trim() == '') return text;
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(EmptyBody, null, text);
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement(EmptyBody, null, text);
   }, [text, Comp]);
 };
 var EmptyBody = function EmptyBody(_ref) {
   var children = _ref.children;
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_layout__WEBPACK_IMPORTED_MODULE_3__.Flex, {
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement(_layout__WEBPACK_IMPORTED_MODULE_4__.Flex, {
     align_items: "center",
     width: "100%",
-    padding: "".concat(_theme__WEBPACK_IMPORTED_MODULE_4__["default"].spacing['04'], " ").concat(_theme__WEBPACK_IMPORTED_MODULE_4__["default"].spacing['05'])
-  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_typography__WEBPACK_IMPORTED_MODULE_5__.Label, {
+    padding: "".concat(_theme__WEBPACK_IMPORTED_MODULE_5__["default"].spacing['04'], " ").concat(_theme__WEBPACK_IMPORTED_MODULE_5__["default"].spacing['05'])
+  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement(_typography__WEBPACK_IMPORTED_MODULE_6__.Label, {
     color: "gray_11_50"
   }, children));
 };
@@ -38827,27 +38824,26 @@ var HeaderCell = function HeaderCell(props) {
     isLast = props.isLast;
   var id = header.id,
     name = header.name,
-    on_sort = header.on_sort,
     isResizing = header.isResizing,
     getResizerProps = header.getResizerProps;
   var _useTableContext2 = (0,_context__WEBPACK_IMPORTED_MODULE_8__.useTableContext)(),
     getColumnProps = _useTableContext2.getColumnProps,
     getHeaderProps = _useTableContext2.getHeaderProps,
-    columnsSort = _useTableContext2.columnsSort,
+    columnSort = _useTableContext2.columnSort,
     fullWidth = _useTableContext2.fullWidth,
     canOrderColumns = _useTableContext2.canOrderColumns,
-    orderLogic = _useTableContext2.orderLogic;
-  var sort = columnsSort[id];
-  var canSort = header.can_sort && header.on_sort;
-  var handleSort = (0,react__WEBPACK_IMPORTED_MODULE_1__.useCallback)(function () {
-    if (on_sort) {
-      on_sort(id, {
-        asc: 'desc',
-        desc: undefined,
-        none: 'asc'
-      }[sort || 'none']);
-    }
-  }, [id, sort, on_sort]);
+    orderLogic = _useTableContext2.orderLogic,
+    onColumnSortChanged = _useTableContext2.onColumnSortChanged;
+  var sort = columnSort[id];
+  var onSortChanged = (0,_util__WEBPACK_IMPORTED_MODULE_5__.firstDefined)(onColumnSortChanged, header.on_sort);
+  var canSort = (0,_util__WEBPACK_IMPORTED_MODULE_5__.firstDefined)(header.canSort, header.can_sort) && !!onColumnSortChanged;
+  var onSort = (0,react__WEBPACK_IMPORTED_MODULE_1__.useCallback)(function () {
+    onSortChanged === null || onSortChanged === void 0 || onSortChanged(id, {
+      asc: 'desc',
+      desc: undefined,
+      none: 'asc'
+    }[sort || 'none']);
+  }, [id, sort, onColumnSortChanged]);
   var canResize = header.canResize && !(fullWidth && isLast) && !compact;
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -38866,29 +38862,32 @@ var HeaderCell = function HeaderCell(props) {
       return setHovered(false);
     }
   }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(HeaderCellWrapper, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(HeaderCellLeft, {
-    $canSort: canSort,
-    onClick: handleSort
+    style: canSort ? {
+      cursor: 'pointer'
+    } : undefined,
+    onClick: onSort
   }, !compact && renderCellContent(header, 'Header', {
     compact: compact
   }), compact && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_typography__WEBPACK_IMPORTED_MODULE_4__.Label, {
     variant: "sm",
     color: "gray_11",
     no_wrap: true
-  }, name || id), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_sort_icon__WEBPACK_IMPORTED_MODULE_10__.SortIcon, {
+  }, name || id), canSort && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_sort_icon__WEBPACK_IMPORTED_MODULE_10__.SortIcon, {
     visible: !!iconVisible,
     reverse: sort == 'desc'
   })), !compact && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_header_functions__WEBPACK_IMPORTED_MODULE_9__.HeaderFunctions, {
     header: header,
     visible: hovered,
+    canSort: canSort,
     onItemClick: function onItemClick() {
       return setHovered(false);
     },
-    orderLogic: canOrderColumns && orderLogic
+    orderLogic: canOrderColumns && orderLogic,
+    onSortChanged: onSortChanged
   }), canResize && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(HeaderCellResizer, _extends({}, getResizerProps(), {
     $isResizing: isResizing
   }))));
 };
-HeaderCell.displayName = 'HeaderCell';
 var HeaderCellContent = styled_components__WEBPACK_IMPORTED_MODULE_2___default().div.withConfig({
   displayName: "HeaderCellContent",
   componentId: "sc-8zg5t0-0"
@@ -38897,14 +38896,10 @@ var HeaderCellWrapper = styled_components__WEBPACK_IMPORTED_MODULE_2___default()
   displayName: "HeaderCellWrapper",
   componentId: "sc-8zg5t0-1"
 })(["display:flex;flex-direction:row;justify-content:space-between;align-items:center;padding:8px 8px 8px 16px;"]);
-HeaderCellWrapper.displayName = 'HeaderCellWrapper';
 var HeaderCellLeft = styled_components__WEBPACK_IMPORTED_MODULE_2___default().div.withConfig({
   displayName: "HeaderCellLeft",
   componentId: "sc-8zg5t0-2"
-})(["display:flex;flex-direction:row;align-items:center;padding:0px;gap:4px;min-height:16px;overflow-x:clip;", ""], function (props) {
-  return props.$canSort ? 'cursor: pointer;' : null;
-});
-HeaderCellLeft.displayName = 'HeaderCellLeft';
+})(["display:flex;flex-direction:row;align-items:center;padding:0px;gap:4px;min-height:16px;overflow-x:clip;"]);
 var HeaderCellResizer = styled_components__WEBPACK_IMPORTED_MODULE_2___default().div.withConfig({
   displayName: "HeaderCellResizer",
   componentId: "sc-8zg5t0-3"
@@ -38913,7 +38908,6 @@ var HeaderCellResizer = styled_components__WEBPACK_IMPORTED_MODULE_2___default()
     return (0,styled_components__WEBPACK_IMPORTED_MODULE_2__.css)(["&:after{content:\" \";display:block;width:2px;height:24px;background:", ";position:absolute;bottom:0;left:4px;}"], _theme__WEBPACK_IMPORTED_MODULE_3__["default"].color.blue_10);
   }
 });
-HeaderCellResizer.displayName = 'HeaderCellResizer';
 var renderCellContent = function renderCellContent(column, type, props) {
   var content = column[type];
   if (lodash_isString__WEBPACK_IMPORTED_MODULE_0___default()(content)) return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_typography__WEBPACK_IMPORTED_MODULE_4__.Label, {
@@ -38968,14 +38962,14 @@ var HeaderFunctions = function HeaderFunctions(props) {
   var header = props.header,
     visible = props.visible,
     onItemClick = props.onItemClick,
-    orderLogic = props.orderLogic;
+    orderLogic = props.orderLogic,
+    canSort = props.canSort,
+    onSortChanged = props.onSortChanged;
   if ((0,_order_logic__WEBPACK_IMPORTED_MODULE_9__.isSysColumn)(header.id)) return null;
   var id = header.id,
-    on_sort = header.on_sort,
     canHide = header.canHide,
-    getToggleHiddenProps = header.getToggleHiddenProps,
-    canPin = header.canPin;
-  var canSort = header.can_sort && header.on_sort;
+    canPin = header.canPin,
+    getToggleHiddenProps = header.getToggleHiddenProps;
   var items = [];
   if (orderLogic) {
     var firsts = orderLogic.firsts,
@@ -39014,14 +39008,14 @@ var HeaderFunctions = function HeaderFunctions(props) {
       id: 'sort_asc',
       children: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(SortColumn, {
         id: id,
-        onSort: on_sort,
+        onSort: onSortChanged,
         sort: "asc"
       })
     }, {
       id: 'sort_desc',
       children: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(SortColumn, {
         id: id,
-        onSort: on_sort,
+        onSort: onSortChanged,
         sort: "desc"
       })
     });