@bigbinary/neeto-atoms 1.0.85 → 1.0.87

package/dist/cjs/{DataTable-ONkM1J3v.js → DataTable-BNeEEAKb.js}

@@ -4,6 +4,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var primitives_Table = require('./primitives/Table.js');
 var utils = require('./utils-BhM0B89p.js');
+var reactRouterDom = require('react-router-dom');
 var reactI18next = require('react-i18next');
 var primitives_Checkbox = require('./primitives/Checkbox.js');
 var primitives_Spinner = require('./primitives/Spinner.js');
@@ -3203,20 +3204,6 @@ const writeSortToURL = (sorting) => {
   }
   window.history.pushState({}, "", url.toString());
 };
-const readPageFromURL = () => {
-  const params = new URLSearchParams(window.location.search);
-  const page = params.get(URL_PAGE_PARAM);
-  return page ? Math.max(1, parseInt(page, 10)) : 1;
-};
-const writePageToURL = (page) => {
-  const url = new URL(window.location.href);
-  if (page <= 1) {
-    url.searchParams.delete(URL_PAGE_PARAM);
-  } else {
-    url.searchParams.set(URL_PAGE_PARAM, String(page));
-  }
-  window.history.pushState({}, "", url.toString());
-};
 const keysToRowSelection = (keys) => Object.fromEntries(keys.map((key) => [key, true]));
 const rowSelectionToKeys = (selection) => Object.keys(selection).filter((key) => selection[key]);
 const hashPathname = () => {
@@ -3360,23 +3347,41 @@ const useTablePagination = ({
   enableURLPagination = true
 }) => {
   const isControlled = controlledPage !== void 0;
-  const [internalPage, setInternalPage] = React.useState(
-    () => enableURLPagination ? readPageFromURL() : 1
-  );
-  const currentPage = isControlled ? controlledPage : internalPage;
+  const history = reactRouterDom.useHistory();
+  const location = reactRouterDom.useLocation();
+  const pageFromURL = React.useMemo(() => {
+    if (!enableURLPagination) return 1;
+    const params = new URLSearchParams(location.search);
+    const page = params.get(URL_PAGE_PARAM);
+    return page ? Math.max(1, parseInt(page, 10) || 1) : 1;
+  }, [location.search, enableURLPagination]);
+  const [internalPage, setInternalPage] = React.useState(1);
+  const currentPage = isControlled ? controlledPage : enableURLPagination ? pageFromURL : internalPage;
   const pageCount = Math.max(1, Math.ceil(totalCount / pageSize));
   const onPageChange = React.useCallback(
     (page) => {
       const clampedPage = Math.min(Math.max(1, page), pageCount);
-      if (!isControlled) {
+      if (!isControlled && !enableURLPagination) {
         setInternalPage(clampedPage);
       }
       controlledOnPageChange?.(clampedPage);
       if (enableURLPagination) {
-        writePageToURL(clampedPage);
+        const searchParams = new URLSearchParams(history.location.search);
+        if (clampedPage <= 1) {
+          searchParams.delete(URL_PAGE_PARAM);
+        } else {
+          searchParams.set(URL_PAGE_PARAM, String(clampedPage));
+        }
+        history.push({ search: searchParams.toString() });
       }
     },
-    [pageCount, isControlled, controlledOnPageChange, enableURLPagination]
+    [
+      pageCount,
+      isControlled,
+      controlledOnPageChange,
+      enableURLPagination,
+      history
+    ]
   );
   React.useEffect(() => {
     if (currentPage > pageCount && pageCount > 0) {
@@ -4556,4 +4561,4 @@ exports.useColumnVisibility = useColumnVisibility;
 exports.useTablePagination = useTablePagination;
 exports.useTableSelection = useTableSelection;
 exports.useTableSort = useTableSort;
-//# sourceMappingURL=DataTable-ONkM1J3v.js.map
+//# sourceMappingURL=DataTable-BNeEEAKb.js.map