@xh/hoist 80.0.0-SNAPSHOT.1769000829579 → 80.0.0-SNAPSHOT.1769011463076

package/CHANGELOG.md

@@ -19,6 +19,8 @@
     * `Store.isStore`
     * `View.isView`
     * `Filter.isFilter`
+* Replaced `LeftRightChooserFilter.anyMatch` with `matchMode`. Changes are not expected to be
+  required as apps typically do not create this component directly.
 
 ### 🐞 Bug Fixes
 
@@ -32,6 +34,8 @@
   hamburger menu. Set to `true` to render the current user's initials instead or provide a function
   to render a custom element for the user.
 * Added `AggregationContext` as an additional argument to `CubeField.canAggregateFn`.
+* Added `filterMatchMode` option to `ColChooserModel`, allowing customizing match to `start`,
+  `startWord`, or `any`.
 
 ### ⚙️ Typescript API Adjustments
 

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

@@ -29,7 +29,7 @@ export interface GridConfig {
     /** Config with which to create a GridFilterModel, or `true` to enable default. Desktop only.*/
     filterModel?: GridFilterModelConfig | boolean;
     /** Config with which to create a ColChooserModel, or boolean `true` to enable default.*/
-    colChooserModel?: ColChooserConfig | boolean;
+    colChooserModel?: Omit<ColChooserConfig, 'gridModel'> | boolean;
     /**
      * Function to be called when the user triggers GridModel.restoreDefaultsAsync(). This
      * function will be called after the built-in defaults have been restored, and can be

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

@@ -1,10 +1,10 @@
-import { GridFilterFieldSpecConfig } from '@xh/hoist/cmp/grid/filter/GridFilterFieldSpec';
-import { HSide, PersistOptions, Some } from '@xh/hoist/core';
-import { FilterBindTarget, FilterValueSource, Store, StoreRecord } from '@xh/hoist/data';
+import type { 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';
 import type { Column, ColumnSpec } from './columns/Column';
 import type { ColumnGroup, ColumnGroupSpec } from './columns/ColumnGroup';
+import type { GridFilterFieldSpecConfig } from './filter/GridFilterFieldSpec';
 import type { GridModel } from './GridModel';
 export interface ColumnState {
     colId: string;
@@ -89,6 +89,8 @@ export interface GridFilterBindTarget extends FilterBindTarget, FilterValueSourc
  */
 export type GroupRowRenderer = (context: ICellRendererParams) => ReactNode;
 export interface ColChooserConfig {
+    /** GridModel to bind to. Not required if creating via `GridModel.colChooserModel` */
+    gridModel?: GridModel;
     /**
      * Immediately render changed columns on grid (default true).
      * Set to false to enable Save button for committing changes on save. Desktop only.
@@ -108,6 +110,8 @@ export interface ColChooserConfig {
     width?: string | number;
     /** Chooser height for popover and dialog. Desktop only. */
     height?: string | number;
+    /** Mode to use when filtering (default 'startWord'). Desktop only. */
+    filterMatchMode?: FilterMatchMode;
 }
 export type ColumnOrGroup = Column | ColumnGroup;
 export type ColumnOrGroupSpec = ColumnSpec | ColumnGroupSpec;

package/build/types/cmp/store/StoreFilterField.d.ts

@@ -1,6 +1,6 @@
-import { GridModel } from '@xh/hoist/cmp/grid';
+import type { GridModel } from '@xh/hoist/cmp/grid';
 import { DefaultHoistProps, HoistModel } from '@xh/hoist/core';
-import { FilterTestFn, Store } from '@xh/hoist/data';
+import type { FilterMatchMode, FilterTestFn, Store } from '@xh/hoist/data';
 export interface StoreFilterFieldProps extends DefaultHoistProps {
     /**
      * Automatically apply the filter to bound store (default true). Applications that need to
@@ -37,7 +37,7 @@ export interface StoreFilterFieldProps extends DefaultHoistProps {
      */
     includeFields?: string[];
     /** Mode to use when filtering (default 'startWord'). */
-    matchMode?: 'start' | 'startWord' | 'any';
+    matchMode?: FilterMatchMode;
     /** Optional model for raw value binding - see comments on the `bind` prop for details. */
     model?: HoistModel;
     /**

package/build/types/cmp/store/impl/StoreFilterFieldImplModel.d.ts

@@ -1,5 +1,6 @@
-import { HoistModel } from '@xh/hoist/core';
 import { GridModel } from '@xh/hoist/cmp/grid';
+import { HoistModel } from '@xh/hoist/core';
+import type { FilterMatchMode, StoreRecord } from '@xh/hoist/data';
 import { Store } from '@xh/hoist/data';
 /**
  * @internal
@@ -9,15 +10,16 @@ export declare class StoreFilterFieldImplModel extends HoistModel {
     model: any;
     gridModel: GridModel;
     store: Store;
-    filter: any;
-    bufferedApplyFilter: any;
+    private filter;
+    private bufferedApplyFilter;
+    get matchMode(): FilterMatchMode;
     constructor();
     onLinked(): void;
-    get filterText(): any;
-    setFilterText(v: any): void;
+    get filterText(): string;
+    setFilterText(v: string): void;
     applyFilter(): void;
     regenerateFilter(): void;
-    getRegex(searchTerm: any): RegExp;
+    getRegex(searchTerm: string): RegExp;
     getActiveFields(): string[];
-    getValGetters(fieldName: any): ((record: any) => any)[] | ((rec: any) => any);
+    getValGetters(fieldName: string): ((record: StoreRecord) => any)[] | ((rec: StoreRecord) => any);
 }

package/build/types/data/filter/Types.d.ts

@@ -58,3 +58,10 @@ export interface FilterValueSource {
     isFilterValueSource: true;
 }
 export declare function isFilterValueSource(v: unknown): v is FilterValueSource;
+/**
+ * Option to customize matching behavior for {@link StoreFilterField} and related components.
+ *   - `start`: match beginning of candidate strings only.
+ *   - `startWord`: match beginning of words within candidate strings.
+ *   - `any`: match anywhere within candidate strings.
+ */
+export type FilterMatchMode = 'start' | 'startWord' | 'any';

package/build/types/desktop/cmp/grid/find/GridFindField.d.ts

@@ -1,5 +1,6 @@
-import { GridModel } from '@xh/hoist/cmp/grid';
+import type { GridModel } from '@xh/hoist/cmp/grid';
 import { LayoutProps } from '@xh/hoist/core';
+import type { FilterMatchMode } from '@xh/hoist/data';
 import { TextInputProps } from '@xh/hoist/desktop/cmp/input';
 import '@xh/hoist/desktop/register';
 import './GridFindField.scss';
@@ -10,7 +11,7 @@ export interface GridFindFieldProps extends TextInputProps, LayoutProps {
      */
     gridModel?: GridModel;
     /** Mode to use when searching (default 'startWord'). */
-    matchMode?: 'start' | 'startWord' | 'any';
+    matchMode?: FilterMatchMode;
     /**
      * Delay (in ms) to buffer searching the grid after the value changes from user input.
      * Default 200ms. Set to 0 to filter immediately on each keystroke.

package/build/types/desktop/cmp/grid/find/impl/GridFindFieldImplModel.d.ts

@@ -1,4 +1,6 @@
+import { GridModel } from '@xh/hoist/cmp/grid';
 import { HoistModel } from '@xh/hoist/core';
+import type { FilterMatchMode, StoreRecord } from '@xh/hoist/data';
 import { TextInputModel } from '@xh/hoist/desktop/cmp/input';
 /**
  * @internal
@@ -6,20 +8,20 @@ import { TextInputModel } from '@xh/hoist/desktop/cmp/input';
 export declare class GridFindFieldImplModel extends HoistModel {
     xhImpl: boolean;
     query: string;
-    get matchMode(): string;
+    get matchMode(): FilterMatchMode;
     get queryBuffer(): number;
     get includeFields(): string[];
     get excludeFields(): string[];
     results: any;
     inputRef: import("react").RefObject<TextInputModel> & import("react").RefCallback<TextInputModel>;
-    _records: any;
+    _records: StoreRecord[];
     get count(): number;
     get selectedIdx(): number;
     get countLabel(): string;
     get hasFocus(): boolean;
     get hasQuery(): boolean;
     get hasResults(): boolean;
-    get gridModel(): any;
+    get gridModel(): GridModel;
     constructor();
     onLinked(): void;
     selectPrev(): void;

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

@@ -1,5 +1,6 @@
-import { GridModel } from '@xh/hoist/cmp/grid';
+import { ColChooserConfig, GridModel } 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';
 /**
  * State management for the ColChooser component.
@@ -14,16 +15,10 @@ export declare class ColChooserModel extends HoistModel {
     commitOnChange: boolean;
     showRestoreDefaults: boolean;
     autosizeOnCommit: boolean;
-    width: number;
-    height: number;
-    constructor({ gridModel, commitOnChange, showRestoreDefaults, autosizeOnCommit, width, height }: {
-        gridModel: any;
-        commitOnChange?: boolean;
-        showRestoreDefaults?: boolean;
-        autosizeOnCommit?: boolean;
-        width?: number;
-        height?: number;
-    });
+    width: string | number;
+    height: string | number;
+    filterMatchMode: FilterMatchMode;
+    constructor({ gridModel, commitOnChange, showRestoreDefaults, autosizeOnCommit, width, height, filterMatchMode }: ColChooserConfig);
     open(): void;
     openPopover(): void;
     close(): void;

package/build/types/desktop/cmp/leftrightchooser/LeftRightChooserFilter.d.ts

@@ -1,11 +1,12 @@
 import { HoistProps } from '@xh/hoist/core';
+import type { FilterMatchMode } from '@xh/hoist/data';
 import '@xh/hoist/desktop/register';
 import { LeftRightChooserModel } from './LeftRightChooserModel';
 export interface LeftRightChooserFilterProps extends HoistProps<LeftRightChooserModel> {
     /** Names of fields in chooser on which to filter. Defaults to ['text', 'group'] */
     fields?: string[];
-    /** True to prevent regex start line anchor from being added. */
-    anyMatch?: boolean;
+    /** Mode to use when filtering (default 'startWord'). */
+    matchMode?: FilterMatchMode;
 }
 /**
  * A Component that can bind to a LeftRightChooser and filter both lists

package/cmp/grid/GridModel.ts

@@ -146,7 +146,7 @@ export interface GridConfig {
     filterModel?: GridFilterModelConfig | boolean;
 
     /** Config with which to create a ColChooserModel, or boolean `true` to enable default.*/
-    colChooserModel?: ColChooserConfig | boolean;
+    colChooserModel?: Omit<ColChooserConfig, 'gridModel'> | boolean;
 
     /**
      * Function to be called when the user triggers GridModel.restoreDefaultsAsync(). This

package/cmp/grid/Types.ts

@@ -5,10 +5,14 @@
  * Copyright © 2026 Extremely Heavy Industries Inc.
  */
 
-import {GridFilterFieldSpecConfig} from '@xh/hoist/cmp/grid/filter/GridFilterFieldSpec';
-import {HSide, PersistOptions, Some} from '@xh/hoist/core';
-import {FilterBindTarget, FilterValueSource, Store, StoreRecord} from '@xh/hoist/data';
-
+import type {HSide, PersistOptions, Some} from '@xh/hoist/core';
+import type {
+    FilterBindTarget,
+    FilterMatchMode,
+    FilterValueSource,
+    Store,
+    StoreRecord
+} from '@xh/hoist/data';
 import type {
     CellClassParams,
     CustomCellEditorProps,
@@ -23,6 +27,7 @@ import type {
 import type {ReactElement, ReactNode} from 'react';
 import type {Column, ColumnSpec} from './columns/Column';
 import type {ColumnGroup, ColumnGroupSpec} from './columns/ColumnGroup';
+import type {GridFilterFieldSpecConfig} from './filter/GridFilterFieldSpec';
 import type {GridModel} from './GridModel';
 
 export interface ColumnState {
@@ -124,6 +129,9 @@ export interface GridFilterBindTarget extends FilterBindTarget, FilterValueSourc
 export type GroupRowRenderer = (context: ICellRendererParams) => ReactNode;
 
 export interface ColChooserConfig {
+    /** GridModel to bind to. Not required if creating via `GridModel.colChooserModel` */
+    gridModel?: GridModel;
+
     /**
      * Immediately render changed columns on grid (default true).
      * Set to false to enable Save button for committing changes on save. Desktop only.
@@ -147,6 +155,9 @@ export interface ColChooserConfig {
 
     /** Chooser height for popover and dialog. Desktop only. */
     height?: string | number;
+
+    /** Mode to use when filtering (default 'startWord'). Desktop only. */
+    filterMatchMode?: FilterMatchMode;
 }
 
 export type ColumnOrGroup = Column | ColumnGroup;

package/cmp/store/StoreFilterField.ts

@@ -4,9 +4,9 @@
  *
  * Copyright © 2026 Extremely Heavy Industries Inc.
  */
-import {GridModel} from '@xh/hoist/cmp/grid';
+import type {GridModel} from '@xh/hoist/cmp/grid';
 import {DefaultHoistProps, hoistCmp, HoistModel, useLocalModel, XH} from '@xh/hoist/core';
-import {FilterTestFn, Store} from '@xh/hoist/data';
+import type {FilterMatchMode, FilterTestFn, Store} from '@xh/hoist/data';
 import {storeFilterFieldImpl as desktopStoreFilterFieldImpl} from '@xh/hoist/dynamics/desktop';
 import {storeFilterFieldImpl as mobileStoreFilterFieldImpl} from '@xh/hoist/dynamics/mobile';
 import {StoreFilterFieldImplModel} from './impl/StoreFilterFieldImplModel';
@@ -53,7 +53,7 @@ export interface StoreFilterFieldProps extends DefaultHoistProps {
     includeFields?: string[];
 
     /** Mode to use when filtering (default 'startWord'). */
-    matchMode?: 'start' | 'startWord' | 'any';
+    matchMode?: FilterMatchMode;
 
     /** Optional model for raw value binding - see comments on the `bind` prop for details. */
     model?: HoistModel;

package/cmp/store/impl/StoreFilterFieldImplModel.ts

@@ -4,10 +4,11 @@
  *
  * Copyright © 2026 Extremely Heavy Industries Inc.
  */
-import {HoistModel, XH, lookup} from '@xh/hoist/core';
 import {GridModel} from '@xh/hoist/cmp/grid';
+import {HoistModel, lookup, XH} from '@xh/hoist/core';
+import type {FilterMatchMode, StoreRecord} from '@xh/hoist/data';
 import {CompoundFilter, FilterLike, Store, withFilterByKey} from '@xh/hoist/data';
-import {action, makeObservable, comparer} from '@xh/hoist/mobx';
+import {action, comparer, makeObservable} from '@xh/hoist/mobx';
 import {stripTags, throwIf, warnIf, withDefault} from '@xh/hoist/utils/js';
 import {
     debounce,
@@ -33,8 +34,12 @@ export class StoreFilterFieldImplModel extends HoistModel {
     gridModel: GridModel;
     store: Store;
 
-    filter;
-    bufferedApplyFilter;
+    private filter: (rec: StoreRecord) => boolean;
+    private bufferedApplyFilter;
+
+    get matchMode(): FilterMatchMode {
+        return this.componentProps.matchMode ?? 'startWord';
+    }
 
     constructor() {
         super();
@@ -59,29 +64,30 @@ export class StoreFilterFieldImplModel extends HoistModel {
 
         this.bufferedApplyFilter = debounce(() => this.applyFilter(), filterBuffer);
 
-        this.addReaction({
-            track: () => [this.filterText, gridModel?.columns, gridModel?.groupBy],
-            run: () => this.regenerateFilter(),
-            fireImmediately: true
-        });
-
-        this.addReaction({
-            track: () => [this.componentProps.includeFields, this.componentProps.excludeFields],
-            run: () => this.regenerateFilter(),
-            equals: comparer.structural
-        });
+        this.addReaction(
+            {
+                track: () => [this.filterText, gridModel?.columns, gridModel?.groupBy],
+                run: () => this.regenerateFilter(),
+                fireImmediately: true
+            },
+            {
+                track: () => [this.componentProps.includeFields, this.componentProps.excludeFields],
+                run: () => this.regenerateFilter(),
+                equals: comparer.structural
+            }
+        );
     }
 
     //------------------------------------------------------------------
     // Trampoline value to bindable -- from bound model, or store
     //------------------------------------------------------------------
-    get filterText() {
+    get filterText(): string {
         const {bind, model} = this.componentProps;
         return bind ? model[bind] : this.store.xhFilterText;
     }
 
     @action
-    setFilterText(v) {
+    setFilterText(v: string) {
         const {bind, model} = this.componentProps;
         if (bind) {
             model.setBindable(bind, v);
@@ -122,7 +128,7 @@ export class StoreFilterFieldImplModel extends HoistModel {
         if (filterText && !isEmpty(activeFields)) {
             const regex = this.getRegex(filterText),
                 valGetters = flatMap(activeFields, fieldPath => this.getValGetters(fieldPath));
-            newFilter = rec => valGetters.some(fn => regex.test(fn(rec)));
+            newFilter = (rec: StoreRecord) => valGetters.some(fn => regex.test(fn(rec)));
         }
 
         if (filter === newFilter) return;
@@ -140,9 +146,9 @@ export class StoreFilterFieldImplModel extends HoistModel {
         }
     }
 
-    getRegex(searchTerm) {
+    getRegex(searchTerm: string): RegExp {
         searchTerm = escapeRegExp(searchTerm);
-        switch (this.componentProps.matchMode ?? 'startWord') {
+        switch (this.matchMode) {
             case 'any':
                 return new RegExp(searchTerm, 'i');
             case 'start':
@@ -153,11 +159,11 @@ export class StoreFilterFieldImplModel extends HoistModel {
         throw XH.exception('Unknown matchMode in StoreFilterField');
     }
 
-    getActiveFields() {
+    getActiveFields(): string[] {
         const {gridModel, store, componentProps} = this,
             {includeFields, excludeFields} = componentProps;
 
-        let ret = store ? ['id', ...store.fields.map(f => f.name)] : [];
+        let ret = store ? ['id', ...store.fieldNames] : [];
         if (includeFields) ret = store ? intersection(ret, includeFields) : includeFields;
         if (excludeFields) ret = without(ret, ...excludeFields);
 
@@ -196,7 +202,7 @@ export class StoreFilterFieldImplModel extends HoistModel {
         return ret;
     }
 
-    getValGetters(fieldName) {
+    getValGetters(fieldName: string) {
         const {gridModel} = this;
 
         // If a GridModel has been configured, the user is looking at rendered values in a grid and
@@ -219,7 +225,7 @@ export class StoreFilterFieldImplModel extends HoistModel {
 
                 return cols.map(column => {
                     const {renderer, getValueFn} = column;
-                    return record => {
+                    return (record: StoreRecord) => {
                         const ctx = {
                                 record,
                                 field: field.name,
@@ -239,7 +245,7 @@ export class StoreFilterFieldImplModel extends HoistModel {
         // Otherwise just match raw.
         // Use expensive get() only when needed to support dot-separated paths.
         return fieldName.includes('.')
-            ? rec => get(rec.data, fieldName)
-            : rec => rec.data[fieldName];
+            ? (rec: StoreRecord) => get(rec.data, fieldName)
+            : (rec: StoreRecord) => rec.data[fieldName];
     }
 }

package/data/filter/Types.ts

@@ -97,3 +97,11 @@ export interface FilterValueSource {
 export function isFilterValueSource(v: unknown): v is FilterValueSource {
     return (v as any)?.isFilterValueSource === true;
 }
+
+/**
+ * Option to customize matching behavior for {@link StoreFilterField} and related components.
+ *   - `start`: match beginning of candidate strings only.
+ *   - `startWord`: match beginning of words within candidate strings.
+ *   - `any`: match anywhere within candidate strings.
+ */
+export type FilterMatchMode = 'start' | 'startWord' | 'any';

package/desktop/cmp/grid/find/GridFindField.ts

@@ -5,9 +5,10 @@
  * Copyright © 2026 Extremely Heavy Industries Inc.
  */
 import composeRefs from '@seznam/compose-react-refs/composeRefs';
-import {GridModel} from '@xh/hoist/cmp/grid';
+import type {GridModel} from '@xh/hoist/cmp/grid';
 import {hbox, span, vbox} from '@xh/hoist/cmp/layout';
 import {hoistCmp, LayoutProps, useLocalModel} from '@xh/hoist/core';
+import type {FilterMatchMode} from '@xh/hoist/data';
 import {button} from '@xh/hoist/desktop/cmp/button';
 import {textInput, TextInputProps} from '@xh/hoist/desktop/cmp/input';
 import '@xh/hoist/desktop/register';
@@ -25,7 +26,7 @@ export interface GridFindFieldProps extends TextInputProps, LayoutProps {
     gridModel?: GridModel;
 
     /** Mode to use when searching (default 'startWord'). */
-    matchMode?: 'start' | 'startWord' | 'any';
+    matchMode?: FilterMatchMode;
 
     /**
      * Delay (in ms) to buffer searching the grid after the value changes from user input.

package/desktop/cmp/grid/find/impl/GridFindFieldImplModel.ts

@@ -6,6 +6,7 @@
  */
 import {GridModel} from '@xh/hoist/cmp/grid';
 import {HoistModel, XH} from '@xh/hoist/core';
+import type {FilterMatchMode, StoreRecord} from '@xh/hoist/data';
 import {TextInputModel} from '@xh/hoist/desktop/cmp/input';
 import {action, bindable, comparer, computed, makeObservable, observable} from '@xh/hoist/mobx';
 import {stripTags, withDefault} from '@xh/hoist/utils/js';
@@ -32,22 +33,25 @@ export class GridFindFieldImplModel extends HoistModel {
     @bindable
     query: string = null;
 
-    get matchMode(): string {
+    get matchMode(): FilterMatchMode {
         return this.componentProps.matchMode ?? 'startWord';
     }
+
     get queryBuffer(): number {
         return this.componentProps.queryBuffer ?? 200;
     }
+
     get includeFields(): string[] {
         return this.componentProps.includeFields;
     }
+
     get excludeFields(): string[] {
         return this.componentProps.excludeFields;
     }
 
     @observable.ref results;
     inputRef = createObservableRef<TextInputModel>();
-    _records = null;
+    _records: StoreRecord[] = null;
 
     get count(): number {
         return this.results?.length;
@@ -81,7 +85,7 @@ export class GridFindFieldImplModel extends HoistModel {
     }
 
     @computed
-    get gridModel() {
+    get gridModel(): GridModel {
         const ret = withDefault(this.componentProps.gridModel, this.lookupModel(GridModel));
         if (!ret) {
             this.logError("No GridModel available.  Provide via a 'gridModel' prop, or context.");
@@ -100,30 +104,30 @@ export class GridFindFieldImplModel extends HoistModel {
     }
 
     override onLinked() {
-        this.addReaction({
-            track: () => this.query,
-            run: () => this.updateResults(true),
-            debounce: this.queryBuffer
-        });
-
-        this.addReaction({
-            track: () => [
-                this.gridModel?.store.records,
-                this.gridModel?.columns,
-                this.gridModel?.sortBy,
-                this.gridModel?.groupBy
-            ],
-            run: () => {
-                this._records = null;
-                if (this.hasQuery) this.updateResults();
+        this.addReaction(
+            {
+                track: () => this.query,
+                run: () => this.updateResults(true),
+                debounce: this.queryBuffer
+            },
+            {
+                track: () => [
+                    this.gridModel?.store.records,
+                    this.gridModel?.columns,
+                    this.gridModel?.sortBy,
+                    this.gridModel?.groupBy
+                ],
+                run: () => {
+                    this._records = null;
+                    if (this.hasQuery) this.updateResults();
+                }
+            },
+            {
+                track: () => [this.includeFields, this.excludeFields, this.matchMode],
+                run: () => this.updateResults(),
+                equals: comparer.structural
             }
-        });
-
-        this.addReaction({
-            track: () => [this.includeFields, this.excludeFields],
-            run: () => this.updateResults(),
-            equals: comparer.structural
-        });
+        );
     }
 
     selectPrev() {
@@ -180,7 +184,7 @@ export class GridFindFieldImplModel extends HoistModel {
         }
     }
 
-    private getRecords() {
+    private getRecords(): StoreRecord[] {
         if (!this._records) {
             const records = this.sortRecordsRecursive([...this.gridModel.store.rootRecords]);
             this._records = this.sortRecordsByGroupBy(records);
@@ -189,10 +193,10 @@ export class GridFindFieldImplModel extends HoistModel {
     }
 
     // Sort records with GridModel's sortBy(s) using the Column's comparator
-    private sortRecordsRecursive(records) {
+    private sortRecordsRecursive(records: StoreRecord[]): StoreRecord[] {
         const {gridModel} = this,
             {sortBy, treeMode, agApi, store} = gridModel,
-            ret = [];
+            ret: StoreRecord[] = [];
 
         [...sortBy].reverse().forEach(it => {
             const column = gridModel.getColumn(it.colId);
@@ -225,7 +229,7 @@ export class GridFindFieldImplModel extends HoistModel {
     }
 
     // Sort records with GridModel's groupBy(s) using the GridModel's groupSortFn
-    private sortRecordsByGroupBy(records) {
+    private sortRecordsByGroupBy(records: StoreRecord[]) {
         const {gridModel} = this,
             {agApi, groupBy, groupSortFn, store} = gridModel;
 
@@ -249,7 +253,7 @@ export class GridFindFieldImplModel extends HoistModel {
         return records;
     }
 
-    private getRegex(searchTerm) {
+    private getRegex(searchTerm: string): RegExp {
         searchTerm = escapeRegExp(searchTerm);
         switch (this.matchMode) {
             case 'any':
@@ -262,12 +266,12 @@ export class GridFindFieldImplModel extends HoistModel {
         throw XH.exception('Unknown matchMode in GridFindField');
     }
 
-    private getActiveFields() {
+    private getActiveFields(): string[] {
         const {gridModel, includeFields, excludeFields} = this,
             groupBy = gridModel.groupBy,
             visibleCols = gridModel.getVisibleLeafColumns();
 
-        let ret = ['id', ...gridModel.store.fields.map(f => f.name)];
+        let ret = ['id', ...gridModel.store.fieldNames];
         if (includeFields) ret = intersection(ret, includeFields);
         if (excludeFields) ret = without(ret, ...excludeFields);
 
@@ -301,7 +305,7 @@ export class GridFindFieldImplModel extends HoistModel {
         return ret;
     }
 
-    private getValGetters(fieldName) {
+    private getValGetters(fieldName: string) {
         const {gridModel} = this,
             {store} = gridModel,
             field = store.getField(fieldName);
@@ -313,7 +317,7 @@ export class GridFindFieldImplModel extends HoistModel {
 
             return cols.map(column => {
                 const {renderer, getValueFn} = column;
-                return record => {
+                return (record: StoreRecord) => {
                     const ctx = {
                             record,
                             field: fieldName,
@@ -332,7 +336,7 @@ export class GridFindFieldImplModel extends HoistModel {
         // Otherwise just match raw.
         // Use expensive get() only when needed to support dot-separated paths.
         return fieldName.includes('.')
-            ? rec => get(rec.data, fieldName)
-            : rec => rec.data[fieldName];
+            ? (rec: StoreRecord) => get(rec.data, fieldName)
+            : (rec: StoreRecord) => rec.data[fieldName];
     }
 }