@xh/hoist 75.0.0-SNAPSHOT.1752891558856 → 75.0.0-SNAPSHOT.1753116344421

package/CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ### 🎁 New Features
 
-* Added new `GridModel.expandToLevel` config to control the expansion state of tree/grouped grids.
+* Added new `GridModel.expandLevel` config to control the expansion state of tree/grouped grids.
     * Replaces the use of the `agOptions.groupDefaultExpanded` on the component.
     * The most recently expanded level is persistable with other grid state.
     * The default grid context menu now supports a new item to allow users to expand/collapse out to

package/admin/tabs/activity/tracking/ActivityTrackingModel.ts

@@ -429,8 +429,8 @@ export class ActivityTrackingModel extends HoistModel implements ActivityDetailP
             exportOptions: {filename: exportFilename('activity-summary')},
             emptyText: 'No activity reported...',
             sortBy: ['cubeLabel'],
-            expandToLevel: 1,
-            levelLabels: () => ['Total', ...this.groupingChooserModel.getValueDisplayNames()],
+            expandLevel: 1,
+            levelLabels: () => ['Total', ...this.groupingChooserModel.valueDisplayNames],
             columns: [
                 {
                     field: {

package/admin/tabs/cluster/objects/ClusterObjectsModel.ts

@@ -43,7 +43,7 @@ export class ClusterObjectsModel extends HoistModel {
     @managed gridModel = new GridModel({
         selModel: 'multiple',
         treeMode: true,
-        expandToLevel: 2,
+        expandLevel: 2,
         autosizeOptions: {mode: 'managed', includeCollapsedChildren: true},
         enableExport: true,
         exportOptions: {filename: exportFilenameWithDate('cluster-objects'), columns: 'ALL'},

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

@@ -58,7 +58,7 @@ export interface GridConfig {
      * Depth level to expand to on initial load. 0 = all collapsed, 1 = top level expanded, etc.
      * Defaults to 0 for tree grids (i.e. treeMode = true), 1 for standard grouped grids.
      */
-    expandToLevel?: number;
+    expandLevel?: number;
     /** True (default) to show a count of group member rows within each full-width group row. */
     showGroupRowCounts?: boolean;
     /** Size of text in grid.  If undefined, will default and bind to `XH.sizingMode`. */
@@ -261,7 +261,7 @@ export declare class GridModel extends HoistModel {
     expandState: any;
     sortBy: GridSorter[];
     groupBy: string[];
-    expandToLevel: number;
+    expandLevel: number;
     get persistableColumnState(): ColumnState[];
     showSummary: boolean | VSide;
     emptyText: ReactNode;
@@ -435,7 +435,7 @@ export declare class GridModel extends HoistModel {
     /** Collapse all parent rows in grouped or tree grid. */
     collapseAll(): void;
     /** Expand all parent rows in grouped or tree grid to the specified level. */
-    setExpandToLevel(level: number): void;
+    expandToLevel(level: number): void;
     /**
      * Sort this grid.
      * This method is a no-op if provided any sorters without a corresponding column.

package/build/types/cmp/grouping/GroupingChooserModel.d.ts

@@ -62,6 +62,7 @@ export declare class GroupingChooserModel extends HoistModel {
     get availableDims(): string[];
     get dimensionSpecs(): DimensionSpec[];
     get isValid(): boolean;
+    get valueDisplayNames(): string[];
     get isAddEnabled(): boolean;
     get isAddFavoriteEnabled(): boolean;
     constructor({ allowEmpty, commitOnChange, dimensions, initialFavorites, initialValue, maxDepth, persistWith, sortDimensions }: GroupingChooserConfig);
@@ -78,7 +79,6 @@ export declare class GroupingChooserModel extends HoistModel {
     commitPendingValueAndClose(): void;
     validateValue(value: string[]): boolean;
     getValueLabel(value: string[]): string;
-    getValueDisplayNames(): string[];
     getDimDisplayName(dimName: string): string;
     onDragEnd(result: any): void;
     get favoritesOptions(): {

package/build/types/cmp/zoneGrid/ZoneGridModel.d.ts

@@ -73,7 +73,7 @@ export interface ZoneGridConfig {
     /** Column ID(s) by which to do full-width grouping. */
     groupBy?: Some<string>;
     /** Group level to expand to on initial load. 0 = all collapsed, 1 = only top level expanded. */
-    expandToLevel?: number;
+    expandLevel?: number;
     /** True (default) to show a count of group member rows within each full-width group row. */
     showGroupRowCounts?: boolean;
     /** True to highlight the currently hovered row. */

package/cmp/grid/Grid.ts

@@ -246,7 +246,7 @@ export class GridLocalModel extends HoistModel {
             navigateToNextCell: this.navigateToNextCell,
             processCellForClipboard: this.processCellForClipboard,
             initialGroupOrderComparator: model.groupSortFn ? this.groupSortComparator : undefined,
-            groupDefaultExpanded: model.expandToLevel,
+            groupDefaultExpanded: model.expandLevel,
             groupDisplayType: 'groupRows',
             groupRowRendererParams: {
                 innerRenderer: model.groupRowRenderer,

package/cmp/grid/GridModel.ts

@@ -172,7 +172,7 @@ export interface GridConfig {
      * Depth level to expand to on initial load. 0 = all collapsed, 1 = top level expanded, etc.
      * Defaults to 0 for tree grids (i.e. treeMode = true), 1 for standard grouped grids.
      */
-    expandToLevel?: number;
+    expandLevel?: number;
 
     /** True (default) to show a count of group member rows within each full-width group row. */
     showGroupRowCounts?: boolean;
@@ -426,7 +426,7 @@ export class GridModel extends HoistModel {
     @observable.ref expandState: any = {};
     @observable.ref sortBy: GridSorter[] = [];
     @observable.ref groupBy: string[] = null;
-    @observable expandToLevel: number = 0;
+    @observable expandLevel: number = 0;
 
     get persistableColumnState(): ColumnState[] {
         return this.cleanColumnState(this.columnState);
@@ -540,7 +540,7 @@ export class GridModel extends HoistModel {
             restoreDefaultsWarning = GridModel.DEFAULT_RESTORE_DEFAULTS_WARNING,
             fullRowEditing = false,
             clicksToEdit = 2,
-            expandToLevel = treeMode ? 0 : 1,
+            expandLevel = treeMode ? 0 : 1,
             levelLabels,
             highlightRowOnClick = XH.isMobileApp,
             experimental,
@@ -588,7 +588,7 @@ export class GridModel extends HoistModel {
         this.clicksToExpand = clicksToExpand;
         this.clicksToEdit = clicksToEdit;
         this.highlightRowOnClick = highlightRowOnClick;
-        this.expandToLevel = expandToLevel;
+        this.expandLevel = expandLevel;
         this.levelLabels = levelLabels;
 
         throwIf(
@@ -644,9 +644,9 @@ export class GridModel extends HoistModel {
         });
 
         this.addReaction({
-            track: () => [this.expandToLevel, this.isReady],
+            track: () => [this.expandLevel, this.isReady],
             run: () => {
-                this.agApi?.setGridOption('groupDefaultExpanded', this.expandToLevel);
+                this.agApi?.setGridOption('groupDefaultExpanded', this.expandLevel);
             }
         });
 
@@ -773,7 +773,7 @@ export class GridModel extends HoistModel {
         const {selModel} = this,
             row = this.agGridModel.getFirstSelectableRowNode();
 
-        // If displayed select it -- we never want to auto-expand parent rows
+        // If displayed, or potentially expandable to display, select it.
         if (row && (expandParentGroups || row.displayed)) {
             const id = row.data.id;
             if (id != null) {
@@ -1028,18 +1028,18 @@ export class GridModel extends HoistModel {
 
     /** Expand all parent rows in grouped or tree grid. (Note, this is recursive for trees!) */
     expandAll() {
-        this.setExpandToLevel(this.maxDepth);
+        this.expandToLevel(this.maxDepth);
     }
 
     /** Collapse all parent rows in grouped or tree grid. */
     collapseAll() {
-        this.setExpandToLevel(0);
+        this.expandToLevel(0);
     }
 
     /** Expand all parent rows in grouped or tree grid to the specified level. */
     @action
-    setExpandToLevel(level: number) {
-        this.expandToLevel = level;
+    expandToLevel(level: number) {
+        this.expandLevel = level;
     }
 
     /**

package/cmp/grid/impl/InitPersist.ts

@@ -83,12 +83,12 @@ export function initPersist(
             : rootPersistWith;
         PersistenceProvider.create({
             persistOptions: {
-                path: `${path}.expandToLevel`,
+                path: `${path}.expandLevel`,
                 ...persistWith
             },
             target: {
-                getPersistableState: () => new PersistableState(gridModel.expandToLevel),
-                setPersistableState: ({value}) => gridModel.setExpandToLevel(value)
+                getPersistableState: () => new PersistableState(gridModel.expandLevel),
+                setPersistableState: ({value}) => gridModel.expandToLevel(value)
             },
             owner: gridModel
         });

package/cmp/grid/impl/MenuSupport.ts

@@ -283,26 +283,30 @@ function levelExpandAction(gridModel: GridModel): RecordAction {
         text: 'Expand to ...',
         displayFn: () => {
             // Don't show for degenerate shallow grid models, or if we don't have labels
-            const {maxDepth, expandToLevel} = gridModel;
+            const {maxDepth, expandLevel} = gridModel;
             if (maxDepth <= 1) return {hidden: true};
 
+            // Validate level labels.
             const levelLabels = executeIfFunction(gridModel.levelLabels);
-            if (!levelLabels || levelLabels.length < maxDepth + 1) {
+            if (!levelLabels) {
+                return {hidden: true};
+            }
+            if (levelLabels.length < maxDepth + 1) {
                 gridModel.logDebug(
-                    '"levelLabels" not provided or of insufficient length. No menu items shown.'
+                    'Value produced by `GridModel.levelLabels` has insufficient length. No menu items shown.'
                 );
                 return {hidden: true};
             }
 
             const items = levelLabels.map((label, idx) => {
                 const isCurrLevel =
-                    expandToLevel === idx ||
-                    (expandToLevel > maxDepth && idx === levelLabels.length - 1);
+                    expandLevel === idx ||
+                    (expandLevel > maxDepth && idx === levelLabels.length - 1);
 
                 return {
                     icon: isCurrLevel ? Icon.check() : null,
                     text: label,
-                    actionFn: () => gridModel.setExpandToLevel(idx)
+                    actionFn: () => gridModel.expandToLevel(idx)
                 };
             });
             return {items};

package/cmp/grouping/GroupingChooserModel.ts

@@ -121,6 +121,11 @@ export class GroupingChooserModel extends HoistModel {
         return this.validateValue(this.pendingValue);
     }
 
+    @computed
+    get valueDisplayNames(): string[] {
+        return this.value.map(dimName => this.getDimDisplayName(dimName));
+    }
+
     @computed
     get isAddEnabled(): boolean {
         const {pendingValue, maxDepth, dimensionNames, availableDims} = this,
@@ -274,10 +279,6 @@ export class GroupingChooserModel extends HoistModel {
         return value.map(dimName => this.getDimDisplayName(dimName)).join(' › ');
     }
 
-    getValueDisplayNames(): string[] {
-        return this.value.map(dimName => this.getDimDisplayName(dimName));
-    }
-
     getDimDisplayName(dimName: string) {
         return this.dimensions[dimName]?.displayName ?? dimName;
     }

package/cmp/zoneGrid/ZoneGridModel.ts

@@ -148,7 +148,7 @@ export interface ZoneGridConfig {
     groupBy?: Some<string>;
 
     /** Group level to expand to on initial load. 0 = all collapsed, 1 = only top level expanded. */
-    expandToLevel?: number;
+    expandLevel?: number;
 
     /** True (default) to show a count of group member rows within each full-width group row. */
     showGroupRowCounts?: boolean;

package/desktop/cmp/leftrightchooser/LeftRightChooser.ts

@@ -4,7 +4,6 @@
  *
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
-import {GridOptions} from '@ag-grid-community/core';
 import {grid} from '@xh/hoist/cmp/grid';
 import {hframe, vbox} from '@xh/hoist/cmp/layout';
 import {BoxProps, hoistCmp, HoistProps, uses} from '@xh/hoist/core';
@@ -28,21 +27,15 @@ export const [LeftRightChooser, leftRightChooser] = hoistCmp.withFactory<LeftRig
     className: 'xh-lr-chooser',
 
     render({model, ...props}, ref) {
-        const agOptions: GridOptions = {
-            defaultColDef: {
-                resizable: false
-            }
-        };
-
         return vbox({
             ref,
             items: [
                 hframe({
                     className: 'xh-lr-chooser__grid-frame',
                     items: [
-                        grid({model: model.leftModel, agOptions}),
+                        grid({model: model.leftModel}),
                         chooserToolbar(),
-                        grid({model: model.rightModel, agOptions})
+                        grid({model: model.rightModel})
                     ]
                 }),
                 description()

package/desktop/cmp/leftrightchooser/LeftRightChooserModel.ts

@@ -158,16 +158,19 @@ export class LeftRightChooserModel extends HoistModel {
             ]
         };
 
-        const leftTextCol = {
+        const colSpec = {
                 field: 'text',
                 flex: true,
+                resizable: true
+            },
+            leftTextCol = {
+                ...colSpec,
                 headerName: () =>
                     leftTitle + (showCounts ? ` (${this.leftModel.store.count})` : ''),
                 renderer: this.getTextColRenderer('left')
             },
             rightTextCol = {
-                field: 'text',
-                flex: true,
+                ...colSpec,
                 headerName: () =>
                     rightTitle + (showCounts ? ` (${this.rightModel.store.count})` : ''),
                 renderer: this.getTextColRenderer('right')
@@ -186,7 +189,7 @@ export class LeftRightChooserModel extends HoistModel {
             onRowDoubleClicked: e => this.onRowDoubleClicked(e),
             columns: [leftTextCol, groupCol],
             contextMenu: false,
-            expandToLevel: leftGroupingExpanded ? 1 : 0,
+            expandLevel: leftGroupingExpanded ? 1 : 0,
             xhImpl: true
         });
 
@@ -198,7 +201,7 @@ export class LeftRightChooserModel extends HoistModel {
             onRowDoubleClicked: e => this.onRowDoubleClicked(e),
             columns: [rightTextCol, groupCol],
             contextMenu: false,
-            expandToLevel: rightGroupingExpanded ? 1 : 0,
+            expandLevel: rightGroupingExpanded ? 1 : 0,
             xhImpl: true
         });
 

package/package.json

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