@bigbinary/neeto-atoms 1.0.121 → 1.0.123

package/dist/cjs/{DataTable-CzMzW8tr.js → DataTable-Cu5Gon12.js}

@@ -3182,28 +3182,26 @@ const STORAGE_KEY_PREFIX = "NEETOUI";
 const STORAGE_KEY_SUFFIX = "FIXED_COLUMNS";
 const COLUMN_SIZING_STORAGE_KEY_SUFFIX = "COLUMN_SIZING";
 
-const getSearchParams = () => new URLSearchParams(window.location.search);
-const readSortFromURL = () => {
-  const params = getSearchParams();
+const readSortFromURL = (search) => {
+  const params = new URLSearchParams(search);
   const sortBy = params.get(URL_SORT_PARAMS.SORT_BY);
   const orderBy = params.get(URL_SORT_PARAMS.ORDER_BY);
-  if (!sortBy) return [];
-  return [{ id: sortBy, desc: orderBy === SORT_DIRECTIONS.DESC }];
+  return sortBy ? [{ id: sortBy, desc: orderBy === SORT_DIRECTIONS.DESC }] : [];
 };
-const writeSortToURL = (sorting) => {
-  const url = new URL(window.location.href);
+const buildSortQuery = (search, sorting) => {
+  const searchParams = new URLSearchParams(search);
   if (sorting.length === 0) {
-    url.searchParams.delete(URL_SORT_PARAMS.SORT_BY);
-    url.searchParams.delete(URL_SORT_PARAMS.ORDER_BY);
+    searchParams.delete(URL_SORT_PARAMS.SORT_BY);
+    searchParams.delete(URL_SORT_PARAMS.ORDER_BY);
   } else {
     const { id, desc } = sorting[0];
-    url.searchParams.set(URL_SORT_PARAMS.SORT_BY, id);
-    url.searchParams.set(
+    searchParams.set(URL_SORT_PARAMS.SORT_BY, id);
+    searchParams.set(
       URL_SORT_PARAMS.ORDER_BY,
       desc ? SORT_DIRECTIONS.DESC : SORT_DIRECTIONS.ASC
     );
   }
-  window.history.pushState({}, "", url.toString());
+  return searchParams.toString();
 };
 const keysToRowSelection = (keys) => Object.fromEntries(keys.map((key) => [key, true]));
 const rowSelectionToKeys = (selection) => Object.keys(selection).filter((key) => selection[key]);
@@ -3303,17 +3301,22 @@ const useTableSort = ({
   sorting: controlledSorting,
   onSortingChange: controlledOnSortingChange,
   onSort,
-  enableURLSort = true
+  enableURLSort
 }) => {
   const isControlled = controlledSorting !== void 0;
-  const [internalSorting, setInternalSorting] = React.useState(
-    () => enableURLSort ? readSortFromURL() : []
-  );
-  const sorting = isControlled ? controlledSorting : internalSorting;
+  const isURLSortEnabled = enableURLSort ?? (!isControlled && controlledOnSortingChange === void 0 && !onSort);
+  const history = reactRouterDom.useHistory();
+  const location = reactRouterDom.useLocation();
+  const sortingFromURL = React.useMemo(() => {
+    if (!isURLSortEnabled) return [];
+    return readSortFromURL(location.search);
+  }, [location.search, isURLSortEnabled]);
+  const [internalSorting, setInternalSorting] = React.useState([]);
+  const sorting = isControlled ? controlledSorting : isURLSortEnabled ? sortingFromURL : internalSorting;
   const onSortingChange = React.useCallback(
     (updaterOrValue) => {
       const newSorting = typeof updaterOrValue === "function" ? updaterOrValue(sorting) : updaterOrValue;
-      if (!isControlled) {
+      if (!isControlled && !isURLSortEnabled) {
         setInternalSorting(newSorting);
       }
       controlledOnSortingChange?.(updaterOrValue);
@@ -3325,18 +3328,21 @@ const useTableSort = ({
           } : null
         );
       }
-      if (enableURLSort) {
-        writeSortToURL(newSorting);
+      if (isURLSortEnabled) {
+        history.push({
+          search: buildSortQuery(history.location.search, newSorting)
+        });
       }
     },
-    [sorting, isControlled, controlledOnSortingChange, onSort, enableURLSort]
+    [
+      sorting,
+      isControlled,
+      controlledOnSortingChange,
+      onSort,
+      isURLSortEnabled,
+      history
+    ]
   );
-  React.useEffect(() => {
-    if (enableURLSort && !isControlled) {
-      const urlSorting = readSortFromURL();
-      setInternalSorting(urlSorting);
-    }
-  }, [enableURLSort, isControlled]);
   return { sorting, onSortingChange };
 };
 
@@ -4171,7 +4177,7 @@ const DataTable = ({
   onSortingChange: onSortingChangeProp,
   onSort: onSortProp,
   enableSorting = false,
-  enableURLSort = true,
+  enableURLSort,
   totalCount,
   pageSize = DEFAULT_PAGE_SIZE,
   currentPage: currentPageProp,
@@ -4627,4 +4633,4 @@ exports.useColumnVisibility = useColumnVisibility;
 exports.useTablePagination = useTablePagination;
 exports.useTableSelection = useTableSelection;
 exports.useTableSort = useTableSort;
-//# sourceMappingURL=DataTable-CzMzW8tr.js.map
+//# sourceMappingURL=DataTable-Cu5Gon12.js.map