@geomak/ui 7.0.0 → 7.1.0

package/dist/index.d.cts

@@ -2375,11 +2375,55 @@ interface TableColumn<T extends Record<string, any> = Record<string, any>> {
     width?: string | number;
     /** Text alignment for both header and cells. Defaults to `'center'`. */
     align?: 'left' | 'center' | 'right';
+    /** Allow clicking this column's header to sort by it. */
+    sortable?: boolean;
+    /** Custom value used when sorting (defaults to `row[keyBind]`). */
+    sortAccessor?: (row: T) => string | number | boolean | Date | null | undefined;
+    /** Make this column's cells inline-editable. Pair with `onCellEdit`. */
+    editable?: boolean;
+    /** Custom inline editor (overrides the built-in text input). */
+    editor?: (args: EditorArgs<T>) => react__default.ReactNode;
+}
+interface EditorArgs<T extends Record<string, any> = Record<string, any>> {
+    value: T[keyof T];
+    row: T;
+    /** Commit a new value (fires `onCellEdit`) and leave edit mode. */
+    commit: (next: string) => void;
+    /** Discard changes and leave edit mode. */
+    cancel: () => void;
+}
+interface CellEditInfo<T extends Record<string, any> = Record<string, any>> {
+    row: T;
+    key: keyof T & string;
+    value: string;
+    /** Index of the row within the current page. */
+    rowIndex: number;
+}
+type SortDirection = 'asc' | 'desc';
+interface SortState {
+    key: string;
+    direction: SortDirection;
+}
+interface SearchOptions<T extends Record<string, any> = Record<string, any>> {
+    /** Restrict search to these row keys. Default: every value in the row. */
+    keys?: (keyof T & string)[];
+    /** Match strategy. Default `'contains'`. */
+    matchMode?: 'contains' | 'startsWith' | 'equals';
+    /** Case-sensitive matching. Default `false`. */
+    caseSensitive?: boolean;
+    /** Debounce the filter (ms) — useful for large lists. Default `0`. */
+    debounceMs?: number;
+    /** Input placeholder. */
+    placeholder?: string;
+    /** Full custom matcher — overrides keys / matchMode / caseSensitive. */
+    predicate?: (row: T, term: string) => boolean;
 }
 interface PaginationOptions {
     enabled?: boolean;
     perPage?: number;
     withPicker?: boolean;
+    /** Where to render the pager: `'top'` (default), `'bottom'`, or `'both'`. */
+    position?: 'top' | 'bottom' | 'both';
     serverSide?: boolean;
     /** Server-side: current 1-based page number */
     page?: number;
@@ -2397,7 +2441,10 @@ interface PaginationOptions {
 }
 interface ExpandRowOptions<T extends Record<string, any> = Record<string, any>> {
     enabled?: boolean;
+    /** Icon shown when collapsed. If no `collapseIcon` is given, this icon rotates 180° when open. */
     expandIcon?: react__default.ReactNode;
+    /** Distinct icon shown when expanded. When set, the icons swap instead of rotating. */
+    collapseIcon?: react__default.ReactNode;
     expandComponent?: (row: T) => react__default.ReactNode;
 }
 interface TableProps<T extends Record<string, any> = Record<string, any>> {
@@ -2414,6 +2461,14 @@ interface TableProps<T extends Record<string, any> = Record<string, any>> {
     pagination?: PaginationOptions;
     expandRow?: ExpandRowOptions<T>;
     hasSearch?: boolean;
+    /** Fine-tune search: keys, match mode, debounce, placeholder, custom predicate. */
+    search?: SearchOptions<T>;
+    /** Initial sort (uncontrolled). */
+    defaultSort?: SortState | null;
+    /** Fires when the sort column/direction changes, or clears (`null`). Use for server-side sorting. */
+    onSortChange?: (sort: SortState | null) => void;
+    /** Fires when an editable cell commits a new value. */
+    onCellEdit?: (info: CellEditInfo<T>) => void;
     footer?: react__default.ReactNode;
     header?: react__default.ReactNode;
     /**
@@ -2472,7 +2527,7 @@ interface TableProps<T extends Record<string, any> = Record<string, any>> {
  * />
  * ```
  */
-declare function Table<T extends Record<string, any> = Record<string, any>>({ columns, rows, getRowKey, pagination, expandRow, hasSearch, footer, header, loading, loadingRowCount, className, style, }: TableProps<T>): react_jsx_runtime.JSX.Element;
+declare function Table<T extends Record<string, any> = Record<string, any>>({ columns, rows, getRowKey, pagination, expandRow, hasSearch, search, defaultSort, onSortChange, onCellEdit, footer, header, loading, loadingRowCount, className, style, }: TableProps<T>): react_jsx_runtime.JSX.Element;
 
 interface ThemeSwitchProps {
     checked: boolean;

package/dist/index.d.ts

@@ -2375,11 +2375,55 @@ interface TableColumn<T extends Record<string, any> = Record<string, any>> {
     width?: string | number;
     /** Text alignment for both header and cells. Defaults to `'center'`. */
     align?: 'left' | 'center' | 'right';
+    /** Allow clicking this column's header to sort by it. */
+    sortable?: boolean;
+    /** Custom value used when sorting (defaults to `row[keyBind]`). */
+    sortAccessor?: (row: T) => string | number | boolean | Date | null | undefined;
+    /** Make this column's cells inline-editable. Pair with `onCellEdit`. */
+    editable?: boolean;
+    /** Custom inline editor (overrides the built-in text input). */
+    editor?: (args: EditorArgs<T>) => react__default.ReactNode;
+}
+interface EditorArgs<T extends Record<string, any> = Record<string, any>> {
+    value: T[keyof T];
+    row: T;
+    /** Commit a new value (fires `onCellEdit`) and leave edit mode. */
+    commit: (next: string) => void;
+    /** Discard changes and leave edit mode. */
+    cancel: () => void;
+}
+interface CellEditInfo<T extends Record<string, any> = Record<string, any>> {
+    row: T;
+    key: keyof T & string;
+    value: string;
+    /** Index of the row within the current page. */
+    rowIndex: number;
+}
+type SortDirection = 'asc' | 'desc';
+interface SortState {
+    key: string;
+    direction: SortDirection;
+}
+interface SearchOptions<T extends Record<string, any> = Record<string, any>> {
+    /** Restrict search to these row keys. Default: every value in the row. */
+    keys?: (keyof T & string)[];
+    /** Match strategy. Default `'contains'`. */
+    matchMode?: 'contains' | 'startsWith' | 'equals';
+    /** Case-sensitive matching. Default `false`. */
+    caseSensitive?: boolean;
+    /** Debounce the filter (ms) — useful for large lists. Default `0`. */
+    debounceMs?: number;
+    /** Input placeholder. */
+    placeholder?: string;
+    /** Full custom matcher — overrides keys / matchMode / caseSensitive. */
+    predicate?: (row: T, term: string) => boolean;
 }
 interface PaginationOptions {
     enabled?: boolean;
     perPage?: number;
     withPicker?: boolean;
+    /** Where to render the pager: `'top'` (default), `'bottom'`, or `'both'`. */
+    position?: 'top' | 'bottom' | 'both';
     serverSide?: boolean;
     /** Server-side: current 1-based page number */
     page?: number;
@@ -2397,7 +2441,10 @@ interface PaginationOptions {
 }
 interface ExpandRowOptions<T extends Record<string, any> = Record<string, any>> {
     enabled?: boolean;
+    /** Icon shown when collapsed. If no `collapseIcon` is given, this icon rotates 180° when open. */
     expandIcon?: react__default.ReactNode;
+    /** Distinct icon shown when expanded. When set, the icons swap instead of rotating. */
+    collapseIcon?: react__default.ReactNode;
     expandComponent?: (row: T) => react__default.ReactNode;
 }
 interface TableProps<T extends Record<string, any> = Record<string, any>> {
@@ -2414,6 +2461,14 @@ interface TableProps<T extends Record<string, any> = Record<string, any>> {
     pagination?: PaginationOptions;
     expandRow?: ExpandRowOptions<T>;
     hasSearch?: boolean;
+    /** Fine-tune search: keys, match mode, debounce, placeholder, custom predicate. */
+    search?: SearchOptions<T>;
+    /** Initial sort (uncontrolled). */
+    defaultSort?: SortState | null;
+    /** Fires when the sort column/direction changes, or clears (`null`). Use for server-side sorting. */
+    onSortChange?: (sort: SortState | null) => void;
+    /** Fires when an editable cell commits a new value. */
+    onCellEdit?: (info: CellEditInfo<T>) => void;
     footer?: react__default.ReactNode;
     header?: react__default.ReactNode;
     /**
@@ -2472,7 +2527,7 @@ interface TableProps<T extends Record<string, any> = Record<string, any>> {
  * />
  * ```
  */
-declare function Table<T extends Record<string, any> = Record<string, any>>({ columns, rows, getRowKey, pagination, expandRow, hasSearch, footer, header, loading, loadingRowCount, className, style, }: TableProps<T>): react_jsx_runtime.JSX.Element;
+declare function Table<T extends Record<string, any> = Record<string, any>>({ columns, rows, getRowKey, pagination, expandRow, hasSearch, search, defaultSort, onSortChange, onCellEdit, footer, header, loading, loadingRowCount, className, style, }: TableProps<T>): react_jsx_runtime.JSX.Element;
 
 interface ThemeSwitchProps {
     checked: boolean;

package/dist/index.js

@@ -5273,22 +5273,78 @@ function createDatasets(rows, perPage) {
 }
 var defaultGetRowKey = (_row, index) => index;
 var cellAlign = (align) => align === "left" ? "text-left" : align === "right" ? "text-right" : "text-center";
+function compareValues(a, b) {
+  if (a == null && b == null) return 0;
+  if (a == null) return -1;
+  if (b == null) return 1;
+  if (typeof a === "number" && typeof b === "number") return a - b;
+  if (a instanceof Date && b instanceof Date) return a.getTime() - b.getTime();
+  if (typeof a === "boolean" && typeof b === "boolean") return a === b ? 0 : a ? 1 : -1;
+  return String(a).localeCompare(String(b), void 0, { numeric: true, sensitivity: "base" });
+}
+function SortGlyph({ direction }) {
+  return /* @__PURE__ */ jsxs("svg", { viewBox: "0 0 24 24", width: "14", height: "14", fill: "none", "aria-hidden": "true", className: "shrink-0", children: [
+    /* @__PURE__ */ jsx(
+      "path",
+      {
+        d: "M8 11l4-4 4 4",
+        stroke: "currentColor",
+        strokeWidth: 2,
+        strokeLinecap: "round",
+        strokeLinejoin: "round",
+        className: direction === "asc" ? "text-accent" : "text-foreground-muted",
+        opacity: direction === "asc" ? 1 : 0.45
+      }
+    ),
+    /* @__PURE__ */ jsx(
+      "path",
+      {
+        d: "M8 13l4 4 4-4",
+        stroke: "currentColor",
+        strokeWidth: 2,
+        strokeLinecap: "round",
+        strokeLinejoin: "round",
+        className: direction === "desc" ? "text-accent" : "text-foreground-muted",
+        opacity: direction === "desc" ? 1 : 0.45
+      }
+    )
+  ] });
+}
 function TableHeader({
   columns,
-  hasExpand
+  hasExpand,
+  sort,
+  onSort
 }) {
   return /* @__PURE__ */ jsx("thead", { className: "bg-surface-raised border-b border-border", children: /* @__PURE__ */ jsxs("tr", { children: [
     hasExpand && /* @__PURE__ */ jsx("th", { "aria-hidden": "true", className: "w-9" }),
-    columns.map((col) => /* @__PURE__ */ jsx(
-      "th",
-      {
-        scope: "col",
-        className: `${cellAlign(col.align)} text-sm font-semibold text-foreground py-3 px-3`,
-        style: col.width != null ? { width: col.width } : void 0,
-        children: col.label
-      },
-      col.key
-    ))
+    columns.map((col) => {
+      const active = sort?.key === col.keyBind;
+      const dir = active ? sort.direction : void 0;
+      const justify = col.align === "left" ? "justify-start" : col.align === "right" ? "justify-end" : "justify-center";
+      return /* @__PURE__ */ jsx(
+        "th",
+        {
+          scope: "col",
+          "aria-sort": col.sortable ? active ? dir === "asc" ? "ascending" : "descending" : "none" : void 0,
+          className: `${cellAlign(col.align)} text-sm font-semibold text-foreground py-3 px-3`,
+          style: col.width != null ? { width: col.width } : void 0,
+          children: col.sortable ? /* @__PURE__ */ jsxs(
+            "button",
+            {
+              type: "button",
+              onClick: () => onSort(col),
+              className: `inline-flex items-center gap-1.5 ${justify} w-full select-none rounded transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-accent ${active ? "text-accent" : "hover:text-accent"}`,
+              children: [
+                /* @__PURE__ */ jsx("span", { children: col.label }),
+                /* @__PURE__ */ jsx(SortGlyph, { direction: dir })
+              ]
+            }
+          ) : col.label
+        },
+        col.key
+      );
+    })
   ] }) });
 }
 var DefaultExpandIcon = /* @__PURE__ */ jsx(
@@ -5296,24 +5352,66 @@ var DefaultExpandIcon = /* @__PURE__ */ jsx(
   {
     xmlns: "http://www.w3.org/2000/svg",
     viewBox: "0 0 24 24",
-    fill: "currentColor",
-    className: "w-5 h-5 text-foreground-muted",
+    fill: "none",
+    stroke: "currentColor",
+    strokeWidth: 2,
+    className: "w-4 h-4 text-foreground-muted",
     "aria-hidden": "true",
-    children: /* @__PURE__ */ jsx(
-      "path",
+    children: /* @__PURE__ */ jsx("path", { strokeLinecap: "round", strokeLinejoin: "round", d: "M19.5 8.25l-7.5 7.5-7.5-7.5" })
+  }
+);
+function EditableCell({
+  col,
+  row,
+  rowIndex,
+  onCellEdit
+}) {
+  const [editing, setEditing] = useState(false);
+  const value = row[col.keyBind];
+  const commit = (next) => {
+    setEditing(false);
+    onCellEdit?.({ row, key: col.keyBind, value: next, rowIndex });
+  };
+  const cancel = () => setEditing(false);
+  if (editing) {
+    if (col.editor) return /* @__PURE__ */ jsx(Fragment, { children: col.editor({ value, row, commit, cancel }) });
+    return /* @__PURE__ */ jsx(
+      "input",
       {
-        fillRule: "evenodd",
-        d: "M12 2.25c-5.385 0-9.75 4.365-9.75 9.75s4.365 9.75 9.75 9.75 9.75-4.365 9.75-9.75S17.385 2.25 12 2.25zM12.75 9a.75.75 0 00-1.5 0v2.25H9a.75.75 0 000 1.5h2.25V15a.75.75 0 001.5 0v-2.25H15a.75.75 0 000-1.5h-2.25V9z",
-        clipRule: "evenodd"
+        autoFocus: true,
+        defaultValue: value == null ? "" : String(value),
+        onBlur: (e) => commit(e.target.value),
+        onKeyDown: (e) => {
+          if (e.key === "Enter") {
+            e.preventDefault();
+            commit(e.target.value);
+          } else if (e.key === "Escape") {
+            e.preventDefault();
+            cancel();
+          }
+        },
+        "aria-label": `Edit ${typeof col.label === "string" ? col.label : col.keyBind}`,
+        className: "w-full rounded border border-accent bg-surface px-2 py-1 text-sm text-foreground outline-none"
       }
-    )
+    );
   }
-);
+  return /* @__PURE__ */ jsx(
+    "button",
+    {
+      type: "button",
+      onClick: () => setEditing(true),
+      title: "Click to edit",
+      className: `${cellAlign(col.align)} w-full cursor-text rounded px-1 py-0.5 hover:bg-background focus:outline-none focus-visible:ring-2 focus-visible:ring-accent`,
+      children: col.component ? col.component(value, row) : value
+    }
+  );
+}
 function TableBody({
   columns,
   rows,
   expandRow,
-  getRowKey
+  getRowKey,
+  onCellEdit
 }) {
   const [expanded, setExpanded] = useState(() => /* @__PURE__ */ new Set());
   const reduced = useReducedMotion();
@@ -5343,15 +5441,15 @@ function TableBody({
                 onClick: () => toggleRow(rowKey),
                 "aria-expanded": isExpanded,
                 "aria-label": isExpanded ? "Collapse row" : "Expand row",
-                className: `w-9 h-9 inline-flex items-center justify-center rounded-md hover:bg-surface/80 transition-transform duration-200 focus:outline-none focus-visible:ring-2 focus-visible:ring-accent ${isExpanded ? "rotate-180" : ""}`,
-                children: expandRow.expandIcon ?? DefaultExpandIcon
+                className: `w-9 h-9 inline-flex items-center justify-center rounded-md hover:bg-background transition-transform duration-200 focus:outline-none focus-visible:ring-2 focus-visible:ring-accent ${isExpanded && !expandRow.collapseIcon ? "rotate-180" : ""}`,
+                children: isExpanded ? expandRow.collapseIcon ?? expandRow.expandIcon ?? DefaultExpandIcon : expandRow.expandIcon ?? DefaultExpandIcon
               }
             ) }),
             columns.map((col) => /* @__PURE__ */ jsx(
               "td",
               {
                 className: `${cellAlign(col.align)} text-sm text-foreground py-2 px-3 align-middle`,
-                children: col.component ? col.component(row[col.keyBind], row) : row[col.keyBind]
+                children: col.editable ? /* @__PURE__ */ jsx(EditableCell, { col, row, rowIndex: i, onCellEdit }) : col.component ? col.component(row[col.keyBind], row) : row[col.keyBind]
               },
               col.key
             ))
@@ -5445,6 +5543,10 @@ function Table({
   pagination = DEFAULT_PAGINATION,
   expandRow = DEFAULT_EXPAND,
   hasSearch = true,
+  search,
+  defaultSort = null,
+  onSortChange,
+  onCellEdit,
   footer = null,
   header = null,
   loading = false,
@@ -5458,20 +5560,54 @@ function Table({
     typeof pagination.perPage === "number" ? pagination.perPage : 15
   );
   const [activePage, setActivePage] = useState(0);
+  const [sortState, setSortState] = useState(defaultSort);
   const isServerSide = !!(pagination.enabled && pagination.serverSide);
+  const handleSort = (col) => {
+    const key = col.keyBind;
+    let next;
+    if (!sortState || sortState.key !== key) next = { key, direction: "asc" };
+    else if (sortState.direction === "asc") next = { key, direction: "desc" };
+    else next = null;
+    setSortState(next);
+    onSortChange?.(next);
+  };
+  const debounceMs = search?.debounceMs ?? 0;
+  const [debouncedTerm, setDebouncedTerm] = useState("");
+  useEffect(() => {
+    if (debounceMs <= 0) {
+      setDebouncedTerm(searchTerm);
+      return;
+    }
+    const t = setTimeout(() => setDebouncedTerm(searchTerm), debounceMs);
+    return () => clearTimeout(t);
+  }, [searchTerm, debounceMs]);
+  const term = debounceMs > 0 ? debouncedTerm : searchTerm;
   const filteredRows = useMemo(() => {
-    if (isServerSide || !searchTerm) return rows;
-    const term = searchTerm.toLowerCase();
-    return rows.filter(
-      (row) => Object.values(row).some(
-        (v) => v != null && String(v).toLowerCase().includes(term)
-      )
-    );
-  }, [rows, searchTerm, isServerSide]);
+    if (isServerSide || !term) return rows;
+    if (search?.predicate) return rows.filter((row) => search.predicate(row, term));
+    const cs = !!search?.caseSensitive;
+    const needle = cs ? term : term.toLowerCase();
+    const mode = search?.matchMode ?? "contains";
+    const keys = search?.keys;
+    const test = (raw) => {
+      if (raw == null) return false;
+      const s = cs ? String(raw) : String(raw).toLowerCase();
+      return mode === "startsWith" ? s.startsWith(needle) : mode === "equals" ? s === needle : s.includes(needle);
+    };
+    return rows.filter((row) => keys ? keys.some((k) => test(row[k])) : Object.values(row).some(test));
+  }, [rows, term, isServerSide, search?.predicate, search?.caseSensitive, search?.matchMode, search?.keys]);
+  const sortedRows = useMemo(() => {
+    if (isServerSide || !sortState) return filteredRows;
+    const col = columns.find((c) => c.keyBind === sortState.key);
+    const accessor = col?.sortAccessor ?? ((r) => r[sortState.key]);
+    const out = [...filteredRows].sort((a, b) => compareValues(accessor(a), accessor(b)));
+    if (sortState.direction === "desc") out.reverse();
+    return out;
+  }, [filteredRows, sortState, isServerSide, columns]);
   const datasets = useMemo(() => {
     if (isServerSide) return [rows];
-    return createDatasets(filteredRows, pagination.enabled ? perPage : null);
-  }, [filteredRows, perPage, pagination.enabled, isServerSide, rows]);
+    return createDatasets(sortedRows, pagination.enabled ? perPage : null);
+  }, [sortedRows, perPage, pagination.enabled, isServerSide, rows]);
   const MAX_PAGE = useMemo(() => {
     if (isServerSide && typeof pagination.maxPage === "number") return Math.max(0, pagination.maxPage);
     if (isServerSide && typeof pagination.totalCount === "number")
@@ -5510,32 +5646,36 @@ function Table({
     }
     setActivePage(newPage);
   };
+  const pagPos = pagination.position ?? "top";
+  const showTopPager = !!pagination.enabled && (pagPos === "top" || pagPos === "both");
+  const showBottomPager = !!pagination.enabled && (pagPos === "bottom" || pagPos === "both");
+  const pager = /* @__PURE__ */ jsx(
+    Pagination,
+    {
+      activePage,
+      onPageChange: handlePageChange,
+      maxPage: MAX_PAGE,
+      onPerPageChange: onPaginationChange,
+      options: pagination,
+      serverSide: isServerSide
+    }
+  );
   return /* @__PURE__ */ jsxs("div", { className: `w-full h-max rounded-lg ${className}`.trim(), style, children: [
-    /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between mb-2", children: [
-      hasSearch && /* @__PURE__ */ jsx(
+    (hasSearch || showTopPager) && /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-3 mb-2", children: [
+      hasSearch ? /* @__PURE__ */ jsx(
         SearchInput_default,
         {
           ref: searchRef,
           value: searchTerm,
           onChange: onSearchChange,
-          placeholder: "Search term..."
+          placeholder: search?.placeholder ?? "Search term..."
         }
-      ),
-      pagination.enabled && /* @__PURE__ */ jsx(
-        Pagination,
-        {
-          activePage,
-          onPageChange: handlePageChange,
-          maxPage: MAX_PAGE,
-          onPerPageChange: onPaginationChange,
-          options: pagination,
-          serverSide: isServerSide
-        }
-      )
+      ) : /* @__PURE__ */ jsx("span", {}),
+      showTopPager && pager
     ] }),
     /* @__PURE__ */ jsx("div", { children: header }),
     /* @__PURE__ */ jsx("div", { className: "overflow-x-auto rounded-lg", children: /* @__PURE__ */ jsxs("table", { className: "w-full border-collapse", "aria-busy": loading || void 0, children: [
-      /* @__PURE__ */ jsx(TableHeader, { columns, hasExpand: !!expandRow.enabled }),
+      /* @__PURE__ */ jsx(TableHeader, { columns, hasExpand: !!expandRow.enabled, sort: sortState, onSort: handleSort }),
       loading ? /* @__PURE__ */ jsx(
         TableSkeletonBody,
         {
@@ -5549,10 +5689,12 @@ function Table({
           columns,
           rows: currentPageRows,
           expandRow,
-          getRowKey
+          getRowKey,
+          onCellEdit
         }
       )
     ] }) }),
+    showBottomPager && /* @__PURE__ */ jsx("div", { className: "mt-2 flex justify-end", children: pager }),
     /* @__PURE__ */ jsx("div", { children: footer })
   ] });
 }