@m5kdev/frontend 0.3.1 → 0.3.2

package/dist/src/modules/table/hooks/useDateRangeFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDateRangeFilter.d.ts","sourceRoot":"","sources":["../../../../../src/modules/table/hooks/useDateRangeFilter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGhF,MAAM,WAAW,qBAAqB,CAAC,KAAK;IAC1C,MAAM,EAAE,eAAe,CAAC;IACxB,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;CAC9B;AAED;;;;GAIG;AAEH,KAAK,gBAAgB,CAAC,KAAK,IAAI,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;AAEvE;;;GAGG;AAEH,KAAK,iBAAiB,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAC;AAEnG,MAAM,WAAW,sBAAsB,CAAC,MAAM,EAAE,KAAK;IACnD,eAAe,EAAE,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,EAAE,KAAK,EAAE,mCAG/C,sBAAsB,CAAC,MAAM,EAAE,KAAK,CAAC,KAAG,qBAAqB,CAAC,KAAK,CAgBrE,CAAC"}
+{"version":3,"file":"useDateRangeFilter.d.ts","sourceRoot":"","sources":["../../../../../src/modules/table/hooks/useDateRangeFilter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,sBAAsB,CAAC;AAGhF,MAAM,WAAW,qBAAqB,CAAC,KAAK;IAC1C,MAAM,EAAE,eAAe,CAAC;IACxB,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;CAC9B;AAED;;;;GAIG;AAEH,KAAK,gBAAgB,CAAC,KAAK,IAAI,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;AAEvE;;;GAGG;AAEH,KAAK,iBAAiB,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAC;AAEnG,MAAM,WAAW,sBAAsB,CAAC,MAAM,EAAE,KAAK;IACnD,eAAe,EAAE,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,EAAE,KAAK,EAAE,mCAG/C,sBAAsB,CAAC,MAAM,EAAE,KAAK,CAAC,KAAG,qBAAqB,CAAC,KAAK,CAuBrE,CAAC"}

package/dist/src/modules/table/hooks/useDateRangeFilter.js

@@ -14,7 +14,15 @@ export const useDateRangeFilter = ({ getQueryOptions, queryParams = {}, }) => {
         queryState: { filters },
     });
     return {
-        params: { filters, setFilters, granularity, setGranularity },
+        params: {
+            filters,
+            setFilters,
+            granularity,
+            setGranularity,
+            // TODO: Review - just fixing ts errors for now
+            grouping: [],
+            setGrouping: () => { },
+        },
         query: queryResult,
     };
 };

package/dist/src/modules/table/hooks/useNuqsQueryParams.d.ts

@@ -1,5 +1,5 @@
 import type { QueryFilters } from "@m5kdev/commons/modules/schemas/query.schema";
-import type { PaginationState, SortingState, Updater } from "@tanstack/react-table";
+import type { GroupingState, PaginationState, SortingState, Updater } from "@tanstack/react-table";
 export type Order = "asc" | "desc";
 export type Granularity = "daily" | "weekly" | "monthly" | "yearly";
 export interface NuqsQueryParams {
@@ -15,11 +15,13 @@ export interface NuqsQueryParams {
     limit?: number;
     setPagination?: (updater: Updater<PaginationState>) => void;
     pagination?: PaginationState;
+    grouping: GroupingState;
+    setGrouping: (updater: Updater<GroupingState>) => void;
 }
 /**
  * Hook to manage all query parameters via nuqs (URL query parameters)
- * Manages: filters, sort, order, page, limit
- * Reusable for any paginated/sorted/filtered lists
+ * Manages: filters, sort, order, page, limit, groupBy, granularity
+ * Accepts an optional prefix to namespace params when multiple tables share a view.
  */
-export declare const useNuqsQueryParams: () => NuqsQueryParams;
+export declare const useNuqsQueryParams: (prefix?: string) => NuqsQueryParams;
 //# sourceMappingURL=useNuqsQueryParams.d.ts.map

package/dist/src/modules/table/hooks/useNuqsQueryParams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useNuqsQueryParams.d.ts","sourceRoot":"","sources":["../../../../../src/modules/table/hooks/useNuqsQueryParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AAEjF,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAcpF,MAAM,MAAM,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;AAEnC,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEpE,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IAC7C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;IACtD,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC;IAC5D,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,QAAO,eA6FrC,CAAC"}
+{"version":3,"file":"useNuqsQueryParams.d.ts","sourceRoot":"","sources":["../../../../../src/modules/table/hooks/useNuqsQueryParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AAEjF,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAiBnG,MAAM,MAAM,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC;AAEnC,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;AAEpE,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;IAC7C,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,IAAI,CAAC;IAC9C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,KAAK,IAAI,CAAC;IACtD,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC;IAC5D,UAAU,CAAC,EAAE,eAAe,CAAC;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,WAAW,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC;CACxD;AAED;;;;GAIG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,eA6GpD,CAAC"}

package/dist/src/modules/table/hooks/useNuqsQueryParams.js

@@ -1,19 +1,27 @@
 import { filtersSchema } from "@m5kdev/commons/modules/schemas/query.schema";
-import { parseAsInteger, parseAsJson, parseAsString, parseAsStringLiteral, useQueryState, } from "nuqs";
+import { parseAsArrayOf, parseAsInteger, parseAsJson, parseAsString, parseAsStringLiteral, useQueryState, } from "nuqs";
 import { useCallback, useEffect, useMemo } from "react";
 const parseAsFilters = parseAsJson((value) => filtersSchema.parse(value)).withDefault([]);
+const parseAsGrouping = parseAsArrayOf(parseAsString).withDefault([]);
 /**
  * Hook to manage all query parameters via nuqs (URL query parameters)
- * Manages: filters, sort, order, page, limit
- * Reusable for any paginated/sorted/filtered lists
+ * Manages: filters, sort, order, page, limit, groupBy, granularity
+ * Accepts an optional prefix to namespace params when multiple tables share a view.
  */
-export const useNuqsQueryParams = () => {
-    const [sort, setSort] = useQueryState("sort", parseAsString.withDefault(""));
-    const [order, setOrder] = useQueryState("order", parseAsStringLiteral(["asc", "desc"]));
-    const [page, setPage] = useQueryState("page", parseAsInteger.withDefault(1));
-    const [limit, setLimit] = useQueryState("limit", parseAsInteger.withDefault(10));
-    const [filters, setFilters] = useQueryState("filters", parseAsFilters);
-    const [granularity, setGranularity] = useQueryState("granularity", parseAsStringLiteral(["daily", "weekly", "monthly", "yearly"]).withDefault("daily"));
+export const useNuqsQueryParams = (prefix) => {
+    const k = (name) => (prefix ? `${prefix}_${name}` : name);
+    const [sort, setSort] = useQueryState(k("sort"), parseAsString.withDefault(""));
+    const [order, setOrder] = useQueryState(k("order"), parseAsStringLiteral(["asc", "desc"]));
+    const [page, setPage] = useQueryState(k("page"), parseAsInteger.withDefault(1));
+    const [limit, setLimit] = useQueryState(k("limit"), parseAsInteger.withDefault(10));
+    const [filters, setFilters] = useQueryState(k("filters"), parseAsFilters);
+    const [granularity, setGranularity] = useQueryState(k("granularity"), parseAsStringLiteral(["daily", "weekly", "monthly", "yearly"]).withDefault("daily"));
+    const [groupingRaw, setGroupingRaw] = useQueryState(k("groupBy"), parseAsGrouping);
+    const grouping = groupingRaw;
+    const setGrouping = useCallback((updater) => {
+        const next = typeof updater === "function" ? updater(groupingRaw) : updater;
+        setGroupingRaw(next.length > 0 ? next : null);
+    }, [groupingRaw, setGroupingRaw]);
     const sorting = useMemo(() => {
         if (!sort) {
             return [];
@@ -65,6 +73,8 @@ export const useNuqsQueryParams = () => {
         limit,
         setPagination,
         pagination,
+        grouping,
+        setGrouping,
     }), [
         filters,
         setFilters,
@@ -78,5 +88,7 @@ export const useNuqsQueryParams = () => {
         limit,
         setPagination,
         pagination,
+        grouping,
+        setGrouping,
     ]);
 };

package/dist/src/modules/table/hooks/useNuqsTable.d.ts

@@ -1,3 +1,4 @@
+import type { QueryFilters } from "@m5kdev/commons/modules/schemas/query.schema";
 import type { UseQueryOptions, UseQueryResult } from "@tanstack/react-query";
 import type { RowSelectionState, Updater } from "@tanstack/react-table";
 import { type NuqsQueryParams } from "./useNuqsQueryParams";
@@ -27,7 +28,10 @@ type GetQueryOptionsFn<TInput, TData> = (input: TInput, ...args: any[]) => Query
 export interface NuqsTableOptions<TInput, TData> {
     getQueryOptions: GetQueryOptionsFn<TInput, TData>;
     queryParams?: TInput;
+    prefix?: string;
+    additionalFilters?: QueryFilters;
+    onAdditionalFiltersChange?: (filters: QueryFilters) => void;
 }
-declare const useNuqsTable: <TInput, TData>({ getQueryOptions, queryParams, }: NuqsTableOptions<TInput, TData>) => NuqsTableReturn<TData>;
+declare const useNuqsTable: <TInput, TData>({ getQueryOptions, queryParams, prefix, additionalFilters, onAdditionalFiltersChange, }: NuqsTableOptions<TInput, TData>) => NuqsTableReturn<TData>;
 export default useNuqsTable;
 //# sourceMappingURL=useNuqsTable.d.ts.map

package/dist/src/modules/table/hooks/useNuqsTable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useNuqsTable.d.ts","sourceRoot":"","sources":["../../../../../src/modules/table/hooks/useNuqsTable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAExE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,sBAAsB,CAAC;AAGhF,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,YAAY,EAAE,iBAAiB,CAAC;IAChC,eAAe,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;CAChE;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC;AAErC,MAAM,WAAW,eAAe,CAAC,KAAK;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;CAC9B;AAED;;;;GAIG;AAEH,KAAK,gBAAgB,CAAC,KAAK,IAAI,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;AAEvE;;;GAGG;AAEH,KAAK,iBAAiB,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAC;AAEnG,MAAM,WAAW,gBAAgB,CAAC,MAAM,EAAE,KAAK;IAC7C,eAAe,EAAE,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,QAAA,MAAM,YAAY,GAAI,MAAM,EAAE,KAAK,EAAE,mCAGlC,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,KAAG,eAAe,CAAC,KAAK,CAoCzD,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"useNuqsTable.d.ts","sourceRoot":"","sources":["../../../../../src/modules/table/hooks/useNuqsTable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7E,OAAO,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAExE,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,sBAAsB,CAAC;AAGhF,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,YAAY,EAAE,iBAAiB,CAAC;IAChC,eAAe,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;CAChE;AAED;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC;AAErC,MAAM,WAAW,eAAe,CAAC,KAAK;IACpC,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,cAAc,CAAC,KAAK,CAAC,CAAC;CAC9B;AAED;;;;GAIG;AAEH,KAAK,gBAAgB,CAAC,KAAK,IAAI,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;AAEvE;;;GAGG;AAEH,KAAK,iBAAiB,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAC;AAEnG,MAAM,WAAW,gBAAgB,CAAC,MAAM,EAAE,KAAK;IAC7C,eAAe,EAAE,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,YAAY,CAAC;IACjC,yBAAyB,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC;CAC7D;AAED,QAAA,MAAM,YAAY,GAAI,MAAM,EAAE,KAAK,EAAE,yFAMlC,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,KAAG,eAAe,CAAC,KAAK,CAmEzD,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/dist/src/modules/table/hooks/useNuqsTable.js

@@ -1,29 +1,52 @@
 import { useCallback, useMemo, useState } from "react";
 import { useNuqsQueryParams } from "./useNuqsQueryParams";
 import { useQueryWithParams } from "./useQueryWithParams";
-const useNuqsTable = ({ getQueryOptions, queryParams = {}, }) => {
-    // Get all URL query state
-    const queryState = useNuqsQueryParams();
-    // Get query result
+const useNuqsTable = ({ getQueryOptions, queryParams = {}, prefix, additionalFilters, onAdditionalFiltersChange, }) => {
+    // Get all URL query state (includes grouping)
+    const queryState = useNuqsQueryParams(prefix);
+    // Get query result — passes grouping so limit can be overridden when grouped
     const queryResult = useQueryWithParams({
         getQueryOptions,
         queryParams,
         queryState,
+        grouping: queryState.grouping,
+        additionalFilters,
     });
     // Table-specific row selection state
     const [rowSelection, setRowSelectionRaw] = useState({});
-    console.log("rowSelection", rowSelection);
     const setRowSelection = useCallback((updater) => {
         setRowSelectionRaw((prev) => {
             const next = typeof updater === "function" ? updater(prev) : updater;
             return next;
         });
     }, []);
+    // Merge additionalFilters into displayed filters so the table UI shows all active filters.
+    // On write, strip the additional filters so only the table's own go to the prefixed URL param.
+    const displayFilters = useMemo(() => {
+        if (!additionalFilters?.length)
+            return queryState.filters ?? [];
+        return [...additionalFilters, ...(queryState.filters ?? [])];
+    }, [additionalFilters, queryState.filters]);
+    const additionalColumnIds = useMemo(() => new Set(additionalFilters?.map((f) => f.columnId) ?? []), [additionalFilters]);
+    const wrappedSetFilters = useCallback((newFilters) => {
+        if (!additionalColumnIds.size) {
+            queryState.setFilters?.(newFilters);
+            return;
+        }
+        const ownFilters = newFilters.filter((f) => !additionalColumnIds.has(f.columnId));
+        queryState.setFilters?.(ownFilters);
+        if (onAdditionalFiltersChange) {
+            const updatedAdditional = newFilters.filter((f) => additionalColumnIds.has(f.columnId));
+            onAdditionalFiltersChange(updatedAdditional);
+        }
+    }, [additionalColumnIds, queryState.setFilters, onAdditionalFiltersChange]);
     const params = useMemo(() => ({
         ...queryState,
+        filters: displayFilters,
+        setFilters: wrappedSetFilters,
         rowSelection,
         setRowSelection,
-    }), [queryState, rowSelection, setRowSelection]);
+    }), [queryState, displayFilters, wrappedSetFilters, rowSelection, setRowSelection]);
     return {
         params,
         query: queryResult,

package/dist/src/modules/table/hooks/useQueryWithParams.d.ts

@@ -1,4 +1,6 @@
+import type { QueryFilters } from "@m5kdev/commons/modules/schemas/query.schema";
 import { type UseQueryOptions, type UseQueryResult } from "@tanstack/react-query";
+import type { GroupingState } from "@tanstack/react-table";
 import type { NuqsQueryParams } from "./useNuqsQueryParams";
 /**
  * Flexible query options type that accepts both standard TanStack Query options
@@ -15,12 +17,14 @@ export interface QueryWithParamsOptions<TInput, TData> {
     getQueryOptions: GetQueryOptionsFn<TInput, TData>;
     queryParams?: TInput;
     queryState: Pick<NuqsQueryParams, "filters" | "sort" | "order" | "page" | "limit">;
+    grouping?: GroupingState;
+    additionalFilters?: QueryFilters;
     enabled?: boolean;
 }
 /**
  * Hook to integrate query state with React Query
  * Combines queryParams with queryState and manages data fetching
  */
-export declare const useQueryWithParams: <TInput, TData>({ getQueryOptions, queryParams, queryState, enabled, }: QueryWithParamsOptions<TInput, TData>) => UseQueryResult<TData>;
+export declare const useQueryWithParams: <TInput, TData>({ getQueryOptions, queryParams, queryState, grouping, additionalFilters, enabled, }: QueryWithParamsOptions<TInput, TData>) => UseQueryResult<TData>;
 export {};
 //# sourceMappingURL=useQueryWithParams.d.ts.map

package/dist/src/modules/table/hooks/useQueryWithParams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useQueryWithParams.d.ts","sourceRoot":"","sources":["../../../../../src/modules/table/hooks/useQueryWithParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAY,MAAM,uBAAuB,CAAC;AAE5F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;;;GAIG;AAEH,KAAK,gBAAgB,CAAC,KAAK,IAAI,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;AAEvE;;;GAGG;AAEH,KAAK,iBAAiB,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAC;AAEnG,MAAM,WAAW,sBAAsB,CAAC,MAAM,EAAE,KAAK;IACnD,eAAe,EAAE,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;IACnF,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,EAAE,KAAK,EAAE,wDAK/C,sBAAsB,CAAC,MAAM,EAAE,KAAK,CAAC,KAAG,cAAc,CAAC,KAAK,CA0B9D,CAAC"}
+{"version":3,"file":"useQueryWithParams.d.ts","sourceRoot":"","sources":["../../../../../src/modules/table/hooks/useQueryWithParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,cAAc,EAAY,MAAM,uBAAuB,CAAC;AAC5F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;;;GAIG;AAEH,KAAK,gBAAgB,CAAC,KAAK,IAAI,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;AAEvE;;;GAGG;AAEH,KAAK,iBAAiB,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,gBAAgB,CAAC,KAAK,CAAC,CAAC;AAInG,MAAM,WAAW,sBAAsB,CAAC,MAAM,EAAE,KAAK;IACnD,eAAe,EAAE,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAClD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;IACnF,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,iBAAiB,CAAC,EAAE,YAAY,CAAC;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAAI,MAAM,EAAE,KAAK,EAAE,qFAO/C,sBAAsB,CAAC,MAAM,EAAE,KAAK,CAAC,KAAG,cAAc,CAAC,KAAK,CA6C9D,CAAC"}

package/dist/src/modules/table/hooks/useQueryWithParams.js

@@ -1,24 +1,44 @@
 import { useQuery } from "@tanstack/react-query";
-import { useMemo } from "react";
+import { useEffect, useMemo, useRef } from "react";
+const FETCH_ALL_LIMIT = 99999;
 /**
  * Hook to integrate query state with React Query
  * Combines queryParams with queryState and manages data fetching
  */
-export const useQueryWithParams = ({ getQueryOptions, queryParams = {}, queryState, enabled = true, }) => {
+export const useQueryWithParams = ({ getQueryOptions, queryParams = {}, queryState, grouping = [], additionalFilters, enabled = true, }) => {
     const { filters, sort, order, page, limit } = queryState;
-    const input = useMemo(() => ({
-        ...queryParams,
-        page,
-        limit,
-        sort,
-        order: order ?? undefined,
-        filters,
-    }), [queryParams, page, limit, sort, order, filters]);
+    const isGrouped = grouping.length > 0;
+    const input = useMemo(() => {
+        let mergedFilters;
+        if (additionalFilters?.length) {
+            const additionalColumnIds = new Set(additionalFilters.map((f) => f.columnId));
+            const ownFiltersOnly = (filters ?? []).filter((f) => !additionalColumnIds.has(f.columnId));
+            mergedFilters = [...additionalFilters, ...ownFiltersOnly];
+        }
+        else {
+            mergedFilters = filters;
+        }
+        return {
+            ...queryParams,
+            page: isGrouped ? 1 : page,
+            limit: isGrouped ? FETCH_ALL_LIMIT : limit,
+            sort,
+            order: order ?? undefined,
+            filters: mergedFilters,
+        };
+    }, [queryParams, page, limit, sort, order, filters, isGrouped, additionalFilters]);
+    const prevIsGroupedRef = useRef(isGrouped);
+    const groupingTransitioned = prevIsGroupedRef.current !== isGrouped;
+    useEffect(() => {
+        prevIsGroupedRef.current = isGrouped;
+    }, [isGrouped]);
     const queryOptions = useMemo(() => ({
         ...getQueryOptions(input),
-        placeholderData: (previousData) => previousData,
+        placeholderData: groupingTransitioned
+            ? undefined
+            : (previousData) => previousData,
         enabled,
-    }), [getQueryOptions, input, enabled]);
+    }), [getQueryOptions, input, enabled, groupingTransitioned]);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return useQuery(queryOptions);
 };