@adaptabletools/adaptable-cjs 23.0.0-canary.1 → 23.0.0-canary.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adaptabletools/adaptable-cjs",
-  "version": "23.0.0-canary.1",
-  "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
+  "version": "23.0.0-canary.10",
+  "description": "Powerful AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",
     "datagrid",
@@ -19,9 +19,14 @@
     "blotter",
     "data-visualisation",
     "react",
-    "angular",
+    "react-ag-grid",
     "react-component",
-    "angular-component"
+    "angular",
+    "angular-ag-grid",
+    "angular-component",
+    "vue3",
+    "vue3-ag-grid",
+    "vue-component"
   ],
   "homepage": "http://www.adaptabletools.com/",
   "license": "contact sales@adaptabletools.com for details",

package/src/AdaptableOptions/DataSetOptions.d.ts

@@ -1,5 +1,6 @@
 import { AdaptableForm, AdaptableObject } from '../../types';
 import { FormContext } from '../AdaptableState/Common/FormContext';
+import { DataSetSelectedInfo } from '../Api/Events/DataSetSelected';
 /**
  * Options to provide Data Sets
  */
@@ -9,12 +10,12 @@ export interface DataSetOptions<TData = any> {
      *
      * @defaultValue []
      */
-    dataSets?: DataSet[];
+    dataSets?: DataSet<TData>[];
 }
 /**
  * Defines a Data Set object that can provide data to AdapTable
  */
-export interface DataSet extends AdaptableObject {
+export interface DataSet<TData = any> extends AdaptableObject {
     /**
      * Name of Data Set
      */
@@ -31,6 +32,29 @@ export interface DataSet extends AdaptableObject {
      * Additional info for Data Set
      */
     info?: Record<string, string | number | boolean | Date>;
+    /**
+     * Invoked when this Data Set is selected and it does not define a `form`.
+     *
+     * Use for custom loading logic (e.g. server requests). The `DataSetSelected`
+     * event is still fired for backward compatibility.
+     *
+     * @defaultValue undefined
+     */
+    onSelect?: (info: DataSetSelectedInfo) => void | Promise<void>;
+    /**
+     * Optional shortcut that loads row data into the Grid when this Data Set is
+     * selected (only when no `form` is defined). Runs before `onSelect`.
+     *
+     * @defaultValue undefined
+     */
+    loadData?: (info: DataSetSelectedInfo) => TData[] | Promise<TData[]>;
+    /**
+     * Invoked when the user submits the Data Set form (Enter key or form button).
+     * When no form `buttons` are defined, an OK button is added automatically.
+     *
+     * @defaultValue undefined
+     */
+    onFormSubmit?: (context: DataSetFormContext) => void | Promise<void>;
 }
 /**
  * Used when a DataSet displays a Form

package/src/AdaptableOptions/DefaultAdaptableOptions.js

@@ -170,10 +170,6 @@ const DefaultAdaptableOptions = {
         },
     },
     filterOptions: {
-        filterActionOnDataChange: {
-            applyFilter: 'Always',
-            throttleDelay: 0,
-        },
         clearFiltersOnStartUp: false,
         enableFilterOnSpecialColumns: true,
         useAdaptableFiltering: true,
@@ -277,7 +273,6 @@ const DefaultAdaptableOptions = {
         popupType: 'modal',
         title: ModuleConstants.SettingsPanelFriendlyName,
         icon: 'ConfigurationIcon',
-        navigation: {},
         alwaysShowInDashboard: false,
         alwaysShowInToolPanel: false,
         showModuleIcons: true,

package/src/AdaptableOptions/EditOptions.d.ts

@@ -149,13 +149,13 @@ export interface CellEditableContext<TData = any> extends BaseContext {
  */
 export interface PlusMinusOptions {
     /**
-     * Key that increases cell value for nudges (if not overriden in a Plus Minus Rule)
+     * Key to increase cell value for nudges (if not overriden in Plus Minus Rule)
      *
      * @defaultValue '+'
      */
     incrementKey?: string;
     /**
-     * Key that decreases cell value for nudges (if not overriden in a Plus Minus Rule)
+     * Key to decrease cell value for nudges (if not overriden in Plus Minus Rule)
      *
      * @defaultValue '-'
      */

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -1,4 +1,3 @@
-import { FilterActionOnDataChange } from '../AdaptableState/Common/FilterActionOnDataChange';
 import { BaseContext } from '../../types';
 import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
 import { SystemAlertPredicateId, SystemFilterPredicateId } from '../../types';
@@ -30,12 +29,6 @@ export interface FilterOptions<TData = any> {
      * @returns
      */
     customInFilterValues?: (context: CustomInFilterValuesContext<TData>) => Promise<InFilterValueResult> | InFilterValueResult;
-    /**
-     * When to re-filter grid after data changes: 'Always', 'Never' or 'Throttle' (with a delay value)
-     *
-     * @defaultValue 'Always'
-     */
-    filterActionOnDataChange?: FilterActionOnDataChange;
     /**
      * Allow filtering on Calculated & FreeText columns
      *

package/src/AdaptableOptions/SettingsPanelOptions.d.ts

@@ -1,5 +1,6 @@
 import { AdaptableFrameworkComponent, AdaptableIcon } from '../../types';
 import { AdaptableSettingsPanel } from '../AdaptableState/Common/Types';
+import { BaseContext } from '../AdaptableState/Common/BaseContext';
 import { CustomRenderContext } from '../agGrid/AdaptableFrameworkComponent';
 /**
  * Options for managing the AdapTable Settings Panel
@@ -34,13 +35,15 @@ export interface SettingsPanelOptions {
      */
     alwaysShowInToolPanel?: boolean;
     /**
-     * Ordered items to display at side of Settings Panel
+     * Configure grouped navigation for the Settings Panel.
      *
-     * @defaultValue all available AdapTable modules
+     * Receives the default grouped navigation and AdapTable context; return an amended copy.
+     * Groups with no visible modules (e.g. due to entitlements) are omitted automatically.
+     * Group headings are omitted when every module in the group is hidden.
+     *
+     * @defaultValue all available AdapTable modules in the default grouped order
      */
-    navigation?: {
-        items?: (AdaptableSettingsPanel | string | '-')[];
-    };
+    navigation?: SettingsPanelNavigationConfigurer;
     /**
      * Initial position of Settings Panel window
      *
@@ -70,18 +73,47 @@ export interface SettingsPanelOptions {
      */
     customSettingsPanels?: CustomSettingsPanel[];
     /**
-   * Which Tabs can be used to display Grid Info: 'Grid Options', 'Grid Summary' or 'Grid State'
-   *
-   * @defaultValue ['Grid Options', 'Grid Summary', 'Grid State']
-   */
+     * Which Tabs can be used to display Grid Info: 'Grid Options', 'Grid Summary' or 'Grid State'
+     *
+     * @defaultValue ['Grid Options', 'Grid Summary', 'Grid State']
+     */
     gridInfoTabs?: GridInfoTabs;
 }
+/**
+ * A labelled group of Settings Panel navigation entries.
+ */
+export interface SettingsPanelNavigationGroup {
+    /**
+     * Section heading shown above the group. Use an empty string to show items without a heading.
+     */
+    label: string;
+    /**
+     * Module names or custom panel names in display order.
+     */
+    items: (AdaptableSettingsPanel | string)[];
+}
+/**
+ * Grouped Settings Panel navigation structure.
+ */
+export interface SettingsPanelNavigation {
+    groups: SettingsPanelNavigationGroup[];
+}
+/**
+ * Context passed to `SettingsPanelOptions.navigation`.
+ */
+export interface SettingsPanelNavigationContext extends BaseContext {
+}
+/**
+ * Function used to customise Settings Panel navigation.
+ */
+export type SettingsPanelNavigationConfigurer = (context: SettingsPanelNavigationContext, defaultNavigation: SettingsPanelNavigation) => SettingsPanelNavigation;
 /**
  * Definition of a Custom Panel to add to the Adaptable Settings Panel
  */
 export interface CustomSettingsPanel {
     /**
-     * Appears in Settings Panel Navigation and must be included in settingsPanelOptions.navigation for it to be displayed (by default added to the end)
+     * Appears in Settings Panel Navigation. Include in `navigation` to choose placement
+     * (by default added to a `Custom Panels` group at the end).
      */
     name: string;
     /**

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -29,9 +29,7 @@ export interface UserInterfaceOptions<TData = any> {
      */
     dateInputOptions?: DateInputOptions;
     /**
-     * @deprecated Override `--ab-color-swatch-*`, `--ab-color-palette-*`, and semantic
-     * `--ab-color-*` variables in your light or dark theme CSS instead. Will be removed in a
-     * future major release.
+     * @deprecated Override `--ab-color-swatch-*`, `--ab-color-palette-*`, and semantic `--ab-color-*` variables in light/dark theme instead; will be removed in future release
      */
     colorPalette?: string[] | ((currentTheme: string) => string[]);
     /**

package/src/{Utilities → AdaptableState/Aggregations}/weightedAverage.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.weightedAverage = exports.getNumericValue = void 0;
-const tslib_1 = require("tslib");
-const toNumber_1 = tslib_1.__importDefault(require("./utils/toNumber"));
+const NumberExtensions_1 = require("../../Utilities/Extensions/NumberExtensions");
 const getNumericValue = (input) => {
     if (typeof input === 'number') {
         return input;
     }
-    const numericValue = (0, toNumber_1.default)(input);
+    const numericValue = (0, NumberExtensions_1.toNumber)(input);
     return isNaN(numericValue) ? null : numericValue;
 };
 exports.getNumericValue = getNumericValue;

package/src/AdaptableState/Common/AdaptableForm.d.ts

@@ -133,8 +133,19 @@ export interface AdaptableFormField {
     /**
      * Field Default Value - can be of type string, boolean, number, or for
      * `select` fields with `multi: true` an array of those.
+     *
+     * For single `select` fields, this is also the value restored when the user
+     * clears the combobox (unless {@link clearToDefault} is `false`).
      */
     defaultValue?: string | boolean | number | Array<string | number | boolean>;
+    /**
+     * For single `select` fields only. When the user clears the combobox,
+     * whether to restore {@link defaultValue} instead of leaving the field empty.
+     *
+     * Defaults to `true` when `defaultValue` is set, otherwise `false`.
+     * Set to `false` when an empty selection is a distinct state from the default.
+     */
+    clearToDefault?: boolean;
     /**
      * Items to populate the `select` and `radio` fieldTypes.
      *
@@ -166,7 +177,10 @@ export interface AdaptableFormField {
     /**
      * Placeholder text shown inside `text`, `textarea`, `number`, `date`,
      * `time` and `datetime` inputs when empty. For `select` fields it is
-     * rendered as the empty-state label.
+     * rendered as the empty-state label when no value is selected.
+     *
+     * When omitted on a `select` field with a {@link defaultValue}, the label of
+     * the matching `options` entry is used as the empty-state label.
      */
     placeholder?: string;
     /**
@@ -310,6 +324,9 @@ export declare function isAdaptableFormFieldGroup(entry: AdaptableFormField | Ad
  * computing defaults, validation or per-field lookups.
  */
 export declare function flattenAdaptableFormFields<T extends BaseContext>(formDef?: AdaptableForm<T, any>): AdaptableFormField[];
+export declare function shouldClearSelectToDefault(field: AdaptableFormField): boolean;
+export declare function resolveSelectValueAfterClear(field: AdaptableFormField, newValue: unknown): unknown;
+export declare function resolveSelectPlaceholder(field: AdaptableFormField, options: AdaptableFormFieldOption[]): string | undefined;
 export declare function getDefaultAdaptableFormData<T extends BaseContext = BaseContext>(formDef?: AdaptableForm<T, any>): AdaptableFormData;
 /**
  * Resolves a field's `options` to the current array of options.

package/src/AdaptableState/Common/AdaptableForm.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAdaptableFormFieldGroup = isAdaptableFormFieldGroup;
 exports.flattenAdaptableFormFields = flattenAdaptableFormFields;
+exports.shouldClearSelectToDefault = shouldClearSelectToDefault;
+exports.resolveSelectValueAfterClear = resolveSelectValueAfterClear;
+exports.resolveSelectPlaceholder = resolveSelectPlaceholder;
 exports.getDefaultAdaptableFormData = getDefaultAdaptableFormData;
 exports.resolveAdaptableFormFieldOptionsSync = resolveAdaptableFormFieldOptionsSync;
 exports.isAdaptableFormFieldHidden = isAdaptableFormFieldHidden;
@@ -42,6 +45,37 @@ function flattenAdaptableFormFields(formDef) {
     }
     return out;
 }
+function shouldClearSelectToDefault(field) {
+    if (field.fieldType !== 'select' || field.multi) {
+        return false;
+    }
+    if (field.clearToDefault === false) {
+        return false;
+    }
+    if (field.clearToDefault === true) {
+        return true;
+    }
+    return (field.defaultValue !== undefined && field.defaultValue !== null && field.defaultValue !== '');
+}
+function resolveSelectValueAfterClear(field, newValue) {
+    if (field.fieldType !== 'select' || field.multi) {
+        return newValue;
+    }
+    const isEmpty = newValue === null || newValue === undefined || newValue === '';
+    if (!isEmpty || !shouldClearSelectToDefault(field)) {
+        return newValue;
+    }
+    return field.defaultValue;
+}
+function resolveSelectPlaceholder(field, options) {
+    if (field.placeholder) {
+        return field.placeholder;
+    }
+    if (field.defaultValue === undefined || field.defaultValue === null || field.defaultValue === '') {
+        return undefined;
+    }
+    return options.find((option) => option.value === field.defaultValue)?.label;
+}
 function getDefaultAdaptableFormData(formDef) {
     return flattenAdaptableFormFields(formDef).reduce((data, field) => {
         if (field.fieldType === 'select' && field.multi) {

package/src/AdaptableState/Common/AdaptableFormat.d.ts

@@ -50,6 +50,13 @@ export interface NumberFormatterOptions extends BaseFormatterOptions {
      * Multiplier to use on cell value
      */
     Multiplier?: number;
+    /**
+     * When the numeric value is zero (after multiplier and rounding):
+     * - omitted / undefined, or `'0'` — use normal formatting (e.g. `0`, `0.00`)
+     * - `''` — show a blank cell (user cleared the default `0` in the wizard)
+     * - any other string — show that text (e.g. `-`, `—`)
+     */
+    ZeroDisplay?: string;
     /**
      * Shows negative numbers in parentheses
      */
@@ -102,7 +109,7 @@ export interface DateFormatterOptions extends BaseFormatterOptions {
  */
 export interface StringFormatterOptions extends BaseFormatterOptions {
     /**
-     * Sets text to Upper or Lower case
+     * Sets text to Upper, Lower or Sentence case
      */
     Case?: 'Upper' | 'Lower' | 'Sentence';
     /**

package/src/AdaptableState/Common/AdaptableMessageType.d.ts

@@ -15,6 +15,6 @@ export type AdaptableMessageType =
  */
  | 'Warning'
 /**
- * Error Message - displays '-ab-color-error' variable (defaults to red)
+ * Error Message - displays '-ab-color-destructive' variable (defaults to red)
  */
  | 'Error';

package/src/AdaptableState/Common/AggregationColumns.d.ts

@@ -2,12 +2,8 @@
  * Defines which Columns in a Layout display Aggregated values when Row-Grouped
  */
 import { PivotTotalPosition } from '../LayoutState';
-/**
- * Aggregations that require extra configuration beyond a single aggFunc name.
- * Extend this union when adding new parameterized aggregation types.
- */
-export type ParameterizedAggFunc = WeightedAverageAggregation;
-export type AggregationColumnValue = string | true | ParameterizedAggFunc;
+import type { AdaptableColumn } from './AdaptableColumn';
+export type AggregationColumnValue = string | true | WeightedAverageAggregation;
 /**
  * Defines an Aggregated Column in a Table Layout
  */
@@ -59,3 +55,15 @@ export interface WeightedAverageAggregation {
 export declare const isWeightedAverageAggFuncName: (aggFunc: string) => aggFunc is "weightedAvg";
 export declare const isWeightedAverageAggregation: (aggFunc: TableAggregationColumns[0]["AggFunc"]) => aggFunc is WeightedAverageAggregation;
 export declare const getAggFuncName: (aggFunc: TableAggregationColumns[0]["AggFunc"]) => string | true;
+/**
+ * Whether the Weighted Average aggregation should be offered for this Column:
+ * it must be a numeric, aggregatable Column that either has no agg-func
+ * restriction or explicitly allows `weightedAvg`.
+ */
+export declare const isWeightedAverageAggFuncEligible: (column: AdaptableColumn) => boolean;
+/**
+ * Returns the Column's available aggregation function names ordered for display,
+ * ensuring `weightedAvg` is positioned right after `avg` (and only present when
+ * the Column is eligible for Weighted Average).
+ */
+export declare const getDisplayAggFuncNames: (column: AdaptableColumn) => string[];

package/src/AdaptableState/Common/AggregationColumns.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAggFuncName = exports.isWeightedAverageAggregation = exports.isWeightedAverageAggFuncName = exports.ONLY_AGG_FN_NAME = exports.WEIGHTED_AVERAGE_AGG_FN_NAME = void 0;
+exports.getDisplayAggFuncNames = exports.isWeightedAverageAggFuncEligible = exports.getAggFuncName = exports.isWeightedAverageAggregation = exports.isWeightedAverageAggFuncName = exports.ONLY_AGG_FN_NAME = exports.WEIGHTED_AVERAGE_AGG_FN_NAME = void 0;
 exports.WEIGHTED_AVERAGE_AGG_FN_NAME = 'weightedAvg';
 exports.ONLY_AGG_FN_NAME = 'only';
 const isWeightedAverageAggFuncName = (aggFunc) => {
@@ -15,9 +15,36 @@ const getAggFuncName = (aggFunc) => {
     if ((0, exports.isWeightedAverageAggregation)(aggFunc)) {
         return exports.WEIGHTED_AVERAGE_AGG_FN_NAME;
     }
-    if (typeof aggFunc === 'string') {
+    else if (typeof aggFunc === 'string') {
+        return aggFunc;
+    }
+    else {
         return aggFunc;
     }
-    return aggFunc;
 };
 exports.getAggFuncName = getAggFuncName;
+/**
+ * Whether the Weighted Average aggregation should be offered for this Column:
+ * it must be a numeric, aggregatable Column that either has no agg-func
+ * restriction or explicitly allows `weightedAvg`.
+ */
+const isWeightedAverageAggFuncEligible = (column) => {
+    const weightedAverageAllowed = !column.userAllowedAggFuncs?.length ||
+        column.userAllowedAggFuncs.includes(exports.WEIGHTED_AVERAGE_AGG_FN_NAME);
+    return column.dataType === 'number' && column.aggregatable && weightedAverageAllowed;
+};
+exports.isWeightedAverageAggFuncEligible = isWeightedAverageAggFuncEligible;
+/**
+ * Returns the Column's available aggregation function names ordered for display,
+ * ensuring `weightedAvg` is positioned right after `avg` (and only present when
+ * the Column is eligible for Weighted Average).
+ */
+const getDisplayAggFuncNames = (column) => {
+    const names = [...new Set(column.availableAggregationFunctions || [])].filter((name) => name !== exports.WEIGHTED_AVERAGE_AGG_FN_NAME);
+    if ((0, exports.isWeightedAverageAggFuncEligible)(column)) {
+        const avgIndex = names.indexOf('avg');
+        names.splice(avgIndex >= 0 ? avgIndex + 1 : names.length, 0, exports.WEIGHTED_AVERAGE_AGG_FN_NAME);
+    }
+    return names;
+};
+exports.getDisplayAggFuncNames = getDisplayAggFuncNames;

package/src/AdaptableState/Common/CellDataChangedInfo.d.ts

@@ -33,9 +33,10 @@ export interface CellDataChangedInfo<TData = any> {
      */
     rowData?: TData;
     /**
-     * What triggered the change - user, background change or a reverted change?
+     * What triggered the change - user, background change, a reverted change, or a
+     * derived update on a Calculated Column whose source value changed?
      */
-    trigger?: 'edit' | 'tick' | 'undo' | 'aggChange';
+    trigger?: 'edit' | 'tick' | 'undo' | 'aggChange' | 'calculatedColumnChange';
     /**
      * Whether the change was prevented by a validation rule
      */

package/src/AdaptableState/Common/ColumnScope.d.ts

@@ -1,4 +1,8 @@
 export type ScopeDataType = 'text' | 'number' | 'boolean' | 'date' | 'textArray' | 'numberArray';
+/**
+ * Scope data type for modules that only apply to numeric columns (e.g. Shortcut, Plus/Minus).
+ */
+export type NumberScopeDataType = 'number';
 export type ScopeAll = {
     All: true;
 };

package/src/AdaptableState/Common/Enums.d.ts

@@ -4,17 +4,10 @@ export declare enum MathOperation {
     Multiply = "Multiply",
     Divide = "Divide"
 }
-export declare enum ScheduleType {
-    Reminder = "Reminder"
-}
 export declare enum SortOrder {
     Asc = "Asc",
     Desc = "Desc"
 }
-export declare enum SelectionMode {
-    Multi = "Multi",
-    Single = "Single"
-}
 export declare enum FontWeight {
     Normal = "Normal",
     Bold = "Bold"
@@ -31,31 +24,21 @@ export declare enum FontSize {
     XLarge = "XLarge"
 }
 export declare enum StatusColour {
-    Error = "var(--ab-color-error)",
+    Error = "var(--ab-color-destructive)",
     Warn = "var(--ab-color-warn)",
     Success = "var(--ab-color-success)",
     Info = "var(--ab-color-info)"
 }
 export declare enum SummaryOperation {
     Sum = "Sum",
+    Max = "Max",
+    Min = "Min",
+    Count = "Count",
     Average = "Average",
+    Weighted_Average = "Weighted Average",
     Median = "Median",
     Mode = "Mode",
     Distinct = "Distinct",
-    Max = "Max",
-    Min = "Min",
-    Count = "Count",
     Std_Deviation = "Std Deviation",
-    Only = "Only",
-    Weighted_Average = "Weighted Avg"
-}
-export declare enum FilterOnDataChangeOptions {
-    Always = "Always",
-    Never = "Never",
-    Throttle = "Throttle"
-}
-export declare enum ChangeDirection {
-    Up = "Up",
-    Down = "Down",
-    Neutral = "Neutral"
+    Only = "Only"
 }

package/src/AdaptableState/Common/Enums.js

@@ -1,7 +1,7 @@
 "use strict";
 // General Enums
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeDirection = exports.FilterOnDataChangeOptions = exports.SummaryOperation = exports.StatusColour = exports.FontSize = exports.FontStyle = exports.FontWeight = exports.SelectionMode = exports.SortOrder = exports.ScheduleType = exports.MathOperation = void 0;
+exports.SummaryOperation = exports.StatusColour = exports.FontSize = exports.FontStyle = exports.FontWeight = exports.SortOrder = exports.MathOperation = void 0;
 var MathOperation;
 (function (MathOperation) {
     MathOperation["Add"] = "Add";
@@ -10,20 +10,11 @@ var MathOperation;
     MathOperation["Divide"] = "Divide";
 })(MathOperation || (exports.MathOperation = MathOperation = {}));
 // Enums used in Strategies
-var ScheduleType;
-(function (ScheduleType) {
-    ScheduleType["Reminder"] = "Reminder";
-})(ScheduleType || (exports.ScheduleType = ScheduleType = {}));
 var SortOrder;
 (function (SortOrder) {
     SortOrder["Asc"] = "Asc";
     SortOrder["Desc"] = "Desc";
 })(SortOrder || (exports.SortOrder = SortOrder = {}));
-var SelectionMode;
-(function (SelectionMode) {
-    SelectionMode["Multi"] = "Multi";
-    SelectionMode["Single"] = "Single";
-})(SelectionMode || (exports.SelectionMode = SelectionMode = {}));
 var FontWeight;
 (function (FontWeight) {
     FontWeight["Normal"] = "Normal";
@@ -45,7 +36,7 @@ var FontSize;
 })(FontSize || (exports.FontSize = FontSize = {}));
 var StatusColour;
 (function (StatusColour) {
-    StatusColour["Error"] = "var(--ab-color-error)";
+    StatusColour["Error"] = "var(--ab-color-destructive)";
     StatusColour["Warn"] = "var(--ab-color-warn)";
     StatusColour["Success"] = "var(--ab-color-success)";
     StatusColour["Info"] = "var(--ab-color-info)";
@@ -53,26 +44,14 @@ var StatusColour;
 var SummaryOperation;
 (function (SummaryOperation) {
     SummaryOperation["Sum"] = "Sum";
+    SummaryOperation["Max"] = "Max";
+    SummaryOperation["Min"] = "Min";
+    SummaryOperation["Count"] = "Count";
     SummaryOperation["Average"] = "Average";
+    SummaryOperation["Weighted_Average"] = "Weighted Average";
     SummaryOperation["Median"] = "Median";
     SummaryOperation["Mode"] = "Mode";
     SummaryOperation["Distinct"] = "Distinct";
-    SummaryOperation["Max"] = "Max";
-    SummaryOperation["Min"] = "Min";
-    SummaryOperation["Count"] = "Count";
     SummaryOperation["Std_Deviation"] = "Std Deviation";
     SummaryOperation["Only"] = "Only";
-    SummaryOperation["Weighted_Average"] = "Weighted Avg";
 })(SummaryOperation || (exports.SummaryOperation = SummaryOperation = {}));
-var FilterOnDataChangeOptions;
-(function (FilterOnDataChangeOptions) {
-    FilterOnDataChangeOptions["Always"] = "Always";
-    FilterOnDataChangeOptions["Never"] = "Never";
-    FilterOnDataChangeOptions["Throttle"] = "Throttle";
-})(FilterOnDataChangeOptions || (exports.FilterOnDataChangeOptions = FilterOnDataChangeOptions = {}));
-var ChangeDirection;
-(function (ChangeDirection) {
-    ChangeDirection["Up"] = "Up";
-    ChangeDirection["Down"] = "Down";
-    ChangeDirection["Neutral"] = "Neutral";
-})(ChangeDirection || (exports.ChangeDirection = ChangeDirection = {}));

package/src/{Utilities → AdaptableState/Common}/MenuItem.d.ts

@@ -1,8 +1,8 @@
 import * as Redux from 'redux';
-import { ModuleParams } from '../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from '../AdaptableState/Common/Menu';
-import { AdaptableModule } from '../AdaptableState/Common/Types';
-import { AdaptableIcon, AdaptableSystemIconName } from '../AdaptableState/Common/AdaptableIcon';
+import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
+import { AdaptableMenuItem, AdaptableContextMenuItemName, AdaptableColumnMenuItemName } from './Menu';
+import { AdaptableModule } from './Types';
+import { AdaptableIcon, AdaptableSystemIconName } from './AdaptableIcon';
 export declare class MenuItemDoReduxAction<MENU_TYPE_NAME extends AdaptableColumnMenuItemName | AdaptableContextMenuItemName = AdaptableColumnMenuItemName | AdaptableContextMenuItemName> implements AdaptableMenuItem<MENU_TYPE_NAME> {
     constructor(name: MENU_TYPE_NAME, label: string, module: AdaptableModule, reduxAction: Redux.Action, icon: AdaptableSystemIconName, isVisible: boolean);
     name: MENU_TYPE_NAME;

package/src/{Utilities → AdaptableState/Common}/MenuItem.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MenuItemShowPopup = exports.MenuItemDoClickFunction = exports.MenuItemDoReduxAction = void 0;
 const tslib_1 = require("tslib");
-const PopupRedux = tslib_1.__importStar(require("../Redux/ActionsReducers/PopupRedux"));
+const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 // A menu item which performs a Redux Action when it is clicke
 class MenuItemDoReduxAction {
     constructor(name, label, module, reduxAction, icon, isVisible) {

package/src/AdaptableState/LayoutState.d.ts

@@ -44,6 +44,10 @@ export interface LayoutState extends BaseState {
 /**
  * Base object for both Table and Pivot Layouts
  */
+/**
+ * How row groups are displayed in a Layout (maps to AG Grid `groupDisplayType`).
+ */
+export type RowGroupDisplayType = 'single' | 'multi' | 'groupRows';
 export interface LayoutBase extends AdaptableObject {
     /**
      * Name of the Layout as it appears in the Layout toolbar and tool panel
@@ -101,10 +105,7 @@ export interface LayoutBase extends AdaptableObject {
      * Position of the Grand Total Row in the Layout
      */
     GrandTotalRow?: 'top' | 'bottom' | 'pinnedTop' | 'pinnedBottom' | boolean;
-    /**
-     * Display Row Grouped Columns as 'single' or 'multi' column
-     */
-    RowGroupDisplayType?: 'single' | 'multi';
+    RowGroupDisplayType?: RowGroupDisplayType;
 }
 /**
  * Defines a Table-based Layout