@xh/hoist 86.2.0 → 86.4.0

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/data/Store.d.ts

@@ -267,8 +267,9 @@ export declare class Store extends HoistBase implements FilterBindTarget, Filter
      * Add new Records to this Store in a local, uncommitted state - i.e. with data that has yet to
      * be persisted back to, or sourced from, the server or other data source of record.
      *
-     * Note that data objects passed to this method must include a unique ID - callers can generate
-     * one with `XH.genId()` if no natural ID can be produced locally on the client.
+     * Note that data objects passed to this method must include a literal `id` property - this
+     * method does *not* run the Store's `idSpec` function. Callers can generate an id with
+     * `XH.genId()` if no natural ID can be produced locally on the client.
      *
      * For StoreRecord additions that originate from the server, call `updateData()` instead.
      *

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;

package/build/types/desktop/cmp/grid/impl/filter/headerfilter/custom/CustomRowModel.d.ts

@@ -1,8 +1,16 @@
+import type { GridFilterFieldSpec } from '@xh/hoist/cmp/grid';
 import { HoistModel } from '@xh/hoist/core';
 import { FieldFilterOperator, FieldFilterSpec } from '@xh/hoist/data';
 import { HeaderFilterModel } from '../HeaderFilterModel';
 import { CustomTabModel } from './CustomTabModel';
 type OperatorOptionValue = 'blank' | 'not blank' | FieldFilterOperator;
+/**
+ * Whether a row for the given op renders the multi-value `select` input - the only custom-tab input
+ * that holds an array of values directly. The single-value inputs (number, date, text) are used
+ * otherwise, so array filter values bound for them must be expanded into one row each (see
+ * `CustomTabModel.doSyncWithFilter`). Mirrors the input choice made in `CustomRow`.
+ */
+export declare function usesMultiValueInput(fieldSpec: GridFilterFieldSpec, op: FieldFilterOperator): boolean;
 /**
  * @internal
  */
@@ -14,7 +22,7 @@ export declare class CustomRowModel extends HoistModel {
     inputVal: any;
     /** FieldFilter config output of this row. */
     get value(): FieldFilterSpec;
-    get fieldSpec(): import("../../../../../../../cmp/grid").GridFilterFieldSpec;
+    get fieldSpec(): GridFilterFieldSpec;
     get options(): {
         label: string;
         value: OperatorOptionValue;

package/build/types/desktop/cmp/grid/impl/filter/headerfilter/custom/CustomTabModel.d.ts

@@ -1,5 +1,5 @@
 import { HoistModel } from '@xh/hoist/core';
-import { CompoundFilterOperator, FilterLike } from '@xh/hoist/data';
+import { CompoundFilterOperator, FieldFilter, FilterLike } from '@xh/hoist/data';
 import { HeaderFilterModel } from '../HeaderFilterModel';
 import { CustomRowModel } from './CustomRowModel';
 export declare class CustomTabModel extends HoistModel {
@@ -11,11 +11,17 @@ export declare class CustomTabModel extends HoistModel {
     get filter(): FilterLike;
     get fieldSpec(): import("../../../../../../../cmp/grid").GridFilterFieldSpec;
     get currentGridFilter(): import("@xh/hoist/data").Filter;
-    get columnFilters(): import("@xh/hoist/data").FieldFilter[];
+    get columnFilters(): FieldFilter[];
+    get columnCompoundFilter(): import("@xh/hoist/data").CompoundFilter;
     constructor(headerFilterModel: HeaderFilterModel);
     syncWithFilter(): void;
     reset(): void;
     addEmptyRow(): void;
     removeRow(model: any): void;
     private doSyncWithFilter;
+    private needsExpansion;
+    private mergeOpFor;
+    private deriveOp;
+    private get isRepresentable();
+    private collapseToArrayFilters;
 }

package/build/types/desktop/cmp/input/Select.d.ts

@@ -127,6 +127,14 @@ export interface SelectProps extends HoistProps, HoistInputProps, LayoutProps {
     selectOnFocus?: boolean;
     /** Field on provided options for sourcing each option's value (default `value`). */
     valueField?: string;
+    /**
+     * Function to generate a `SelectOption` for a (non-null) selected value not present in the
+     * current options list. Return null to fall back to the default value-as-label behavior.
+     *
+     * Useful with queryFn-based selects, readonly forms, or any case where options may not be
+     * loaded when a value is set, ensuring the value renders with its proper label.
+     */
+    generateOptionFn?: (value: any) => SelectOption;
 }
 /**
  * A managed wrapper around the React-Select combobox/dropdown component.

package/build/types/kit/react-dropzone/index.d.ts

@@ -1,4 +1,5 @@
 import Dropzone from 'react-dropzone';
 export { Dropzone };
+export { ErrorCode } from 'react-dropzone';
 export type { Accept, FileRejection, FileWithPath } from 'react-dropzone';
 export declare const dropzone: import("@xh/hoist/core").ElementFactory<import("react-dropzone").DropzoneProps & import("react").RefAttributes<import("react-dropzone").DropzoneRef>>;

package/build/types/kit/swiper/index.d.ts

@@ -28,6 +28,7 @@ export declare const swiper: import("@xh/hoist/core").ElementFactory<import("rea
     onScrollbarDragMove?: (swiper: import("swiper/types").Swiper, event: MouseEvent | TouchEvent | PointerEvent) => void;
     onScrollbarDragEnd?: (swiper: import("swiper/types").Swiper, event: MouseEvent | TouchEvent | PointerEvent) => void;
     onZoomChange?: (swiper: import("swiper/types").Swiper, scale: number, imageEl: HTMLElement, slideEl: HTMLElement) => void;
+    onVirtualUpdate?: (swiper: import("swiper/types").Swiper) => void;
     onInit?: (swiper: import("swiper/types").Swiper) => any;
     onBeforeDestroy?: (swiper: import("swiper/types").Swiper) => void;
     onSlidesUpdated?: (swiper: import("swiper/types").Swiper) => void;
@@ -53,8 +54,8 @@ export declare const swiper: import("@xh/hoist/core").ElementFactory<import("rea
     onReachEnd?: (swiper: import("swiper/types").Swiper) => void;
     onToEdge?: (swiper: import("swiper/types").Swiper) => void;
     onFromEdge?: (swiper: import("swiper/types").Swiper) => void;
-    onSetTranslate?: (swiper: import("swiper/types").Swiper, translate: number) => void;
-    onSetTransition?: (swiper: import("swiper/types").Swiper, transition: number) => void;
+    onSetTranslate?: (swiper: import("swiper/types").Swiper, translate: number, byController?: boolean | Swiper) => void;
+    onSetTransition?: (swiper: import("swiper/types").Swiper, transition: number, byController?: boolean | Swiper) => void;
     onResize?: (swiper: import("swiper/types").Swiper) => void;
     onObserverUpdate?: (swiper: import("swiper/types").Swiper) => void;
     onBeforeLoopFix?: (swiper: import("swiper/types").Swiper) => void;
@@ -77,7 +78,7 @@ export declare const swiper: import("@xh/hoist/core").ElementFactory<import("rea
     onBeforeInit?: (swiper: import("swiper/types").Swiper) => void;
     onBeforeResize?: (swiper: import("swiper/types").Swiper) => void;
     onBeforeSlideChangeStart?: (swiper: import("swiper/types").Swiper) => void;
-    onBeforeTransitionStart?: (swiper: import("swiper/types").Swiper, speed: number, internal: any) => void;
+    onBeforeTransitionStart?: (swiper: import("swiper/types").Swiper, speed: number, internal: unknown) => void;
     onChangeDirection?: (swiper: import("swiper/types").Swiper) => void;
     onDoubleClick?: (swiper: import("swiper/types").Swiper, event: MouseEvent | TouchEvent | PointerEvent) => void;
     onDestroy?: (swiper: import("swiper/types").Swiper) => void;

package/build/types/mobile/cmp/grid/impl/ColChooserModel.d.ts

@@ -1,4 +1,4 @@
-import { GridModel } from '@xh/hoist/cmp/grid';
+import { GridModel, IColChooserModel } from '@xh/hoist/cmp/grid';
 import { HoistModel, HSide } from '@xh/hoist/core';
 import '@xh/hoist/mobile/register';
 /**
@@ -7,7 +7,7 @@ import '@xh/hoist/mobile/register';
  * It is not necessary to manually create instances of this class within an application.
  * @internal
  */
-export declare class ColChooserModel extends HoistModel {
+export declare class ColChooserModel extends HoistModel implements IColChooserModel {
     xhImpl: boolean;
     gridModel: GridModel;
     showRestoreDefaults: boolean;

package/build/types/mobile/cmp/input/Select.d.ts

@@ -109,6 +109,14 @@ export interface SelectProps extends HoistProps, HoistInputProps, LayoutProps {
     title?: string;
     /** Field on provided options for sourcing each option's value (default `value`). */
     valueField?: string;
+    /**
+     * Function to generate a `SelectOption` for a (non-null) selected value not present in the
+     * current options list. Return null to fall back to the default value-as-label behavior.
+     *
+     * Useful with queryFn-based selects, readonly forms, or any case where options may not be
+     * loaded when a value is set, ensuring the value renders with its proper label.
+     */
+    generateOptionFn?: (value: any) => SelectOption;
 }
 /**
  * A managed wrapper around the React-Select combobox/dropdown component.

package/build/types/svc/PrefService.d.ts

@@ -25,6 +25,13 @@ export declare class PrefService extends HoistService {
      * Check to see if a given preference has been *defined*.
      */
     hasKey(key: string): boolean;
+    /**
+     * Check whether the current user has an explicit value on file for the given preference, vs.
+     * receiving the preference's server-side default value.
+     *
+     * @param key - unique key used to identify the pref.
+     */
+    isSet(key: string): boolean;
     /**
      * Get the value for a given key, either the user-specific value (if set) or the default.
      * Typically accessed via the convenience alias {@link XH.getPref}.
@@ -47,7 +54,10 @@ export declare class PrefService extends HoistService {
      */
     set(key: string, value: any): void;
     /**
-     * Restore a preference to its default value.
+     * Restore a preference to its default value, clearing the user's explicit value on the server.
+     *
+     * Unlike `set()`, this clears the user's explicit value rather than persisting the default as
+     * one - so {@link isSet} will report `false` afterwards. Saved asynchronously (see `set()`).
      */
     unset(key: string): void;
     /**
@@ -66,6 +76,7 @@ export declare class PrefService extends HoistService {
     pushPendingAsync(): Promise<void>;
     private pushPendingBuffered;
     private loadPrefsAsync;
+    private ensureKeyExists;
     private validateBeforeSet;
     private valueIsOfType;
 }

package/build/types/utils/datetime/LocalDate.d.ts

@@ -9,6 +9,15 @@ import { Moment, MomentInput } from 'moment';
  * For efficiency and to enable strict equality checks, instances of this class are memoized:
  * only a single version of the object will be created and returned for each calendar day,
  * as long as the caller uses one of the *public factory methods*, which they always should!
+ *
+ * Instances serialize directly to their ISO date string (e.g. '2024-01-15') via built-in
+ * `toString()`, `valueOf()`, and `toJSON()` overrides. This means a LocalDate can be passed
+ * as-is within the params or body of a `FetchService` request (or any `JSON.stringify()` call)
+ * and will serialize as expected - prefer this over calling `toString()` or `format()` yourself.
+ *
+ * Instances also support natural comparison: because they are memoized, `===` tests whether two
+ * references are the same calendar day, while `valueOf()` returning the (lexically sortable) ISO
+ * string means the relational operators `<`, `>`, `<=`, `>=` order instances chronologically.
  */
 export declare class LocalDate {
     static readonly VALID_UNITS: Set<LocalDateUnit>;
@@ -33,7 +42,11 @@ export declare class LocalDate {
      * @param val - any string, timestamp, or date parsable by moment.js.
      */
     static from(val: MomentInput | LocalDate): LocalDate;
-    /** LocalDate representing the current day. */
+    /**
+     * LocalDate representing the current day in the browser's local time zone.
+     * See `currentAppDay()` / `currentServerDay()` to resolve "today" in the app or server zone,
+     * which can differ from the browser for users in another region.
+     */
     static today(): LocalDate;
     /** LocalDate representing the current day in the App TimeZone */
     static currentAppDay(): LocalDate;
@@ -46,9 +59,17 @@ export declare class LocalDate {
     /** Is the input value a local Date? */
     static isLocalDate(val: any): boolean;
     get isoString(): string;
+    /** JS `Date` for this day at midnight in the browser's local time zone. Fresh instance per call. */
     get date(): Date;
+    /** A mutable moment.js clone - safe to modify without affecting this (immutable) instance. */
     get moment(): Moment;
+    /** Epoch millis for this day at midnight in the browser's local time zone. */
     get timestamp(): number;
+    /**
+     * Format this date using moment.js format tokens, primarily for display.
+     * Note: to send a LocalDate to the server, pass the instance directly rather than a formatted
+     * string - it serializes to an ISO date on its own (see class-level docs).
+     */
     format(...args: any[]): string;
     dayOfWeek(): string;
     get isToday(): boolean;
@@ -83,6 +104,7 @@ export declare class LocalDate {
     currentOrNextWeekday(): LocalDate;
     /** The same date if already a weekday, or the previous weekday. */
     currentOrPreviousWeekday(): LocalDate;
+    /** Difference between this date and `other` in the given unit; positive when this is later. */
     diff(other: LocalDate, unit?: LocalDateUnit): number;
     /** @internal - use one of the static factory methods instead. */
     private constructor();

package/cmp/grid/Grid.ts

@@ -49,6 +49,7 @@ import {composeRefs, createObservableRef, getLayoutProps} from '@xh/hoist/utils/
 import classNames from 'classnames';
 import {compact, debounce, isBoolean, isEmpty, isEqual, isNil, max, maxBy, merge} from 'lodash';
 import {type MouseEvent} from 'react';
+import {PartialDeep} from 'type-fest';
 import './Grid.scss';
 import {GridModel} from './GridModel';
 import {columnGroupHeader} from './impl/ColumnGroupHeader';
@@ -66,7 +67,7 @@ export interface GridProps<M extends GridModel = GridModel>
      *
      * 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
@@ -392,7 +393,14 @@ export class GridLocalModel extends HoistModel {
         return {
             track: () => [model.agApi, model.groupBy],
             run: ([agApi, groupBy]) => {
-                if (agApi) agApi.setRowGroupColumns(groupBy);
+                if (!agApi) return;
+                agApi.setRowGroupColumns(groupBy);
+
+                // Re-assert configured visibility - AG Grid re-shows a column when ungrouped (#4473).
+                const state = model.columnState
+                    .filter(({colId}) => !groupBy.includes(colId))
+                    .map(({colId, hidden}) => ({colId, hide: hidden}));
+                agApi.applyColumnState({state});
             }
         };
     }

package/cmp/grid/GridModel.ts

@@ -16,6 +16,7 @@ import {
     GridAutosizeMode,
     GridFilterModelConfig,
     GridGroupSortFn,
+    IColChooserModel,
     isColumnSpec,
     TreeStyle
 } from '@xh/hoist/cmp/grid';
@@ -498,7 +499,7 @@ export class GridModel extends HoistModel {
     store: Store;
     selModel: StoreSelectionModel;
     treeMode: boolean;
-    colChooserModel: HoistModel;
+    colChooserModel: IColChooserModel;
     rowClassFn: RowClassFn;
     rowClassRules: Record<string, RowClassRuleFn>;
     contextMenu: GridContextMenuSpec;
@@ -1259,7 +1260,7 @@ export class GridModel extends HoistModel {
     }
 
     showColChooser() {
-        (this.colChooserModel as any)?.open();
+        this.colChooserModel?.open();
     }
 
     noteAgColumnStateChanged(agColState: AgColumnState[]) {
@@ -1986,7 +1987,7 @@ export class GridModel extends HoistModel {
         };
     }
 
-    private parseChooserModel(chooserModel: GridConfig['colChooserModel']): HoistModel {
+    private parseChooserModel(chooserModel: GridConfig['colChooserModel']): IColChooserModel {
         if (!chooserModel) return null;
 
         const modelClass = XH.isMobileApp ? MobileColChooserModel : DesktopColChooserModel;

package/cmp/grid/Types.ts

@@ -5,7 +5,7 @@
  * Copyright © 2026 Extremely Heavy Industries Inc.
  */
 
-import type {HSide, PersistOptions, Some} from '@xh/hoist/core';
+import type {HoistModel, HSide, PersistOptions, Some} from '@xh/hoist/core';
 import type {
     FilterBindTarget,
     FilterMatchMode,
@@ -142,6 +142,14 @@ export interface GridFilterBindTarget extends FilterBindTarget, FilterValueSourc
  */
 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/cmp/grid/impl/MenuSupport.ts

@@ -138,7 +138,7 @@ function replaceHoistToken(token: string, gridModel: GridModel): Some<RecordActi
                 text: 'Columns...',
                 icon: Icon.gridPanel(),
                 hidden: !gridModel?.colChooserModel,
-                actionFn: () => (gridModel.colChooserModel as any)?.open()
+                actionFn: () => gridModel.colChooserModel?.open()
             });
         case 'expandCollapseAll': // For backward compatibility
         case 'expandCollapse':

package/cmp/input/SegmentedControlOption.ts

@@ -33,6 +33,13 @@ 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;
 }
 
 /**
@@ -58,4 +65,11 @@ 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/cmp/store/impl/StoreFilterFieldImplModel.ts

@@ -66,7 +66,7 @@ export class StoreFilterFieldImplModel extends HoistModel {
 
         this.addReaction(
             {
-                track: () => [this.filterText, gridModel?.columns, gridModel?.groupBy],
+                track: () => [this.filterText, gridModel?.columns],
                 run: () => this.regenerateFilter(),
                 fireImmediately: true
             },
@@ -161,8 +161,7 @@ export class StoreFilterFieldImplModel extends HoistModel {
         if (excludeFields) ret = without(ret, ...excludeFields);
 
         if (gridModel) {
-            const groupBy = gridModel.groupBy,
-                visibleCols = gridModel.getVisibleLeafColumns();
+            const visibleCols = gridModel.getVisibleLeafColumns();
 
             // Push on dot-delimited grid column fields. These are supported by Grid and traverse
             // sub-objects in StoreRecord.data to display nested properties. Given that Grid treats these
@@ -182,12 +181,12 @@ export class StoreFilterFieldImplModel extends HoistModel {
             // Run exclude once more to support explicitly excluding a dot-sep field added above.
             if (excludeFields) ret = without(ret, ...excludeFields);
 
-            // Final filter for column visibility, or explicit request for inclusion.
+            // Final filter for column visibility, or explicit request for inclusion. Deliberately
+            // not keyed to groupBy, so filter results stay stable across regrouping (see #4070).
             ret = ret.filter(f => {
                 return (
                     (includeFields && includeFields.includes(f)) ||
-                    visibleCols.find(c => c.field === f) ||
-                    groupBy.includes(f)
+                    visibleCols.find(c => c.field === f)
                 );
             });
         }

package/core/HoistAppModel.ts

@@ -5,8 +5,7 @@
  * Copyright © 2026 Extremely Heavy Industries Inc.
  */
 import {webSocketIndicator} from '@xh/hoist/cmp/websocket';
-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
@@ -52,7 +51,7 @@ export class HoistAppModel extends HoistModel {
     /**
      * Provide the initial set of Router5 Routes to be used by this application.
      */
-    getRoutes(): Route[] {
+    getRoutes(): HoistRoute[] {
         return [];
     }