@xh/hoist 80.0.0-SNAPSHOT.1767974090726 → 80.0.0-SNAPSHOT.1767982629403

package/CHANGELOG.md

@@ -10,6 +10,18 @@
     * Renamed `AppContainerModel.loadModel` to `loadObserver`. This is primarily an internal model,
       so there is no deprecated alias. Any app usages should swap to `XH.appLoadObserver`.
     * Removed additional references to deprecated `loadModel` within Hoist itself.
+* Removed the following instance getters - use new static typeguards instead:
+  * `Store.isStore`
+  * `View.isView`
+  * `Filter.isFilter`
+
+### ⚙️ Typescript API Adjustments
+
+* Introduced new `FilterBindTarget` and `FilterValueSource` interfaces to generalize the data
+  sources that could be used with `FilterChooserModel` and `GridFilterModel`. Both `Store` and
+  `View` implement these interfaces, meaning no changes are required for apps, but it is now
+  possible to use these models with other, alternate implementations if needed.
+* Added new static typeguard methods on `Store`, `View`, and `Filter` + subclasses.
 
 ## 79.0.0 - 2026-01-05
 

package/build/types/cmp/filter/FilterChooserFieldSpec.d.ts

@@ -31,7 +31,7 @@ export declare class FilterChooserFieldSpec extends BaseFilterFieldSpec {
     renderValue(value: any, op: FieldFilterOperator): string;
     parseValue(value: any, op: FieldFilterOperator): any;
     parseExample(example: any): any;
-    parseValueParser(valueParser: any): any;
+    parseValueParser(valueParser: FilterChooserValueParser): FilterChooserValueParser;
     loadValuesFromSource(): void;
 }
 type FilterChooserValueRenderer = (value: any, op: FieldFilterOperator) => ReactNode;

package/build/types/cmp/filter/FilterChooserModel.d.ts

@@ -1,5 +1,5 @@
 import { HoistModel, PersistOptions, TaskObserver, Thunkable } from '@xh/hoist/core';
-import { CompoundFilter, FieldFilter, Filter, Store, View } from '@xh/hoist/data';
+import { CompoundFilter, FieldFilter, Filter, FilterBindTarget, FilterValueSource } from '@xh/hoist/data';
 import { CompoundFilterSpec, FieldFilterSpec, FilterLike } from '@xh/hoist/data/filter/Types';
 import { ReactNode } from 'react';
 import { FilterChooserFieldSpec, FilterChooserFieldSpecConfig } from './FilterChooserFieldSpec';
@@ -15,16 +15,25 @@ export interface FilterChooserConfig {
     /** Default properties to be assigned to all FilterChooserFieldSpecs created by this model. */
     fieldSpecDefaults?: Partial<FilterChooserFieldSpecConfig>;
     /**
-     * Store or cube View that should actually be filtered as this model's value changes.
-     * This may be the same as `valueSource`. Leave undefined if you wish to combine this model's values
-     * with other filters, send it to the server, or otherwise observe and handle value changes manually.
+     * Target (typically a {@link Store} or Cube {@link View}) to which this model's filter should
+     * be automatically applied as it changes.
+     *
+     * Note this binding is bi-directional - the target's filter will also be *set onto* this model
+     * if it changes on the target, to support e.g. sync'd filtering between a FilterChooser and
+     * Grid filtering bound to the same target Store.
+     *
+     * Leave undefined if you wish to combine this model's values with other filters, send it to
+     * the server, or otherwise observe and handle value changes manually.
      */
-    bind?: Store | View;
+    bind?: FilterBindTarget;
     /**
-     * Store or cube View to be used to lookup matching Field-level defaults for `fieldSpecs` and to
-     * provide suggested data values (if so configured) from user input. Defaults to `bind` if provided.
+     * Source (typically a {@link Store} or Cube {@link View}) from which this model can lookup
+     * matching Field-level defaults for `fieldSpecs` and provide suggested data values (if so
+     * configured) from user input.
+     *
+     * Defaults to {@link bind} if the a bind target is provided and is a valid source.
      */
-    valueSource?: Store | View;
+    valueSource?: FilterValueSource;
     /**
      * Configuration for a filter appropriate to be rendered and managed by FilterChooser, or a function
      * to produce the same. Note that FilterChooser currently can only edit and create a flat collection
@@ -62,8 +71,8 @@ export interface FilterChooserConfig {
 export declare class FilterChooserModel extends HoistModel {
     value: FilterChooserFilter;
     favorites: FilterChooserFilter[];
-    bind: Store | View;
-    valueSource: Store | View;
+    bind: FilterBindTarget;
+    valueSource: FilterValueSource;
     fieldSpecs: FilterChooserFieldSpec[];
     suggestFieldsWhenEmpty: boolean;
     sortFieldSuggestions: boolean;

package/build/types/cmp/grid/filter/GridFilterFieldSpec.d.ts

@@ -22,17 +22,18 @@ export interface GridFilterFieldSpecConfig extends BaseFilterFieldSpecConfig {
 }
 /**
  * Apps should NOT instantiate this class directly.
- * Instead, provide a config for this object to the GridModel's `filterModel` config.
+ * Instead, provide a config for this object via {@link GridConfig.filterModel} config.
  */
 export declare class GridFilterFieldSpec extends BaseFilterFieldSpec {
     filterModel: GridFilterModel;
     renderer: ColumnRenderer;
     inputProps: PlainObject;
     defaultOp: FieldFilterOperator;
-    valueCount: number;
+    /** Total number of unique values for this field in the source, regardless of other filters. */
+    allValuesCount: number;
     constructor({ filterModel, renderer, inputProps, defaultOp, ...rest }: GridFilterFieldSpecConfig);
     getUniqueValue(value: unknown): unknown;
     loadValuesFromSource(): void;
     private cleanFilter;
-    private valueFromRecord;
+    private toDisplayValue;
 }

package/build/types/cmp/grid/filter/GridFilterModel.d.ts

@@ -38,7 +38,7 @@ export declare class GridFilterModel extends HoistModel {
     fromDisplayValue(value: any): any;
     openDialog(): void;
     closeDialog(): void;
-    setFilter(filter: any): void;
+    setFilter(filter: Filter): void;
     private parseFieldSpecs;
     private getOuterCompoundFilter;
 }

package/build/types/data/Store.d.ts

@@ -1,10 +1,7 @@
 import { HoistBase, PlainObject, Some } from '@xh/hoist/core';
-import { Field, FieldSpec } from './Field';
+import { Field, FieldSpec, Filter, FilterBindTarget, FilterLike, FilterValueSource, StoreRecord, StoreRecordId, StoreRecordOrId } from '@xh/hoist/data';
 import { RecordSet } from './impl/RecordSet';
 import { StoreErrorMap, StoreValidator } from './impl/StoreValidator';
-import { StoreRecord, StoreRecordId, StoreRecordOrId } from './StoreRecord';
-import { Filter } from './filter/Filter';
-import { FilterLike } from './filter/Types';
 export interface StoreConfig {
     /** Field names, configs, or instances. */
     fields?: Array<string | FieldSpec | Field>;
@@ -127,8 +124,9 @@ export type StoreRecordIdSpec = string | ((data: PlainObject) => StoreRecordId);
 /**
  * A managed and observable set of local, in-memory Records.
  */
-export declare class Store extends HoistBase {
-    get isStore(): boolean;
+export declare class Store extends HoistBase implements FilterBindTarget, FilterValueSource {
+    static isStore(obj: unknown): obj is Store;
+    readonly isFilterValueSource = true;
     fields: Field[];
     idSpec: (data: PlainObject) => StoreRecordId;
     processRawData: (raw: any) => any;
@@ -323,6 +321,7 @@ export declare class Store extends HoistBase {
      *      false if the record is either not in the Store at all or not filtered out.
      */
     recordIsFiltered(recOrId: StoreRecordOrId): boolean;
+    getValuesForFieldFilter(fieldName: string, filter?: Filter): any[];
     /**
      * Set whether the root should be loaded as summary data in loadData().
      */

package/build/types/data/cube/View.d.ts

@@ -1,5 +1,5 @@
 import { HoistBase, PlainObject, Some } from '@xh/hoist/core';
-import { Cube, CubeField, Filter, FilterLike, Query, QueryConfig, Store, StoreChangeLog, StoreRecordId } from '@xh/hoist/data';
+import { Cube, CubeField, Filter, FilterBindTarget, FilterLike, FilterValueSource, Query, QueryConfig, Store, StoreChangeLog, StoreRecordId } from '@xh/hoist/data';
 import { ViewRowData } from '@xh/hoist/data/cube/ViewRowData';
 import { AggregationContext } from './aggregate/AggregationContext';
 import { BaseRow } from './row/BaseRow';
@@ -33,8 +33,9 @@ export interface DimensionValue {
  * Primary interface for consuming grouped and aggregated data from the cube.
  * Applications should create via the {@link Cube.createView} factory.
  */
-export declare class View extends HoistBase {
-    get isView(): boolean;
+export declare class View extends HoistBase implements FilterBindTarget, FilterValueSource {
+    static isView(obj: unknown): obj is View;
+    readonly isFilterValueSource = true;
     /** Query defining this View. Update via {@link updateQuery}. */
     query: Query;
     /**
@@ -81,6 +82,7 @@ export declare class View extends HoistBase {
     setFilter(filter: FilterLike): void;
     noteCubeLoaded(): void;
     noteCubeUpdated(changeLog: StoreChangeLog): void;
+    getValuesForFieldFilter(fieldName: string, filter?: Filter): any[];
     private fullUpdate;
     private dataOnlyUpdate;
     private loadStores;

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

@@ -1,5 +1,5 @@
 import { HoistBase } from '@xh/hoist/core';
-import { Field, Store, FieldType, View } from '@xh/hoist/data';
+import { Field, FieldType, FilterValueSource } from '@xh/hoist/data';
 import { FieldFilterOperator } from './Types';
 export interface BaseFilterFieldSpecConfig {
     /** Identifying field name to filter on. */
@@ -11,7 +11,7 @@ export interface BaseFilterFieldSpecConfig {
     /** Operators available for filtering, will default to a supported set based on type.*/
     ops?: FieldFilterOperator[];
     /** Used to source matching data `Field` and extract values if configured. */
-    source?: Store | View;
+    source?: FilterValueSource;
     /**
      * True to provide interfaces and auto-complete options
      * with enumerated matches for creating '=' or '!=' filters. Defaults to true for
@@ -38,7 +38,7 @@ export declare abstract class BaseFilterFieldSpec extends HoistBase {
     fieldType: FieldType;
     displayName: string;
     ops: FieldFilterOperator[];
-    source: Store | View;
+    source: FilterValueSource;
     enableValues: boolean;
     forceSelection: boolean;
     values: any[];

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

@@ -6,7 +6,7 @@ import { CompoundFilterSpec, CompoundFilterOperator, FilterTestFn } from './Type
  * Immutable.
  */
 export declare class CompoundFilter extends Filter {
-    get isCompoundFilter(): boolean;
+    static isCompoundFilter(obj: unknown): obj is CompoundFilter;
     readonly filters: Filter[];
     readonly op: CompoundFilterOperator;
     /** @returns the singular field this filter operates on, if consistent across all clauses. */

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

@@ -11,7 +11,7 @@ import { FieldFilterOperator, FieldFilterSpec, FilterTestFn } from './Types';
  * Immutable.
  */
 export declare class FieldFilter extends Filter {
-    get isFieldFilter(): boolean;
+    static isFieldFilter(obj: unknown): obj is FieldFilter;
     readonly field: string;
     readonly op: FieldFilterOperator;
     readonly value: any;

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

@@ -1,5 +1,5 @@
-import { Store } from '../Store';
-import { FilterSpec, FilterTestFn } from './Types';
+import { Store } from '@xh/hoist/data';
+import type { FilterSpec, FilterTestFn } from './Types';
 /**
  * Base class for Hoist data package Filters.
  *
@@ -12,7 +12,7 @@ import { FilterSpec, FilterTestFn } from './Types';
  *      via an `AND` or `OR` operator.
  */
 export declare abstract class Filter {
-    get isFilter(): boolean;
+    static isFilter(obj: unknown): obj is Filter;
     /**
      * @returns a function that can be used to test a record or object.
      * @param store - if provided, return will be appropriate for testing records of this store.

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

@@ -8,7 +8,7 @@ import { FunctionFilterSpec, FilterTestFn } from './Types';
  * Immutable.
  */
 export declare class FunctionFilter extends Filter {
-    get isFunctionFilter(): boolean;
+    static isFunctionFilter(obj: unknown): obj is FunctionFilter;
     readonly key: string;
     readonly testFn: FilterTestFn;
     /**

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

@@ -1,14 +1,8 @@
-import { PlainObject } from '@xh/hoist/core';
-import { Filter } from './Filter';
-import { StoreRecord, Field, FieldType } from '../';
-export type CompoundFilterOperator = 'AND' | 'OR' | 'and' | 'or';
-export interface CompoundFilterSpec {
-    /** Collection of Filters or configs to create. */
-    filters: FilterLike[];
-    /** logical operator 'AND' (default) or 'OR'. */
-    op?: CompoundFilterOperator;
-}
-export type FieldFilterOperator = '=' | '!=' | '>' | '>=' | '<' | '<=' | 'like' | 'not like' | 'begins' | 'not begins' | 'ends' | 'not ends' | 'includes' | 'excludes';
+import type { PlainObject } from '@xh/hoist/core';
+import type { Filter } from './Filter';
+import type { StoreRecord, Field, FieldType } from '../';
+export type FilterLike = Filter | FilterSpec | FilterTestFn | FilterLike[];
+export type FilterSpec = FieldFilterSpec | FunctionFilterSpec | CompoundFilterSpec;
 export interface FieldFilterSpec {
     /** Name of Field to filter or Field instance. */
     field: string | Field;
@@ -18,6 +12,14 @@ export interface FieldFilterSpec {
     /** For internal serialization only. */
     valueType?: FieldType;
 }
+export type FieldFilterOperator = '=' | '!=' | '>' | '>=' | '<' | '<=' | 'like' | 'not like' | 'begins' | 'not begins' | 'ends' | 'not ends' | 'includes' | 'excludes';
+export interface CompoundFilterSpec {
+    /** Collection of Filters or configs to create. */
+    filters: FilterLike[];
+    /** logical operator 'AND' (default) or 'OR'. */
+    op?: CompoundFilterOperator;
+}
+export type CompoundFilterOperator = 'AND' | 'OR' | 'and' | 'or';
 export interface FunctionFilterSpec {
     /** Key used to identify this FunctionFilter.*/
     key: string;
@@ -30,5 +32,29 @@ export interface FunctionFilterSpec {
  * @returns  true if the candidate passes and should be included in filtered results.
  */
 export type FilterTestFn = (candidate: PlainObject | StoreRecord) => boolean;
-export type FilterSpec = FieldFilterSpec | FunctionFilterSpec | CompoundFilterSpec;
-export type FilterLike = Filter | FilterSpec | FilterTestFn | FilterLike[];
+/**
+ * Target (typically a {@link Store} or Cube {@link View}) that can be used by filtering models
+ * such as {@link FilterChooserModel} and {@link GridFilterModel} to get and set filters.
+ */
+export interface FilterBindTarget {
+    filter: Filter;
+    setFilter(filter: FilterLike): unknown;
+}
+/**
+ * Data provider (typically a {@link Store} or Cube {@link View}) that can be used by filtering
+ * models such as {@link FilterChooserModel} and {@link GridFilterModel} to source available
+ * values from within a dataset for display / suggestion to users.
+ */
+export interface FilterValueSource {
+    /** Names of all fields available in the source. */
+    fieldNames: string[];
+    /** @returns the Field instance for the given field name. */
+    getField(fieldName: string): Field;
+    /** @returns unique values for the given field, applying the given filter if provided. */
+    getValuesForFieldFilter(fieldName: string, filter?: Filter): any[];
+    /** Observable timestamp for the source's data, to trigger consumers to re-query values. */
+    lastUpdated: number;
+    /** For the {@link isFilterValueSource} typeguard. */
+    isFilterValueSource: true;
+}
+export declare function isFilterValueSource(v: unknown): v is FilterValueSource;

package/build/types/desktop/cmp/grid/impl/filter/headerfilter/values/ValuesTabModel.d.ts

@@ -1,6 +1,6 @@
 import { GridFilterModel, GridModel } from '@xh/hoist/cmp/grid';
 import { HoistModel } from '@xh/hoist/core';
-import { FieldFilterSpec } from '@xh/hoist/data';
+import type { FieldFilterSpec } from '@xh/hoist/data';
 import { HeaderFilterModel } from '../HeaderFilterModel';
 export declare class ValuesTabModel extends HoistModel {
     xhImpl: boolean;
@@ -24,7 +24,7 @@ export declare class ValuesTabModel extends HoistModel {
     get columnFilters(): import("@xh/hoist/data").FieldFilter[];
     get gridFilterModel(): GridFilterModel;
     get values(): any[];
-    get valueCount(): number;
+    get allValuesCount(): number;
     get hasHiddenValues(): boolean;
     get sortIcon(): any;
     constructor(headerFilterModel: HeaderFilterModel);

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

@@ -45,13 +45,13 @@ export declare class InspectorService extends HoistService {
     clearStats(): void;
     restoreDefaultsAsync(): Promise<void>;
     private sync;
-    setActiveInstances(ai: any): void;
+    setActiveInstances(ai: InspectorInstanceData[]): void;
     _prevModelCount: number;
     get conf(): any;
 }
 interface InspectorInstanceData {
     className: string;
-    created: Date;
+    created: number;
     isHoistModel: boolean;
     isHoistService: boolean;
     isStore: boolean;

package/cmp/filter/FilterChooserFieldSpec.ts

@@ -4,17 +4,17 @@
  *
  * Copyright © 2026 Extremely Heavy Industries Inc.
  */
+import {parseFieldValue} from '@xh/hoist/data';
 import {
     BaseFilterFieldSpec,
     BaseFilterFieldSpecConfig
 } from '@xh/hoist/data/filter/BaseFilterFieldSpec';
 import {FieldFilterOperator} from '@xh/hoist/data/filter/Types';
-import {parseFieldValue, View} from '@xh/hoist/data';
 import {fmtDate, parseNumber} from '@xh/hoist/format';
 import {stripTags, throwIf} from '@xh/hoist/utils/js';
-import {isFunction, isNil} from 'lodash';
-import {isValidElement, ReactNode} from 'react';
 import {renderToStaticMarkup} from '@xh/hoist/utils/react';
+import {isFunction} from 'lodash';
+import {isValidElement, ReactNode} from 'react';
 
 export interface FilterChooserFieldSpecConfig extends BaseFilterFieldSpecConfig {
     /**
@@ -120,7 +120,7 @@ export class FilterChooserFieldSpec extends BaseFilterFieldSpec {
         return 'value';
     }
 
-    parseValueParser(valueParser) {
+    parseValueParser(valueParser: FilterChooserValueParser): FilterChooserValueParser {
         // Default numeric parser
         if (!valueParser && (this.fieldType === 'int' || this.fieldType === 'number')) {
             return input => parseNumber(input);
@@ -129,24 +129,7 @@ export class FilterChooserFieldSpec extends BaseFilterFieldSpec {
     }
 
     loadValuesFromSource() {
-        const {field, source} = this,
-            values = new Set();
-
-        // Note use of unfiltered recordset here to source suggest values. This allows chooser to
-        // suggest values from already-filtered fields that will expand the results when selected.
-        const sourceStore = source instanceof View ? source.cube.store : source;
-        sourceStore.allRecords.forEach(rec => {
-            const val = rec.get(field);
-            if (!isNil(val)) {
-                if (sourceStore.getField(field).type === 'tags') {
-                    val.forEach(it => values.add(it));
-                } else {
-                    values.add(val);
-                }
-            }
-        });
-
-        this.values = Array.from(values);
+        this.values = this.source.getValuesForFieldFilter(this.field);
     }
 }
 

package/cmp/filter/FilterChooserModel.ts

@@ -18,9 +18,10 @@ import {
     CompoundFilter,
     FieldFilter,
     Filter,
+    FilterBindTarget,
+    FilterValueSource,
+    isFilterValueSource,
     parseFilter,
-    Store,
-    View,
     withFilterByTypes
 } from '@xh/hoist/data';
 import {CompoundFilterSpec, FieldFilterSpec, FilterLike} from '@xh/hoist/data/filter/Types';
@@ -66,17 +67,26 @@ export interface FilterChooserConfig {
     fieldSpecDefaults?: Partial<FilterChooserFieldSpecConfig>;
 
     /**
-     * Store or cube View that should actually be filtered as this model's value changes.
-     * This may be the same as `valueSource`. Leave undefined if you wish to combine this model's values
-     * with other filters, send it to the server, or otherwise observe and handle value changes manually.
+     * Target (typically a {@link Store} or Cube {@link View}) to which this model's filter should
+     * be automatically applied as it changes.
+     *
+     * Note this binding is bi-directional - the target's filter will also be *set onto* this model
+     * if it changes on the target, to support e.g. sync'd filtering between a FilterChooser and
+     * Grid filtering bound to the same target Store.
+     *
+     * Leave undefined if you wish to combine this model's values with other filters, send it to
+     * the server, or otherwise observe and handle value changes manually.
      */
-    bind?: Store | View;
+    bind?: FilterBindTarget;
 
     /**
-     * Store or cube View to be used to lookup matching Field-level defaults for `fieldSpecs` and to
-     * provide suggested data values (if so configured) from user input. Defaults to `bind` if provided.
+     * Source (typically a {@link Store} or Cube {@link View}) from which this model can lookup
+     * matching Field-level defaults for `fieldSpecs` and provide suggested data values (if so
+     * configured) from user input.
+     *
+     * Defaults to {@link bind} if the a bind target is provided and is a valid source.
      */
-    valueSource?: Store | View;
+    valueSource?: FilterValueSource;
 
     /**
      * Configuration for a filter appropriate to be rendered and managed by FilterChooser, or a function
@@ -124,8 +134,8 @@ export interface FilterChooserConfig {
 export class FilterChooserModel extends HoistModel {
     @observable.ref value: FilterChooserFilter = null;
     @observable.ref favorites: FilterChooserFilter[] = [];
-    bind: Store | View;
-    valueSource: Store | View;
+    bind: FilterBindTarget;
+    valueSource: FilterValueSource;
 
     @managed fieldSpecs: FilterChooserFieldSpec[] = [];
 
@@ -155,7 +165,7 @@ export class FilterChooserModel extends HoistModel {
         fieldSpecs,
         fieldSpecDefaults,
         bind = null,
-        valueSource = bind,
+        valueSource,
         initialValue = null,
         initialFavorites = [],
         suggestFieldsWhenEmpty = true,
@@ -169,7 +179,12 @@ export class FilterChooserModel extends HoistModel {
         makeObservable(this);
 
         this.bind = bind;
+
         this.valueSource = valueSource;
+        if (!this.valueSource && isFilterValueSource(bind)) {
+            this.valueSource = bind;
+        }
+
         this.fieldSpecs = this.parseFieldSpecs(fieldSpecs, fieldSpecDefaults);
         this.suggestFieldsWhenEmpty = !!suggestFieldsWhenEmpty;
         this.sortFieldSuggestions = sortFieldSuggestions;

package/cmp/grid/filter/GridFilterFieldSpec.ts

@@ -7,12 +7,18 @@
 import {ColumnRenderer} from '@xh/hoist/cmp/grid';
 import {HoistInputProps} from '@xh/hoist/cmp/input';
 import {PlainObject} from '@xh/hoist/core';
-import {FieldFilterOperator, parseFilter, StoreRecord, View} from '@xh/hoist/data';
+import {
+    CompoundFilter,
+    FieldFilter,
+    FieldFilterOperator,
+    Filter,
+    parseFilter
+} from '@xh/hoist/data';
 import {
     BaseFilterFieldSpec,
     BaseFilterFieldSpecConfig
 } from '@xh/hoist/data/filter/BaseFilterFieldSpec';
-import {castArray, compact, flatten, isDate, isEmpty, uniqBy} from 'lodash';
+import {castArray, compact, flatMap, isDate, isEmpty, uniqBy} from 'lodash';
 import {GridFilterModel} from './GridFilterModel';
 
 export interface GridFilterFieldSpecConfig extends BaseFilterFieldSpecConfig {
@@ -37,14 +43,16 @@ export interface GridFilterFieldSpecConfig extends BaseFilterFieldSpecConfig {
 
 /**
  * Apps should NOT instantiate this class directly.
- * Instead, provide a config for this object to the GridModel's `filterModel` config.
+ * Instead, provide a config for this object via {@link GridConfig.filterModel} config.
  */
 export class GridFilterFieldSpec extends BaseFilterFieldSpec {
     filterModel: GridFilterModel;
     renderer: ColumnRenderer;
     inputProps: PlainObject;
     defaultOp: FieldFilterOperator;
-    valueCount: number;
+
+    /** Total number of unique values for this field in the source, regardless of other filters. */
+    allValuesCount: number;
 
     constructor({
         filterModel,
@@ -71,68 +79,61 @@ export class GridFilterFieldSpec extends BaseFilterFieldSpec {
     //------------------------
     loadValuesFromSource() {
         const {filterModel, field, source, sourceField} = this,
-            columnFilters = filterModel.getColumnFilters(field),
-            sourceStore = source instanceof View ? source.cube.store : source,
-            allRecords = sourceStore.allRecords;
-
-        // Apply external filters *not* pertaining to this field to the sourceStore
-        // to get the filtered set of available values to offer as options.
-        const cleanedFilter = this.cleanFilter(filterModel.filter);
-        let filteredRecords = allRecords;
-        if (cleanedFilter) {
-            const testFn = parseFilter(cleanedFilter).getTestFn(sourceStore);
-            filteredRecords = allRecords.filter(testFn);
-        }
+            columnFilters = filterModel.getColumnFilters(field);
+
+        // All possible values for this field from our source.
+        const allSrcVals = source.getValuesForFieldFilter(field).map(it => this.toDisplayValue(it));
+
+        // Values from current column filter.
+        const colFilterVals = flatMap(columnFilters, filter => {
+            return castArray(filter.value).map(val => sourceField.parseVal(val));
+        }).map(it => this.toDisplayValue(it));
+
+        // Combine + unique - these are all values that *could* be shown in the filter UI.
+        const allValues = uniqBy([...allSrcVals, ...colFilterVals], this.getUniqueValue);
 
-        // Get values from current column filter
-        const filterValues = [];
-        columnFilters.forEach(filter => {
-            const newValues = castArray(filter.value).map(value => {
-                value = sourceField.parseVal(value);
-                return filterModel.toDisplayValue(value);
-            });
-            filterValues.push(...newValues);
-        });
-
-        // Combine unique values from record sets and column filters.
-        const allValues = uniqBy(
-            [...flatten(allRecords.map(rec => this.valueFromRecord(rec))), ...filterValues],
-            this.getUniqueValue
-        );
-        let values;
-        if (cleanedFilter) {
-            values = uniqBy(
-                [
-                    ...flatten(filteredRecords.map(rec => this.valueFromRecord(rec))),
-                    ...filterValues
-                ],
-                this.getUniqueValue
-            );
+        // Create a filter with other filters *not* pertaining to this field, if any.
+        // This filter will be used to get the subset of all possible values for this field that
+        // exist in records passing those other filters.
+        const otherFieldsFilter = this.cleanFilter(filterModel.filter);
+
+        let values: any[];
+
+        if (otherFieldsFilter) {
+            // If we have filters on other fields, get values from source that pass that filter.
+            // These will be the set of values shown in the filter UI.
+            const filteredSrcVals = source
+                .getValuesForFieldFilter(field, otherFieldsFilter)
+                .map(it => this.toDisplayValue(it));
+            values = uniqBy([...filteredSrcVals, ...colFilterVals], this.getUniqueValue);
         } else {
+            // Otherwise, all possible values are shown.
             values = allValues;
         }
 
         this.values = values.sort();
-        this.valueCount = allValues.length;
+
+        // Note count of all possible values for this field - allows ValuesTabModel
+        // to indicate to the user if some values are hidden due to other active filters.
+        this.allValuesCount = allValues.length;
     }
 
     // Recursively modify a Filter|CompoundFilter to remove all FieldFilters referencing this column
-    private cleanFilter(filter) {
-        if (!filter) return filter;
-
-        const {field, filters, op} = filter;
-        if (filters) {
+    private cleanFilter(filter: Filter): Filter {
+        if (CompoundFilter.isCompoundFilter(filter)) {
+            const {filters, op} = filter;
             const ret = compact(filters.map(it => this.cleanFilter(it)));
-            return !isEmpty(ret) ? {op, filters: ret} : null;
-        } else if (field === this.field) {
+            return !isEmpty(ret) ? parseFilter({op, filters: ret}) : null;
+        }
+
+        if (FieldFilter.isFieldFilter(filter) && filter.field === this.field) {
             return null;
         }
 
         return filter;
     }
 
-    private valueFromRecord(record: StoreRecord) {
-        const {filterModel, field} = this;
-        return filterModel.toDisplayValue(record.get(field));
+    private toDisplayValue(val: any): any {
+        return this.filterModel.toDisplayValue(val);
     }
 }