@xcelsior/ui-spreadsheets 1.1.15 → 1.1.16

package/dist/index.js

@@ -1365,7 +1365,8 @@ var SpreadsheetToolbar = ({
                     activeFilterCount,
                     " filter",
                     activeFilterCount !== 1 ? "s" : "",
-                    " active"
+                    " ",
+                    "active"
                   ] }),
                   showFiltersPanel ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(HiChevronUp, { className: "h-3 w-3" }) : /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(HiChevronDown, { className: "h-3 w-3" })
                 ]
@@ -1429,7 +1430,7 @@ var SpreadsheetToolbar = ({
                   ]
                 }
               ),
-              showMoreMenu && /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "absolute right-0 top-full mt-1 bg-white border border-gray-200 shadow-lg rounded py-1 min-w-[180px] z-20", children: [
+              showMoreMenu && /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)("div", { className: "absolute right-0 top-full mt-1 bg-white border border-gray-200 shadow-lg rounded py-1 min-w-[180px] z-50", children: [
                 onSettings && /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
                   "button",
                   {
@@ -3835,6 +3836,23 @@ function Spreadsheet({
     },
     [controlledPageSize, controlledCurrentPage, onPageChange]
   );
+  const resetPaginationToFirstPage = (0, import_react17.useCallback)(() => {
+    if (controlledCurrentPage === void 0) {
+      setInternalCurrentPage(1);
+    }
+    onPageChange?.(1, pageSize);
+  }, [controlledCurrentPage, onPageChange, pageSize]);
+  const handleFilterChangeWithReset = (0, import_react17.useCallback)(
+    (columnId, filter) => {
+      handleFilterChange(columnId, filter);
+      resetPaginationToFirstPage();
+    },
+    [handleFilterChange, resetPaginationToFirstPage]
+  );
+  const clearAllFiltersWithReset = (0, import_react17.useCallback)(() => {
+    clearAllFilters();
+    resetPaginationToFirstPage();
+  }, [clearAllFilters, resetPaginationToFirstPage]);
   (0, import_react17.useEffect)(() => {
     setSpreadsheetSettings((prev) => ({
       ...prev,
@@ -4247,10 +4265,10 @@ function Spreadsheet({
         saveStatus,
         autoSave: spreadsheetSettings.autoSave,
         hasActiveFilters,
-        onClearFilters: clearAllFilters,
+        onClearFilters: clearAllFiltersWithReset,
         filters,
         columns,
-        onClearFilter: (columnId) => handleFilterChange(columnId, void 0),
+        onClearFilter: (columnId) => handleFilterChangeWithReset(columnId, void 0),
         showFiltersPanel,
         onToggleFiltersPanel: () => setShowFiltersPanel(!showFiltersPanel),
         onZoomIn: () => setZoom((z) => Math.min(z + 10, 200)),
@@ -4392,7 +4410,7 @@ function Spreadsheet({
                       {
                         column,
                         filter: filters[column.id],
-                        onFilterChange: (filter) => handleFilterChange(column.id, filter),
+                        onFilterChange: (filter) => handleFilterChangeWithReset(column.id, filter),
                         onClose: () => setActiveFilterColumn(null)
                       }
                     )