@bigbinary/neetoui 8.10.1 → 8.10.2

package/dist/Table.js

@@ -16,13 +16,13 @@ import { useHistory } from 'react-router-dom';
 import { ANTD_LOCALE } from './constants.js';
 import '@bigbinary/neeto-hotkeys';
 import './overlayManager.js';
-import { a as getLocale, b as getFromLocalStorage, r as removeFromLocalStorage, s as setToLocalStorage, h as hyphenize, g as getContentDir, c as buildUrl, n as noop$1, A as ANT_DESIGN_GLOBAL_TOKEN_OVERRIDES } from './index-C1skvRll.js';
+import { a as getLocale, b as getFromLocalStorage, r as removeFromLocalStorage, s as setToLocalStorage, h as hyphenize, g as getContentDir, k as getQueryParams, c as buildUrl, n as noop$1, A as ANT_DESIGN_GLOBAL_TOKEN_OVERRIDES } from './index-CmH5FLoh.js';
 import { u as useQueryParams } from './useQueryParams-BKsf4FPY.js';
 import Button from './Button.js';
 import Callout from './Callout.js';
 import Typography from './Typography.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import { H as HeaderCellMenu, a as TABLE_SORT_ORDERS, b as TABLE_PAGINATION_HEIGHT, c as TABLE_ROW_HEIGHT, C as COLUMN_FIXED_VALUES, S as SELECT_ALL_ROWS_CALLOUT_MOBILE_HEIGHT, d as SELECT_ALL_ROWS_CALLOUT_DESKTOP_HEIGHT, U as URL_SORT_ORDERS, u as useRestoreScrollPosition, e as TABLE_DEFAULT_HEADER_HEIGHT, f as TableInfoPane } from './index-B_RZyIZX.js';
+import { H as HeaderCellMenu, a as TABLE_SORT_ORDERS, b as TABLE_PAGINATION_HEIGHT, c as TABLE_ROW_HEIGHT, C as COLUMN_FIXED_VALUES, S as SELECT_ALL_ROWS_CALLOUT_MOBILE_HEIGHT, d as SELECT_ALL_ROWS_CALLOUT_DESKTOP_HEIGHT, U as URL_SORT_ORDERS, u as useRestoreScrollPosition, e as TABLE_DEFAULT_HEADER_HEIGHT, f as TableInfoPane } from './index-BahjCKd8.js';
 import { Resizable as Resizable$1 } from 'react-resizable';
 import '@babel/runtime/helpers/classCallCheck';
 import '@babel/runtime/helpers/createClass';
@@ -59,12 +59,12 @@ import './ActionDropdown.js';
 import './Dropdown.js';
 import '@bigbinary/neeto-icons/Down';
 import './useId-Jj9hXm-g.js';
-import './Textarea-Cuk_pAwz.js';
+import './Textarea-DhKUj8Sp.js';
 import './Label.js';
 import '@bigbinary/neeto-icons/Help';
 import './Modal.js';
 import '@bigbinary/neeto-icons/Close';
-import './Portal-DfZ0fHhp.js';
+import './Portal-CN3j2Xyh.js';
 import '@babel/runtime/helpers/esm/extends';
 import '@babel/runtime/helpers/esm/objectWithoutPropertiesLoose';
 import '@babel/runtime/helpers/esm/inheritsLoose';
@@ -75,7 +75,7 @@ import '@babel/runtime/helpers/asyncToGenerator';
 import '@babel/runtime/regenerator';
 import '@bigbinary/neeto-icons/ColorPicker';
 import 'react-colorful';
-import './useRecentlyUsedColors-Dh3Iah-r.js';
+import './useRecentlyUsedColors-CVOmlcly.js';
 import 'antd/lib/date-picker';
 import '@bigbinary/neeto-icons/Calendar';
 import './Input.js';
@@ -450,6 +450,14 @@ var getFrozenColumnsLocalStorageKey = function getFrozenColumnsLocalStorageKey(l
   var prefix = isPresent(localStorageKeyPrefix) ? localStorageKeyPrefix : convertLocationPathnameToId();
   return "NEETOUI-".concat(prefix, "-FIXED_COLUMNS");
 };
+var getSortPreferenceLocalStorageKey = function getSortPreferenceLocalStorageKey(localStorageKeyPrefix) {
+  var prefix = isPresent(localStorageKeyPrefix) ? localStorageKeyPrefix : convertLocationPathnameToId();
+  return "NEETOUI-".concat(prefix, "-SORT");
+};
+var getPersistedTableSort = function getPersistedTableSort(localStorageKeyPrefix) {
+  var _getFromLocalStorage;
+  return (_getFromLocalStorage = getFromLocalStorage(getSortPreferenceLocalStorageKey(localStorageKeyPrefix))) !== null && _getFromLocalStorage !== void 0 ? _getFromLocalStorage : null;
+};
 var getSortInfoFromQueryParams = function getSortInfoFromQueryParams(queryParams) {
   var sortedInfo = {};
   if (isPresent(queryParams.sort_by) && isPresent(queryParams.order_by) && isPresent(TABLE_SORT_ORDERS[queryParams.order_by])) {
@@ -805,6 +813,10 @@ var useScroll = function useScroll(_ref) {
 };
 
 var useTableSort = function useTableSort() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    _ref$shouldPersistSor = _ref.shouldPersistSort,
+    shouldPersistSort = _ref$shouldPersistSor === void 0 ? false : _ref$shouldPersistSor,
+    localStorageKeyPrefix = _ref.localStorageKeyPrefix;
   var queryParams = useQueryParams();
   var _useState = useState(function () {
       return getSortInfoFromQueryParams(queryParams);
@@ -816,12 +828,37 @@ var useTableSort = function useTableSort() {
     setSortedInfo(getSortInfoFromQueryParams(queryParams));
   }, [queryParams === null || queryParams === void 0 ? void 0 : queryParams.sort_by, queryParams === null || queryParams === void 0 ? void 0 : queryParams.order_by]);
   var history = useHistory();
+  var persistSortPreference = function persistSortPreference(params) {
+    var _params$sort_by, _params$order_by;
+    if (!shouldPersistSort) return;
+    setToLocalStorage(getSortPreferenceLocalStorageKey(localStorageKeyPrefix), {
+      sort_by: (_params$sort_by = params.sort_by) !== null && _params$sort_by !== void 0 ? _params$sort_by : null,
+      order_by: (_params$order_by = params.order_by) !== null && _params$order_by !== void 0 ? _params$order_by : null
+    });
+  };
+  useEffect(function () {
+    if (!shouldPersistSort) return;
+    var currentQueryParams = getQueryParams();
+    if (isPresent(currentQueryParams.sort_by)) return;
+    var persistedSort = getPersistedTableSort(localStorageKeyPrefix);
+    if (isNil(persistedSort === null || persistedSort === void 0 ? void 0 : persistedSort.sort_by) || isNil(TABLE_SORT_ORDERS[persistedSort === null || persistedSort === void 0 ? void 0 : persistedSort.order_by])) {
+      return;
+    }
+
+    // Restore the persisted sort into the URL on mount; the URL remains the
+    // single source of truth afterwards.
+    history.replace(buildUrl(window.location.pathname, mergeLeft({
+      sort_by: persistedSort.sort_by,
+      order_by: persistedSort.order_by
+    }, currentQueryParams)));
+  }, [shouldPersistSort, localStorageKeyPrefix, history]);
   var handleTableChange = function handleTableChange(pagination, sorter) {
     var params = {
       sort_by: sorter.order ? getSortField(sorter.field) : undefined,
       order_by: URL_SORT_ORDERS[sorter.order],
       page: pagination.current
     };
+    persistSortPreference(params);
     var pathname = window.location.pathname;
     history.push(buildUrl(pathname, mergeLeft(params, queryParams)));
   };
@@ -881,7 +918,7 @@ var useVirtualScroll = function useVirtualScroll(_ref) {
   };
 };
 
-var _excluded = ["allowRowClick", "enableColumnResize", "enableColumnReorder", "enableColumnFreeze", "enableAddColumn", "className", "columnData", "currentPageNumber", "defaultPageSize", "handlePageChange", "loading", "onRowClick", "onRowSelect", "rowData", "totalCount", "selectedRowKeys", "fixedHeight", "paginationProps", "rowKey", "scroll", "rowSelection", "shouldDynamicallyRenderRowSize", "bordered", "onColumnUpdate", "components", "onColumnHide", "onColumnAdd", "onColumnDelete", "onChange", "onMoreActionClick", "bulkSelectAllRowsProps", "localStorageKeyPrefix", "virtual"];
+var _excluded = ["allowRowClick", "enableColumnResize", "enableColumnReorder", "enableColumnFreeze", "enableAddColumn", "className", "columnData", "currentPageNumber", "defaultPageSize", "handlePageChange", "loading", "onRowClick", "onRowSelect", "rowData", "totalCount", "selectedRowKeys", "fixedHeight", "paginationProps", "rowKey", "scroll", "rowSelection", "shouldDynamicallyRenderRowSize", "bordered", "onColumnUpdate", "components", "onColumnHide", "onColumnAdd", "onColumnDelete", "onChange", "onMoreActionClick", "bulkSelectAllRowsProps", "localStorageKeyPrefix", "persistSort", "virtual"];
 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), true).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; }
 var Table = function Table(_ref) {
@@ -938,6 +975,8 @@ var Table = function Table(_ref) {
     onMoreActionClick = _ref.onMoreActionClick,
     bulkSelectAllRowsProps = _ref.bulkSelectAllRowsProps,
     localStorageKeyPrefix = _ref.localStorageKeyPrefix,
+    _ref$persistSort = _ref.persistSort,
+    persistSort = _ref$persistSort === void 0 ? false : _ref$persistSort,
     _ref$virtual = _ref.virtual,
     virtual = _ref$virtual === void 0 ? false : _ref$virtual,
     otherProps = _objectWithoutProperties(_ref, _excluded);
@@ -959,13 +998,16 @@ var Table = function Table(_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     columnChanges = _useState8[0],
     setColumnChanges = _useState8[1];
-  var _useTableSort = useTableSort(),
+  var isDefaultPageChangeHandler = handlePageChange === noop$1;
+  var _useTableSort = useTableSort({
+      shouldPersistSort: persistSort && isDefaultPageChangeHandler,
+      localStorageKeyPrefix: localStorageKeyPrefix
+    }),
     handleTableSortChange = _useTableSort.handleTableChange,
     sortedInfo = _useTableSort.sortedInfo,
     setSortedInfo = _useTableSort.setSortedInfo;
   var _ref2 = bulkSelectAllRowsProps !== null && bulkSelectAllRowsProps !== void 0 ? bulkSelectAllRowsProps : {},
     handleSetBulkSelectedAllRows = _ref2.setBulkSelectedAllRows;
-  var isDefaultPageChangeHandler = handlePageChange === noop$1;
   var history = useHistory();
   var headerRef = useRef();
   var tableOnChangeProps = useRef({});