@axzydev/axzy_ui_system 1.3.2 → 1.3.4

package/src/hooks/useTableState.ts

@@ -1,4 +1,5 @@
 import { useCallback, useMemo, useState } from "react";
+import type { ColumnFilters, ColumnFilterValue } from "@/types/table.types";
 
 interface SortConfig {
   key: string;
@@ -13,30 +14,35 @@ export interface UseTableStateOptions {
 export interface UseTableStateResult {
   currentPage: number;
   itemsPerPage: number;
-  filters: Record<string, string | boolean | number>;
+  filters: ColumnFilters;
   sortConfig: SortConfig | null;
   totalPages: number;
   setTotalPages: (pages: number) => void;
   goToPage: (page: number) => void;
   handleItemsPerPageChange: (value: number) => void;
-  handleFilterChange: (
-    key: string,
-    value: string | boolean | number | undefined
-  ) => void;
+  handleFilterChange: (key: string, value: ColumnFilterValue | undefined) => void;
   handleSort: (key: string, sortable?: boolean) => void;
   resetPage: () => void;
   clearFilters: () => void;
 }
 
+/**
+ * A filter value is considered empty when it should be removed from the filter
+ * map: `undefined`/`null`/`""`, or a date range whose both ends are null.
+ */
+const isEmptyFilterValue = (value: ColumnFilterValue | undefined): boolean => {
+  if (value === undefined || value === null || value === "") return true;
+  if (Array.isArray(value)) return value[0] == null && value[1] == null;
+  return false;
+};
+
 export function useTableState({
   defaultItemsPerPage = 10,
   initialSort = null,
 }: UseTableStateOptions = {}): UseTableStateResult {
   const [currentPage, setCurrentPage] = useState(1);
   const [itemsPerPage, setItemsPerPage] = useState(defaultItemsPerPage);
-  const [filters, setFilters] = useState<
-    Record<string, string | boolean | number>
-  >({});
+  const [filters, setFilters] = useState<ColumnFilters>({});
   const [sortConfig, setSortConfig] = useState<SortConfig | null>(initialSort);
   const [totalPages, setTotalPages] = useState(1);
 
@@ -58,14 +64,14 @@ export function useTableState({
   }, []);
 
   const handleFilterChange = useCallback(
-    (key: string, value: string | boolean | number | undefined) => {
+    (key: string, value: ColumnFilterValue | undefined) => {
       setFilters((prev) => {
-        if (value === undefined || value === null || value === "") {
+        if (isEmptyFilterValue(value)) {
           const next = { ...prev };
           delete next[key];
           return next;
         }
-        return { ...prev, [key]: value };
+        return { ...prev, [key]: value as ColumnFilterValue };
       });
       setCurrentPage(1);
     },

package/src/index.ts

@@ -107,7 +107,7 @@ import type { ITSlideToggleProps } from "./components/atoms/slide/slide.props";
 import type { ITSliderProps } from "./components/atoms/slider/slider.props";
 import type { ITStackProps } from "./components/atoms/stack/stack.props";
 import type { ITStatCardProps } from "./components/molecules/stat-card/stat-card.props";
-import type { ITTableProps, Column } from "./components/molecules/table/table.props";
+import type { ITTableProps, Column, ColumnFilterMode } from "./components/molecules/table/table.props";
 import type { ITTextProps } from "./components/atoms/text/text.props";
 import type { ITTextareaProps } from "./components/atoms/textarea/textarea.props";
 import type { ITTabsProps, ITTabItem } from "./components/molecules/tabs/tabs.props";
@@ -115,7 +115,7 @@ import type { ITTripleFilterProps, ITTripleFilterOption } from "./components/org
 import type { ITToastProps } from "./components/organisms/toast/toast.props";
 import type { ITWysiwygProps } from "./components/molecules/wysiwyg/wysiwyg.props";
 import type { FieldConfig, FieldConfigV2 } from "./types/field.types";
-import type { TableDensity } from "./types/table.types";
+import type { ColumnFilters, ColumnFilterValue, TableDensity } from "./types/table.types";
 
 // UTILS
 import ITDropfile, { UploadStatus, FileTypeEnum } from "./components/organisms/dropfile/dropfile";
@@ -157,7 +157,7 @@ export {
 };
 
   export type {
-    Column, FieldConfig,
+    Column, ColumnFilters, ColumnFilterMode, ColumnFilterValue, FieldConfig,
     FieldConfigV2,
     ITAccordionItem, ITAccordionProps,
     ITAlertProps, ITAvatarProps, ITBadgetProps,