@rivet-health/design-system 40.35.1 → 40.35.2

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

@@ -8910,6 +8910,50 @@ var TableResultHelpers;
 
 var TableSearchHelpers;
 (function (TableSearchHelpers) {
+    /**
+     * The configured fuse options, without the keys for columns search does not
+     * cover: the ones marked `searchable: false` and the ones turned off in
+     * "Search in". Keys that don't belong to a column are left alone.
+     */
+    function fuseOptionsForSearchColumns(fuseOptions, columns, query) {
+        if (!fuseOptions?.keys)
+            return fuseOptions;
+        const excludedPaths = new Set(Array.from(columns.entries())
+            .filter(([key, column]) => column.searchable === false ||
+            query.searchColumns.get(key) === false)
+            .map(([key, column]) => columnPath(key, column)));
+        return {
+            ...fuseOptions,
+            keys: fuseOptions.keys.filter(key => !excludedPaths.has(fuseKeyPath(key))),
+        };
+    }
+    TableSearchHelpers.fuseOptionsForSearchColumns = fuseOptionsForSearchColumns;
+    /**
+     * Marks the columns with no key in `fuseOptions.keys` as `searchable: false`,
+     * so "Search in" only offers columns that search can cover.
+     */
+    function markColumnsOutsideFuseKeysUnsearchable(columns, fuseOptions) {
+        if (!fuseOptions?.keys)
+            return columns;
+        const keyPaths = new Set(fuseOptions.keys.map(fuseKeyPath));
+        return new Map(Array.from(columns.entries()).map(([key, column]) => [
+            key,
+            keyPaths.has(columnPath(key, column))
+                ? column
+                : { ...column, searchable: false },
+        ]));
+    }
+    TableSearchHelpers.markColumnsOutsideFuseKeysUnsearchable = markColumnsOutsideFuseKeysUnsearchable;
+    function columnPath(key, column) {
+        return column.orderKey?.toString() ?? key.toString();
+    }
+    function fuseKeyPath(key) {
+        if (typeof key === 'string')
+            return key;
+        if (Array.isArray(key))
+            return key.join('.');
+        return Array.isArray(key.name) ? key.name.join('.') : key.name;
+    }
     function getSearchColumnsSelectedState(state, expectedValue) {
         switch (expectedValue) {
             case 'all':
@@ -10034,43 +10078,15 @@ var RivTable;
      */
     RivTable.NestedPaginateByOptions = ['bottomRows', 'topRows'];
     function createInMemoryManager(fetchDataset, columns, pluralEntityName, options) {
+        columns = TableSearchHelpers.markColumnsOutsideFuseKeysUnsearchable(columns, options?.fuseOptions);
         let data;
         let fuse;
         const source = async (query, mostRecentAction) => {
-            //For inMemoryManagers that do not utilize searchColumns,
-            //we do not want to overwrite their fuseOptions
-            if (mostRecentAction.type === 'load') {
-                //Prevent searching on columns that are in fuse options but not supported by search.
-                const nonSearchableColumnsKeys = options?.fuseOptions?.keys
-                    ? Array.from(columns.entries())
-                        .filter(([key, column]) => {
-                        return column.searchable == false;
-                    })
-                        .map(([key, column]) => {
-                        return column.orderKey?.toString() || key.toString();
-                    })
-                    : undefined;
-                const fuseOptions = options?.fuseOptions && nonSearchableColumnsKeys
-                    ? {
-                        ...options?.fuseOptions,
-                        keys: options?.fuseOptions?.keys?.filter(k => !nonSearchableColumnsKeys.includes(k.toString())),
-                    }
-                    : options?.fuseOptions;
-                data = await fetchDataset();
-                fuse = new Fuse(data, fuseOptions);
-            }
-            if (mostRecentAction.type === 'searchColumnsChange' ||
+            if (mostRecentAction.type === 'load' ||
+                mostRecentAction.type === 'searchColumnsChange' ||
                 mostRecentAction.type === 'toggleAllSearchColumns') {
                 data = await fetchDataset();
-                fuse = new Fuse(data, {
-                    ...options?.fuseOptions,
-                    keys: Array.from(query.searchColumns.entries())
-                        .filter(([_, value]) => !!value)
-                        .map(([key, _]) => {
-                        const columnKey = columns.get(key);
-                        return columnKey?.orderKey || key;
-                    }),
-                });
+                fuse = new Fuse(data, TableSearchHelpers.fuseOptionsForSearchColumns(options?.fuseOptions, columns, query));
             }
             const orderColumn = query.order
                 ? columns.get(query.order.column)?.orderKey
@@ -10126,47 +10142,18 @@ var RivTable;
     }
     RivTable.createInMemoryManager = createInMemoryManager;
     function createInMemoryManagerNested(fetchDataset, columns, pluralEntityName, options) {
+        columns = TableSearchHelpers.markColumnsOutsideFuseKeysUnsearchable(columns, options?.fuseOptions);
         let data;
         let rowsFromData;
         // The fuse will search the individual rows
         let fuse;
         const source = async (query, mostRecentAction) => {
-            //For inMemoryManagers that do not utilize searchColumns,
-            //we do not want to overwrite their fuseOptions
-            if (mostRecentAction.type === 'load') {
-                //Prevent searching on columns that are in fuse options but not supported by search.
-                const nonSearchableColumnsKeys = options?.fuseOptions?.keys
-                    ? Array.from(columns.entries())
-                        .filter(([key, column]) => {
-                        return column.searchable == false;
-                    })
-                        .map(([key, column]) => {
-                        return column.orderKey?.toString() || key.toString();
-                    })
-                    : undefined;
-                const fuseOptions = options?.fuseOptions && nonSearchableColumnsKeys
-                    ? {
-                        ...options?.fuseOptions,
-                        keys: options?.fuseOptions?.keys?.filter(k => !nonSearchableColumnsKeys.includes(k.toString())),
-                    }
-                    : options?.fuseOptions;
-                data = await fetchDataset();
-                rowsFromData = TableResultHelpers.getAllRowsFromNestedHeaders(data);
-                fuse = new Fuse(rowsFromData, fuseOptions);
-            }
-            if (mostRecentAction.type === 'searchColumnsChange' ||
+            if (mostRecentAction.type === 'load' ||
+                mostRecentAction.type === 'searchColumnsChange' ||
                 mostRecentAction.type === 'toggleAllSearchColumns') {
                 data = await fetchDataset();
                 rowsFromData = TableResultHelpers.getAllRowsFromNestedHeaders(data);
-                fuse = new Fuse(rowsFromData, {
-                    ...options?.fuseOptions,
-                    keys: Array.from(query.searchColumns.entries())
-                        .filter(([_, value]) => !!value)
-                        .map(([key, _]) => {
-                        const columnKey = columns.get(key);
-                        return columnKey?.orderKey || key;
-                    }),
-                });
+                fuse = new Fuse(rowsFromData, TableSearchHelpers.fuseOptionsForSearchColumns(options?.fuseOptions, columns, query));
             }
             const orderColumn = query.order
                 ? columns.get(query.order.column)?.orderKey