UNFIN

Author: dvitamin

packages/vue-labs/src/components/FTable/columns/anchor.ts

@@ -45,6 +45,5 @@ export function normalizeAnchorColumn<T, K extends keyof T>(
         type: "anchor",
         text: getValueFn(column.text, column.key, String, ""),
         href: column.href,
-        sortable: column.key ?? null,
     };
 }

packages/vue-labs/src/components/FTable/columns/base.ts

@@ -1,4 +1,5 @@
 import { type MaybeRef, type Ref, ref, toRef } from "vue";
+import { getSortable } from "./helpers/get-sortable";
 
 /**
  * @public
@@ -14,6 +15,7 @@ export interface TableColumnBase {
     header: string | Readonly<Ref<string>>;
     description?: string | Readonly<Ref<string | null>>;
     size?: TableColumnSize | Readonly<Ref<TableColumnSize | null>>;
+    sort?: boolean;
     enabled?: MaybeRef<boolean>;
 }
 
@@ -41,30 +43,33 @@ export type OmittedNormalizedColumnProperties =
     | "id"
     | "header"
     | "description"
+    | "sortable"
     | "size"
     | "component"
     | "enabled";
 
 /**
  * @internal
  */
-export function normalizeBaseColumn(
-    column: TableColumnBase,
+export function normalizeBaseColumn<K = never>(
+    column: TableColumnBase & { sort?: boolean; key?: K },
 ): Pick<
-    NormalizedTableColumnBase<unknown>,
-    Exclude<OmittedNormalizedColumnProperties, "component">
+    NormalizedTableColumnBase<K>,
+    "id" | "header" | "description" | "size" | "enabled" | "sortable"
 > {
     const id = Symbol();
     const header = toRef(column.header);
     const description =
         column.description !== undefined ? toRef(column.description) : ref("");
     const size: Readonly<Ref<TableColumnSize | null>> =
         column.size !== undefined ? toRef(column.size) : ref("grow");
+    const sortable = getSortable(column);
 
     return {
         id,
         header,
         description,
+        sortable,
         size,
         enabled: column.enabled ?? true,
     };

packages/vue-labs/src/components/FTable/columns/button.ts

@@ -54,6 +54,5 @@ export function normalizeButtonColumn<T, K extends keyof T>(
         onClick: column.onClick,
         icon: column.icon ?? null,
         iconLibrary: column.iconLibrary,
-        sortable: column.key ?? null,
     };
 }

packages/vue-labs/src/components/FTable/columns/checkbox.ts

@@ -57,6 +57,5 @@ export function normalizeCheckboxColumn<T, K extends keyof T>(
             typeof column.editable === "function"
                 ? column.editable
                 : () => Boolean(column.editable ?? false),
-        sortable: column.key ?? null,
     };
 }

packages/vue-labs/src/components/FTable/columns/helpers/get-sortable.ts

@@ -0,0 +1,15 @@
+/**
+ * Determines the sortable value for a table column based on the sort property and key.
+ *
+ * @param column - An object with sort and key properties
+ * @returns The key if sorting should be enabled, null otherwise
+ *
+ * @internal
+ */
+export function getSortable<K>(column: { sort?: boolean; key?: K }): K | null {
+    // If sort is explicitly set to true, use key (or null if no key)
+    // If sort is explicitly set to false, return null
+    // If sort is undefined, default to true if key exists, false otherwise
+    const shouldSort = column.sort ?? !!column.key;
+    return shouldSort ? (column.key ?? null) : null;
+}

packages/vue-labs/src/components/FTable/columns/number.ts

@@ -109,7 +109,6 @@ export function normalizeNumberColumn<T, K extends keyof T>(
         validation: column.validation ?? {},
         hasValidation:
             column.type.startsWith("text:") || Boolean(column.validation),
-        sortable: column.key ?? null,
         formatter,
         parser,
     };

packages/vue-labs/src/components/FTable/columns/radio.ts

@@ -48,6 +48,5 @@ export function normalizeRadioColumn<T, K extends keyof T>(
         label: getLabelFn(column.label),
         checked: getValueFn(column.checked, column.key, Boolean, false),
         update: getUpdateFn(column.update, column.key),
-        sortable: column.key ?? null,
     };
 }

packages/vue-labs/src/components/FTable/columns/row-header.ts

@@ -45,6 +45,5 @@ export function normalizeRowHeaderColumn<T, K extends keyof T>(
     return {
         type: "rowheader",
         text: getValueFn(column.text, column.key, String, ""),
-        sortable: column.key ?? null,
     };
 }

packages/vue-labs/src/components/FTable/columns/select.ts

@@ -57,6 +57,5 @@ export function normalizeSelectColumn<T, K extends keyof T>(
                 ? column.editable
                 : () => Boolean(column.editable ?? false),
         options: column.options,
-        sortable: column.key ?? null,
     };
 }

packages/vue-labs/src/components/FTable/columns/simple.ts

@@ -37,7 +37,6 @@ export function normalizeSimpleColumn<T, K extends keyof T>(
             /* do nothing */
         },
         editable: () => false,
-        sortable: column.key ?? null,
         validation: {},
         hasValidation: false,
         formatter: (value) => value,