@adaptabletools/adaptable 18.0.0-canary.35 → 18.0.0-canary.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "18.0.0-canary.35",
+  "version": "18.0.0-canary.36",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -7,7 +7,6 @@ import { UserInterfaceOptions } from './UserInterfaceOptions';
 import { AdaptablePlugin } from './AdaptablePlugin';
 import { ExportOptions } from './ExportOptions';
 import { TeamSharingOptions } from './TeamSharingOptions';
-import { MenuOptions } from './MenuOptions';
 import { EntitlementOptions } from './EntitlementOptions';
 import { NotificationsOptions } from './NotificationsOptions';
 import { DashboardOptions } from './DashboardOptions';
@@ -35,6 +34,8 @@ import { DataImportOptions } from './DataImportOptions';
 import { ColumnFilterOptions } from './ColumnFilterOptions';
 import { GridFilterOptions } from './GridFilterOptions';
 import { CommentOptions } from './CommentOptions';
+import { ColumnMenuOptions } from './ColumnMenuOptions';
+import { ContextMenuOptions } from './ContextMenuOptions';
 /**
  * Large group of options enabling developers to set up AdapTable at design time to fit precise requirements
  */
@@ -220,11 +221,17 @@ export interface AdaptableOptions<TData = any> {
      */
     layoutOptions?: LayoutOptions;
     /**
-     * Options for managing AdapTable menus
+     * Options for managing AdapTable Column Menu
      *
      * @gridInfoContainer
      */
-    menuOptions?: MenuOptions<TData>;
+    columnMenuOptions?: ColumnMenuOptions<TData>;
+    /**
+     * Options for managing AdapTable Context Menu
+     *
+     * @gridInfoContainer
+     */
+    contextMenuOptions?: ContextMenuOptions<TData>;
     /**
      * Options for managing Notifications in AdapTable
      *

package/src/AdaptableOptions/ColumnMenuOptions.d.ts

@@ -0,0 +1,94 @@
+import { AdaptableColumnMenuItemName, AdaptableMenuItem, AgGridMenuItem, ColumnMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableIcon } from '../types';
+/**
+ * Options for managing menus in AdapTable – provided using 2 collections
+ */
+export interface ColumnMenuOptions<TData = any> {
+    /**
+     * Customises Column Menu (default column menu items are available in the provided context)
+     */
+    customColumnMenu?: (menuContext: CustomColumnMenuContext<TData>) => CustomColumnMenuItem[];
+}
+/**
+ * Context info provided when building Custom Column Menus
+ */
+export interface CustomColumnMenuContext<TData = any> extends ColumnMenuContext<TData> {
+    /**
+     * Flat list of all available AdapTable Menu Items
+     */
+    defaultAdaptableMenuItems: AdaptableSystemColumnMenuItem<AdaptableColumnMenuItemName>[];
+    /**
+     * Flat list of all available AG Grid Menu Items
+     */
+    defaultAgGridMenuItems: AgGridMenuItem<AgGridColumnMenuItemType>[];
+    /**
+     * Default structure of Adaptable Menu Items
+     */
+    defaultAdaptableMenuStructure: (AdaptableSystemColumnMenuItem<AdaptableColumnMenuItemName> | '-')[];
+    /**
+     * Default structure of AG Grid Menu Items
+     */
+    defaultAgGridMenuStructure: (AgGridMenuItem<AgGridColumnMenuItemType> | {
+        menuType: 'Group';
+        label: string;
+        subMenuItems: AgGridMenuItem<AgGridColumnMenuItemType>[];
+        disabled?: boolean;
+        icon?: AdaptableIcon;
+    })[];
+}
+/**
+ * Custom Column Menu Item
+ */
+export type CustomColumnMenuItem = AgGridMenuItem<AgGridColumnMenuItemType> | AdaptableSystemColumnMenuItem<AdaptableColumnMenuItemName> | UserColumnMenuItem | '-' | {
+    menuType: 'Group';
+    label: string;
+    subMenuItems: CustomColumnMenuItem[];
+    disabled?: boolean;
+    icon?: AdaptableIcon;
+};
+/**
+ * System Menu Item that is provided by AdapTable
+ */
+export interface AdaptableSystemColumnMenuItem<MENU_TYPE_NAME extends AdaptableColumnMenuItemName> extends AdaptableMenuItem<MENU_TYPE_NAME> {
+    /**
+     * Type of Menu - always 'Adaptable'
+     */
+    menuType: 'Adaptable';
+}
+/**
+ * Column Menu Item that is provided by User
+ */
+export interface UserColumnMenuItem {
+    /**
+     * Type of Menu - always 'User'
+     */
+    menuType: 'User';
+    /**
+     * Text to appear in the Menu Item
+     */
+    label: string;
+    /**
+     * Function invoked when the Menu Item is clicked
+     */
+    onClick?: (menuContext: ColumnMenuContext) => void;
+    /**
+     * Whether menu item is disabled
+     */
+    disabled?: boolean;
+    /**
+     * Whether menu item is hidden
+     */
+    hidden?: boolean;
+    /**
+     * Optional icon to display
+     */
+    icon?: AdaptableIcon;
+    /**
+     * Array of Menu Items, enabling limitless levels of menus
+     */
+    subMenuItems?: CustomColumnMenuItem[];
+}
+/**
+ * Defines AG Grid Column Menu Items
+ */
+export type AgGridColumnMenuItemType = 'pinSubMenu' | 'valueAggSubMenu' | 'autoSizeThis' | 'autoSizeAll' | 'rowGroup' | 'rowUnGroup' | 'resetColumns' | 'expandAll' | 'contractAll' | 'separator';

package/src/AdaptableOptions/ColumnMenuOptions.js

@@ -0,0 +1 @@
+export {};

package/src/AdaptableOptions/ContextMenuOptions.d.ts

@@ -0,0 +1,94 @@
+import { AdaptableContextMenuItemName, AdaptableMenuItem, AgGridMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { AdaptableIcon } from '../types';
+/**
+ * Options for managing menus in AdapTable – provided using 2 collections
+ */
+export interface ContextMenuOptions<TData = any> {
+    /**
+     * Customises Context Menu (default context menu items are available in provided context)
+     */
+    customContextMenu?: (menuContext: CustomContextMenuContext<TData>) => CustomContextMenuItem[];
+}
+/**
+ * Context info provided when building Custom Context Menus
+ */
+export interface CustomContextMenuContext<TData = any> extends ContextMenuContext<TData> {
+    /**
+     * Flat list of all available AdapTable Menu Items
+     */
+    defaultAdaptableMenuItems: AdaptableSystemContextMenuItem<AdaptableContextMenuItemName>[];
+    /**
+     * Flat list of all available AG Grid Menu Items
+     */
+    defaultAgGridMenuItems: AgGridMenuItem<AgGridContextMenuItemType>[];
+    /**
+     * Default structure of Adaptable Menu Items
+     */
+    defaultAdaptableMenuStructure: (AdaptableSystemContextMenuItem<AdaptableContextMenuItemName> | '-')[];
+    /**
+     * Default structure of AG Grid Menu Items
+     */
+    defaultAgGridMenuStructure: (AgGridMenuItem<AgGridContextMenuItemType> | {
+        menuType: 'Group';
+        label: string;
+        subMenuItems: AgGridMenuItem<AgGridContextMenuItemType>[];
+        disabled?: boolean;
+        icon?: AdaptableIcon;
+    })[];
+}
+/**
+ * Custom Context Menu Item
+ */
+export type CustomContextMenuItem = AgGridMenuItem<AgGridContextMenuItemType> | AdaptableSystemContextMenuItem<AdaptableContextMenuItemName> | UserContextMenuItem | '-' | {
+    menuType: 'Group';
+    label: string;
+    subMenuItems: CustomContextMenuItem[];
+    disabled?: boolean;
+    icon?: AdaptableIcon;
+};
+/**
+ * System Menu Item that is provided by AdapTable
+ */
+export interface AdaptableSystemContextMenuItem<MENU_TYPE_NAME extends AdaptableContextMenuItemName> extends AdaptableMenuItem<MENU_TYPE_NAME> {
+    /**
+     * Type of Menu - always 'Adaptable'
+     */
+    menuType: 'Adaptable';
+}
+/**
+ * Context Menu Item that is provided by User
+ */
+export interface UserContextMenuItem {
+    /**
+     * Type of Menu - always 'User'
+     */
+    menuType: 'User';
+    /**
+     * Text to appear in the Menu Item
+     */
+    label: string;
+    /**
+     * Function invoked when the Menu Item is clicked
+     */
+    onClick?: (menuContext: ContextMenuContext) => void;
+    /**
+     * Whether menu item is disabled
+     */
+    disabled?: boolean;
+    /**
+     * Whether menu item is hidden
+     */
+    hidden?: boolean;
+    /**
+     * Optional icon to display
+     */
+    icon?: AdaptableIcon;
+    /**
+     * Array of Menu Items, enabling limitless levels of menus
+     */
+    subMenuItems?: CustomContextMenuItem[];
+}
+/**
+ * Defines AG Grid Context Menu Items
+ */
+export type AgGridContextMenuItemType = 'autoSizeAll' | 'expandAll' | 'contractAll' | 'copy' | 'copyWithHeaders' | 'copyWithGroupHeaders' | 'cut' | 'paste' | 'resetColumns' | 'export' | 'csvExport' | 'excelExport' | 'chartRange' | 'pivotChart' | 'separator';

package/src/AdaptableOptions/ContextMenuOptions.js

@@ -0,0 +1 @@
+export {};

package/src/Api/AdaptableApi.d.ts

@@ -47,6 +47,8 @@ import { GridFilterApi } from './GridFilterApi';
 import { NamedQueryApi } from './NamedQueryApi';
 import { ColumnFilterApi } from './ColumnFilterApi';
 import { CommentApi } from './CommentApi';
+import { ColumnMenuApi } from './ColumnMenuApi';
+import { ContextMenuApi } from './ContextMenuApi';
 /**
  *
  * The `AdaptableApi` provides developers with run-time access to AdapTable.
@@ -234,6 +236,14 @@ export interface AdaptableApi {
      * Provides access to the Note Module
      */
     noteApi: NoteApi;
+    /**
+     * Provides access to Column Menu
+     */
+    columnMenuApi: ColumnMenuApi;
+    /**
+     * Provides access to Context Menu
+     */
+    contextMenuApi: ContextMenuApi;
     /**
      * Provides access to the Comment Module
      */

package/src/Api/ColumnMenuApi.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Provides run-time access to Column Menu
+ */
+export interface ColumnMenuApi {
+}

package/src/Api/ColumnMenuApi.js

@@ -0,0 +1 @@
+export {};

package/src/Api/ContextMenuApi.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Provides run-time access to Context Menu
+ */
+export interface ContextMenuApi {
+}

package/src/Api/ContextMenuApi.js

@@ -0,0 +1 @@
+export {};

package/src/Api/Implementation/AdaptableApiImpl.d.ts

@@ -1,6 +1,6 @@
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableInternalApi } from '../Internal/AdaptableInternalApi';
-import { AdaptableApi, DataImportApi, NamedQueryApi, OptionsApi, SettingsPanelApi } from '../../types';
+import { AdaptableApi, ColumnMenuApi, ContextMenuApi, DataImportApi, NamedQueryApi, OptionsApi, SettingsPanelApi } from '../../types';
 import { AlertApi } from '../AlertApi';
 import { BulkUpdateApi } from '../BulkUpdateApi';
 import { CalendarApi } from '../CalendarApi';
@@ -91,6 +91,8 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     chartingApi: ChartingApi;
     statusBarApi: StatusBarApi;
     noteApi: NoteApi;
+    columnMenuApi: ColumnMenuApi;
+    contextMenuApi: ContextMenuApi;
     fdc3Api: Fdc3Api;
     dataImportApi: DataImportApi;
     gridFilterApi: GridFilterApi;

package/src/Api/Implementation/ApiBase.d.ts

@@ -7,7 +7,7 @@ import { ModuleInfo } from '../../Strategy/Interface/IModule';
 import { AdaptableOptions } from '../../AdaptableOptions/AdaptableOptions';
 import { AdaptableApi } from '../AdaptableApi';
 import { ExportOptions } from '../../AdaptableOptions/ExportOptions';
-import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ColumnFilterApi, ColumnFilterOptions, ColumnOptions, CommentOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, GroupingOptions, LayoutApi, LayoutAssociatedObject, LayoutOptions, MenuOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ColumnScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions } from '../../types';
+import { ActionColumnApi, ActionColumnOptions, ActionRowApi, ActionRowOptions, AlertApi, AlertOptions, ApplicationApi, BulkUpdateApi, CalculatedColumnApi, CalendarApi, CalendarOptions, CellSummaryApi, CellSummaryOptions, ChartingApi, ChartingOptions, ColumnApi, ColumnFilterApi, ColumnFilterOptions, ColumnOptions, CommentOptions, ConfigApi, ContainerOptions, CustomSortApi, CustomSortOptions, DashboardApi, DashboardOptions, DataChangeHistoryApi, DataChangeHistoryOptions, DataSetApi, DataSetOptions, EditOptions, EntitlementApi, EntitlementOptions, EventApi, ExportApi, ExpressionApi, ExpressionOptions, Fdc3Api, Fdc3Options, FlashingCellApi, FlashingCellOptions, FormatColumnApi, FormatColumnOptions, FreeTextColumnApi, GridApi, GridFilterApi, GroupingOptions, LayoutApi, LayoutAssociatedObject, LayoutOptions, NamedQueryApi, NoteOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ColumnScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions, ColumnMenuOptions, ContextMenuOptions } from '../../types';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export declare abstract class ApiBase {
     protected adaptable: IAdaptable;
@@ -67,7 +67,8 @@ export declare abstract class ApiBase {
     protected getExportOptions(): ExportOptions;
     protected getGroupingOptions(): GroupingOptions;
     protected getLayoutOptions(): LayoutOptions;
-    protected getMenuOptions(): MenuOptions;
+    protected getColumnMenuOptions(): ColumnMenuOptions;
+    protected getContextMenuOptions(): ContextMenuOptions;
     protected getColumnFilterOptions(): ColumnFilterOptions;
     protected getExpressionOptions(): ExpressionOptions;
     protected getPredicateOptions(): PredicateOptions;

package/src/Api/Implementation/ApiBase.js

@@ -143,8 +143,11 @@ export class ApiBase {
     getLayoutOptions() {
         return this.getOptions().layoutOptions;
     }
-    getMenuOptions() {
-        return this.getOptions().menuOptions;
+    getColumnMenuOptions() {
+        return this.getOptions().columnMenuOptions;
+    }
+    getContextMenuOptions() {
+        return this.getOptions().contextMenuOptions;
     }
     getColumnFilterOptions() {
         return this.getOptions().columnFilterOptions;

package/src/Api/Implementation/OptionsApiImpl.d.ts

@@ -1,5 +1,5 @@
 import { ApiBase } from './ApiBase';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, NoteOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions, GridFilterOptions } from '../../types';
+import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, NoteOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, DataSetOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions, GridFilterOptions, ColumnMenuOptions, ContextMenuOptions } from '../../types';
 import { GroupingOptions } from '../../AdaptableOptions/GroupingOptions';
 import { CustomSortOptions } from '../../AdaptableOptions/CustomSortOptions';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
@@ -31,7 +31,8 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getExportOptions(): ExportOptions;
     getGroupingOptions(): GroupingOptions;
     getLayoutOptions(): LayoutOptions;
-    getMenuOptions(): MenuOptions;
+    getColumnMenuOptions(): ColumnMenuOptions;
+    getContextMenuOptions(): ContextMenuOptions;
     getColumnFilterOptions(): ColumnFilterOptions;
     getGridFilterOptions(): Readonly<GridFilterOptions<any>>;
     getExpressionOptions(): ExpressionOptions;

package/src/Api/Implementation/OptionsApiImpl.js

@@ -72,8 +72,11 @@ export class OptionsApiImpl extends ApiBase {
     getLayoutOptions() {
         return this.getOptions().layoutOptions;
     }
-    getMenuOptions() {
-        return this.getOptions().menuOptions;
+    getColumnMenuOptions() {
+        return this.getOptions().columnMenuOptions;
+    }
+    getContextMenuOptions() {
+        return this.getOptions().contextMenuOptions;
     }
     getColumnFilterOptions() {
         return this.getOptions().columnFilterOptions;

package/src/Api/OptionsApi.d.ts

@@ -1,7 +1,7 @@
 import { CustomSortOptions } from '../AdaptableOptions/CustomSortOptions';
 import { DataSetOptions } from '../AdaptableOptions/DataSetOptions';
 import { GroupingOptions } from '../AdaptableOptions/GroupingOptions';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnFilterOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, GridFilterOptions, LayoutOptions, MenuOptions, NoteOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
+import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnFilterOptions, ColumnMenuOptions, ColumnOptions, ContainerOptions, ContextMenuOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, GridFilterOptions, LayoutOptions, NoteOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
 import { Fdc3Options } from '../AdaptableOptions/Fdc3Options';
 import { ExpressionOptions } from '../AdaptableOptions/ExpressionOptions';
 import { DataImportOptions } from '../AdaptableOptions/DataImportOptions';
@@ -127,9 +127,13 @@ export interface OptionsApi {
      */
     getLayoutOptions(): Readonly<LayoutOptions>;
     /**
-     * Returns `AdaptableOptions.menuOptions`
+     * Returns `AdaptableOptions.columnMenuOptions`
      */
-    getMenuOptions(): Readonly<MenuOptions>;
+    getColumnMenuOptions(): Readonly<ColumnMenuOptions>;
+    /**
+     * Returns `AdaptableOptions.contextMenuOptions`
+     */
+    getContextMenuOptions(): Readonly<ContextMenuOptions>;
     /**
      * Returns `AdaptableOptions.notificationsOptions`
      */

package/src/PredefinedConfig/Common/Menu.d.ts

@@ -159,3 +159,16 @@ export interface ContextMenuContext<TData = any> extends BaseContext {
      */
     selectedRowInfo: SelectedRowInfo<TData>;
 }
+/**
+ * Menu Item that is provided by AG Grid
+ */
+export interface AgGridMenuItem<MENU_TYPE> {
+    /**
+     * Type of Menu - always 'AgGrid'
+     */
+    menuType: 'AgGrid';
+    /**
+     * Name of the Menu Type
+     */
+    name: MENU_TYPE;
+}

package/src/agGrid/AgGridMenuAdapter.js

@@ -16,7 +16,7 @@ export class AgGridMenuAdapter {
     }
     buildColumnMenu(params, originalGetMainMenuItems) {
         var _a;
-        const menuOptions = this.adaptableOptions.menuOptions;
+        const columnMenuOptions = this.adaptableOptions.columnMenuOptions;
         const agGridMenuItems = (params.defaultItems ? [...params.defaultItems] : []);
         if (!params.column) {
             // return only AG Grid context if the Adaptable column is not found (should not happen)
@@ -31,10 +31,10 @@ export class AgGridMenuAdapter {
         const adaptableMenuItems = this.createAdaptableColumnMenuItems(menuContext);
         const defaultColumnMenuStructure = this.buildColumnMenuDefaultStructure(adaptableMenuItems, menuContext);
         // 1. first check if there is a custom column menu defined
-        if (typeof menuOptions.customColumnMenu === 'function') {
+        if (typeof columnMenuOptions.customColumnMenu === 'function') {
             const defaultAgGridMenuItems = agGridMenuItems.map((itemName) => this.mapAgGridItemTypeToAgGridMenuItem(itemName));
             const defaultAdaptableMenuItems = adaptableMenuItems.map((adaptableItem) => (Object.assign({ menuType: 'Adaptable' }, adaptableItem)));
-            const customMenuItems = menuOptions
+            const customMenuItems = columnMenuOptions
                 .customColumnMenu(Object.assign(Object.assign({}, menuContext), { defaultAgGridMenuItems,
                 defaultAdaptableMenuItems, defaultAdaptableMenuStructure: this.mapAdaptableMenuItemToSystemMenuItems(defaultColumnMenuStructure), defaultAgGridMenuStructure: agGridDefaultStructure }))
                 .filter(Boolean);
@@ -58,7 +58,7 @@ export class AgGridMenuAdapter {
         // we do this in order to refresh the internal state of selected cells (technically query the AG Grid cellRanges)
         // (right-click selected the current cell, but this was not reflected in the internal state of the selected cells)
         this.adaptableInstance.refreshSelectedCellsState();
-        const menuOptions = this.adaptableOptions.menuOptions;
+        const contextMenuOptions = this.adaptableOptions.contextMenuOptions;
         const adaptableColumn = this.adaptableApi.columnApi.getColumnWithColumnId((_a = params.column) === null || _a === void 0 ? void 0 : _a.getColId());
         const menuContext = this.createContextMenuContextObject(params, adaptableColumn);
         /**
@@ -91,10 +91,10 @@ export class AgGridMenuAdapter {
          * Build the context menu
          */
         // 1. first check if there is a custom context menu defined
-        if (typeof menuOptions.customContextMenu === 'function') {
+        if (typeof contextMenuOptions.customContextMenu === 'function') {
             const defaultAgGridMenuItems = agGridMenuItems.map((itemName) => this.mapAgGridItemTypeToAgGridMenuItem(itemName));
             const defaultAdaptableMenuItems = adaptableMenuItems.map((adaptableItem) => (Object.assign({ menuType: 'Adaptable' }, adaptableItem)));
-            const customMenuItems = menuOptions
+            const customMenuItems = contextMenuOptions
                 .customContextMenu(Object.assign(Object.assign({}, menuContext), { defaultAgGridMenuItems,
                 defaultAdaptableMenuItems, defaultAdaptableMenuStructure: this.mapAdaptableMenuItemToSystemMenuItems(adaptableDefaultStructure), defaultAgGridMenuStructure: agGridDefaultStructure }))
                 .filter(Boolean);

package/src/agGrid/defaultAdaptableOptions.js

@@ -164,8 +164,10 @@ const DefaultAdaptableOptions = {
             autoCheckTagsForLayouts: false,
         },
     },
-    menuOptions: {
+    columnMenuOptions: {
         customColumnMenu: undefined,
+    },
+    contextMenuOptions: {
         customContextMenu: undefined,
     },
     columnFilterOptions: {
@@ -356,7 +358,8 @@ export function applyDefaultAdaptableOptions(adaptableOptions) {
     adaptableOptsWithDefaults.gridFilterOptions = Object.assign({}, DefaultAdaptableOptions.gridFilterOptions, adaptableOptions.gridFilterOptions);
     adaptableOptsWithDefaults.userInterfaceOptions = Object.assign({}, DefaultAdaptableOptions.userInterfaceOptions, adaptableOptions.userInterfaceOptions);
     adaptableOptsWithDefaults.userInterfaceOptions.dateInputOptions = Object.assign({}, DefaultAdaptableOptions.userInterfaceOptions.dateInputOptions, adaptableOptsWithDefaults.userInterfaceOptions.dateInputOptions);
-    adaptableOptsWithDefaults.menuOptions = Object.assign({}, DefaultAdaptableOptions.menuOptions, adaptableOptions.menuOptions);
+    adaptableOptsWithDefaults.columnMenuOptions = Object.assign({}, DefaultAdaptableOptions.columnMenuOptions, adaptableOptions.columnMenuOptions);
+    adaptableOptsWithDefaults.contextMenuOptions = Object.assign({}, DefaultAdaptableOptions.contextMenuOptions, adaptableOptions.contextMenuOptions);
     adaptableOptsWithDefaults.stateOptions = Object.assign({}, DefaultAdaptableOptions.stateOptions, adaptableOptions.stateOptions);
     adaptableOptsWithDefaults.exportOptions = Object.assign({}, DefaultAdaptableOptions.exportOptions, adaptableOptions.exportOptions);
     adaptableOptsWithDefaults.teamSharingOptions = Object.assign({}, DefaultAdaptableOptions.teamSharingOptions, adaptableOptions.teamSharingOptions);

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1712929460827 || Date.now(),
-    VERSION: "18.0.0-canary.35" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1713090178193 || Date.now(),
+    VERSION: "18.0.0-canary.36" || '--current-version--',
 };

package/src/metamodel/adaptable.metamodel.d.ts

@@ -737,18 +737,18 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             isOpt: boolean;
             gridInfo: string;
-            noCode: string;
-            ref: string;
+            noCode?: undefined;
             defVal?: undefined;
+            ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
             gridInfo: string;
-            noCode?: undefined;
+            noCode: string;
+            ref: string;
             defVal?: undefined;
-            ref?: undefined;
         } | {
             name: string;
             kind: string;
@@ -980,6 +980,26 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt: boolean;
         }[];
     };
+    AdaptableSystemColumnMenuItem: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
+    AdaptableSystemContextMenuItem: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
     AdaptableSystemIcon: {
         name: string;
         kind: string;
@@ -1001,16 +1021,6 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
-    AdaptableSystemMenuItem: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-        }[];
-    };
     AdaptableTheme: {
         name: string;
         kind: string;
@@ -1909,6 +1919,17 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
+    ColumnMenuOptions: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+        }[];
+    };
     ColumnOptions: {
         name: string;
         kind: string;
@@ -2095,6 +2116,17 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
+    ContextMenuOptions: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+        }[];
+    };
     CountryContext: {
         name: string;
         kind: string;
@@ -3950,28 +3982,6 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
-    MenuOptions: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-        }[];
-    };
-    MenuOrderContext: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-            ref: string;
-        }[];
-    };
     ModuleExpressionFunctions: {
         name: string;
         kind: string;