@adaptabletools/adaptable 18.0.0-canary.11 → 18.0.0-canary.13

package/src/Api/Implementation/GridApiImpl.js

@@ -33,6 +33,15 @@ export class GridApiImpl extends ApiBase {
     getFilteredData() {
         return this.adaptable.getFilteredData();
     }
+    getVisibleData() {
+        const data = [];
+        this.adaptable.forAllVisibleRowNodesDo((rowNode) => {
+            if (!this.isGroupRowNode(rowNode)) {
+                data.push(rowNode.data);
+            }
+        });
+        return data;
+    }
     async updateGridData(dataRows, dataUpdateConfig) {
         const rowNodes = await this.adaptable.updateRows(dataRows, dataUpdateConfig);
         this.internalApi.fireGridDataChangedEvent(dataRows, rowNodes, 'Edit');
@@ -516,7 +525,12 @@ export class GridApiImpl extends ApiBase {
         logDeprecation(this.adaptable.logger, 'GridApi', 'getVisibleRowCount', 'getRowCount');
         return this.getRowCount();
     }
-    showTransposedView(transposedColumnId, hideTransposedColumn) {
+    showTransposedView(transposeConfig) {
+        var _a, _b, _c, _d;
+        const transposedColumnId = (_a = transposeConfig.transposedColumnId) !== null && _a !== void 0 ? _a : this.getAdaptableApi().optionsApi.getPrimaryKey();
+        const hideTransposedColumn = (_b = transposeConfig.hideTransposedColumn) !== null && _b !== void 0 ? _b : true;
+        const visibleColumns = (_c = transposeConfig.visibleColumns) !== null && _c !== void 0 ? _c : false;
+        const visibleRows = (_d = transposeConfig.visibleRows) !== null && _d !== void 0 ? _d : false;
         this.adaptable.api.internalApi.showPopupWindow({
             id: WINDOW_SHOW_TRANSPOSED_VIEW,
             factoryId: WINDOW_SHOW_TRANSPOSED_VIEW,
@@ -525,6 +539,8 @@ export class GridApiImpl extends ApiBase {
             popupProps: {
                 transposedColumnId,
                 hideTransposedColumn,
+                visibleColumns,
+                visibleRows,
             },
         });
     }

package/src/Api/Implementation/{NotesApiImpl.d.ts → NoteApiImpl.d.ts}

@@ -1,18 +1,18 @@
 import { ApiBase } from './ApiBase';
-import { NotesApi } from '../NotesApi';
-import { AdaptableNote, AdaptableNotes, NotesState } from '../../PredefinedConfig/NotesState';
-import { CellAddress } from '../../PredefinedConfig/CellAddress';
+import { NoteApi } from '../NoteApi';
+import { AdaptableNote, AdaptableNotes, NoteState } from '../../PredefinedConfig/NoteState';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';
-import { NotesInternalApi } from '../Internal/NotesInternalApi';
-export declare class NotesApiImpl extends ApiBase implements NotesApi {
-    internalApi: NotesInternalApi;
+import { NoteInternalApi } from '../Internal/NoteInternalApi';
+import { CellAddress } from '../../types';
+export declare class NoteApiImpl extends ApiBase implements NoteApi {
+    internalApi: NoteInternalApi;
     constructor(adaptable: IAdaptable);
     addNote(noteStr: string, primaryKeyValue: any, columnId: string): void;
     editNote(note: AdaptableNote): void;
     updateNoteText(noteStr: string, note: AdaptableNote): void;
     deleteNote(note: AdaptableNote): void;
-    getNotesState(): NotesState;
+    getNoteState(): NoteState;
     getAllNotes(): AdaptableNotes;
-    getCellNotes(address: CellAddress): AdaptableNote[];
+    getNotesForCell(address: CellAddress): AdaptableNote[];
     getNoteByUuid(uuid: string): AdaptableNote | undefined;
 }

package/src/Api/Implementation/{NotesApiImpl.js → NoteApiImpl.js}

@@ -1,10 +1,10 @@
 import { ApiBase } from './ApiBase';
-import * as NotesRedux from '../../Redux/ActionsReducers/NotesRedux';
-import { NotesInternalApi } from '../Internal/NotesInternalApi';
-export class NotesApiImpl extends ApiBase {
+import * as NoteRedux from '../../Redux/ActionsReducers/NoteRedux';
+import { NoteInternalApi } from '../Internal/NoteInternalApi';
+export class NoteApiImpl extends ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new NotesInternalApi(adaptable);
+        this.internalApi = new NoteInternalApi(adaptable);
     }
     addNote(noteStr, primaryKeyValue, columnId) {
         const note = {
@@ -13,26 +13,26 @@ export class NotesApiImpl extends ApiBase {
             ColumnId: columnId,
             Timestamp: Date.now(),
         };
-        this.dispatchAction(NotesRedux.NotesAdd(note));
+        this.dispatchAction(NoteRedux.NoteAdd(note));
     }
     editNote(note) {
         note.Timestamp = Date.now();
-        this.dispatchAction(NotesRedux.NotesEdit(note));
+        this.dispatchAction(NoteRedux.NoteEdit(note));
     }
     updateNoteText(noteStr, note) {
         this.editNote(Object.assign(Object.assign({}, note), { Text: noteStr }));
     }
     deleteNote(note) {
-        this.dispatchAction(NotesRedux.NotesDelete(note));
+        this.dispatchAction(NoteRedux.NoteDelete(note));
     }
-    getNotesState() {
-        return this.getAdaptableState().Notes;
+    getNoteState() {
+        return this.getAdaptableState().Note;
     }
     getAllNotes() {
-        return this.getNotesState().Notes;
+        return this.getNoteState().Notes;
     }
-    getCellNotes(address) {
-        return NotesRedux.GetNotesSelector(this.getAdaptableState().Notes, address);
+    getNotesForCell(address) {
+        return NoteRedux.GetNotesSelector(this.getAdaptableState().Note, address);
     }
     getNoteByUuid(uuid) {
         return this.getAllNotes().find((note) => note.Uuid === uuid);

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

@@ -1,11 +1,11 @@
 import { ApiBase } from './ApiBase';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnOptions, NotesOptions, 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, MenuOptions, NotificationsOptions, OptionsApi, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions, GridFilterOptions } from '../../types';
 import { GroupingOptions } from '../../AdaptableOptions/GroupingOptions';
 import { CustomSortOptions } from '../../AdaptableOptions/CustomSortOptions';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
 import { ExpressionOptions } from '../../AdaptableOptions/ExpressionOptions';
 import { ColumnFilterOptions } from '../../AdaptableOptions/ColumnFilterOptions';
-import { CommentsOptions } from '../../AdaptableOptions/CommentOptions';
+import { CommentOptions } from '../../AdaptableOptions/CommentOptions';
 export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getAdaptableId(): string;
     getAdaptableStateKey(): string;
@@ -15,13 +15,12 @@ export declare class OptionsApiImpl extends ApiBase implements OptionsApi {
     getUserName(): string;
     getAdaptableOptions(): AdaptableOptions;
     getActionColumnOptions(): ActionColumnOptions;
-    getColumnTypes(): string[];
     getActionRowOptions(): ActionRowOptions;
     getCellSummaryOptions(): CellSummaryOptions;
     getCalendarOptions(): CalendarOptions;
     getColumnOptions(): ColumnOptions;
-    getNotesOptions(): NotesOptions;
-    getCommentsOptions(): Readonly<CommentsOptions<any>>;
+    getNoteOptions(): NoteOptions;
+    getCommentOptions(): Readonly<CommentOptions<any>>;
     getCustomSortOptions(): CustomSortOptions;
     getContainerOptions(): ContainerOptions;
     getDataSetOptions(): DataSetOptions;

package/src/Api/Implementation/OptionsApiImpl.js

@@ -1,5 +1,4 @@
 import { ApiBase } from './ApiBase';
-import { createBaseContext } from '../../Utilities/ObjectFactory';
 export class OptionsApiImpl extends ApiBase {
     getAdaptableId() {
         return this.adaptable.adaptableOptions.adaptableId;
@@ -25,15 +24,6 @@ export class OptionsApiImpl extends ApiBase {
     getActionColumnOptions() {
         return this.getOptions().actionColumnOptions;
     }
-    getColumnTypes() {
-        const columnTypes = this.getOptions().columnOptions.columnTypes;
-        if (typeof columnTypes === 'function') {
-            return columnTypes(createBaseContext(this.getAdaptableApi()));
-        }
-        else {
-            return columnTypes;
-        }
-    }
     getActionRowOptions() {
         return this.getOptions().actionRowOptions;
     }
@@ -46,10 +36,10 @@ export class OptionsApiImpl extends ApiBase {
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }
-    getNotesOptions() {
+    getNoteOptions() {
         return this.getOptions().noteOptions;
     }
-    getCommentsOptions() {
+    getCommentOptions() {
         return this.getOptions().commentOptions;
     }
     getCustomSortOptions() {

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

@@ -2,7 +2,6 @@ import { ApiBase } from './ApiBase';
 import { UserInterfaceApi } from '../UserInterfaceApi';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../../PredefinedConfig/Common/AdaptableStyle';
-import { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../../PredefinedConfig/Common/Menu';
 import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
 import { AdaptableObjectTag, CustomWindowConfig, GridCell } from '../../types';
 import { UserInterfaceInternalApi } from '../Internal/UserInterfaceInternalApi';
@@ -24,8 +23,6 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     getEditLookUpItems(): EditLookUpPermittedValues[];
     getEditLookUpItemForColumn(column: AdaptableColumn): EditLookUpPermittedValues | undefined;
     getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
-    addColumnMenuItem(userMenuItem: UserMenuItem<ColumnMenuContext>): void;
-    addContextMenuItem(userMenuItem: UserMenuItem<ContextMenuContext>): void;
     getEditableCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -142,14 +142,6 @@ export class UserInterfaceApiImpl extends ApiBase {
         }
         return this.adaptable.api.gridApi.internalApi.getEditLookUpValuesForColumn(editLookUpItem, gridCell.column, gridCell);
     }
-    addColumnMenuItem(userMenuItem) {
-        var _a;
-        (_a = this.getMenuOptions().columnMenuItems) === null || _a === void 0 ? void 0 : _a.push(userMenuItem);
-    }
-    addContextMenuItem(userMenuItem) {
-        var _a;
-        (_a = this.getMenuOptions().contextMenuItems) === null || _a === void 0 ? void 0 : _a.push(userMenuItem);
-    }
     getEditableCellStyle() {
         return this.getUserInterfaceOptions().editableCellStyle;
     }

package/src/Api/Internal/ActionRowInternalApi.js

@@ -220,7 +220,7 @@ export class ActionRowInternalApi extends ApiBase {
                 lockVisible: true,
                 suppressColumnsToolPanel: true,
                 suppressFiltersToolPanel: true,
-                suppressMenu: true,
+                suppressHeaderMenuButton: true,
                 suppressMovable: true,
                 filter: false,
                 sortable: false,

package/src/Api/Internal/AdaptableInternalApi.d.ts

@@ -72,7 +72,7 @@ export declare class AdaptableInternalApi extends ApiBase {
         includeGroupRows?: boolean;
         filterFn?: (rowNode: IRowNode) => boolean;
     }): void;
-    forAllVisibleRowNodesDo(func: (rowNode: IRowNode) => void, config?: {
+    forAllVisibleRowNodesDo(func: (rowNode: IRowNode, index: number) => void, config?: {
         includeGroupRows?: boolean;
         filterFn?: (rowNode: IRowNode) => boolean;
     }): void;
@@ -105,8 +105,8 @@ export declare class AdaptableInternalApi extends ApiBase {
     getPreviousGroupedColumnsIndex(layoutId: string): {
         [key: string]: number;
     };
-    getValueUsingField(rowData: Record<string, any>, columnValueKey: string): any;
-    setValueUsingField(rowData: Record<string, any>, columnValueKey: string, newValue: any): Record<string, any>;
+    getValueUsingField(rowData: Record<string, any>, fieldName: string): any;
+    setValueUsingField(rowData: Record<string, any>, fieldName: string, newValue: any): Record<string, any>;
     findAdaptableObjectsByLookupCriteria<T extends AdaptableObjectWithScope>({ scope, tag, ids }: AdaptableObjectLookupCriteria, specificAdaptableObjects: T[]): T[];
     buildBaseContext(): BaseContext;
     getActionButtonsAndActionColumn(colDef: ColDef): {

package/src/Api/Internal/AdaptableInternalApi.js

@@ -366,17 +366,17 @@ export class AdaptableInternalApi extends ApiBase {
         return (_a = SystemRedux.SystemPreviousGroupedColumnsSelector(this.getAdaptableState().System)) === null || _a === void 0 ? void 0 : _a[layoutId];
     }
     // "borrowed" from https://github.com/ag-grid/ag-grid/blob/v28.2.1/community-modules/core/src/ts/utils/object.ts#L205
-    getValueUsingField(rowData, columnValueKey) {
-        if (!rowData || !(columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.length)) {
+    getValueUsingField(rowData, fieldName) {
+        if (!rowData || !(fieldName === null || fieldName === void 0 ? void 0 : fieldName.length)) {
             return;
         }
-        const isColumnValueKeyNested = columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.includes('.');
+        const isColumnValueKeyNested = fieldName === null || fieldName === void 0 ? void 0 : fieldName.includes('.');
         // if no '.', then it's not a deep value
         if (!isColumnValueKeyNested) {
-            return rowData[columnValueKey];
+            return rowData[fieldName];
         }
         // otherwise it is a deep value, so need to dig for it
-        const fields = columnValueKey.split('.');
+        const fields = fieldName.split('.');
         let currentObject = rowData;
         for (let i = 0; i < fields.length; i++) {
             if (currentObject == null) {
@@ -387,22 +387,22 @@ export class AdaptableInternalApi extends ApiBase {
         return currentObject;
     }
     // "borrowed" from https://github.com/ag-grid/ag-grid/blob/v28.2.1/community-modules/core/src/ts/valueService/valueService.ts#L236
-    setValueUsingField(rowData, columnValueKey, newValue) {
-        if (!rowData || !(columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.length)) {
+    setValueUsingField(rowData, fieldName, newValue) {
+        if (!rowData || !(fieldName === null || fieldName === void 0 ? void 0 : fieldName.length)) {
             return;
         }
-        const isColumnValueKeyContainsDots = columnValueKey === null || columnValueKey === void 0 ? void 0 : columnValueKey.includes('.');
+        const isColumnValueKeyContainsDots = fieldName === null || fieldName === void 0 ? void 0 : fieldName.includes('.');
         let valuesAreSame = false;
         if (!isColumnValueKeyContainsDots) {
             // soft comparison to match strings and numbers
-            valuesAreSame = rowData[columnValueKey] == newValue;
+            valuesAreSame = rowData[fieldName] == newValue;
             if (!valuesAreSame) {
-                rowData[columnValueKey] = newValue;
+                rowData[fieldName] = newValue;
             }
         }
         else {
             // otherwise it is a deep value, so need to dig for it
-            const fieldPieces = columnValueKey.split('.');
+            const fieldPieces = fieldName.split('.');
             let currentObject = rowData;
             while (fieldPieces.length > 0 && currentObject) {
                 const fieldPiece = fieldPieces.shift();

package/src/Api/Internal/CalculatedColumnInternalApi.js

@@ -92,7 +92,8 @@ export class CalculatedColumnInternalApi extends ApiBase {
         this.adaptable.api.eventApi.emit('CalculatedColumnChanged', calculatedColumnChangedInfo);
     }
     getColDefsForCalculatedColumns() {
-        const defaultCalculatedColumnSettings = CreateEmptyCalculatedColumn().CalculatedColumnSettings;
+        const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();
+        const defaultCalculatedColumnSettings = CreateEmptyCalculatedColumn(defaultSpecialColumnSettings).CalculatedColumnSettings;
         return this.getCalculatedColumnApi()
             .getCalculatedColumns()
             .map((calculatedColumn) => {
@@ -139,7 +140,7 @@ export class CalculatedColumnInternalApi extends ApiBase {
                 enableRowGroup: calculatedColumnSettings.Groupable,
                 sortable: calculatedColumnSettings.Sortable,
                 enablePivot: calculatedColumnSettings.Pivotable,
-                suppressMenu: calculatedColumnSettings.SuppressMenu,
+                suppressHeaderMenuButton: calculatedColumnSettings.SuppressMenu,
                 suppressMovable: calculatedColumnSettings.SuppressMovable,
                 type: columnTypes,
                 valueGetter,

package/src/Api/Internal/ExportInternalApi.d.ts

@@ -2,7 +2,7 @@ import { ApiBase } from '../Implementation/ApiBase';
 import { CellDataChangedInfo } from '../../PredefinedConfig/Common/CellDataChangedInfo';
 import { Report } from '../../PredefinedConfig/ExportState';
 import { AdaptableColumnType } from '../../PredefinedConfig/Common/Types';
-import { ExcelDataType } from '@ag-grid-community/core';
+import { ExcelDataType, ExcelStyle } from '@ag-grid-community/core';
 import { AdaptableColumnDataType } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { DataFormatType } from '../../AdaptableOptions/ExportOptions';
 export declare class ExportInternalApi extends ApiBase {
@@ -17,4 +17,5 @@ export declare class ExportInternalApi extends ApiBase {
     isDateCellExportedAsFormattedValue(): boolean;
     getCellExportFormatType(columnDataType: AdaptableColumnDataType): DataFormatType;
     isDestinationEnabled(destination: string): boolean;
+    getExcelStylesForVisualDataExport(original_excelStyles: ExcelStyle[]): ExcelStyle[];
 }

package/src/Api/Internal/ExportInternalApi.js

@@ -92,7 +92,7 @@ export class ExportInternalApi extends ApiBase {
         }
     }
     isVisualDataExportInProgress() {
-        return this.getAdaptableState().System.Export.inProgressVisualData;
+        return this.getAdaptableState().System.Export.visualDataExportInProgress;
     }
     isDateCellExportedAsFormattedValue() {
         return (!!this.getExportOptions().exportDateFormat ||
@@ -123,4 +123,7 @@ export class ExportInternalApi extends ApiBase {
         }
         return true;
     }
+    getExcelStylesForVisualDataExport(original_excelStyles) {
+        return [];
+    }
 }

package/src/Api/Internal/Fdc3InternalApi.js

@@ -39,7 +39,7 @@ export class Fdc3InternalApi extends ApiBase {
                 editable: false,
                 width: actionColumnConfig.width,
                 resizable: actionColumnConfig.resizable,
-                suppressMenu: true,
+                suppressHeaderMenuButton: true,
                 suppressMovable: !actionColumnConfig.movable,
                 filter: false,
                 sortable: false,
@@ -59,7 +59,7 @@ export class Fdc3InternalApi extends ApiBase {
                 editable: false,
                 width: actionColumnConfig.defaultWidth,
                 resizable: true,
-                suppressMenu: true,
+                suppressHeaderMenuButton: true,
                 suppressMovable: false,
                 filter: false,
                 sortable: false,

package/src/Api/Internal/FreeTextColumnInternalApi.js

@@ -43,7 +43,8 @@ export class FreeTextColumnInternalApi extends ApiBase {
         return references;
     }
     getColDefsForFreeTextColumns() {
-        const defaultFreeTextColumnSettings = CreateEmptyFreeTextColumn().FreeTextColumnSettings;
+        const defaultSpecialColumnSettings = this.getGridApi().internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef();
+        const defaultFreeTextColumnSettings = CreateEmptyFreeTextColumn(defaultSpecialColumnSettings).FreeTextColumnSettings;
         return this.getFreeTextColumnApi()
             .getFreeTextColumns()
             .map((freeTextColumn) => {
@@ -74,7 +75,7 @@ export class FreeTextColumnInternalApi extends ApiBase {
                 enableRowGroup: freeTextColumnSettings.Groupable,
                 sortable: freeTextColumnSettings.Sortable,
                 enablePivot: freeTextColumnSettings.Pivotable,
-                suppressMenu: freeTextColumnSettings.SuppressMenu,
+                suppressHeaderMenuButton: freeTextColumnSettings.SuppressMenu,
                 suppressMovable: freeTextColumnSettings.SuppressMovable,
                 cellEditor: dataTypeEditor !== null && dataTypeEditor !== void 0 ? dataTypeEditor : (freeTextColumn.TextEditor && freeTextColumn.TextEditor == 'Large'
                     ? 'agLargeTextCellEditor'

package/src/Api/Internal/GridInternalApi.d.ts

@@ -10,6 +10,7 @@ import { AdaptableMenuItem } from '../../PredefinedConfig/Common/Menu';
 import { EditLookUpPermittedValues } from '../../AdaptableOptions/UserInterfaceOptions';
 import { DistinctValuesParams } from '../../AdaptableInterfaces/IAdaptable';
 import { AdaptableColumnType } from '../../PredefinedConfig/Common/Types';
+import { SpecialColumnSettings } from '../../PredefinedConfig/Common/SpecialColumnSettings';
 export declare class GridInternalApi extends ApiBase {
     /**
      * Fires Grid Sorted Event
@@ -96,4 +97,5 @@ export declare class GridInternalApi extends ApiBase {
     };
     getAlertRowClass(params: RowClassParams): string | null;
     getRowHighlightClass(params: RowClassParams): string | null;
+    deriveSpecialColumnSettingsFromAgGridDefaultColDef(): Partial<SpecialColumnSettings>;
 }

package/src/Api/Internal/GridInternalApi.js

@@ -404,4 +404,19 @@ export class GridInternalApi extends ApiBase {
             ? highlightRow.highlightStyle.ClassName
             : null;
     }
+    deriveSpecialColumnSettingsFromAgGridDefaultColDef() {
+        const defaultColumnDefinition = this.adaptable.agGridAdapter.getDefaultColumnDefinition();
+        return {
+            Filterable: defaultColumnDefinition.filter,
+            Resizable: defaultColumnDefinition.resizable,
+            Groupable: defaultColumnDefinition.enableRowGroup,
+            Sortable: defaultColumnDefinition.sortable,
+            Pivotable: defaultColumnDefinition.enablePivot,
+            Aggregatable: defaultColumnDefinition.enableValue,
+            SuppressMenu: defaultColumnDefinition.suppressHeaderMenuButton,
+            SuppressMovable: defaultColumnDefinition.suppressMovable,
+            HeaderToolTip: defaultColumnDefinition.headerTooltip,
+            Width: defaultColumnDefinition.width,
+        };
+    }
 }

package/src/Api/Internal/{NotesInternalApi.d.ts → NoteInternalApi.d.ts}

@@ -1,4 +1,4 @@
 import { ApiBase } from '../Implementation/ApiBase';
-export declare class NotesInternalApi extends ApiBase {
+export declare class NoteInternalApi extends ApiBase {
     areNotesAvailable(): boolean;
 }

package/src/Api/Internal/{NotesInternalApi.js → NoteInternalApi.js}

@@ -1,5 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
-export class NotesInternalApi extends ApiBase {
+export class NoteInternalApi extends ApiBase {
     areNotesAvailable() {
         var _a;
         const currentLayout = this.getLayoutApi().getCurrentLayout();

package/src/Api/NoteApi.d.ts

@@ -0,0 +1,48 @@
+import { AdaptableNote, AdaptableNotes, NoteState } from '../PredefinedConfig/NoteState';
+import { CellAddress } from '../../types';
+/**
+ * Provides run-time access to Notes Module and related State
+ */
+export interface NoteApi {
+    /**
+     * Adds a new Note
+     * @param text
+     * @param primaryKeyValue
+     * @param columnId
+     */
+    addNote(text: string, primaryKeyValue: any, columnId: string): void;
+    /**
+     * Edits a Note
+     * @param note
+     */
+    editNote(note: AdaptableNote): void;
+    /**
+     * Edits text of a Note
+     * @param text
+     * @param note
+     */
+    updateNoteText(text: string, note: AdaptableNote): void;
+    /**
+     * Deletes a Note
+     * @param note
+     */
+    deleteNote(note: AdaptableNote): void;
+    /**
+     * Gets the Note State
+     */
+    getNoteState(): NoteState;
+    /**
+     * Gets all Notes
+     */
+    getAllNotes(): AdaptableNotes;
+    /**
+     * Gets all Notes for a cell
+     * @param CellAddress note position
+     */
+    getNotesForCell(CellAddress: CellAddress): AdaptableNote[];
+    /**
+     * Returns a Note by uuid
+     * @param uuid note uuid
+     */
+    getNoteByUuid(uuid: string): AdaptableNote | undefined;
+}

package/src/Api/OptionsApi.d.ts

@@ -1,11 +1,11 @@
 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, NotesOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
+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 { Fdc3Options } from '../AdaptableOptions/Fdc3Options';
 import { ExpressionOptions } from '../AdaptableOptions/ExpressionOptions';
 import { DataImportOptions } from '../AdaptableOptions/DataImportOptions';
-import { CommentsOptions } from '../AdaptableOptions/CommentOptions';
+import { CommentOptions } from '../AdaptableOptions/CommentOptions';
 /**
  * Range of functions to access Adaptable Options
  */
@@ -42,10 +42,6 @@ export interface OptionsApi {
      * Returns `AdaptableOptions.actionColumnOptions`
      */
     getActionColumnOptions(): Readonly<ActionColumnOptions>;
-    /**
-     * Returns available columns types defined under columnOptions.columnTypes
-     */
-    getColumnTypes(): string[];
     /**
      * Returns `AdaptableOptions.actionRowOptions`
      */
@@ -79,13 +75,9 @@ export interface OptionsApi {
      */
     getColumnOptions(): Readonly<ColumnOptions>;
     /**
-     * Returns `AdaptableOptions.noteOptions`
-     */
-    getNotesOptions(): Readonly<NotesOptions>;
-    /**
-     * Returns `AdaptableOptions.commentsOptions`
+     * Returns `AdaptableOptions.commentOptions`
      */
-    getCommentsOptions(): Readonly<CommentsOptions>;
+    getCommentOptions(): Readonly<CommentOptions>;
     /**
      * Returns `AdaptableOptions.customSortOptions`
      */
@@ -150,6 +142,10 @@ export interface OptionsApi {
      * Returns `AdaptableOptions.formatColumnOptions`
      */
     getFormatColumnOptions(): Readonly<FormatColumnOptions>;
+    /**
+     * Returns `AdaptableOptions.noteOptions`
+     */
+    getNoteOptions(): Readonly<NoteOptions>;
     /**
      * Returns `AdaptableOptions.settingsPanelOptions`
      */

package/src/Api/UserInterfaceApi.d.ts

@@ -1,6 +1,5 @@
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
-import { ColumnMenuContext, ContextMenuContext, UserMenuItem } from '../PredefinedConfig/Common/Menu';
 import { BulkUpdatePermittedValues, CustomSortPermittedValues, EditLookUpPermittedValues, FilterPermittedValues, PermittedValues } from '../AdaptableOptions/UserInterfaceOptions';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
@@ -54,16 +53,6 @@ export interface UserInterfaceApi {
      * @param  gridCell: the currently edited Grid Cell
      */
     getEditLookUpValuesForEditLookUpItem(editLookUpItem: EditLookUpPermittedValues, gridCell: GridCell): any[] | undefined;
-    /**
-     * Adds menu item to Column Menu
-     * @param userMenuItem Menu Item to add
-     */
-    addColumnMenuItem(userMenuItem: UserMenuItem<ColumnMenuContext>): void;
-    /**
-     * Adds menu item to Context Menu
-     * @param userMenuItem Menu Item to add
-     */
-    addContextMenuItem(userMenuItem: UserMenuItem<ContextMenuContext>): void;
     /**
      * Returns Style set for Editable cells
      */

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -23,7 +23,7 @@ import { FlashingCellState } from './FlashingCellState';
 import { StatusBarState } from './StatusBarState';
 import { ChartingState } from './ChartingState';
 import { StyledColumnState } from './StyledColumnState';
-import { NotesState } from './NotesState';
+import { NoteState } from './NoteState';
 import { NamedQueryState } from './NamedQueryState';
 import { CommentState } from './CommentState';
 /**
@@ -57,7 +57,7 @@ export interface AdaptablePersistentState {
     Theme: ThemeState;
     ToolPanel: ToolPanelState;
     Charting: ChartingState;
-    Notes: NotesState;
+    Note: NoteState;
     /**
      * @deprecated
      */