@linzjs/step-ag-grid 29.15.0 → 29.16.0

package/dist/src/components/gridFilter/GridFilterColumnsMultiSelect.d.ts

@@ -3,6 +3,7 @@ import type { IDoesFilterPassParams, IFilterComp, IFilterParams } from 'ag-grid-
 export interface CheckboxMultiFilterParams extends IFilterParams {
     labels?: Record<string, string>;
     labelFormatter?: (value: string) => string;
+    customOrder?: string[];
 }
 export interface CheckboxMultiFilterModel {
     values: string[];
@@ -28,4 +29,4 @@ export declare class GridFilterColumnsMultiSelect implements IFilterComp {
     setModel(model: CheckboxMultiFilterModel | null): void;
     destroy(): void;
 }
-export declare const createCheckboxMultiFilterParams: (labels?: Record<string, string>, labelFormatter?: (value: string) => string) => Partial<CheckboxMultiFilterParams>;
+export declare const createCheckboxMultiFilterParams: (labels?: Record<string, string>, labelFormatter?: (value: string) => string, customOrder?: string[]) => Partial<CheckboxMultiFilterParams>;

package/dist/step-ag-grid.cjs

@@ -4249,10 +4249,18 @@ class GridFilterColumnsMultiSelect {
             const norm = this.normalizeCellValue(raw);
             values.add(norm);
         });
+        const { customOrder } = this.params;
+        const orderMap = customOrder?.length ? new Map(customOrder.map((val, idx) => [val, idx])) : null;
         return Array.from(values).sort((a, b) => {
-            if (a === EMPTY_KEY && b !== EMPTY_KEY)
-                return -1;
-            if (b === EMPTY_KEY && a !== EMPTY_KEY)
+            if (orderMap) {
+                const aIdx = orderMap.get(a) ?? Infinity;
+                const bIdx = orderMap.get(b) ?? Infinity;
+                if (aIdx !== bIdx)
+                    return aIdx - bIdx;
+            }
+            if (a === EMPTY_KEY)
+                return b === EMPTY_KEY ? 0 : -1;
+            if (b === EMPTY_KEY)
                 return 1;
             return a.localeCompare(b);
         });
@@ -4299,9 +4307,12 @@ class GridFilterColumnsMultiSelect {
         return this.gui;
     }
     isFilterActive() {
-        return this.selectedValues.size > 0;
+        return this.selectedValues.size !== this.allValues.length;
     }
     doesFilterPass(p) {
+        if (this.selectedValues.size === 0) {
+            return false;
+        }
         const field = this.params.colDef.field;
         if (!p.data || typeof p.data !== 'object') {
             return this.selectedValues.has(EMPTY_KEY);
@@ -4311,7 +4322,10 @@ class GridFilterColumnsMultiSelect {
         return this.selectedValues.has(norm);
     }
     getModel() {
-        return this.selectedValues.size > 0 ? { values: Array.from(this.selectedValues) } : null;
+        if (this.selectedValues.size !== this.allValues.length) {
+            return { values: Array.from(this.selectedValues) };
+        }
+        return null;
     }
     setModel(model) {
         this.selectedValues = new Set(model?.values || []);
@@ -4324,9 +4338,10 @@ class GridFilterColumnsMultiSelect {
         }
     }
 }
-const createCheckboxMultiFilterParams = (labels = {}, labelFormatter) => ({
+const createCheckboxMultiFilterParams = (labels = {}, labelFormatter, customOrder) => ({
     labels: { [EMPTY_KEY]: DEFAULT_EMPTY_LABEL, ...labels },
     labelFormatter,
+    customOrder,
 });
 
 const GridFilterHeaderIconButton = React.forwardRef(function columnsButton({ icon, title, onClick, buttonProps, disabled = false, size = 'md' }, ref) {