@adaptabletools/adaptable 10.0.2 → 10.0.4-canary.2

package/index.css

@@ -1941,6 +1941,21 @@ template {
   --ab-cmp-datepicker__font-family: var(--ab__font-family);
   --ab-cmp-datepicker__cell-size: 30px; }
 
+:root {
+  --ab-cmp-loader__background: var(--ab-color-primarydark);
+  --ab-cmp-loader__border: var(--ab-color-text-on-primary);
+  --ab-cmp-loader__font-size: var(--ab-font-size-2); }
+
+:root {
+  --ab-cmp-progress-indicator__delay: 1s;
+  --ab-cmp-progress-indicator__z-index: 9999;
+  --ab-cmp-progress-indicator__font-size: var(--ab-font-size-4);
+  --ab-cmp-progress-indicator__font-style: italic;
+  --ab-cmp-progress-indicator__font-family: var(--ab__font-family);
+  --ab-cmp-progress-indicator__padding: var(--ab-space-3);
+  --ab-cmp-progress-indicator__background: var(--ab-color-primary);
+  --ab-cmp-progress-indicator__color: var(--ab-color-text-on-primary); }
+
 :root {
   --ab-cmp-wizard__padding: var(--ab-space-5);
   --ab-cmp-wizard__margin: var(--ab-space-1);
@@ -2072,6 +2087,9 @@ template {
   --ab-cmp-toolpanel__color: var(--ab-dashboard__color);
   --ab-cmp-toolpanel__font-family: var(--ab__font-family); }
 
+:root {
+  --ab-cmp-custom-sort-wizard-loader__font-size: var(--ab-font-size-4); }
+
 .ab-Radio-input:focus + svg rect {
   stroke: var(--ab-color-accent);
   stroke-width: 2; }
@@ -2914,9 +2932,15 @@ input[type="number"].ab-Input:hover::-webkit-inner-spin-button:active {
 .ab-Dashboard .ab-Input {
     border: none; }
 
+.ab-Dashboard .ab-DashboardToolbar__Export__wrap {
+    white-space: nowrap; }
+
 .ab-Dashboard .ab-DashboardToolbar__QuickSearch__text .ab-Input {
     padding: var(--ab-space-1); }
 
+.ab-Dashboard .ab-StateManagement__Clear-Button, .ab-Dashboard .ab-StateManagement__Load-Button, .ab-Dashboard .ab-StateManagement__Export-Dropdown {
+    margin-left: var(--ab-space-1); }
+
 .ab-GridList {
   --at-grid__background: transparent; }
 
@@ -3053,6 +3077,63 @@ input[type="number"].ab-Input:hover::-webkit-inner-spin-button:active {
 .ab-ToggleButton__input:disabled + .ab-ToggleButton__slider {
   opacity: 0.5; }
 
+.ab-Loader {
+  font-size: var(--ab-cmp-loader__font-size);
+  margin-top: 8px;
+  font-style: italic; }
+
+.ab-Loader__text, .ab-Loader__Spinner {
+  vertical-align: middle; }
+
+.ab-Loader .ab-Loader__Spinner {
+  margin-right: 5px; }
+
+.ab-Loader__Spinner {
+  display: inline-block;
+  border-radius: 50%;
+  border: 2px solid var(--ab-cmp-loader__background);
+  border-top: 2px solid var(--ab-cmp-loader__border);
+  width: 10px;
+  height: 10px;
+  bottom: 0;
+  animation: spin 1.5s linear infinite; }
+
+@keyframes spin {
+  0% {
+    transform: rotate(0deg); }
+  100% {
+    transform: rotate(360deg); } }
+
+.ab-progress-indicator-wrapper {
+  align-items: center;
+  display: flex;
+  justify-content: center;
+  position: fixed;
+  top: 0;
+  left: 0;
+  height: 0;
+  width: 0;
+  z-index: var(--ab-cmp-progress-indicator__z-index);
+  opacity: 0;
+  transition-delay: var(--ab-cmp-progress-indicator__delay);
+  transition-property: opacity;
+  transition-duration: 0.3s; }
+
+.ab-progress-indicator-wrapper--visible {
+    opacity: 1; }
+
+.ab-progress-indicator-wrapper .ab-progress-indicator-body {
+    padding: var(--ab-cmp-progress-indicator__padding);
+    background: var(--ab-cmp-progress-indicator__background);
+    color: var(--ab-cmp-progress-indicator__color);
+    border-style: none;
+    border-width: 0px;
+    border-radius: var(--ab__border-radius);
+    box-shadow: var(--ab-focus__box-shadow);
+    font-size: var(--ab-cmp-progress-indicator__font-size);
+    font-style: var(--ab-cmp-progress-indicator__font-style);
+    font-family: var(--ab-cmp-progress-indicator__font-family); }
+
 .ab-ObjectCollection__list > * {
   background: var(--ab-cmp-listgroupitem__background);
   color: var(--ab-cmp-listgroupitem__color); }
@@ -3082,19 +3163,19 @@ input[type="number"].ab-Input:hover::-webkit-inner-spin-button:active {
 .ab-ListBoxFilterForm .ab-GridList .AT-VirtualScrollContainer {
     overflow-x: hidden; }
 
-.ag-theme-balham-dark .ab-ListBoxFilterForm--vendor-style,
-.ag-theme-balham .ab-ListBoxFilterForm--vendor-style {
+.ag-theme-balham-dark .ab-ListBoxFilterForm--aggrid-style,
+.ag-theme-balham .ab-ListBoxFilterForm--aggrid-style {
   --ab-cmp-dropdown__border-radius: 0;
   --ab-cmp-input__border-radius: 0;
   --ab-cmp-input__padding: 0;
   --ab-cmp-dropdown__padding: 3px;
   --ab-focus__box-shadow: 0 0 3px 0px var(--ab-color-accent); }
 
-.ag-theme-balham-dark .ab-ListBoxFilterForm--vendor-style .ab-FieldWrap,
-  .ag-theme-balham .ab-ListBoxFilterForm--vendor-style .ab-FieldWrap {
+.ag-theme-balham-dark .ab-ListBoxFilterForm--aggrid-style .ab-FieldWrap,
+  .ag-theme-balham .ab-ListBoxFilterForm--aggrid-style .ab-FieldWrap {
     border-radius: 0; }
 
-html.ab--theme-dark .ab-ListBoxFilterForm--vendor-style {
+html.ab--theme-dark .ab-ListBoxFilterForm--aggrid-style {
   --ab-color-inputborder: white;
   --ab-cmp-dropdown__border: 1px solid white; }
 
@@ -3174,7 +3255,8 @@ html.ab--theme-dark .ab-ListBoxFilterForm--vendor-style {
   margin-right: var(--ab-space-2); }
 
 .ab-ToolPanel {
-  min-width: calc(var(--ab-cmp-toolpanel__width) - 1px);
+  flex: 1 1 0;
+  min-width: 0;
   color: var(--ab-cmp-toolpanel__color);
   font-family: var(--ab-cmp-toolpanel__font-family); }
 
@@ -3191,6 +3273,16 @@ html.ab--theme-dark .ab-ListBoxFilterForm--vendor-style {
     flex-wrap: wrap;
     grid-gap: var(--ab-cmp-toolpanel-header__grid-gap); }
 
+.ab-ToolPanel .ab-StateManagement__Clear-Button, .ab-ToolPanel .ab-StateManagement__Load-Button {
+    justify-content: center;
+    flex: 1; }
+
+.ab-ToolPanel .ab-StateManagement__Clear-Button, .ab-ToolPanel .ab-StateManagement__Load-Button, .ab-ToolPanel .ab-StateManagement__Export-Dropdown {
+    margin-bottom: var(--ab-space-1); }
+
+.ab-CustomSortWizard__SortOrder .ab-Loader__text {
+  font-size: var(--ab-cmp-custom-sort-wizard-loader__font-size); }
+
 .ab-alert--error {
   background: var(--ab-color-error); }
 
@@ -3346,34 +3438,8 @@ html.ab--theme-dark .ab-ListBoxFilterForm--vendor-style {
 .ag-details-row .ag-details-grid {
     flex: 1; }
 
-div.ab-progress-indicator-wrapper {
-  align-items: center;
-  display: flex;
-  height: 100vh;
-  justify-content: center;
-  left: 0;
-  position: fixed;
-  top: 0;
-  width: 100%;
-  z-index: 9999;
-  opacity: 0;
-  transition-delay: 0.5s;
-  transition-property: opacity;
-  transition-duration: 0.3s; }
-
-div.ab-progress-indicator-wrapper--visible {
-    opacity: 1; }
-
-div.ab-progress-indicator-wrapper .ab-progress-indicator-text {
-    padding: var(--ab-space-3);
-    background: var(--ab-color-primary);
-    color: var(--ab-color-text-on-primary);
-    border-style: none;
-    border-width: 0px;
-    border-radius: var(--ab__border-radius);
-    box-shadow: var(--ab-focus__box-shadow);
-    font-size: var(--ab-font-size-3);
-    font-family: var(--ab__font-family); }
+.ab-wait-for-progress-indicator.ab-Grid {
+  pointer-events: none; }
 
 html.ab--theme-light {
   --ab-theme-loaded: light; }

package/package.json

@@ -1,15 +1,11 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "10.0.2",
+  "version": "10.0.4-canary.2",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "main": "index.js",
   "typings": "index.d.ts",
   "dependencies": {
     "@infinite-table/infinite-react": "0.0.1-canary.11",
-    "@types/react": ">=16.8.0",
-    "@types/tinycolor2": "^1.4.2",
-    "babel-polyfill": "^6.26.0",
-    "babel-runtime": "^6.26.0",
     "date-fns": "2.22.1",
     "debug": "^4.3.1",
     "isomorphic-fetch": "^2.2.1",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1636016021593;
+declare const _default: 1641596554967;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1636016021593;
+exports.default = 1641596554967;

package/src/AdaptableInterfaces/AdaptableNoCodeWizard.d.ts

@@ -36,7 +36,7 @@ export interface AdaptableNoCodeWizardOptions {
  *  userName: 'Demo User',
  *  predefinedConfig: demoConfig,
  *
- *  // note we don't need any vendorGrid info, since that's set by the wizard, when
+ *  // note we don't need any agGrid info, since that's set by the wizard, when
  *  // the user configured the columns
  * };
  *

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -1,4 +1,4 @@
-import { RowNode } from '@ag-grid-community/all-modules';
+import { Column, RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { ColumnSort } from '../PredefinedConfig/Common/ColumnSort';
@@ -18,7 +18,7 @@ import { IDataService } from '../Utilities/Services/Interface/IDataService';
 import { IReportService } from '../Utilities/Services/Interface/IReportService';
 import { IValidationService } from '../Utilities/Services/Interface/IValidationService';
 import { IModuleService } from '../Utilities/Services/Interface/IModuleService';
-import { MenuContext } from '../PredefinedConfig/Common/Menu';
+import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
 import { IAlertService } from '../Utilities/Services/Interface/IAlertService';
@@ -39,9 +39,7 @@ export interface IAdaptable {
     adaptableStore: IAdaptableStore;
     modules: IModuleCollection;
     /**
-     * Whether the vendor grid has its own column menu that we need to use (e.g. AG Grid Enterprise) or doesnt in which case we build one (e.g. hypergrid)
-     *
-     * Note: if AG Grid is using community or menu is not added then this should be true.
+     * If using AG Grid community (which has no menu)
      */
     embedColumnMenu: boolean;
     /**
@@ -50,6 +48,10 @@ export interface IAdaptable {
      * Avoid unnecessary store calls and rendering
      */
     isInitialised: boolean;
+    /**
+     * Set to true when adaptable is destroyed.
+     */
+    isDestroyed: boolean;
     /**
      * Adaptable contains a number of 'Services' which are created at Startup
      *
@@ -89,7 +91,7 @@ export interface IAdaptable {
     }) => void): () => void;
     _on(eventName: 'CreateAdaptableContextMenuItems', callback: (param: {
         items: AdaptableMenuItem[];
-        menuContext: MenuContext;
+        menuContext: ContextMenuContext;
     }) => void): () => void;
     _emit(eventName: 'CellEditorKeyDown', data: {
         keyDownEvent: KeyboardEvent;
@@ -114,7 +116,10 @@ export interface IAdaptable {
     jumpToRow(rowNode: RowNode): void;
     jumpToColumn(columnId: string): void;
     jumpToCell(columnId: string, rowNode: RowNode): void;
+    getAgGridContainerElement(): HTMLElement | null;
     setDataSource(dataSource: any): void;
+    getGridData(): any[];
+    getFilteredData(): any[];
     loadDataSource(dataSource: any): void;
     updateRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): void;
     addRows(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): void;
@@ -136,12 +141,17 @@ export interface IAdaptable {
         [key: string]: boolean;
     }): any[];
     getDistinctValuesForColumn(column: AdaptableColumn, visibleRowsOnly: boolean, skipRowNode?: RowNode): GridCell[];
+    getDistinctFilterValuesForColumn(column: AdaptableColumn, visibleRowsOnly: boolean, filter: string, skipRowNode?: RowNode): Promise<{
+        gridCells: GridCell[];
+        suppressClientSideFilter?: boolean;
+    }>;
+    getDistinctCustomSortValuesForColumn(column: AdaptableColumn, visibleRowsOnly: boolean, skipRowNode?: RowNode): Promise<GridCell[]>;
+    getDistinctBulkUpdateValuesForColumn(column: AdaptableColumn, visibleRowsOnly: boolean, selectedGridCells: GridCell[], skipRowNode?: RowNode): Promise<GridCell[]>;
     getDisplayValue(id: any, columnId: string): string;
     getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
     getRawValueFromRowNode(rowNode: RowNode, columnId: string): any;
     getDisplayValueFromRowNode(rowNode: RowNode, columnId: string): string | undefined;
-    getFormattedValueFromRawValue(rawValue: any, columnId: string): string | undefined;
-    getDisplayValueFromRawValue(columnId: string, rawValue: any, skipCellRenderers?: boolean): string | undefined;
+    getDisplayValueFromRawValue(columnId: string, rawValue: any): string | undefined;
     getDataRowFromRowNode(rowNode: RowNode): any;
     getRowNodesForPrimaryKeys(primaryKeyValues: any[]): RowNode[];
     getRowNodeForPrimaryKey(primaryKeyValue: any): RowNode;
@@ -164,7 +174,7 @@ export interface IAdaptable {
     selectCells(columnIds: string[], startNode: RowNode, endNode: RowNode): void;
     getFirstGroupedColumn(): AdaptableColumn | undefined;
     isRowNodeVisible(rowNode: RowNode): boolean;
-    getVendorColumnType(columnId: string): string | string[];
+    getAgGridColumnType(columnId: string): string | string[];
     getActiveColumnComparator(columnId: string, customSort?: CustomSort, customSortComparer?: ColumnValuesComparer): (valueA: any, valueB: any, nodeA?: RowNode, nodeB?: RowNode, isInverted?: boolean) => number | undefined;
     setColumnSort(columnSorts: ColumnSort[]): void;
     clearColumnSort(): void;
@@ -189,8 +199,8 @@ export interface IAdaptable {
     showQuickFilter(): void;
     hideQuickFilter(): void;
     isQuickFilterAvailable(): boolean;
-    getVendorGridLightThemeName(): string;
-    getVendorGridCurrentThemeName(): string;
+    getAgGridLightThemeName(): string;
+    getAgGridCurrentThemeName(): string;
     applyAdaptableTheme(theme: AdaptableTheme | string): void;
     /**
      * called when you want to destroy the instance & cleanup resources
@@ -205,10 +215,12 @@ export interface IAdaptable {
     closeAllRowGroups(): void;
     expandRowGroupsForValues(columnValues: any[]): void;
     getExpandRowGroupsKeys(): any[];
+    getAdaptableContainerElement(): HTMLElement | null;
+    getAgGridContainerElement(): HTMLElement | null;
     buildStandaloneColumnHeader(adaptableColumn: AdaptableColumn): AdaptableMenuItem[];
     setupColumns(): void;
     updateColDefsForSpecialColumns({ skipSetupColumns }?: {
         skipSetupColumns?: boolean;
     }): void;
-    getVendorGridColumnFieldForColumn(abColumn: AdaptableColumn): string;
+    getAgGridColumnForAdaptableColumn(abColumn: AdaptableColumn): Column;
 }

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -19,7 +19,7 @@ import { FilterOptions } from './FilterOptions';
 import { QueryLanguageOptions } from './QueryLanguageOptions';
 import { DataChangeHistoryOptions } from './DataChangeHistoryOptions';
 /**
- * Group of property options enabling developers to set up AdapTable at design time to fit precise requirements - provides Vendor Grid, Predefined Config and other information required to ensure a full, rich user experience
+ * Group of property options enabling developers to set up AdapTable at design time to fit precise requirements - provides AG Grid, Predefined Config and other information required to ensure a full, rich user experience
  */
 export interface AdaptableOptions {
     /**
@@ -69,7 +69,7 @@ export interface AdaptableOptions {
      */
     userName?: string;
     /**
-     * Underlying vendor grid or grid object which AdapTable interacts with.  Note: if using React or Angular Wrapper, no need to populate this property (as `gridOptions` is a separate prop and AdapTable wires up everything)
+     * The AG Grid object which AdapTable interacts with.  Note: if using React or Angular Wrapper, no need to populate this property (as `gridOptions` is a separate prop and AdapTable wires up everything)
      *
      * @defaultValue n/a (Mandatory)
      */
@@ -81,7 +81,7 @@ export interface AdaptableOptions {
      */
     notificationsOptions?: NotificationsOptions;
     /**
-     * Options for setting the 'Div' elements in which AdapTable, the underlying grid, popups and charts are placed
+     * Options for setting the 'Div' elements in which AdapTable, AG Grid, popups and charts are placed
      */
     containerOptions?: ContainerOptions;
     /**

package/src/AdaptableOptions/ContainerOptions.d.ts

@@ -10,20 +10,19 @@ export interface ContainerOptions {
      */
     adaptableContainer?: string | HTMLElement;
     /**
-     * Div containing underlying vendor grid- string Id or HTMLElement
+     * Div containing AG Grid instance - string Id or HTMLElement
      *
      * @defaultValue "grid"
      * @gridInfoItem
      */
-    vendorContainer?: string | HTMLElement;
+    agGridContainer?: string | HTMLElement;
     /**
-     * Useful when the vendor grid is instantiated separately (eg: by vendor wrappers like React and Angular flavors).
-     * This is how long AdapTable waits for the vendor grid before giving up connecting to it.
+     *  how long AdapTable waits for AG Grid before giving up connecting to it; useful when AG Grid is instantiated separately (eg: by React or Angular Wrappers)
      *
      * @defaultValue 60s
      * @gridInfoItem
      */
-    vendorContainerWaitTimeout?: number;
+    agGridContainerWaitTimeout?: number;
     /**
      * Name of div where modals appear (if null, will be centre of page)
      *

package/src/AdaptableOptions/DataChangeHistoryOptions.d.ts

@@ -16,5 +16,5 @@ export interface DataChangeHistoryOptions {
      * @defaultValue undefined (all data changes are logged)
      * @gridInfoItem
      */
-    filterDataChange?: (dataChangeInfo: DataChangedInfo) => boolean;
+    showDataChange?: (dataChangeInfo: DataChangedInfo) => boolean;
 }

package/src/AdaptableOptions/DateInputOptions.d.ts

@@ -44,10 +44,14 @@ export interface DateInputOptions {
  * Datepicker buttons which are displayed in the overlay footer
  */
 export declare type DatepickerButton = 
+/**
+ * Clears the datepicker value
+ */
+'clear'
 /**
  * Closes the datepicker overlay
  */
-'close'
+ | 'close'
 /**
  * Selects the current date
  */

package/src/AdaptableOptions/EditOptions.d.ts

@@ -1,6 +1,5 @@
 import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
-import { RowNode } from '@ag-grid-community/all-modules';
 /**
  * Options related to Editing in Adaptable.
  *
@@ -19,9 +18,9 @@ export interface EditOptions {
      */
     displayServerValidationMessages?: boolean;
     /**
-     * Function which returns true if given cell is editable
+     * Function which checks if given Grid Cell is editable
      */
-    isCellEditable?: (gridCell: GridCell, rowNode: RowNode) => boolean;
+    isCellEditable?: (gridCell: GridCell) => boolean;
 }
 /**
  * Used for Server Validation ie. after an edit has been made in Adaptable which should be checked on the Server

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -6,13 +6,13 @@ import { SystemFilterPredicateIds } from '../PredefinedConfig/FilterState';
  */
 export interface FilterOptions {
     /**
-     * Sets whether to display Dropdown in Quick Filter Bar for given Column
+     * Hides the Dropdown in Quick Filter Bar for a given Column
      *
      * @defaultValue undefined
      */
     hideQuickFilterDropdown?: (column: AdaptableColumn) => boolean;
     /**
-     * Sets whether to display the Input in Quick Filter Bar for given Column
+     * Hides the Input in Quick Filter Bar for a given Column
      *
      * @defaultValue undefined
      */
@@ -32,20 +32,20 @@ export interface FilterOptions {
      */
     indicateFilteredColumns?: boolean;
     /**
-     * Uses Adaptable's Filter Form in Column header menu for all columns if 'true' (the default) or those listed; otherwise vendor grid one will be used
+     * Uses Adaptable's Filter Form in Column header menu for all columns if 'true' (the default) or those listed, in preference to AG Grid's Filter Form
      *
      * @defaultValue true
      */
     useAdaptableFilterForm?: boolean | string[];
     /**
-     * Styles Adaptable Filter Form to match styling of current vendor grid
+     * Styles Adaptable Filter Form to match AG Grid's current styling
      *
      * @defaultValue true
      * @gridInfoItem
      */
-    useVendorFilterFormStyle?: boolean;
+    useAgGridFilterFormStyle?: boolean;
     /**
-     * Use Adaptable's Quick Filter for all columns if 'true' (the default) or those listed; otherwise vendor grid one will be used
+     * Use Adaptable's Quick Filter for all columns if 'true' (the default) or those listed, in preference to AG Grid's Floating Filter
      *
      * @defaultValue true
      * @gridInfoItem
@@ -58,6 +58,13 @@ export interface FilterOptions {
      * @gridInfoItem
      */
     quickFilterTrigger?: 'mouseenter' | 'click';
+    /**
+     * Whether to open Quick Filter Values dropdown with mouse hover or click
+     *
+     * @defaultValue 'mouseenter'
+     * @gridInfoItem
+     */
+    quickFilterValuesTrigger?: 'mouseenter' | 'click';
     /**
      * When to re-filter grid after user edits data: 'Always', 'Never' or 'Throttle' (which requires a 'ThrottleDelay')
      *
@@ -71,7 +78,7 @@ export interface FilterOptions {
      */
     filterActionOnExternalDataChange?: FilterActionOnDataChange;
     /**
-     * Apply selected filters in Filter Form as soon as they are clicked; if false an Apply Filter button is displayed
+     * Apply selected filters (in Filter Form or Quick Filter Bar) as soon as they are clicked; if false an Apply Filter button is displayed
      *
      * @defaultValue true
      * @gridInfoItem
@@ -92,26 +99,26 @@ export interface FilterOptions {
      */
     sortColumnValuesInFilter?: boolean;
     /**
-     * Default filter type for numeric Columns in Quick Filter
+     * Default filter type for numeric Columns
      *
      * @defaultValue Equals
      * @gridInfoItem
      */
-    defaultNumericColumnFilter?: 'GreaterThan' | 'LessThan' | 'Equals' | 'NotEquals';
+    defaultNumericColumnFilter?: 'GreaterThan' | 'LessThan' | 'Equals' | 'NotEquals' | ((column: AdaptableColumn) => 'GreaterThan' | 'LessThan' | 'Equals' | 'NotEquals');
     /**
-     * Default filter type for string Columns in Quick Filter
+     * Default filter type for string Columns
      *
      * @defaultValue Contains
      * @gridInfoItem
      */
-    defaultStringColumnFilter?: 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex';
+    defaultStringColumnFilter?: 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | ((column: AdaptableColumn) => 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex');
     /**
-     * Default filter type for date Columns in Quick Filter
+     * Default filter type for date Columns
      *
      * @defaultValue On
      * @gridInfoItem
      */
-    defaultDateColumnFilter?: 'After' | 'Before' | 'On' | 'NotOn';
+    defaultDateColumnFilter?: 'After' | 'Before' | 'On' | 'NotOn' | ((column: AdaptableColumn) => 'After' | 'Before' | 'On' | 'NotOn');
     /**
      * Whether to open the Filter Form on the Values or Predicates tab
      *
@@ -120,14 +127,14 @@ export interface FilterOptions {
      */
     defaultFilterFormTab?: 'Values' | 'Predicates';
     /**
-     * Allows filtering on Calculated, Action & FreeText columns
+     * Allows filtering on Calculated & FreeText columns
      *
      * @defaultValue true
      * @gridInfoItem
      */
     enableFilterOnSpecialColumns?: boolean;
     /**
-     * Which Adaptable System Filter Predicates are available; provide empty array for none or leave unset for all
+     * Which Adaptable System Filter Predicates are available
      */
     systemFilters?: SystemFilterPredicateIds;
 }

package/src/AdaptableOptions/GeneralOptions.d.ts

@@ -1,8 +1,9 @@
+import { AdaptableScope } from '../../types';
 import { AdaptableComparerFunction } from '../PredefinedConfig/Common/AdaptableComparerFunction';
 import { AlternativeModuleName } from '../PredefinedConfig/Common/AlternativeModuleName';
 import { CellSummaryOperation } from '../PredefinedConfig/Common/CellSummary';
 /**
- * General options for configuring AdapTable including managing Primary Keys.
+ * General options for configuring AdapTable including managing Primary Keys
  */
 export interface GeneralOptions {
     /**
@@ -84,7 +85,7 @@ export interface ColumnValuesComparer {
     /**
      * Column for which to compare values
      */
-    columnId: string;
+    scope: AdaptableScope;
     /**
      * Comparer function to use
      */

package/src/AdaptableOptions/LayoutOptions.d.ts

@@ -32,7 +32,7 @@ export interface LayoutOptions {
      */
     autoSizeColumnsInPivotLayout?: boolean;
     /**
-     * Whether a "Default Layout" will be created in addition to Layouts in Config (if none there, Default Layout is always created)
+     * Whether a "Default Layout" will be created in addition to Layouts provided in Config
      *
      * @defaultValue false
      * @gridInfoItem

package/src/AdaptableOptions/MenuOptions.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableMenuItem, MenuContext, UserMenuItem } from '../PredefinedConfig/Common/Menu';
+import { AdaptableMenuItem, ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../PredefinedConfig/Common/Menu';
 /**
  * Options for managing menus in AdapTable
  */
@@ -9,14 +9,14 @@ export interface MenuOptions {
      * @defaultValue true
      * @gridInfoItem
      */
-    showAdaptableContextMenu?: boolean | ((menuItem: AdaptableMenuItem, menuContext: MenuContext) => boolean);
+    showAdaptableContextMenu?: boolean | ((menuItem: AdaptableMenuItem, menuContext: ContextMenuContext) => boolean);
     /**
      * Show Adaptable Column Menu (or specific items); can be boolean value or function invoked for each menu item
      *
      * @defaultValue true
      * @gridInfoItem
      */
-    showAdaptableColumnMenu?: boolean | ((menuItem: AdaptableMenuItem, menuContext: MenuContext) => boolean);
+    showAdaptableColumnMenu?: boolean | ((menuItem: AdaptableMenuItem, menuContext: ColumnMenuContext) => boolean);
     /**
      * Adds 'Ungroup' Column Menu item to a row grouped column
      *
@@ -25,25 +25,25 @@ export interface MenuOptions {
      */
     showUngroupColumnMenuItem?: boolean;
     /**
-     * Order in which Vendor, AdapTable and User Menu items will appear in Column Menu
+     * Order in which AG Grid, AdapTable and User Menu items will appear in Column Menu
      *
-     * @defaultValue 'vendor', 'adaptable', 'user'
+     * @defaultValue 'aggrid', 'adaptable', 'user'
      * @gridInfoItem
      */
-    columnMenuOrder?: ('vendor' | 'adaptable' | 'user')[];
+    columnMenuOrder?: ('aggrid' | 'adaptable' | 'user')[];
     /**
-     * Order in which Vendor, AdapTable and User Menu items will appear in Context Menu
+     * Order in which AG grid, AdapTable and User Menu items will appear in Context Menu
      *
-     * @defaultValue 'vendor', 'adaptable', 'user'
+     * @defaultValue 'aggrid', 'adaptable', 'user'
      * @gridInfoItem
      */
-    contextMenuOrder?: ('vendor' | 'adaptable' | 'user')[];
+    contextMenuOrder?: ('aggrid' | 'adaptable' | 'user')[];
     /**
      * A collection of UserMenuItem objects to be added to the Column Header Menu (the one that appears as a dropdown in each Column Header).
      */
-    columnMenuItems?: UserMenuItem[];
+    columnMenuItems?: UserMenuItem<ColumnMenuContext>[];
     /**
      * A collection of UserMenuItem objects to be added to the Context Menu (the one that appears when you right-click on a cell, or cells, in the Grid).
      */
-    contextMenuItems?: UserMenuItem[];
+    contextMenuItems?: UserMenuItem<ContextMenuContext>[];
 }