@1771technologies/lytenyte-pro 1.0.0-beta.0 → 1.0.0-beta.10

package/dist/sort-manager/sort-direction-select.d.ts

@@ -1,10 +1,18 @@
 import { type SlotComponent } from "@1771technologies/lytenyte-react-hooks";
 import type { Option } from "./+types";
 export interface SortDirectionSelectProps {
-    readonly slot?: SlotComponent<{
-        options: Option[];
-        onSelect: (v: Option | null) => void;
-        value: Option | null;
-    }>;
+  readonly slot?: SlotComponent<{
+    options: Option[];
+    onSelect: (v: Option | null) => void;
+    value: Option | null;
+  }>;
 }
-export declare const SortDirectionSelect: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & SortDirectionSelectProps, "ref"> & import("react").RefAttributes<HTMLSelectElement>>;
+export declare const SortDirectionSelect: import("react").ForwardRefExoticComponent<
+  Omit<
+    import("react").ClassAttributes<HTMLDivElement> &
+      import("react").HTMLAttributes<HTMLDivElement> &
+      SortDirectionSelectProps,
+    "ref"
+  > &
+    import("react").RefAttributes<HTMLSelectElement>
+>;

package/dist/sort-manager/sort-direction-select.js

@@ -2,23 +2,31 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { useSlot } from "@1771technologies/lytenyte-react-hooks";
 import { forwardRef } from "react";
 import { useSortRowCtx } from "./context";
-export const SortDirectionSelect = forwardRef(function SortDirectionSelect({ slot, ...props }, forwarded) {
-    const row = useSortRowCtx();
-    const el = (_jsx("select", { "aria-label": "Select sort direction", value: row.sortDirectionSelected?.value ?? "", onChange: (e) => {
-            const item = row.sortDirectionOptions.find((c) => c.value === e.target.value);
-            row.sortDirectionOnSelect(item ?? null);
-        }, children: row.sortDirectionOptions.map((c) => {
-            return (_jsx("option", { value: c.value, children: c.label }, c.value));
-        }) }));
-    const renderer = useSlot({
-        props: [props],
-        ref: forwarded,
-        slot: slot ?? el,
-        state: {
-            options: row.sortDirectionOptions,
-            onSelect: row.sortDirectionOnSelect,
-            value: row.sortDirectionSelected,
-        },
-    });
-    return renderer;
+export const SortDirectionSelect = forwardRef(function SortDirectionSelect(
+  { slot, ...props },
+  forwarded,
+) {
+  const row = useSortRowCtx();
+  const el = _jsx("select", {
+    "aria-label": "Select sort direction",
+    value: row.sortDirectionSelected?.value ?? "",
+    onChange: (e) => {
+      const item = row.sortDirectionOptions.find((c) => c.value === e.target.value);
+      row.sortDirectionOnSelect(item ?? null);
+    },
+    children: row.sortDirectionOptions.map((c) => {
+      return _jsx("option", { value: c.value, children: c.label }, c.value);
+    }),
+  });
+  const renderer = useSlot({
+    props: [props],
+    ref: forwarded,
+    slot: slot ?? el,
+    state: {
+      options: row.sortDirectionOptions,
+      onSelect: row.sortDirectionOnSelect,
+      value: row.sortDirectionSelected,
+    },
+  });
+  return renderer;
 });

package/dist/sort-manager/sort-manager.d.ts

@@ -1,16 +1,97 @@
 import { Root } from "./root";
 import { useSortManager } from "./hooks/use-sort-manager";
 export declare const SortManager: {
-    Root: typeof Root;
-    Row: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & import("./sort-row").SortRowProps, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
-    Rows: import("react").ForwardRefExoticComponent<Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
-    ColumnSelect: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & import("./sort-column-select").SortColumnSelectProps, "ref"> & import("react").RefAttributes<HTMLSelectElement>>;
-    ValueSelect: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & import("./sort-value-select").SortValueSelectProps, "ref"> & import("react").RefAttributes<HTMLSelectElement>>;
-    DirectionSelect: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & import("./sort-direction-select").SortDirectionSelectProps, "ref"> & import("react").RefAttributes<HTMLSelectElement>>;
-    Add: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLButtonElement> & import("react").ButtonHTMLAttributes<HTMLButtonElement> & import("./sort-add").SortAddProps, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
-    Remove: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLButtonElement> & import("react").ButtonHTMLAttributes<HTMLButtonElement> & import("./sort-remove").SortRemoveProps, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
-    Cancel: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLButtonElement> & import("react").ButtonHTMLAttributes<HTMLButtonElement> & import("./sort-cancel").SortCancelProps, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
-    Clear: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLButtonElement> & import("react").ButtonHTMLAttributes<HTMLButtonElement> & import("./sort-clear").SortClearProps, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
-    Apply: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLButtonElement> & import("react").ButtonHTMLAttributes<HTMLButtonElement> & import("./sort-apply").SortApplyProps, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
-    useSortManager: typeof useSortManager;
+  Root: typeof Root;
+  Row: import("react").ForwardRefExoticComponent<
+    Omit<
+      import("react").ClassAttributes<HTMLDivElement> &
+        import("react").HTMLAttributes<HTMLDivElement> &
+        import("./sort-row").SortRowProps,
+      "ref"
+    > &
+      import("react").RefAttributes<HTMLDivElement>
+  >;
+  Rows: import("react").ForwardRefExoticComponent<
+    Omit<
+      import("react").DetailedHTMLProps<
+        import("react").HTMLAttributes<HTMLDivElement>,
+        HTMLDivElement
+      >,
+      "ref"
+    > &
+      import("react").RefAttributes<HTMLDivElement>
+  >;
+  ColumnSelect: import("react").ForwardRefExoticComponent<
+    Omit<
+      import("react").ClassAttributes<HTMLDivElement> &
+        import("react").HTMLAttributes<HTMLDivElement> &
+        import("./sort-column-select").SortColumnSelectProps,
+      "ref"
+    > &
+      import("react").RefAttributes<HTMLSelectElement>
+  >;
+  ValueSelect: import("react").ForwardRefExoticComponent<
+    Omit<
+      import("react").ClassAttributes<HTMLDivElement> &
+        import("react").HTMLAttributes<HTMLDivElement> &
+        import("./sort-value-select").SortValueSelectProps,
+      "ref"
+    > &
+      import("react").RefAttributes<HTMLSelectElement>
+  >;
+  DirectionSelect: import("react").ForwardRefExoticComponent<
+    Omit<
+      import("react").ClassAttributes<HTMLDivElement> &
+        import("react").HTMLAttributes<HTMLDivElement> &
+        import("./sort-direction-select").SortDirectionSelectProps,
+      "ref"
+    > &
+      import("react").RefAttributes<HTMLSelectElement>
+  >;
+  Add: import("react").ForwardRefExoticComponent<
+    Omit<
+      import("react").ClassAttributes<HTMLButtonElement> &
+        import("react").ButtonHTMLAttributes<HTMLButtonElement> &
+        import("./sort-add").SortAddProps,
+      "ref"
+    > &
+      import("react").RefAttributes<HTMLDivElement>
+  >;
+  Remove: import("react").ForwardRefExoticComponent<
+    Omit<
+      import("react").ClassAttributes<HTMLButtonElement> &
+        import("react").ButtonHTMLAttributes<HTMLButtonElement> &
+        import("./sort-remove").SortRemoveProps,
+      "ref"
+    > &
+      import("react").RefAttributes<HTMLDivElement>
+  >;
+  Cancel: import("react").ForwardRefExoticComponent<
+    Omit<
+      import("react").ClassAttributes<HTMLButtonElement> &
+        import("react").ButtonHTMLAttributes<HTMLButtonElement> &
+        import("./sort-cancel").SortCancelProps,
+      "ref"
+    > &
+      import("react").RefAttributes<HTMLDivElement>
+  >;
+  Clear: import("react").ForwardRefExoticComponent<
+    Omit<
+      import("react").ClassAttributes<HTMLButtonElement> &
+        import("react").ButtonHTMLAttributes<HTMLButtonElement> &
+        import("./sort-clear").SortClearProps,
+      "ref"
+    > &
+      import("react").RefAttributes<HTMLDivElement>
+  >;
+  Apply: import("react").ForwardRefExoticComponent<
+    Omit<
+      import("react").ClassAttributes<HTMLButtonElement> &
+        import("react").ButtonHTMLAttributes<HTMLButtonElement> &
+        import("./sort-apply").SortApplyProps,
+      "ref"
+    > &
+      import("react").RefAttributes<HTMLDivElement>
+  >;
+  useSortManager: typeof useSortManager;
 };

package/dist/sort-manager/sort-manager.js

@@ -11,16 +11,16 @@ import { SortCancel } from "./sort-cancel";
 import { SortClear } from "./sort-clear";
 import { SortApply } from "./sort-apply";
 export const SortManager = {
-    Root,
-    Row: SortRow,
-    Rows: SortRows,
-    ColumnSelect: SortColumnSelect,
-    ValueSelect: SortValueSelect,
-    DirectionSelect: SortDirectionSelect,
-    Add: SortAdd,
-    Remove: SortRemove,
-    Cancel: SortCancel,
-    Clear: SortClear,
-    Apply: SortApply,
-    useSortManager,
+  Root,
+  Row: SortRow,
+  Rows: SortRows,
+  ColumnSelect: SortColumnSelect,
+  ValueSelect: SortValueSelect,
+  DirectionSelect: SortDirectionSelect,
+  Add: SortAdd,
+  Remove: SortRemove,
+  Cancel: SortCancel,
+  Clear: SortClear,
+  Apply: SortApply,
+  useSortManager,
 };

package/dist/sort-manager/sort-remove.d.ts

@@ -1,7 +1,15 @@
 import { type SlotComponent } from "@1771technologies/lytenyte-react-hooks";
 export interface SortRemoveProps {
-    readonly slot?: SlotComponent<{
-        onRemove: () => void;
-    }>;
+  readonly slot?: SlotComponent<{
+    onRemove: () => void;
+  }>;
 }
-export declare const SortRemove: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLButtonElement> & import("react").ButtonHTMLAttributes<HTMLButtonElement> & SortRemoveProps, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
+export declare const SortRemove: import("react").ForwardRefExoticComponent<
+  Omit<
+    import("react").ClassAttributes<HTMLButtonElement> &
+      import("react").ButtonHTMLAttributes<HTMLButtonElement> &
+      SortRemoveProps,
+    "ref"
+  > &
+    import("react").RefAttributes<HTMLDivElement>
+>;

package/dist/sort-manager/sort-remove.js

@@ -3,12 +3,12 @@ import { useSlot } from "@1771technologies/lytenyte-react-hooks";
 import { forwardRef } from "react";
 import { useSortRowCtx } from "./context";
 export const SortRemove = forwardRef(function SortRemove({ slot, ...props }, forwarded) {
-    const row = useSortRowCtx();
-    const renderer = useSlot({
-        props: [props],
-        ref: forwarded,
-        slot: slot ?? _jsx("button", { onClick: row.onDelete, children: "x" }),
-        state: { onAdd: row.onDelete },
-    });
-    return renderer;
+  const row = useSortRowCtx();
+  const renderer = useSlot({
+    props: [props],
+    ref: forwarded,
+    slot: slot ?? _jsx("button", { onClick: row.onDelete, children: "x" }),
+    state: { onAdd: row.onDelete },
+  });
+  return renderer;
 });

package/dist/sort-manager/sort-row.d.ts

@@ -1,5 +1,13 @@
 import type { SortRowItem } from "./hooks/use-sort-row-item";
 export interface SortRowProps {
-    readonly row: SortRowItem;
+  readonly row: SortRowItem;
 }
-export declare const SortRow: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & SortRowProps, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
+export declare const SortRow: import("react").ForwardRefExoticComponent<
+  Omit<
+    import("react").ClassAttributes<HTMLDivElement> &
+      import("react").HTMLAttributes<HTMLDivElement> &
+      SortRowProps,
+    "ref"
+  > &
+    import("react").RefAttributes<HTMLDivElement>
+>;

package/dist/sort-manager/sort-row.js

@@ -3,5 +3,8 @@ import { forwardRef } from "react";
 import { Item } from "../listbox/item";
 import { rowContext } from "./context";
 export const SortRow = forwardRef(function SortRow({ row, ...props }, forwarded) {
-    return (_jsx(rowContext.Provider, { value: row, children: _jsx(Item, { ...props, ref: forwarded }) }));
+  return _jsx(rowContext.Provider, {
+    value: row,
+    children: _jsx(Item, { ...props, ref: forwarded }),
+  });
 });

package/dist/sort-manager/sort-rows.d.ts

@@ -1 +1,10 @@
-export declare const SortRows: import("react").ForwardRefExoticComponent<Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & import("react").RefAttributes<HTMLDivElement>>;
+export declare const SortRows: import("react").ForwardRefExoticComponent<
+  Omit<
+    import("react").DetailedHTMLProps<
+      import("react").HTMLAttributes<HTMLDivElement>,
+      HTMLDivElement
+    >,
+    "ref"
+  > &
+    import("react").RefAttributes<HTMLDivElement>
+>;

package/dist/sort-manager/sort-rows.js

@@ -2,5 +2,5 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { forwardRef } from "react";
 import { Panel } from "../listbox/panel";
 export const SortRows = forwardRef(function SortRows(props, forwarded) {
-    return _jsx(Panel, { ...props, ref: forwarded });
+  return _jsx(Panel, { ...props, ref: forwarded });
 });

package/dist/sort-manager/sort-value-select.d.ts

@@ -1,11 +1,19 @@
 import { type SlotComponent } from "@1771technologies/lytenyte-react-hooks";
 import type { Option } from "./+types";
 export interface SortValueSelectProps {
-    readonly slot?: SlotComponent<{
-        options: Option[];
-        onSelect: (v: Option | null) => void;
-        value: Option | null;
-        disabled: boolean;
-    }>;
+  readonly slot?: SlotComponent<{
+    options: Option[];
+    onSelect: (v: Option | null) => void;
+    value: Option | null;
+    disabled: boolean;
+  }>;
 }
-export declare const SortValueSelect: import("react").ForwardRefExoticComponent<Omit<import("react").ClassAttributes<HTMLDivElement> & import("react").HTMLAttributes<HTMLDivElement> & SortValueSelectProps, "ref"> & import("react").RefAttributes<HTMLSelectElement>>;
+export declare const SortValueSelect: import("react").ForwardRefExoticComponent<
+  Omit<
+    import("react").ClassAttributes<HTMLDivElement> &
+      import("react").HTMLAttributes<HTMLDivElement> &
+      SortValueSelectProps,
+    "ref"
+  > &
+    import("react").RefAttributes<HTMLSelectElement>
+>;

package/dist/sort-manager/sort-value-select.js

@@ -3,23 +3,32 @@ import { useSlot } from "@1771technologies/lytenyte-react-hooks";
 import { forwardRef } from "react";
 import { useSortRowCtx } from "./context";
 export const SortValueSelect = forwardRef(function SortValueSelect({ slot, ...props }, forwarded) {
-    const row = useSortRowCtx();
-    const el = (_jsxs("select", { "aria-label": "Select sort value", value: row.sortSelected?.value ?? "", onChange: (e) => {
-            const item = row.sortOptions.find((c) => c.value === e.target.value);
-            row.sortOnSelect(item ?? null);
-        }, disabled: !row.sortOptions.length, children: [_jsx("option", { value: "", children: "Select..." }), row.sortOptions.map((c) => {
-                return (_jsx("option", { value: c.value, children: c.label }, c.value));
-            })] }));
-    const renderer = useSlot({
-        props: [props],
-        ref: forwarded,
-        slot: slot ?? el,
-        state: {
-            options: row.sortOptions,
-            value: row.sortSelected,
-            onSelect: row.sortOnSelect,
-            disabled: !row.sortOptions.length,
-        },
-    });
-    return renderer;
+  const row = useSortRowCtx();
+  const el = _jsxs("select", {
+    "aria-label": "Select sort value",
+    value: row.sortSelected?.value ?? "",
+    onChange: (e) => {
+      const item = row.sortOptions.find((c) => c.value === e.target.value);
+      row.sortOnSelect(item ?? null);
+    },
+    disabled: !row.sortOptions.length,
+    children: [
+      _jsx("option", { value: "", children: "Select..." }),
+      row.sortOptions.map((c) => {
+        return _jsx("option", { value: c.value, children: c.label }, c.value);
+      }),
+    ],
+  });
+  const renderer = useSlot({
+    props: [props],
+    ref: forwarded,
+    slot: slot ?? el,
+    state: {
+      options: row.sortOptions,
+      value: row.sortSelected,
+      onSelect: row.sortOnSelect,
+      disabled: !row.sortOptions.length,
+    },
+  });
+  return renderer;
 });

package/dist/sort-manager/utils/sort-item-to-sort-model.d.ts

@@ -1,3 +1,6 @@
-import type { SortItem } from "../+types";
+import type { SortItem } from "../+types.js";
 import type { Column, SortModelItem } from "../../+types";
-export declare function sortItemsToSortModel(sortItems: SortItem[], lookup: Map<string, Column<any>>): SortModelItem<any>[];
+export declare function sortItemsToSortModel(
+  sortItems: SortItem[],
+  lookup: Map<string, Column<any>>,
+): SortModelItem<any>[];

package/dist/sort-manager/utils/sort-item-to-sort-model.js

@@ -1,57 +1,54 @@
 export function sortItemsToSortModel(sortItems, lookup) {
-    return sortItems
-        .filter((c) => {
-        if (!c.columnId)
-            return false;
-        if (!c.sortOn)
-            return false;
-        if (!lookup.has(c.columnId))
-            return false;
-        return true;
+  return sortItems
+    .filter((c) => {
+      if (!c.columnId) return false;
+      if (!c.sortOn) return false;
+      if (!lookup.has(c.columnId)) return false;
+      return true;
     })
-        .map((c) => {
-        const col = lookup.get(c.columnId);
-        if (col.type === "number") {
-            return {
-                columnId: col.id,
-                isDescending: c.sortDirection === "descending",
-                sort: {
-                    columnId: col.id,
-                    kind: "number",
-                    options: {
-                        absoluteValue: c.sortOn.includes("absolute"),
-                        nullsFirst: c.sortOn.includes("nulls_first"),
-                    },
-                },
-            };
-        }
-        if (col.type === "date" || col.type === "datetime") {
-            return {
-                columnId: col.id,
-                isDescending: c.sortDirection === "descending",
-                sort: {
-                    columnId: col.id,
-                    kind: "date",
-                    options: {
-                        includeTime: col.type === "datetime",
-                        nullsFirst: c.sortOn.includes("nulls_first"),
-                    },
-                },
-            };
-        }
+    .map((c) => {
+      const col = lookup.get(c.columnId);
+      if (col.type === "number") {
         return {
+          columnId: col.id,
+          isDescending: c.sortDirection === "descending",
+          sort: {
             columnId: col.id,
-            isDescending: c.sortDirection === "descending",
-            sort: {
-                columnId: col.id,
-                kind: "string",
-                options: {
-                    caseInsensitive: c.sortOn?.includes("insensitive"),
-                    ignorePunctuation: c.sortOn?.includes("ignore"),
-                    nullsFirst: c.sortOn?.includes("nulls_first"),
-                    trimWhitespace: c.sortOn?.includes("trim"),
-                },
+            kind: "number",
+            options: {
+              absoluteValue: c.sortOn.includes("absolute"),
+              nullsFirst: c.sortOn.includes("nulls_first"),
             },
+          },
         };
+      }
+      if (col.type === "date" || col.type === "datetime") {
+        return {
+          columnId: col.id,
+          isDescending: c.sortDirection === "descending",
+          sort: {
+            columnId: col.id,
+            kind: "date",
+            options: {
+              includeTime: col.type === "datetime",
+              nullsFirst: c.sortOn.includes("nulls_first"),
+            },
+          },
+        };
+      }
+      return {
+        columnId: col.id,
+        isDescending: c.sortDirection === "descending",
+        sort: {
+          columnId: col.id,
+          kind: "string",
+          options: {
+            caseInsensitive: c.sortOn?.includes("insensitive"),
+            ignorePunctuation: c.sortOn?.includes("ignore"),
+            nullsFirst: c.sortOn?.includes("nulls_first"),
+            trimWhitespace: c.sortOn?.includes("trim"),
+          },
+        },
+      };
     });
 }

package/dist/sort-manager/utils/sort-model-to-sort-items.d.ts

@@ -1,3 +1,6 @@
 import type { Column, SortModelItem } from "../../+types";
-import type { SortItem } from "../+types";
-export declare function sortModelToSortItems<T>(items: SortModelItem<T>[], lookup: Map<string, Column<T>>): SortItem[];
+import type { SortItem } from "../+types.js";
+export declare function sortModelToSortItems<T>(
+  items: SortModelItem<T>[],
+  lookup: Map<string, Column<T>>,
+): SortItem[];

package/dist/sort-manager/utils/sort-model-to-sort-items.js

@@ -1,49 +1,41 @@
 export function sortModelToSortItems(items, lookup) {
-    return items
-        .map((c) => {
-        const columnId = c.columnId;
-        const sortDirection = c.isDescending ? "descending" : "ascending";
-        if (c.sort.kind === "custom") {
-            return {
-                isCustom: true,
-                sortDirection,
-                columnId: c.columnId ?? undefined,
-            };
-        }
-        const column = lookup.get(columnId);
-        if (!column)
-            return;
-        let value = "values";
-        if (c.sort.kind === "string") {
-            const opts = c.sort.options;
-            if (opts?.nullsFirst)
-                value += "_nulls_first";
-            if (opts?.caseInsensitive)
-                value += "_insensitive";
-            if (opts?.ignorePunctuation)
-                value += "_ignore";
-            if (opts?.trimWhitespace)
-                value += "trim";
-        }
-        if (c.sort.kind === "number") {
-            const opts = c.sort.options;
-            if (opts?.nullsFirst)
-                value += "_nulls_first";
-            if (opts?.absoluteValue)
-                value += "_absolute";
-        }
-        if (c.sort.kind === "date") {
-            const opts = c.sort.options;
-            if (opts?.nullsFirst)
-                value += "_nulls_first";
-        }
+  return items
+    .map((c) => {
+      const columnId = c.columnId;
+      const sortDirection = c.isDescending ? "descending" : "ascending";
+      if (c.sort.kind === "custom") {
         return {
-            isCustom: false,
-            columnId,
-            sortDirection,
-            label: column?.name ?? column?.id,
-            sortOn: value,
+          isCustom: true,
+          sortDirection,
+          columnId: c.columnId ?? undefined,
         };
+      }
+      const column = lookup.get(columnId);
+      if (!column) return;
+      let value = "values";
+      if (c.sort.kind === "string") {
+        const opts = c.sort.options;
+        if (opts?.nullsFirst) value += "_nulls_first";
+        if (opts?.caseInsensitive) value += "_insensitive";
+        if (opts?.ignorePunctuation) value += "_ignore";
+        if (opts?.trimWhitespace) value += "trim";
+      }
+      if (c.sort.kind === "number") {
+        const opts = c.sort.options;
+        if (opts?.nullsFirst) value += "_nulls_first";
+        if (opts?.absoluteValue) value += "_absolute";
+      }
+      if (c.sort.kind === "date") {
+        const opts = c.sort.options;
+        if (opts?.nullsFirst) value += "_nulls_first";
+      }
+      return {
+        isCustom: false,
+        columnId,
+        sortDirection,
+        label: column?.name ?? column?.id,
+        sortOn: value,
+      };
     })
-        .filter((c) => c != null);
+    .filter((c) => c != null);
 }