cx 26.6.0 → 26.7.0

package/build/data/ExposedValueView.js

@@ -45,7 +45,7 @@ export class ExposedValueView extends View {
         if (path == this.recordName) {
             data = this.getData();
             container = this.containerBinding.value(data);
-            if (!container || !container.hasOwnProperty(path))
+            if (!container || !container.hasOwnProperty(this.key))
                 return false;
             newContainer = Object.assign({}, container);
             delete newContainer[this.key];

package/build/data/comparer.d.ts

@@ -1,12 +1,10 @@
-interface Sorter {
-    value?: any;
-    field?: string;
-    direction?: string;
+import type { CollatorOptions, Sorter } from "../ui/Prop";
+export interface ExtendedSorter extends Sorter {
     comparer?: (a: any, b: any) => number;
     compare?: (a: any, b: any) => number;
+    sortOptions?: CollatorOptions;
 }
-export declare function getComparer(sorters: Sorter[], dataAccessor?: (x: any) => any, comparer?: (a: any, b: any) => number): (a: any, b: any) => number;
-export declare function indexSorter(sorters: Sorter[], dataAccessor?: (x: any) => any, compare?: (a: any, b: any) => number): (data: any[]) => number[];
-export declare function sorter(sorters: Sorter[], dataAccessor?: (x: any) => any, compare?: (a: any, b: any) => number): (data: any[]) => any[];
-export {};
+export declare function getComparer(sorters: ExtendedSorter[], dataAccessor?: (x: any) => any, comparer?: (a: any, b: any) => number): (a: any, b: any) => number;
+export declare function indexSorter(sorters: ExtendedSorter[], dataAccessor?: (x: any) => any, compare?: (a: any, b: any) => number): (data: any[]) => number[];
+export declare function sorter(sorters: ExtendedSorter[], dataAccessor?: (x: any) => any, compare?: (a: any, b: any) => number): (data: any[]) => any[];
 //# sourceMappingURL=comparer.d.ts.map

package/build/data/comparer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comparer.d.ts","sourceRoot":"","sources":["../../src/data/comparer.ts"],"names":[],"mappings":"AAIA,UAAU,MAAM;IACb,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,CAAC;IACtC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,CAAC;CACvC;AAED,wBAAgB,WAAW,CACxB,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,EAC9B,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,GACrC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,CAkC5B;AAED,wBAAgB,WAAW,CACxB,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,EAC9B,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,GACpC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,EAAE,CAO3B;AAED,wBAAgB,MAAM,CACnB,OAAO,EAAE,MAAM,EAAE,EACjB,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,EAC9B,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,GACpC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,CAQxB"}
+{"version":3,"file":"comparer.d.ts","sourceRoot":"","sources":["../../src/data/comparer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAE1D,MAAM,WAAW,cAAe,SAAQ,MAAM;IAC3C,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,CAAC;IACtC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,CAAC;IACrC,WAAW,CAAC,EAAE,eAAe,CAAC;CAChC;AAED,wBAAgB,WAAW,CACxB,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,EAC9B,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,GACrC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,CAkC5B;AAED,wBAAgB,WAAW,CACxB,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,EAC9B,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,GACpC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,EAAE,CAO3B;AAED,wBAAgB,MAAM,CACnB,OAAO,EAAE,cAAc,EAAE,EACzB,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,EAC9B,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,MAAM,GACpC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,CAQxB"}

package/build/ui/Prop.d.ts

@@ -82,7 +82,7 @@ export type RecordAlias = string | {
 export type SortDirection = "ASC" | "DESC";
 export interface Sorter {
     field?: string;
-    value?: (record: DataRecord) => any;
+    value?: Prop<any>;
     direction: SortDirection;
 }
 export interface CollatorOptions {

package/build/ui/Prop.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Prop.d.ts","sourceRoot":"","sources":["../../src/ui/Prop.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Prop.d.ts","sourceRoot":"","sources":["../../src/ui/Prop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,MAAM,MAAM,IAAI,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,GAAG,GAAG;IACf,GAAG,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,IAAI,GAAG;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAC;IACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC;AAExC,MAAM,MAAM,MAAM,CAAC,CAAC,IAAI;IACrB,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACjB,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC;IAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,WAAW,kBAAkB;IAChC,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;CAChC;AAED,MAAM,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;AAE/E,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,IAAI,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;AAEtD,MAAM,WAAW,UAAU;IACxB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED,MAAM,WAAW,MAAM;IACpB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC5B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;CAC5B;AAED;;;GAGG;AACH,MAAM,MAAM,WAAW,CAAC,CAAC,IACtB,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GACtB,CAAC,GACD,CAAC,SAAS,aAAa,CAAC,MAAM,CAAC,CAAC,GAC9B,CAAC,GACD,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,CAAC,GACvB,CAAC,GACD,CAAC,SAAS,IAAI,GACZ,GAAG,GACH,CAAC,SAAS,GAAG,GACX,MAAM,GACN,CAAC,SAAS,IAAI,GACZ,GAAG,GACH,CAAC,CAAC;AAEpB;;;GAGG;AACH,MAAM,MAAM,yBAAyB,CAAC,CAAC,IAAI;KACvC,CAAC,IAAI,MAAM,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,MAAM,eAAe,CAAC,CAAC,IAC1B,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GACtB,CAAC,GACD,CAAC,SAAS,aAAa,CAAC,MAAM,CAAC,CAAC,GAC9B,CAAC,GACD,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,CAAC,GACvB,CAAC,GACD,CAAC,SAAS,IAAI,GACZ,GAAG,GACH,CAAC,SAAS,GAAG,GACX,MAAM,GACN,CAAC,SAAS,IAAI,GACZ,GAAG,GACH,CAAC,SAAS,MAAM,GACd,yBAAyB,CAAC,CAAC,CAAC,GAC5B,CAAC,CAAC;AAEtB;;;GAGG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI;KAC7D,CAAC,IAAI,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;AACtC,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,GAAG,cAAc,CAAC;AAC5E,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;AACtC,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;AACxC,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC;AACtD,MAAM,MAAM,WAAW,CAAC,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;AAC7C,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;AACzC,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC;AACxC,MAAM,MAAM,OAAO,GAAG,UAAU,GAAG,cAAc,CAAC;AAElD,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG;IAAE,QAAQ,IAAI,MAAM,CAAA;CAAE,CAAC;AAE1D,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAC;AAE3C,MAAM,WAAW,MAAM;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAClB,SAAS,EAAE,aAAa,CAAC;CAC3B;AAED,MAAM,WAAW,eAAe;IAC7B,aAAa,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,SAAS,CAAC;IACrD,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,OAAO,CAAC;CAC1C"}

package/build/ui/adapter/ArrayAdapter.d.ts

@@ -1,9 +1,10 @@
 import { DataAdapter, DataAdapterRecord, DataAdapterConfig } from "./DataAdapter";
+import { type ExtendedSorter } from "../../data/comparer";
 import { Accessor } from "../../data/getAccessor";
 import { RenderingContext } from "../RenderingContext";
 import { Instance } from "../Instance";
 import { View } from "../../data/View";
-import { Prop, Sorter, CollatorOptions } from "../Prop";
+import { Prop, CollatorOptions } from "../Prop";
 export interface RecordStoreCache {
     recordStoreCache: WeakMap<any, View>;
     cacheByKey: Record<string | number, View>;
@@ -17,10 +18,7 @@ export interface ArrayAdapterConfig extends DataAdapterConfig {
     sortOptions?: CollatorOptions;
     preserveOrder?: boolean;
 }
-export interface ExtendedSorter extends Sorter {
-    comparer?: (a: any, b: any) => number;
-    sortOptions?: CollatorOptions;
-}
+export type { ExtendedSorter } from "../../data/comparer";
 export interface ResolvedSorter {
     getter: (x: any) => any;
     factor: number;
@@ -44,6 +42,6 @@ export declare class ArrayAdapter<T = any> extends DataAdapter<T> {
     setFilter(filterFn?: (data: T) => boolean): void;
     getComparer(sortOptions?: CollatorOptions): ((a: any, b: any) => number) | undefined;
     buildSorter(sorters: ExtendedSorter[]): void;
-    sort(sorters?: Sorter[] | ExtendedSorter[]): void;
+    sort(sorters?: ExtendedSorter[]): void;
 }
 //# sourceMappingURL=ArrayAdapter.d.ts.map

package/build/ui/adapter/ArrayAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ArrayAdapter.d.ts","sourceRoot":"","sources":["../../../src/ui/adapter/ArrayAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ArrayAdapter.d.ts","sourceRoot":"","sources":["../../../src/ui/adapter/ArrayAdapter.ts"],"names":[],"mappings":"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"}

package/build/ui/adapter/GroupAdapter.d.ts

@@ -1,9 +1,9 @@
 import { Grouper } from "../../data/Grouper";
 import { View } from "../../data/View";
 import { Instance } from "../Instance";
-import { Prop, SortDirection, StructuredProp } from "../Prop";
+import { Prop, SortDirection, Sorter, StructuredProp } from "../Prop";
 import { RenderingContext } from "../RenderingContext";
-import { ArrayAdapter, ArrayAdapterConfig, RecordStoreCache } from "./ArrayAdapter";
+import { ArrayAdapter, ArrayAdapterConfig, ExtendedSorter, RecordStoreCache } from "./ArrayAdapter";
 import { DataAdapterRecord } from "./DataAdapter";
 export interface GroupKey {
     [field: string]: Prop<any> | {
@@ -17,7 +17,17 @@ export interface GroupingConfig {
     text?: Prop<string>;
     includeHeader?: boolean;
     includeFooter?: boolean;
+    /** Custom group comparer. Takes precedence over `sortField`/`sortDirection`/`sorters`. */
     comparer?: ((a: any, b: any) => number) | null;
+    /**
+     * Sort groups by a single field resolved against the group's `key`, `aggregates` and `name`.
+     * Use an aggregate alias (e.g. `"total"`) to sort by an aggregate, or a key field to sort by key.
+     */
+    sortField?: string;
+    /** Sort direction used together with `sortField`. Defaults to `"ASC"`. */
+    sortDirection?: SortDirection;
+    /** Multi-field group sorting. Each sorter's `field` is resolved against the group's `key`, `aggregates` and `name`. */
+    sorters?: Sorter[];
     header?: any;
     footer?: any;
 }
@@ -42,6 +52,8 @@ export interface GroupAdapterConfig extends ArrayAdapterConfig {
     groupRecordsName?: string;
     groupings?: GroupingConfig[] | null;
     groupName?: string;
+    /** When enabled, the active record sorters also reorder groups (resolved against each group's key/aggregates/name). */
+    sortGroupsBySorters?: boolean;
 }
 export declare class GroupAdapter<T = any> extends ArrayAdapter<T> {
     aggregates?: StructuredProp;
@@ -49,7 +61,15 @@ export declare class GroupAdapter<T = any> extends ArrayAdapter<T> {
     groupRecordsName?: string;
     groupings?: ResolvedGrouping[] | null;
     groupName: string;
+    sortGroupsBySorters?: boolean;
+    /**
+     * Per-level comparer derived from the active record sorters, used to reorder groups when
+     * `sortGroupsBySorters` is set. A level's entry is `null` when no active sorter maps to that
+     * level's key/aggregate, so the grouping's own configured order is kept.
+     */
+    protected groupSortComparers?: (((a: any, b: any) => number) | null)[];
     constructor(config?: GroupAdapterConfig);
+    sort(sorters?: ExtendedSorter[]): void;
     init(): void;
     getRecords(context: RenderingContext, instance: Instance & Partial<RecordStoreCache>, records: T[], parentStore: View): DataAdapterRecord<T>[];
     protected processLevel(keys: any[], records: DataAdapterRecord<T>[], result: DataAdapterRecord<T>[], parentStore: View): void;

package/build/ui/adapter/GroupAdapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GroupAdapter.d.ts","sourceRoot":"","sources":["../../../src/ui/adapter/GroupAdapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GroupAdapter.d.ts","sourceRoot":"","sources":["../../../src/ui/adapter/GroupAdapter.ts"],"names":[],"mappings":"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"}

package/build/ui/adapter/GroupAdapter.js

@@ -3,12 +3,40 @@ import { Grouper } from "../../data/Grouper";
 import { ReadOnlyDataView } from "../../data/ReadOnlyDataView";
 import { isDataRecord } from "../../util";
 import { isArray } from "../../util/isArray";
+import { isDefined } from "../../util/isDefined";
+import { isNonEmptyArray } from "../../util/isNonEmptyArray";
 import { Culture } from "../Culture";
 import { ArrayAdapter } from "./ArrayAdapter";
 export class GroupAdapter extends ArrayAdapter {
+    /**
+     * Per-level comparer derived from the active record sorters, used to reorder groups when
+     * `sortGroupsBySorters` is set. A level's entry is `null` when no active sorter maps to that
+     * level's key/aggregate, so the grouping's own configured order is kept.
+     */
+    groupSortComparers;
     constructor(config) {
         super(config);
     }
+    sort(sorters) {
+        super.sort(sorters);
+        // When enabled, derive a group comparer from the active record sorters so that interactive
+        // column sorting also reorders the groups. A column only reorders groups at levels where its
+        // field is a group key or aggregate; other levels keep their configured order. The record-level
+        // value selector is ignored — the field is resolved against the group's key/aggregates/name.
+        if (this.sortGroupsBySorters && this.groupings) {
+            const cultureComparer = this.sortOptions ? Culture.getComparer(this.sortOptions) : undefined;
+            const colSorters = isNonEmptyArray(sorters)
+                ? sorters.map((s) => ({ field: s.field, direction: s.direction, comparer: s.comparer }))
+                : [];
+            this.groupSortComparers = this.groupings.map((g) => {
+                if (colSorters.length === 0)
+                    return null;
+                const fields = groupFieldNames(g, this.aggregates);
+                const applicable = colSorters.filter((s) => s.field && fields.has(s.field));
+                return applicable.length > 0 ? buildGroupComparer(applicable, cultureComparer) : null;
+            });
+        }
+    }
     init() {
         super.init();
         if (this.groupRecordsAlias) {
@@ -44,8 +72,12 @@ export class GroupAdapter extends ArrayAdapter {
         grouper.reset();
         grouper.processAll(records);
         let results = grouper.getResults();
-        if (grouping.comparer && !this.preserveOrder) {
-            results.sort(grouping.comparer);
+        // An active column sort that maps to this level's key/aggregate (when `sortGroupsBySorters` is
+        // enabled) takes over; otherwise the grouping's configured comparer (or implicit key order) applies.
+        const dynamicComparer = this.sortGroupsBySorters ? this.groupSortComparers?.[level] : undefined;
+        const comparer = dynamicComparer ?? grouping.comparer;
+        if (comparer && !this.preserveOrder) {
+            results.sort(comparer);
         }
         results.forEach((gr) => {
             keys.push(gr.key);
@@ -118,10 +150,21 @@ export class GroupAdapter extends ArrayAdapter {
                     });
                 }
                 const grouper = new Grouper(key, { ...this.aggregates, ...g.aggregates }, (r) => r.store.getData(), g.text);
+                const cultureComparer = this.sortOptions ? Culture.getComparer(this.sortOptions) : undefined;
+                // Sort groups by an aggregate/key/name through `sortField`/`sortDirection` or a `sorters` array.
+                let sortSorters = null;
+                if (isNonEmptyArray(g.sorters))
+                    sortSorters = g.sorters;
+                else if (g.sortField)
+                    sortSorters = [{ field: g.sortField, direction: g.sortDirection ?? "ASC" }];
+                // `comparer`, `sortField`/`sorters` and the implicit key order are equivalent alternatives; an
+                // explicit `comparer` wins, then declarative sorters, then sorting by key in declaration order.
                 const comparer = g.comparer ??
-                    (groupSorters.length > 0
-                        ? getComparer(groupSorters, (x) => x.key, this.sortOptions ? Culture.getComparer(this.sortOptions) : undefined)
-                        : null);
+                    (sortSorters
+                        ? buildGroupComparer(sortSorters, cultureComparer)
+                        : groupSorters.length > 0
+                            ? getComparer(groupSorters, (x) => x.key, cultureComparer)
+                            : null);
                 return {
                     ...g,
                     key: resolvedKey,
@@ -137,6 +180,38 @@ export class GroupAdapter extends ArrayAdapter {
 }
 GroupAdapter.prototype.groupName = "$group";
 GroupAdapter.prototype.preserveOrder = false;
+GroupAdapter.prototype.sortGroupsBySorters = false;
+// The set of fields a group can be sorted by at a given level: its key fields, its aggregate aliases
+// and the group name. Used to decide whether an active column sort applies to that grouping level.
+function groupFieldNames(grouping, adapterAggregates) {
+    const names = new Set();
+    for (const k of grouping.grouper.keys)
+        names.add(k.name);
+    const aggregates = { ...adapterAggregates, ...grouping.aggregates };
+    for (const a in aggregates)
+        names.add(a);
+    names.add("name");
+    names.add("$name");
+    return names;
+}
+// Reads a sort field straight from the GroupResult — first its key fields, then its aggregates, then
+// its name. Returns a plain selector so groups can be sorted without cloning the result per comparison.
+function groupFieldSelector(field) {
+    if (field === "name" || field === "$name")
+        return (gr) => gr?.name;
+    return (gr) => {
+        if (gr?.key && field in gr.key)
+            return gr.key[field];
+        if (gr?.aggregates && field in gr.aggregates)
+            return gr.aggregates[field];
+        return undefined;
+    };
+}
+// Builds a group comparer from a list of sorters. Each sorter resolves by its explicit `value`
+// selector, or by `field` looked up against the group's key/aggregates/name.
+function buildGroupComparer(sorters, cultureComparer) {
+    return getComparer(sorters.map((s) => (isDefined(s.value) || !s.field ? s : { ...s, value: groupFieldSelector(s.field) })), undefined, cultureComparer);
+}
 function serializeKey(data) {
     if (isDataRecord(data)) {
         return Object.keys(data)

package/build/widgets/drag-drop/DragSource.d.ts

@@ -1,5 +1,6 @@
 /** @jsxImportSource react */
 import { StyledContainerBase, StyledContainerConfig } from "../../ui/Container";
+import { DragEndEvent } from "./ops";
 import { Instance } from "../../ui/Instance";
 import { StringProp, StyleProp, ClassProp, Config } from "../../ui/Prop";
 import { RenderingContext } from "../../ui/RenderingContext";
@@ -19,7 +20,7 @@ export interface DragSourceConfig extends StyledContainerConfig {
     /** Base CSS class to be applied to the element. Defaults to 'dragsource'. */
     baseClass?: string;
     onDragStart?: (e: React.MouseEvent | React.TouchEvent, instance: Instance) => any;
-    onDragEnd?: (e: React.MouseEvent | React.TouchEvent, instance: Instance) => void;
+    onDragEnd?: (e: DragEndEvent, instance: Instance) => void;
     id?: StringProp;
     /** Custom contents to be displayed during drag & drop operation. */
     clone?: Config;
@@ -45,7 +46,7 @@ export declare class DragSource extends StyledContainerBase<DragSourceConfig, Dr
     cloneStyle: any;
     draggedStyle: any;
     onDragStart?: (e: React.MouseEvent | React.TouchEvent, instance: DragSourceInstance) => any;
-    onDragEnd?: (e: React.MouseEvent | React.TouchEvent, instance: DragSourceInstance) => void;
+    onDragEnd?: (e: DragEndEvent, instance: DragSourceInstance) => void;
     constructor(config?: DragSourceConfig);
     init(): void;
     declareData(): void;

package/build/widgets/drag-drop/DragSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DragSource.d.ts","sourceRoot":"","sources":["../../../src/widgets/drag-drop/DragSource.tsx"],"names":[],"mappings":"AAAA,6BAA6B;AAG7B,OAAO,EAAkC,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAIhH,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC5D;;;OAGG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,sGAAsG;IACtG,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,KAAK,GAAG,CAAC;IAElF,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;IAEjF,EAAE,CAAC,EAAE,UAAU,CAAC;IAEhB,oEAAoE;IACpE,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,0EAA0E;IAC1E,UAAU,CAAC,EAAE,SAAS,CAAC;IAEvB,6DAA6D;IAC7D,YAAY,CAAC,EAAE,SAAS,CAAC;IAEzB,oFAAoF;IACpF,UAAU,CAAC,EAAE,SAAS,CAAC;IAEvB,uEAAuE;IACvE,YAAY,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,MAAM,WAAW,kBAAmB,SAAQ,QAAQ,CAAC,UAAU,CAAC;IAC7D,WAAW,EAAE,GAAG,EAAE,CAAC;CACrB;AAED,qBAAa,UAAW,SAAQ,mBAAmB,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;IAC9E,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,GAAG,CAAC;IAChB,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,kBAAkB,KAAK,GAAG,CAAC;IAC5F,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAEvF,MAAM,CAAC,EAAE,gBAAgB;IAIrC,IAAI;IAMJ,WAAW;IAWX,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,kBAAkB;IAK/D,cAAc,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,kBAAkB;IAItE,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM;CAO7E"}
+{"version":3,"file":"DragSource.d.ts","sourceRoot":"","sources":["../../../src/widgets/drag-drop/DragSource.tsx"],"names":[],"mappings":"AAAA,6BAA6B;AAG7B,OAAO,EAAkC,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChH,OAAO,EAAyE,YAAY,EAAE,MAAM,OAAO,CAAC;AAG5G,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC5D;;;OAGG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB,sGAAsG;IACtG,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,6EAA6E;IAC7E,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,KAAK,GAAG,CAAC;IAElF,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,KAAK,IAAI,CAAC;IAE1D,EAAE,CAAC,EAAE,UAAU,CAAC;IAEhB,oEAAoE;IACpE,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,0EAA0E;IAC1E,UAAU,CAAC,EAAE,SAAS,CAAC;IAEvB,6DAA6D;IAC7D,YAAY,CAAC,EAAE,SAAS,CAAC;IAEzB,oFAAoF;IACpF,UAAU,CAAC,EAAE,SAAS,CAAC;IAEvB,uEAAuE;IACvE,YAAY,CAAC,EAAE,SAAS,CAAC;CAC3B;AAED,MAAM,WAAW,kBAAmB,SAAQ,QAAQ,CAAC,UAAU,CAAC;IAC7D,WAAW,EAAE,GAAG,EAAE,CAAC;CACrB;AAED,qBAAa,UAAW,SAAQ,mBAAmB,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;IAC9E,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,GAAG,CAAC;IAChB,YAAY,EAAE,GAAG,CAAC;IAClB,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,kBAAkB,KAAK,GAAG,CAAC;IAC5F,SAAS,CAAC,EAAE,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,kBAAkB,KAAK,IAAI,CAAC;gBAEhE,MAAM,CAAC,EAAE,gBAAgB;IAIrC,IAAI;IAMJ,WAAW;IAWX,OAAO,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,kBAAkB;IAK/D,cAAc,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,kBAAkB;IAItE,MAAM,CAAC,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,kBAAkB,EAAE,GAAG,EAAE,MAAM;CAO7E"}

package/build/widgets/drag-drop/DropZone.d.ts

@@ -1,6 +1,6 @@
 /** @jsxImportSource react */
 import { StyledContainerBase, StyledContainerConfig } from "../../ui/Container";
-import { DragEvent } from "./ops";
+import { DragEvent, DragEndEvent } from "./ops";
 import { Instance } from "../../ui/Instance";
 import { StyleProp, ClassProp, StructuredProp } from "../../ui/Prop";
 import { RenderingContext } from "../../ui/RenderingContext";
@@ -63,8 +63,8 @@ export interface DropZoneConfig extends StyledContainerConfig {
     onDragLeave?: string | ((event: DragEvent, instance: Instance) => void);
     /** A callback method invoked when at the beginning of the drag & drop operation. */
     onDragStart?: string | ((event: DragEvent, instance: Instance) => void);
-    /** A callback method invoked when at the end of the drag & drop operation. */
-    onDragEnd?: string | ((event: DragEvent, instance: Instance) => void);
+    /** A callback method invoked when at the end of the drag & drop operation. `event.cancelled` is `true` when the operation was cancelled (e.g. via Esc) instead of dropped. */
+    onDragEnd?: string | ((event: DragEndEvent, instance: Instance) => void);
     /** Match height of the item being dragged */
     matchHeight?: boolean;
     /** Match width of the item being dragged */
@@ -95,7 +95,7 @@ export declare class DropZone extends StyledContainerBase<DropZoneConfig, DropZo
     onDragEnter?: string | ((event?: DragEvent, instance?: Instance) => void);
     onDragLeave?: string | ((event?: DragEvent, instance?: Instance) => void);
     onDragStart?: string | ((event?: DragEvent, instance?: Instance) => void);
-    onDragEnd?: string | ((event?: DragEvent, instance?: Instance) => void);
+    onDragEnd?: string | ((event?: DragEndEvent, instance?: Instance) => void);
     constructor(config?: DropZoneConfig);
     init(): void;
     declareData(): void;

package/build/widgets/drag-drop/DropZone.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DropZone.d.ts","sourceRoot":"","sources":["../../../src/widgets/drag-drop/DropZone.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"DropZone.d.ts","sourceRoot":"","sources":["../../../src/widgets/drag-drop/DropZone.tsx"],"names":[],"mappings":"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"}

package/build/widgets/drag-drop/ops.d.ts

@@ -16,6 +16,17 @@ export interface DragEvent {
     dataTransfer?: DataTransfer;
     result?: any;
 }
+export interface DragEndEvent {
+    type: "dragend";
+    /** The triggering pointer event, or `null` when the operation was cancelled via the keyboard. */
+    event: DragEvent["event"] | null;
+    /** Cursor position, or `null` when the operation was cancelled via the keyboard. */
+    cursor: CursorPosition | null;
+    source: DragEvent["source"];
+    /** `true` when the operation was cancelled (e.g. by pressing Esc) instead of dropped. */
+    cancelled: boolean;
+    result?: any;
+}
 export interface DragDropOptions {
     sourceEl?: Element | null;
     clone?: any;
@@ -30,7 +41,7 @@ export interface IDropZone {
     onDragStart?: DragEventHandler;
     onDragAway?: DragEventHandler;
     onDragNear?: DragEventHandler;
-    onDragEnd?: DragEventHandler;
+    onDragEnd?: (e: DragEndEvent) => void;
     onDragMeasure?: (e: DragEvent, operation: DragDropOperationContext) => {
         over: number | false;
         near: number | boolean;
@@ -44,7 +55,7 @@ export interface IDropZone {
 }
 export type UnregisterFunction = () => void;
 export declare function registerDropZone(dropZone: IDropZone): UnregisterFunction;
-export declare function initiateDragDrop(e: MouseEvent | TouchEvent | React.MouseEvent | React.TouchEvent, options?: DragDropOptions, onDragEnd?: (e?: DragEvent) => void): void;
+export declare function initiateDragDrop(e: MouseEvent | TouchEvent | React.MouseEvent | React.TouchEvent, options?: DragDropOptions, onDragEnd?: (e?: DragEndEvent) => void): void;
 export declare function ddMouseDown(e: React.MouseEvent | React.TouchEvent): void;
 export declare function ddMouseUp(): void;
 export declare function ddDetect(e: MouseEvent | TouchEvent | React.TouchEvent | React.MouseEvent): void | true;

package/build/widgets/drag-drop/ops.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ops.d.ts","sourceRoot":"","sources":["../../../src/widgets/drag-drop/ops.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ops.d.ts","sourceRoot":"","sources":["../../../src/widgets/drag-drop/ops.tsx"],"names":[],"mappings":"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"}

package/build/widgets/drag-drop/ops.js

@@ -19,6 +19,7 @@ let puppet = null;
 let scrollTimer = null;
 let vscrollParent = null;
 let hscrollParent = null;
+let releaseCapture = null;
 export function registerDropZone(dropZone) {
     dropZones.push(dropZone);
     return () => {
@@ -107,7 +108,16 @@ export function initiateDragDrop(e, options = {}, onDragEnd) {
         dragStartedZones.set(zone, true);
     });
     notifyDragMove(e, null);
-    captureMouseOrTouch(e, notifyDragMove, notifyDragDrop);
+    releaseCapture = captureMouseOrTouch(e, notifyDragMove, notifyDragDrop);
+    document.addEventListener("keydown", onDragKeyDown, true);
+}
+function onDragKeyDown(e) {
+    if (!puppet || e.key !== "Escape")
+        return;
+    //cancel the operation without dropping; there is no pointer event to report
+    e.preventDefault();
+    e.stopPropagation();
+    notifyDragDrop(null, true);
 }
 function notifyDragMove(e, _captureData) {
     let event = getDragEvent(e, "dragmove");
@@ -222,27 +232,44 @@ function clearScrollTimer() {
         scrollTimer = null;
     }
 }
-function notifyDragDrop(e) {
+function notifyDragDrop(e, cancelled = false) {
+    if (!puppet)
+        return;
     clearScrollTimer();
-    let event = getDragEvent(e, "dragdrop");
+    document.removeEventListener("keydown", onDragKeyDown, true);
     if (puppet.stop)
         puppet.stop();
-    if (activeZone && activeZone.onDrop)
-        event.result = activeZone.onDrop(event);
+    //a keyboard cancellation has no pointer event, so the drop and away notifications are skipped
+    let dropEvent = !cancelled && e ? getDragEvent(e, "dragdrop") : null;
+    let result;
+    if (dropEvent && activeZone && activeZone.onDrop)
+        result = activeZone.onDrop(dropEvent);
+    let endEvent = {
+        type: "dragend",
+        event: e,
+        cursor: e ? getCursorPos(e) : null,
+        source: puppet.source,
+        cancelled,
+        result,
+    };
     dropZones.forEach((zone) => {
-        if (nearZones != null && zone.onDragAway && nearZones.has(zone))
-            zone.onDragAway(event);
+        if (dropEvent && nearZones != null && zone.onDragAway && nearZones.has(zone))
+            zone.onDragAway(dropEvent);
         if (!dragStartedZones.has(zone))
             return;
         if (zone.onDragEnd)
-            zone.onDragEnd(event);
+            zone.onDragEnd(endEvent);
     });
     if (puppet.onDragEnd)
-        puppet.onDragEnd(event);
+        puppet.onDragEnd(endEvent);
+    //tear down the mouse/touch capture when cancelling; on a normal drop the capture ends itself
+    if (cancelled && releaseCapture)
+        releaseCapture();
     nearZones = null;
     activeZone = null;
     puppet = null;
     dragStartedZones = null;
+    releaseCapture = null;
 }
 function getDragEvent(event, type) {
     return {

package/build/widgets/form/NumberField.js

@@ -141,6 +141,7 @@ class Input extends VDOM.Component {
                 visited: state.visited,
                 focus: this.state.focus,
                 icon: !!icon,
+                clear: insideButton != null,
                 empty: empty && !data.placeholder,
                 error: data.error &&
                     (state.visited || !suppressErrorsUntilVisited || !empty),

package/build/widgets/grid/Grid.d.ts

@@ -5,14 +5,14 @@ import { DataAdapter, DataAdapterRecord } from "../../ui/adapter/DataAdapter";
 import { GroupAdapter } from "../../ui/adapter/GroupAdapter";
 import { ContainerBase, StyledContainerConfig } from "../../ui/Container";
 import { Instance } from "../../ui/Instance";
-import { BooleanProp, ClassProp, CollatorOptions, Config, DataRecord, NumberProp, Prop, RecordAlias, SortDirection, SortersProp, StringProp, StructuredProp, StyleProp, UnknownProp } from "../../ui/Prop";
+import { BooleanProp, ClassProp, CollatorOptions, Config, DataRecord, NumberProp, Prop, RecordAlias, Sorter, SortDirection, SortersProp, StringProp, StructuredProp, StyleProp, UnknownProp } from "../../ui/Prop";
 import { PureContainerConfig } from "../../ui/PureContainer";
 import { RenderingContext } from "../../ui/RenderingContext";
 import { Selection, SimpleSelection } from "../../ui/selection/Selection";
 import type { KeySelection } from "../../ui/selection/KeySelection";
 import type { PropertySelection } from "../../ui/selection/PropertySelection";
 import { WidgetConfig } from "../../ui/Widget";
-import { DragEvent } from "../drag-drop/ops";
+import { DragEvent, DragEndEvent } from "../drag-drop/ops";
 import { GridRow, GridRowConfig, GridRowInstance } from "./GridRow";
 import { CreateConfig } from "../../util";
 import type { TreeAdapter } from "../../ui/adapter/TreeAdapter";
@@ -81,6 +81,15 @@ export interface GridGroupingConfig<T> {
     name?: StringProp;
     text?: StringProp;
     comparer?: (a: GroupingResult<T>, b: GroupingResult<T>) => number;
+    /**
+     * Sort groups by a single field resolved against the group's key, aggregates and name.
+     * Use an aggregate alias to sort by an aggregate, or a key field to sort by key.
+     */
+    sortField?: string;
+    /** Sort direction used together with `sortField`. Defaults to `"ASC"`. */
+    sortDirection?: SortDirection;
+    /** Multi-field group sorting. Each sorter's `field` is resolved against the group's key, aggregates and name. */
+    sorters?: Sorter[];
 }
 export interface GridColumnHeaderConfig {
     text?: StringProp;
@@ -250,7 +259,7 @@ export interface GridConfig<T = any> extends StyledContainerConfig {
     onDrop?: string | ((e: GridDragEvent<T>, instance: Instance) => void);
     onDropTest?: string | ((e: DragEvent, instance: Instance) => boolean);
     onDragStart?: string | ((e: DragEvent, instance: Instance) => void);
-    onDragEnd?: string | ((e: DragEvent, instance: Instance) => void);
+    onDragEnd?: string | ((e: DragEndEvent, instance: Instance) => void);
     onDragOver?: string | ((e: GridDragEvent<T>, instance: Instance) => void | boolean);
     onRowDropTest?: string | ((e: DragEvent, instance: Instance) => boolean);
     onRowDragOver?: string | ((e: GridRowDragEvent<T>, instance: Instance) => void | boolean);
@@ -331,6 +340,12 @@ export interface GridConfig<T = any> extends StyledContainerConfig {
     onRef?: string | ((element: any, instance: GridInstance) => void);
     /** When enabled, groups are shown in the same order as the source records. */
     preserveGroupOrder?: boolean;
+    /**
+     * When enabled, sorting by a column header also reorders groups. The active sort field is resolved
+     * against each group's key fields, aggregates and name, so it works for both grouping columns and
+     * aggregate columns. Ignored when `preserveGroupOrder` is set.
+     */
+    sortGroups?: boolean;
 }
 export interface GridCellInfo {
     column: any;
@@ -452,6 +467,7 @@ export declare class Grid<T = unknown> extends ContainerBase<GridConfig<T>, Grid
     onCreateIsRecordDraggable?: any;
     onRef?: any;
     preserveGroupOrder: boolean;
+    sortGroups: boolean;
     styled: boolean;
     selectable?: boolean;
     recordsAccessor: any;