@rivet-health/design-system 37.2.1 → 37.3.0

package/fesm2020/rivet-health-design-system.mjs

@@ -6438,11 +6438,35 @@ var RivTable;
             const orderColumn = query.order
                 ? columns.get(query.order.column)?.orderKey
                 : undefined;
-            const ordered = query.search
-                ? fuse.search(query.search).map(result => result.item)
-                : query.order && orderColumn
-                    ? orderBy(data, orderColumn, query.order.direction)
-                    : data;
+            const hasExplicitSort = query.order != null && orderColumn !== undefined;
+            const defaultSortSpec = (() => {
+                if (options?.defaultSort) {
+                    const key = columns.get(options.defaultSort.column)?.orderKey;
+                    if (key !== undefined) {
+                        return { key, direction: options.defaultSort.direction };
+                    }
+                }
+                const firstOrderable = [...columns.entries()].find(([, meta]) => meta.orderKey != null);
+                const key = firstOrderable?.[1].orderKey;
+                return key !== undefined ? { key, direction: 'asc' } : null;
+            })();
+            let ordered;
+            if (query.search) {
+                const matches = fuse.search(query.search).map(result => result.item);
+                ordered =
+                    hasExplicitSort && query.order
+                        ? orderBy(matches, orderColumn, query.order.direction)
+                        : matches;
+            }
+            else if (hasExplicitSort && query.order) {
+                ordered = orderBy(data, orderColumn, query.order.direction);
+            }
+            else if (query.order == null && defaultSortSpec) {
+                ordered = orderBy(data, defaultSortSpec.key, defaultSortSpec.direction);
+            }
+            else {
+                ordered = data;
+            }
             const filter = options?.filter;
             const filtered = filter
                 ? ordered.filter(row => filter(query.filters, row))
@@ -6470,6 +6494,21 @@ var RivTable;
                 displayName: metadata.displayName,
             },
         ]));
+        // When a defaultSort is specified, seed the initial query.order so the
+        // table header shows the sort indicator from the start.
+        if (options?.defaultSort && !options?.initialState?.query?.order) {
+            const order = options.defaultSort;
+            options = {
+                ...options,
+                initialState: {
+                    ...options.initialState,
+                    query: {
+                        ...options.initialState?.query,
+                        order,
+                    },
+                },
+            };
+        }
         return createManager(source, columnMetadata, pluralEntityName, options);
     }
     RivTable.createInMemoryManager = createInMemoryManager;