@xh/hoist 86.2.0 → 86.3.0

package/.gitattributes

@@ -0,0 +1,4 @@
+# Launcher scripts run under node via a `#!/usr/bin/env node` shebang; a CRLF
+# shebang line breaks execution on Linux/macOS. Force LF so Windows checkouts
+# don't rewrite them to CRLF (which otherwise shows them as perpetually modified).
+bin/*.mjs text eol=lf

package/CHANGELOG.md

@@ -1,5 +1,63 @@
 # Changelog
 
+## 86.3.0 - 2026-07-10
+
+### 🎁 New Features
+
+* `Select` now accepts a `generateOptionFn` prop to resolve an option for a selected value that is
+  not present in the current options list (e.g. with `queryFn`-based selects or readonly forms),
+  ensuring such values render with their proper label rather than falling back to the raw value.
+* `SegmentedControl` options (desktop and mobile) now accept a `testId`, emitted on the option's
+  rendered button as `data-testid` for E2E targeting. If an option omits its own `testId` but the
+  control has one, an id is auto-derived as `${controlTestId}-${value}` - restoring parity with
+  the legacy `ButtonGroupInput` test-hook pattern for apps migrating between the two.
+
+### 🐞 Bug Fixes
+
+* Fixed grid columns configured as `hidden` becoming visible after being grouped and then
+  ungrouped. `GridModel` now re-asserts each column's configured visibility whenever `groupBy`
+  changes, keeping AG Grid's column state in sync with `columnState`.
+* Fixed `StoreFilterField` and grid Find so an active quick-filter or find query no longer returns
+  different results when the grid's `groupBy` changes.
+* Fixed inline grid cell editors to reliably commit their value when editing ends, including popup
+  editors (e.g. `textAreaEditor`) within a dialog, which previously dropped edits on Enter or
+  click-away.
+* Fixed `Select` to correctly handle non-primitive (object) values: selected-option matching and
+  async query de-duplication now use deep equality, so object values no longer render as
+  `[object Object]` or collide with one another.
+* Hardened the grid column filter's Custom tab against filters it previously mishandled -
+  multi-value clauses are now expanded into editable rows and recombined on commit, and filters it
+  cannot represent are left untouched rather than corrupted.
+* Fixed `FilterChooser` popover mode (formerly `PopoverFilterChooser`) so its collapsed control no
+  longer disappears when opened - it now always occupies its place in the layout, so surrounding
+  elements no longer shift. Its clear and favorites controls also respond to a single click rather
+  than requiring the popover to be opened first. This mode is now enabled more naturally via
+  a new option `filterChooser({popover: true})`, deprecating `PopoverFilterChooser`, which remains
+  as a thin alias.
+* Fixed "not a valid MIME type" console warnings from `FileChooser`. Accepted extensions are now
+  passed under a dummy MIME type key, silencing the warnings while continuing to filter selected
+  files by extension.
+
+### ⚙️ Typescript API Adjustments
+
+* Retyped `GridModel.colChooserModel` as the new cross-platform `IColChooserModel` interface,
+  replacing the bare `HoistModel` type and exposing `isOpen`, `open()`, and `close()` directly.
+* Added the exported `HoistRoute` type - Router5's `Route` extended with Hoist's `omit` key - and
+  retyped `HoistAppModel.getRoutes()` to return it, so declarative route exclusion (e.g.
+  `omit: !XH.getUser().isHoistAdmin`) now type-checks without a cast.
+
+### 🤖 AI Docs + Tooling
+
+* Fixed the MCP server and `hoist-ts` CLI TypeScript symbol tools (`search`, `symbol`, `members`)
+  returning no results on Windows, where a path-separator mismatch left the symbol index empty.
+  Path handling is now normalized so the developer tools work on Windows as well as macOS/Linux.
+
+### 📚 Libraries
+
+* @auth0/auth0-spa-js `2.21 → 2.23`
+* @azure/msal-browser `5.14 → 5.16`
+* swiper  `12.1 -> 14.0`
+
 ## 86.2.0 - 2026-06-25
 
 ### 🎁 New Features

package/admin/AppModel.ts

@@ -7,10 +7,9 @@
 import {GridModel} from '@xh/hoist/cmp/grid';
 import {TabConfig, TabContainerModel} from '@xh/hoist/cmp/tab';
 import {ViewManagerModel} from '@xh/hoist/cmp/viewmanager';
-import {HoistAppModel, InitContext, XH} from '@xh/hoist/core';
+import {HoistAppModel, HoistRoute, InitContext, XH} from '@xh/hoist/core';
 import {Icon} from '@xh/hoist/icon';
 import {without} from 'lodash';
-import {Route} from 'router5';
 import {activityTrackingPanel} from './tabs/activity/tracking/ActivityTrackingPanel';
 import {clientsPanel} from './tabs/clients/ClientsPanel';
 import {monitorTab} from './tabs/monitor/MonitorTab';
@@ -49,7 +48,7 @@ export class AppModel extends HoistAppModel {
         await super.initAsync(ctx);
     }
 
-    override getRoutes(): Route[] {
+    override getRoutes(): HoistRoute[] {
         return [
             {
                 name: 'default',
@@ -66,7 +65,7 @@ export class AppModel extends HoistAppModel {
         return [];
     }
 
-    getTabRoutes(): Route[] {
+    getTabRoutes(): HoistRoute[] {
         return [
             {
                 name: 'general',

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

@@ -15,7 +15,17 @@ import {FilterChooserModel} from '@xh/hoist/cmp/filter';
 import {FormModel} from '@xh/hoist/cmp/form';
 import {ColumnRenderer, ColumnSpec, GridModel, TreeStyle} from '@xh/hoist/cmp/grid';
 import {GroupingChooserModel} from '@xh/hoist/cmp/grouping';
-import {HoistModel, LoadSpec, managed, PlainObject, XH} from '@xh/hoist/core';
+import {
+    HoistModel,
+    LoadSpec,
+    LocalDateUnit,
+    managed,
+    PersistableState,
+    PersistenceProvider,
+    persistOptions,
+    PlainObject,
+    XH
+} from '@xh/hoist/core';
 import {Cube, CubeFieldSpec, FieldSpec, ViewRowData} from '@xh/hoist/data';
 import {dateRenderer, dateTimeSecRenderer, numberRenderer} from '@xh/hoist/format';
 import {action, computed, makeObservable, observable} from '@xh/hoist/mobx';
@@ -24,6 +34,23 @@ import {compact, get, isEmpty, isEqual, round} from 'lodash';
 import moment from 'moment';
 import {ActivityDetailProvider} from './detail/ActivityDetailModel';
 
+/**
+ * A relative time interval (e.g. 7 days) ending on the current app day. Drives the quick-select
+ * buttons and the persisted time period, which rolls forward to end on today on restore.
+ */
+export interface ActivityInterval {
+    value: number;
+    unit: LocalDateUnit;
+}
+
+/** Quick-select intervals offered in the toolbar - labels are derived as `${value}${unit[0]}`. */
+export const INTERVALS: ActivityInterval[] = [
+    {value: 6, unit: 'months'},
+    {value: 1, unit: 'months'},
+    {value: 7, unit: 'days'},
+    {value: 1, unit: 'days'}
+];
+
 export class ActivityTrackingModel extends HoistModel implements ActivityDetailProvider {
     override telemetryPrefix = 'xh.client.admin.tracking';
 
@@ -115,6 +142,7 @@ export class ActivityTrackingModel extends HoistModel implements ActivityDetailP
         this.markPersist('showFilterChooser');
 
         this.formModel = this.createQueryFormModel();
+        this.setupPeriodPersistence();
 
         this.dataFieldsEditorModel = new DataFieldsEditorModel(this);
         this.markPersist('dataFields');
@@ -203,17 +231,17 @@ export class ActivityTrackingModel extends HoistModel implements ActivityDetailP
         endDay.setValue(newEnd);
     }
 
-    // Set the start date by taking the end date and pushing back [value] [units] - then pushing
+    // Set the start date by taking the end date and pushing back the interval - then pushing
     // forward one day as the day range query is inclusive.
-    adjustStartDate(value, unit) {
+    adjustStartDate(interval: ActivityInterval) {
         this.formModel.setValues({
-            startDay: this.endDay.subtract(value, unit).nextDay()
+            startDay: this.endDay.subtract(interval.value, interval.unit).nextDay()
         });
     }
 
-    isInterval(value, unit) {
+    isInterval(interval: ActivityInterval) {
         const {startDay, endDay} = this.formModel.values;
-        return startDay === endDay.subtract(value, unit).nextDay();
+        return startDay === endDay.subtract(interval.value, interval.unit).nextDay();
     }
 
     getDisplayName(fieldName: string) {
@@ -234,6 +262,28 @@ export class ActivityTrackingModel extends HoistModel implements ActivityDetailP
         });
     }
 
+    // Persist the selected time period as part of the active view, if endDay is currentDay
+    private setupPeriodPersistence() {
+        PersistenceProvider.create<ActivityInterval>({
+            persistOptions: persistOptions({path: 'queryPeriod'}, this.persistWith),
+            owner: this,
+            target: {
+                getPersistableState: () => {
+                    const currDay = this.endDay === LocalDate.currentAppDay(),
+                        interval = currDay ? INTERVALS.find(it => this.isInterval(it)) : null;
+                    return new PersistableState(interval ?? null);
+                },
+                setPersistableState: ({value}) => {
+                    if (value) {
+                        const endDay = LocalDate.currentAppDay();
+                        this.formModel.setValues({endDay});
+                        this.adjustStartDate(value);
+                    }
+                }
+            }
+        });
+    }
+
     private async loadGridAsync() {
         const {cube, gridModel, dimensions} = this,
             data = cube.executeQuery({

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

@@ -11,7 +11,7 @@ import {grid} from '@xh/hoist/cmp/grid';
 import {div, filler, hframe} from '@xh/hoist/cmp/layout';
 import {creates, hoistCmp} from '@xh/hoist/core';
 import {button, buttonGroup, colChooserButton, exportButton} from '@xh/hoist/desktop/cmp/button';
-import {popoverFilterChooser} from '@xh/hoist/desktop/cmp/filter';
+import {filterChooser} from '@xh/hoist/desktop/cmp/filter';
 import {formField} from '@xh/hoist/desktop/cmp/form';
 import {groupingChooser} from '@xh/hoist/desktop/cmp/grouping';
 import {dateInput, DateInputProps, select} from '@xh/hoist/desktop/cmp/input';
@@ -20,7 +20,7 @@ import {toolbar, toolbarSep} from '@xh/hoist/desktop/cmp/toolbar';
 import {viewManager} from '@xh/hoist/desktop/cmp/viewmanager';
 import {Icon} from '@xh/hoist/icon';
 import {LocalDate} from '@xh/hoist/utils/datetime';
-import {ActivityTrackingModel} from './ActivityTrackingModel';
+import {INTERVALS, ActivityTrackingModel} from './ActivityTrackingModel';
 import {aggChartPanel} from '@xh/hoist/admin/tabs/activity/tracking/chart/AggChartPanel';
 import {activityDetailView} from './detail/ActivityDetailView';
 import './ActivityTracking.scss';
@@ -75,32 +75,14 @@ const tbar = hoistCmp.factory<ActivityTrackingModel>(({model}) => {
                     disabled: model.endDay >= LocalDate.currentAppDay()
                 }),
                 buttonGroup({
-                    items: [
+                    items: INTERVALS.map(interval =>
                         button({
-                            text: '6m',
-                            onClick: () => model.adjustStartDate(6, 'months'),
-                            active: model.isInterval(6, 'months'),
-                            ...dateBtn
-                        }),
-                        button({
-                            text: '1m',
-                            onClick: () => model.adjustStartDate(1, 'months'),
-                            active: model.isInterval(1, 'months'),
-                            ...dateBtn
-                        }),
-                        button({
-                            text: '7d',
-                            onClick: () => model.adjustStartDate(7, 'days'),
-                            active: model.isInterval(7, 'days'),
-                            ...dateBtn
-                        }),
-                        button({
-                            text: '1d',
-                            onClick: () => model.adjustStartDate(1, 'days'),
-                            active: model.isInterval(1, 'days'),
+                            text: `${interval.value}${interval.unit[0]}`,
+                            onClick: () => model.adjustStartDate(interval),
+                            active: model.isInterval(interval),
                             ...dateBtn
                         })
-                    ]
+                    )
                 }),
                 toolbarSep(),
                 filterChooserToggleButton(),
@@ -137,7 +119,8 @@ const filterChooserToggleButton = hoistCmp.factory<ActivityTrackingModel>(({mode
 const filterBar = hoistCmp.factory<ActivityTrackingModel>(({model}) => {
     return model.showFilterChooser
         ? toolbar(
-              popoverFilterChooser({
+              filterChooser({
+                  popover: true,
                   flex: 1,
                   enableClear: true
               })

package/admin/tabs/clients/ClientsModel.ts

@@ -9,7 +9,7 @@ import {AppModel} from '@xh/hoist/admin/AppModel';
 import * as Col from '@xh/hoist/admin/columns';
 import {GridModel} from '@xh/hoist/cmp/grid';
 import {div, p} from '@xh/hoist/cmp/layout';
-import {LoadSpec, managed, XH} from '@xh/hoist/core';
+import {LoadSpec, managed, persistOptions, XH} from '@xh/hoist/core';
 import {RecordActionSpec, StoreRecord} from '@xh/hoist/data';
 import {textInput} from '@xh/hoist/desktop/cmp/input';
 import {Icon} from '@xh/hoist/icon';
@@ -23,6 +23,8 @@ import {BaseAdminTabModel} from '@xh/hoist/admin/tabs/BaseAdminTabModel';
 export class ClientsModel extends BaseAdminTabModel {
     override telemetryPrefix = 'xh.client.admin.clients';
 
+    override persistWith = {localStorageKey: 'xhAdminClientsState'};
+
     @observable
     lastRefresh: number;
 
@@ -150,6 +152,7 @@ export class ClientsModel extends BaseAdminTabModel {
         return new GridModel({
             emptyText: 'No clients connected.',
             groupBy: this.groupBy,
+            persistWith: persistOptions(this.persistWith, {path: 'mainGrid'}),
             colChooserModel: true,
             enableExport: true,
             selModel: 'multiple',

package/admin/tabs/clients/activity/ClientDetailModel.ts

@@ -6,7 +6,7 @@
  */
 import {ClientsModel} from '../ClientsModel';
 import {ColumnSpec} from '@xh/hoist/cmp/grid';
-import {HoistModel, LoadSpec, lookup, PlainObject, XH} from '@xh/hoist/core';
+import {HoistModel, LoadSpec, lookup, persistOptions, PlainObject, XH} from '@xh/hoist/core';
 import {StoreRecord} from '@xh/hoist/data';
 import {bindable, computed, makeObservable} from '@xh/hoist/mobx';
 import {ReactNode} from 'react';
@@ -53,6 +53,10 @@ export class ClientDetailModel extends HoistModel implements ActivityDetailProvi
     override onLinked() {
         super.onLinked();
 
+        this.persistWith = persistOptions(this.clientsModel.persistWith, {
+            pathPrefix: 'activityGrid'
+        });
+
         this.addReaction(
             {
                 track: () => this.clientsModel.gridModel.selectedRecord,

package/admin/tabs/userData/roles/RolePanel.ts

@@ -10,7 +10,7 @@ import {fragment, hframe, vframe} from '@xh/hoist/cmp/layout';
 import {creates, hoistCmp} from '@xh/hoist/core';
 import {button, colChooserButton} from '@xh/hoist/desktop/cmp/button';
 import {errorMessage} from '@xh/hoist/cmp/error';
-import {popoverFilterChooser} from '@xh/hoist/desktop/cmp/filter';
+import {filterChooser} from '@xh/hoist/desktop/cmp/filter';
 import {switchInput} from '@xh/hoist/desktop/cmp/input';
 import {panel} from '@xh/hoist/desktop/cmp/panel';
 import {recordActionBar} from '@xh/hoist/desktop/cmp/record';
@@ -44,7 +44,7 @@ export const rolePanel = hoistCmp.factory({
                         selModel: gridModel.selModel
                     }),
                     '-',
-                    popoverFilterChooser({flex: 1}),
+                    filterChooser({popover: true, flex: 1}),
                     '-',
                     switchInput({
                         bind: 'showInGroups',

package/appcontainer/RouterModel.ts

@@ -4,7 +4,7 @@
  *
  * Copyright © 2026 Extremely Heavy Industries Inc.
  */
-import {HoistModel} from '../core';
+import {HoistModel, HoistRoute} from '../core';
 import {action, observable, makeObservable} from '@xh/hoist/mobx';
 import {mergeDeep} from '@xh/hoist/utils/js';
 import {isOmitted} from '@xh/hoist/utils/impl';
@@ -38,11 +38,11 @@ export class RouterModel extends HoistModel {
     /**
      * Add routes to the router.
      *
-     * @param routes - collection of router5 route spec.
-     *      This method supports an additional keyword 'omit' on each spec, in order to allow declarative
-     *      exclusion.  Otherwise these are Router5 configs to be passed directly to the Router5 API.
+     * @param routes - collection of {@link HoistRoute} specs. In addition to the standard Router5
+     *      route config, each spec supports an `omit` keyword to allow declarative exclusion.
+     *      Otherwise these are Router5 configs to be passed directly to the Router5 API.
      */
-    addRoutes(routes: object[]) {
+    addRoutes(routes: HoistRoute[]) {
         this.router.add(this.preprocessRoutes(routes));
     }
 
@@ -100,7 +100,7 @@ export class RouterModel extends HoistModel {
         return ret;
     }
 
-    private preprocessRoutes(routes) {
+    private preprocessRoutes(routes: HoistRoute[]): HoistRoute[] {
         const ret = routes.filter(r => !isOmitted(r));
         ret.forEach(r => {
             if (r.children) r.children = this.preprocessRoutes(r.children);

package/build/types/admin/AppModel.d.ts

@@ -1,16 +1,15 @@
 import { TabConfig, TabContainerModel } from '@xh/hoist/cmp/tab';
 import { ViewManagerModel } from '@xh/hoist/cmp/viewmanager';
-import { HoistAppModel, InitContext } from '@xh/hoist/core';
-import { Route } from 'router5';
+import { HoistAppModel, HoistRoute, InitContext } from '@xh/hoist/core';
 export declare class AppModel extends HoistAppModel {
     tabModel: TabContainerModel;
     viewManagerModels: Record<string, ViewManagerModel>;
     static get readonly(): boolean;
     constructor();
     initAsync(ctx: InitContext): Promise<void>;
-    getRoutes(): Route[];
+    getRoutes(): HoistRoute[];
     getAppMenuButtonExtraItems(): any[];
-    getTabRoutes(): Route[];
+    getTabRoutes(): HoistRoute[];
     createTabs(): TabConfig[];
     /** Open the primary business-facing application, typically 'app'. */
     openPrimaryApp(): void;

package/build/types/admin/tabs/activity/tracking/ActivityTrackingModel.d.ts

@@ -3,10 +3,20 @@ import { FilterChooserModel } from '@xh/hoist/cmp/filter';
 import { FormModel } from '@xh/hoist/cmp/form';
 import { ColumnSpec, GridModel } from '@xh/hoist/cmp/grid';
 import { GroupingChooserModel } from '@xh/hoist/cmp/grouping';
-import { HoistModel, LoadSpec, PlainObject } from '@xh/hoist/core';
+import { HoistModel, LoadSpec, LocalDateUnit, PlainObject } from '@xh/hoist/core';
 import { Cube } from '@xh/hoist/data';
 import { LocalDate } from '@xh/hoist/utils/datetime';
 import { ActivityDetailProvider } from './detail/ActivityDetailModel';
+/**
+ * A relative time interval (e.g. 7 days) ending on the current app day. Drives the quick-select
+ * buttons and the persisted time period, which rolls forward to end on today on restore.
+ */
+export interface ActivityInterval {
+    value: number;
+    unit: LocalDateUnit;
+}
+/** Quick-select intervals offered in the toolbar - labels are derived as `${value}${unit[0]}`. */
+export declare const INTERVALS: ActivityInterval[];
 export declare class ActivityTrackingModel extends HoistModel implements ActivityDetailProvider {
     telemetryPrefix: string;
     /** FormModel for server-side querying controls. */
@@ -45,10 +55,11 @@ export declare class ActivityTrackingModel extends HoistModel implements Activit
     setDataFields(dataFields: ActivityTrackingDataFieldSpec[]): void;
     toggleFilterChooser(): void;
     adjustDates(dir: 'add' | 'subtract'): void;
-    adjustStartDate(value: any, unit: any): void;
-    isInterval(value: any, unit: any): boolean;
+    adjustStartDate(interval: ActivityInterval): void;
+    isInterval(interval: ActivityInterval): boolean;
     getDisplayName(fieldName: string): string;
     private createQueryFormModel;
+    private setupPeriodPersistence;
     private loadGridAsync;
     private cubeLabelComparator;
     private getComparableValForDim;

package/build/types/admin/tabs/clients/ClientsModel.d.ts

@@ -4,6 +4,9 @@ import { RecordActionSpec, StoreRecord } from '@xh/hoist/data';
 import { BaseAdminTabModel } from '@xh/hoist/admin/tabs/BaseAdminTabModel';
 export declare class ClientsModel extends BaseAdminTabModel {
     telemetryPrefix: string;
+    persistWith: {
+        localStorageKey: string;
+    };
     lastRefresh: number;
     gridModel: GridModel;
     groupBy: 'user' | 'instance';

package/build/types/appcontainer/RouterModel.d.ts

@@ -1,4 +1,4 @@
-import { HoistModel } from '../core';
+import { HoistModel, HoistRoute } from '../core';
 import { Router, State } from 'router5';
 import 'router5-plugin-browser';
 /**
@@ -19,11 +19,11 @@ export declare class RouterModel extends HoistModel {
     /**
      * Add routes to the router.
      *
-     * @param routes - collection of router5 route spec.
-     *      This method supports an additional keyword 'omit' on each spec, in order to allow declarative
-     *      exclusion.  Otherwise these are Router5 configs to be passed directly to the Router5 API.
+     * @param routes - collection of {@link HoistRoute} specs. In addition to the standard Router5
+     *      route config, each spec supports an `omit` keyword to allow declarative exclusion.
+     *      Otherwise these are Router5 configs to be passed directly to the Router5 API.
      */
-    addRoutes(routes: object[]): void;
+    addRoutes(routes: HoistRoute[]): void;
     /**
      * Add a routeName to the current route, preserving params
      * @param routeName - the routeName to append

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

@@ -4,6 +4,7 @@ import { HoistModel, HoistProps, LayoutProps, PlainObject, ReactionSpec, TestSup
 import { RecordSet } from '@xh/hoist/data/impl/RecordSet';
 import type { ColDef, ColGroupDef, GetContextMenuItemsParams, GridOptions, GridReadyEvent, ProcessCellForExportParams } from '@xh/hoist/kit/ag-grid';
 import { type MouseEvent } from 'react';
+import { PartialDeep } from 'type-fest';
 import './Grid.scss';
 import { GridModel } from './GridModel';
 export interface GridProps<M extends GridModel = GridModel> extends HoistProps<M>, LayoutProps, TestSupportProps {
@@ -16,7 +17,7 @@ export interface GridProps<M extends GridModel = GridModel> extends HoistProps<M
      *
      * Note that changes to these options after the component's initial render will be ignored.
      */
-    agOptions?: GridOptions;
+    agOptions?: PartialDeep<GridOptions>;
     /**
      * Callback when the grid has initialized. The component will call this with the ag-Grid
      * event after running its internal handler to associate the ag-Grid APIs with its model.

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

@@ -1,5 +1,5 @@
 import { AgGridModel } from '@xh/hoist/cmp/ag-grid';
-import { Column, ColumnGroup, ColumnOrGroup, ColumnOrGroupSpec, ColumnSpec, GridAutosizeMode, GridFilterModelConfig, GridGroupSortFn, TreeStyle } from '@xh/hoist/cmp/grid';
+import { Column, ColumnGroup, ColumnOrGroup, ColumnOrGroupSpec, ColumnSpec, GridAutosizeMode, GridFilterModelConfig, GridGroupSortFn, IColChooserModel, TreeStyle } from '@xh/hoist/cmp/grid';
 import { GridFilterModel } from '@xh/hoist/cmp/grid/filter/GridFilterModel';
 import { Awaitable, HoistModel, HSide, LoadSpec, PlainObject, SizingMode, Some, TaskObserver, Thunkable, VSide } from '@xh/hoist/core';
 import { Store, StoreConfig, StoreRecord, StoreRecordId, StoreRecordOrId, StoreSelectionConfig, StoreSelectionModel, StoreTransaction } from '@xh/hoist/data';
@@ -285,7 +285,7 @@ export declare class GridModel extends HoistModel {
     store: Store;
     selModel: StoreSelectionModel;
     treeMode: boolean;
-    colChooserModel: HoistModel;
+    colChooserModel: IColChooserModel;
     rowClassFn: RowClassFn;
     rowClassRules: Record<string, RowClassRuleFn>;
     contextMenu: GridContextMenuSpec;

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

@@ -1,4 +1,4 @@
-import type { HSide, PersistOptions, Some } from '@xh/hoist/core';
+import type { HoistModel, HSide, PersistOptions, Some } from '@xh/hoist/core';
 import type { FilterBindTarget, FilterMatchMode, FilterValueSource, Store, StoreRecord } from '@xh/hoist/data';
 import type { CellClassParams, CustomCellEditorProps, HeaderClassParams, HeaderValueGetterParams, ICellRendererParams, IRowNode, ITooltipParams, RowClassParams, ValueSetterParams } from '@xh/hoist/kit/ag-grid';
 import type { ReactElement, ReactNode } from 'react';
@@ -101,6 +101,13 @@ export interface GridFilterBindTarget extends FilterBindTarget, FilterValueSourc
  * @returns the formatted value for display.
  */
 export type GroupRowRenderer = (context: ICellRendererParams) => ReactNode;
+/** Cross-platform interface for desktop and mobile ColChooserModels. */
+export interface IColChooserModel extends HoistModel {
+    readonly gridModel: GridModel;
+    readonly isOpen: boolean;
+    open(): void;
+    close(): void;
+}
 /**
  * Configuration for a {@link ColChooserModel} - the model backing the grid column chooser UI.
  * Passed via the `colChooserModel` config on {@link GridConfig}, or set app-wide via

package/build/types/cmp/input/SegmentedControlOption.d.ts

@@ -21,6 +21,12 @@ export interface SegmentedControlOption {
      * `intent` default. Defaults to the control's `intent`.
      */
     intent?: Intent;
+    /**
+     * Optional stable identifier emitted on this option's rendered button as `data-testid`, for
+     * use by E2E tests. If omitted and the control itself has a `testId`, one is auto-derived as
+     * `${controlTestId}-${value}`. If neither is set, no attribute is emitted.
+     */
+    testId?: string;
 }
 /**
  * Variant of SegmentedControlOption for representing a null/"no value" selection.
@@ -41,4 +47,10 @@ export interface SegmentedControlNullOption {
      * `intent` default. Defaults to the control's `intent`.
      */
     intent?: Intent;
+    /**
+     * Optional stable identifier emitted on this option's rendered button as `data-testid`, for
+     * use by E2E tests. If omitted and the control itself has a `testId`, one is auto-derived as
+     * `${controlTestId}-null`. If neither is set, no attribute is emitted.
+     */
+    testId?: string;
 }

package/build/types/core/HoistAppModel.d.ts

@@ -1,5 +1,4 @@
-import { AppOptionSpec, HoistModel, InitContext, Thunkable } from './';
-import { Route } from 'router5';
+import { AppOptionSpec, HoistModel, HoistRoute, InitContext, Thunkable } from './';
 import { ReactNode } from 'react';
 /**
  * Specialized base class for defining the central model for a Hoist app as specified by its
@@ -40,7 +39,7 @@ export declare class HoistAppModel extends HoistModel {
     /**
      * Provide the initial set of Router5 Routes to be used by this application.
      */
-    getRoutes(): Route[];
+    getRoutes(): HoistRoute[];
     /**
      * Provide a list of app-wide options to be displayed in the App's built-in Options
      * dialog, accessible from the default AppBar menu when this method returns non-empty.

package/build/types/core/types/Types.d.ts

@@ -3,6 +3,7 @@ import { LocalDate } from '@xh/hoist/utils/datetime';
 import { MomentInput } from 'moment';
 import { Component, FunctionComponent, ReactElement } from 'react';
 import { DebounceSettings } from 'lodash';
+import { Route } from 'router5';
 /** Values available for intents. */
 export type Intent = 'primary' | 'success' | 'warning' | 'danger';
 /** Values available for App Theme. */
@@ -42,6 +43,17 @@ export type DebounceSpec = number | (DebounceSettings & {
  */
 export type Content = ReactElement | FunctionComponent | Component | ElementFactory | (() => ReactElement);
 export type DateLike = Date | LocalDate | MomentInput;
+/**
+ * A Router5 {@link Route} spec, extended with Hoist's `omit` support for declarative exclusion of
+ * routes at registration time (e.g. role-gated sections). Note `omit` is evaluated once when routes
+ * are added to the router during app startup - it is not reactive.
+ *
+ * @see HoistAppModel.getRoutes
+ */
+export interface HoistRoute extends Omit<Route, 'children'> {
+    omit?: Thunkable<boolean>;
+    children?: HoistRoute[];
+}
 /** Valid units for the {@link LocalDate} adjustment methods. */
 export type LocalDateUnit = 'year' | 'years' | 'quarter' | 'quarters' | 'month' | 'months' | 'week' | 'weeks' | 'day' | 'days';
 export type PageState = 

package/build/types/desktop/cmp/filter/FilterChooser.d.ts

@@ -24,6 +24,11 @@ export interface FilterChooserProps extends HoistProps<FilterChooserModel>, Layo
     placeholder?: string;
     /** Icon clicked to launch favorites menu. (Defaults to Icon.favorite()) */
     favoritesIcon?: ReactElement;
+    /**
+     * True to render collapsed in-place, expanding into a popover when opened - useful in toolbars
+     * and other height-constrained containers. Opens in the direction set by `menuPlacement`.
+     */
+    popover?: boolean;
 }
 /**
  * A Select based control for searching and choosing filters.

package/build/types/desktop/cmp/filter/PopoverFilterChooser.d.ts

@@ -1,9 +1,11 @@
 import '@xh/hoist/desktop/register';
-import './PopoverFilterChooser.scss';
 import { FilterChooserProps } from './FilterChooser';
 /**
  * A wrapper around a FilterChooser that renders in a popover when opened, allowing it to expand
  * vertically beyond the height of a toolbar.
+ *
+ * @deprecated Use `filterChooser({popover: true})` instead - the popover behavior is now a built-in
+ *      mode of `FilterChooser`. This alias will be removed in a future major release.
  * @see FilterChooser
  */
 export declare const PopoverFilterChooser: import("react").FC<FilterChooserProps>, popoverFilterChooser: import("@xh/hoist/core").ElementFactory<FilterChooserProps>;

package/build/types/desktop/cmp/grid/impl/colchooser/ColChooserModel.d.ts

@@ -1,4 +1,4 @@
-import { ColChooserConfig, GridModel } from '@xh/hoist/cmp/grid';
+import { ColChooserConfig, GridModel, IColChooserModel } from '@xh/hoist/cmp/grid';
 import { HoistModel } from '@xh/hoist/core';
 import type { FilterMatchMode } from '@xh/hoist/data';
 import { LeftRightChooserModel } from '@xh/hoist/desktop/cmp/leftrightchooser';
@@ -6,7 +6,7 @@ import { LeftRightChooserModel } from '@xh/hoist/desktop/cmp/leftrightchooser';
  * State management for the ColChooser component.
  * @internal
  */
-export declare class ColChooserModel extends HoistModel {
+export declare class ColChooserModel extends HoistModel implements IColChooserModel {
     xhImpl: boolean;
     gridModel: GridModel;
     lrModel: LeftRightChooserModel;