@xh/hoist 73.0.0-SNAPSHOT.1745417754393 → 73.0.0-SNAPSHOT.1745445775316

package/CHANGELOG.md

@@ -2,9 +2,13 @@
 
 ## v73.0.0-SNAPSHOT - unreleased
 
+### 🐞 Bug Fixes
+* Made `GridModel.defaultGroupSortFn` null-safe and improved type signature.
+
 ### ⚙️ Typescript API Adjustments
 
 * Corrected `StoreCountLabelProps` interface.
+* Corrected `GridGroupSortFn` param types.
 
 ## v72.5.1 - 2025-04-15
 

package/build/types/cmp/grid/GridModel.d.ts

@@ -534,6 +534,10 @@ export declare class GridModel extends HoistModel {
      * @param timeout - timeout in ms
      */
     whenReadyAsync(timeout?: number): Promise<boolean>;
+    /**
+     * Sorts ungrouped items to the bottom.
+     */
+    defaultGroupSortFn: (a: string, b: string) => number;
     private buildColumn;
     private autosizeColsInternalAsync;
     private gatherLeaves;
@@ -553,7 +557,6 @@ export declare class GridModel extends HoistModel {
     private parseExperimental;
     private parseChooserModel;
     private isGroupSpec;
-    defaultGroupSortFn: (a: any, b: any) => any;
     private readonly LEFT_BORDER_CLASS;
     private readonly RIGHT_BORDER_CLASS;
     private enhanceConfigWithGroupBorders;

package/build/types/cmp/grid/Types.d.ts

@@ -25,7 +25,7 @@ export interface ColumnState {
  * @returns 0 if group values are equal, a negative number if `a` sorts first,
  *      and a positive number if `b` sorts first.
  */
-export type GridGroupSortFn = (groupAVal: any, groupBVal: any, groupField: string, metadata: {
+export type GridGroupSortFn = (groupAVal: string, groupBVal: string, groupField: string, metadata: {
     gridModel: GridModel;
     nodeA: IRowNode;
     nodeB: IRowNode;

package/cmp/grid/GridModel.ts

@@ -1432,6 +1432,18 @@ export class GridModel extends HoistModel {
         return this.isReady;
     }
 
+    /**
+     * Sorts ungrouped items to the bottom.
+     */
+    defaultGroupSortFn = (a: string, b: string): number => {
+        a = a ?? '';
+        b = b ?? '';
+        if (a === b) return 0;
+        if (a === '') return 1;
+        if (b === '') return -1;
+        return a.localeCompare(b);
+    };
+
     //-----------------------
     // Implementation
     //-----------------------
@@ -1775,14 +1787,6 @@ export class GridModel extends HoistModel {
         return 'children' in col;
     }
 
-    defaultGroupSortFn = (a, b) => {
-        // Place ungrouped items at bottom.
-        if (a === b) return 0;
-        if (a === '') return 1;
-        if (b === '') return -1;
-        return a.localeCompare(b);
-    };
-
     private readonly LEFT_BORDER_CLASS = 'xh-cell--group-border-left';
     private readonly RIGHT_BORDER_CLASS = 'xh-cell--group-border-right';
 

package/cmp/grid/Types.ts

@@ -46,8 +46,8 @@ export interface ColumnState {
  *      and a positive number if `b` sorts first.
  */
 export type GridGroupSortFn = (
-    groupAVal: any,
-    groupBVal: any,
+    groupAVal: string,
+    groupBVal: string,
     groupField: string,
     metadata: {
         gridModel: GridModel;

package/inspector/instances/InstancesModel.ts

@@ -264,9 +264,9 @@ export class InstancesModel extends HoistModel {
             showGroupRowCounts: false,
             groupRowRenderer: ({value, node}) => propsGridGroupRenderer({value, node, model: this}),
             groupSortFn: (a, b) => {
-                a = a === 'Watchlist' ? 0 : 1;
-                b = b === 'Watchlist' ? 0 : 1;
-                return a - b;
+                const sortValA = a === 'Watchlist' ? 0 : 1,
+                    sortValB = b === 'Watchlist' ? 0 : 1;
+                return sortValA - sortValB;
             },
             store: {
                 fields: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "73.0.0-SNAPSHOT.1745417754393",
+  "version": "73.0.0-SNAPSHOT.1745445775316",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",