@adaptabletools/adaptable-cjs 18.0.0-canary.11 → 18.0.0-canary.12

package/src/AdaptableOptions/ColumnOptions.d.ts

@@ -1,7 +1,5 @@
 import { Column } from '@ag-grid-community/core';
 import { AdaptableColumnGroup, BaseContext } from '../types';
-export interface ColumnTypesContext extends BaseContext {
-}
 /**
  * Options related to managing Columns in Adaptable.
  */
@@ -12,8 +10,8 @@ export interface ColumnOptions {
      */
     columnFriendlyName?: (columnFriendlyNameContext: ColumnFriendlyNameContext) => string | undefined;
     /**
-     * Optional list of Column Types - used primarily for Calculated and FreeText Columns
-     * @defaultValue undefined
+     * Optional list of Column Types - used for Scope and creating Special Columns
+     * @defaultValue Empty Array
      */
     columnTypes?: string[] | ((context: ColumnTypesContext) => string[]);
     /**
@@ -54,3 +52,8 @@ export interface ColumnFriendlyNameContext {
      */
     columnGroup: AdaptableColumnGroup;
 }
+/**
+ * Context used when retrieving Column Types
+ */
+export interface ColumnTypesContext extends BaseContext {
+}

package/src/AdaptableOptions/CommentOptions.d.ts

@@ -2,27 +2,29 @@ import { CommentThread, BaseContext, CellAddress } from '../../types';
 /**
  * Options for managing Comments and Comment Threads in AdapTable
  */
-export interface CommentsOptions<TData = any> {
+export interface CommentOptions<TData = any> {
     /**
-     * Whether a cell can be noted on
-     * TODO: check if it works
+     * Whether a cell can be receive Comments
      */
     isCellCommentable?: (commentableCellContext: CommentableCellContext) => boolean;
     /**
-     * Called to load initial comments
+     * Loads initial Comments
      */
     loadCommentThreads?(commentLoadContext: CommentLoadContext): Promise<CommentThread[]>;
     /**
-     * Called when comments change
+     * Called when Comments change
      * @param commentThreads
      */
     persistCommentThreads?(commentThreads: CommentThread[]): void;
 }
 /**
- * Context used when determining if a Comment can be added to a Cell
+ * Context used when determining if a cell can show Comments
  */
 export interface CommentableCellContext extends BaseContext {
-    address: CellAddress;
+    /**
+     * Cell in AdapTable which might receive a Comment
+     */
+    cellAddress: CellAddress;
 }
 export interface CommentLoadContext extends BaseContext {
 }

package/src/AdaptableOptions/NoteOptions.d.ts

@@ -4,7 +4,7 @@ import { BaseContext, CellAddress } from '../../types';
  */
 export interface NoteOptions<TData = any> {
     /**
-     * Whether a cell can be noted on
+     * Whether a cell can contain Notes
      */
     isCellNotable?: (context: NotableCellContext) => boolean;
 }
@@ -12,5 +12,8 @@ export interface NoteOptions<TData = any> {
  * Context used when determining if a Note can be added to a Cell
  */
 export interface NotableCellContext extends BaseContext {
+    /**
+     * Cell which should contain the Note
+     */
     address: CellAddress;
 }

package/src/Api/AdaptableApi.d.ts

@@ -40,7 +40,7 @@ import { StyledColumnApi } from './StyledColumnApi';
 import { OptionsApi } from './OptionsApi';
 import { ActionColumnApi } from './ActionColumnApi';
 import { ActionRowApi } from './ActionRowApi';
-import { NotesApi } from './NotesApi';
+import { NoteApi } from './NoteApi';
 import { Fdc3Api } from './Fdc3Api';
 import { DataImportApi } from './DataImportApi';
 import { GridFilterApi } from './GridFilterApi';
@@ -233,7 +233,7 @@ export interface AdaptableApi {
     /**
      * Provides access to the Notes Module
      */
-    notesApi: NotesApi;
+    noteApi: NoteApi;
     /**
      * Provides access to the Comments Module
      */

package/src/Api/ColumnApi.d.ts

@@ -262,4 +262,8 @@ export interface ColumnApi {
      * Opens Settings Panel with Column Info section selected and visible
      */
     openColumnInfoSettingsPanel(): void;
+    /**
+     * Returns available columns types defined under columnOptions.columnTypes
+     */
+    getColumnTypes(): string[];
 }

package/src/Api/CommentApi.d.ts

@@ -1,56 +1,55 @@
 import { CommentThread } from '../PredefinedConfig/CommentState';
-import { CellAddress } from '../PredefinedConfig/CellAddress';
-import { AdaptableComment } from '../types';
+import { AdaptableComment, CellAddress } from '../types';
 /**
- * Provides run-time access to Notes Module and related State
+ * Provides run-time access to Comment Module and related State
  */
 export interface CommentApi {
     /**
-     * Add comment to comment thread
+     * Add a Comment to a Comment Thread
      *
      * @param comment comment
      * @param address where the comment should be added
      */
     addComment(commentText: string, address: CellAddress): void;
     /**
-     * Edit comment
+     * Edit a Comment
      *
      * @param comment Comment to edit
      * @param cellAddress Location of the comment, if not provided all comments will be traversed to find the comment
      */
     editComment(comment: AdaptableComment, cellAddress?: CellAddress): void;
     /**
-     * Delete a comment
+     * Delete a Comment
      * @param address Location of the comment, if not provided all comments will be traversed to find the comment
      */
     deleteComment(comment: AdaptableComment, cellAddress: CellAddress): void;
     /**
-     * Gets comments on a particular cell
+     * Get Comments for a particular cell
      * @param CellAddress
      */
     getComments(cellAddress: CellAddress): AdaptableComment[];
     /**
-     *  Delete all comments on a particular cell
+     *  Delete all Comments for a particular cell
      * @param cellAddress
      */
     deleteCommentThread(cellAddress: CellAddress): void;
     /**
-     * Returns cell comments at the given address
+     * Return all Comments for a particular cell
      * @param cellAddress
      */
     getCommentThread(cellAddress: CellAddress): CommentThread | undefined;
     /**
-     * Returns all comment threads
+     * Return all Comment Threads
      */
     getCommentThreads(): CommentThread[];
     /**
-     * Called to add a new comment thread
+     * Create a new Comment Thread
      *
      * @param commentThread
      */
     addCommentThread(commentThread: CommentThread): void;
     /**
-     * Called to set all cell comments
+     * Load all Comment Threads
      *
      * @param commentThreads new cell comments
      */

package/src/Api/ConfigApi.d.ts

@@ -16,7 +16,7 @@ import { FreeTextColumnState } from '../PredefinedConfig/FreeTextColumnState';
 import { ToolPanelState } from '../PredefinedConfig/ToolPanelState';
 import { AdaptableStateKey, AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { AdaptableSearchState, AdaptableSortState, NamedQueryState, PredefinedConfig, ScheduleState } from '../types';
-import { NotesState } from '../PredefinedConfig/NotesState';
+import { NoteState } from '../PredefinedConfig/NoteState';
 /**
  * Range of functions to access Predefined Config and Adaptable State
  */
@@ -108,7 +108,7 @@ export interface ConfigApi {
      * Returns Notes section of Adaptable State
      * @param returnJson return as JSON rather than object
      */
-    getNotesState(returnJson?: boolean): NotesState;
+    getNoteState(returnJson?: boolean): NoteState;
     /**
      * Returns Custom Sort section of Adaptable State
      * @param returnJson return as JSON rather than object

package/src/Api/EventApi.d.ts

@@ -1,6 +1,4 @@
-import { ActionRowSubmittedInfo, AdaptableReadyInfo, AdaptableStateChangedInfo, AdaptableStateReloadedInfo, AlertFiredInfo, CellChangedInfo, CellSelectionChangedInfo, ChartChangedInfo, ColumnFilterAppliedInfo, CustomToolbarConfiguredInfo, DashboardChangedInfo, DataImportedInfo, DataSetSelectedInfo, Fdc3MessageInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, GridFilterAppliedInfo, GridSortedInfo, LayoutChangedInfo, LiveDataChangedInfo, RowSelectionChangedInfo, ScheduleTriggeredInfo, SystemStatusMessageDisplayedInfo, TeamSharingEntityChangedInfo, ThemeChangedInfo, ThemeEditedInfo } from '../types';
-import { CalculatedColumnChangedInfo } from './Events/CalculatedColumnChanged';
-import { CommentsChangedInfo } from './Events/CommentsChangedInfo';
+import { ActionRowSubmittedInfo, AdaptableReadyInfo, AdaptableStateChangedInfo, AdaptableStateReloadedInfo, AlertFiredInfo, CalculatedColumnChangedInfo, CellChangedInfo, CellSelectionChangedInfo, ChartChangedInfo, ColumnFilterAppliedInfo, CommentChangedInfo, CustomToolbarConfiguredInfo, DashboardChangedInfo, DataImportedInfo, DataSetSelectedInfo, Fdc3MessageInfo, FlashingCellDisplayedInfo, GridDataChangedInfo, GridFilterAppliedInfo, GridSortedInfo, LayoutChangedInfo, LiveDataChangedInfo, RowSelectionChangedInfo, ScheduleTriggeredInfo, SystemStatusMessageDisplayedInfo, TeamSharingEntityChangedInfo, ThemeChangedInfo, ThemeEditedInfo } from '../types';
 /**
  * Responsible for publishing the many Events that AdapTable fires
  */
@@ -297,17 +295,17 @@ export interface EventApi {
      */
     off(eventName: 'ChartChanged', callback: (chartChangedInfo: ChartChangedInfo) => void): void;
     /**
-     * Event fired when Comments are Changed
-     * @param eventName CommentsChanged
+     * Event fired when a Comment is Changed
+     * @param eventName CommentChanged
      * @param callback
      */
-    on(eventName: 'CommentsChanged', callback: (commentsChangedInfo: CommentsChangedInfo) => void): () => void;
+    on(eventName: 'CommentChanged', callback: (commentChangedInfo: CommentChangedInfo) => void): () => void;
     /**
-     * Unsubscribe from CommentsChanged
+     * Unsubscribe from CommentChanged
      * @param eventName
      * @param callback
      */
-    off(eventName: 'CommentsChanged', callback: (commentsChangedInfo: CommentsChangedInfo) => void): void;
+    off(eventName: 'CommentChanged', callback: (commentChangedInfo: CommentChangedInfo) => void): void;
     /**
      * Fired when Adaptable is up and running - has no arguments.
      * @param eventName - AdaptableReady
@@ -352,6 +350,6 @@ export interface EventApi {
     emitSync(eventName: 'DashboardChanged', data?: any): any[];
     emitSync(eventName: 'FlashingCellDisplayed', data?: any): any[];
     emitSync(eventName: 'AdaptableDestroy'): any[];
-    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataImported' | 'DataSetSelected' | 'ColumnFilterApplied' | 'Fdc3Message' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'CalculatedColumnChanged' | 'LiveDataChanged' | 'ScheduleTriggered' | 'SearchChanged' | 'CellSelectionChanged' | 'RowSelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'ThemeEdited' | 'GridFilterApplied' | 'CommentsChanged', data?: any): Promise<any>;
+    emit(eventName: 'ActionRowSubmitted' | 'AdaptableReady' | 'AlertFired' | 'AdaptableStateChanged' | 'AdaptableStateReloaded' | 'CellChanged' | 'ChartChanged' | 'CheckboxColumnClicked' | 'CustomToolbarConfigured' | 'DashboardChanged' | 'DataImported' | 'DataSetSelected' | 'ColumnFilterApplied' | 'Fdc3Message' | 'GridDataChanged' | 'GridSorted' | 'LayoutChanged' | 'CalculatedColumnChanged' | 'LiveDataChanged' | 'ScheduleTriggered' | 'SearchChanged' | 'CellSelectionChanged' | 'RowSelectionChanged' | 'SystemStatusMessageDisplayed' | 'TeamSharingEntityChanged' | 'ThemeChanged' | 'ThemeEdited' | 'GridFilterApplied' | 'CommentChanged', data?: any): Promise<any>;
     destroy(): void;
 }

package/src/Api/Events/CommentChanged.d.ts

@@ -0,0 +1,11 @@
+import { CommentThread } from '../../types';
+import { BaseEventInfo } from './BaseEventInfo';
+/**
+ * Event fired when a Comment has changed
+ */
+export interface CommentChangedInfo extends BaseEventInfo {
+    /**
+     * All current Comment Threads
+     */
+    commentThreads: CommentThread[];
+}

package/src/Api/GridApi.d.ts

@@ -26,6 +26,10 @@ export interface GridApi {
      * Retrieves filtered data from the grid
      */
     getFilteredData(): any[];
+    /**
+     * Retrieves visible data from the grid (filtered and sorted)
+     */
+    getVisibleData(): any[];
     /**
      * @deprecated use `loadGridData()` instead
      */

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

@@ -40,7 +40,7 @@ import { StatusBarApi } from '../StatusBarApi';
 import { StyledColumnApi } from '../StyledColumnApi';
 import { ActionColumnApi } from '../ActionColumnApi';
 import { ActionRowApi } from '../ActionRowApi';
-import { NotesApi } from '../NotesApi';
+import { NoteApi } from '../NoteApi';
 import { Fdc3Api } from '../Fdc3Api';
 import { GridFilterApi } from '../GridFilterApi';
 import { ColumnFilterApi } from '../ColumnFilterApi';
@@ -90,7 +90,7 @@ export declare class AdaptableApiImpl implements AdaptableApi {
     dataChangeHistoryApi: DataChangeHistoryApi;
     chartingApi: ChartingApi;
     statusBarApi: StatusBarApi;
-    notesApi: NotesApi;
+    noteApi: NoteApi;
     fdc3Api: Fdc3Api;
     dataImportApi: DataImportApi;
     gridFilterApi: GridFilterApi;

package/src/Api/Implementation/AdaptableApiImpl.js

@@ -43,7 +43,7 @@ const StyledColumnApiImpl_1 = require("./StyledColumnApiImpl");
 const CalendarApiImpl_1 = require("./CalendarApiImpl");
 const EntitlementApiImpl_1 = require("./EntitlementApiImpl");
 const OptionsApiImpl_1 = require("./OptionsApiImpl");
-const NotesApiImpl_1 = require("./NotesApiImpl");
+const NoteApiImpl_1 = require("./NoteApiImpl");
 const Fdc3ApiImpl_1 = require("./Fdc3ApiImpl");
 const DataImportApiImpl_1 = require("./DataImportApiImpl");
 const GridFilterApiImpl_1 = require("./GridFilterApiImpl");
@@ -97,7 +97,7 @@ class AdaptableApiImpl {
         this.dataChangeHistoryApi = new DataChangeHistoryApiImpl_1.DataChangeHistoryApiImpl(adaptable);
         this.chartingApi = new ChartingApiImpl_1.ChartingApiImpl(adaptable);
         this.statusBarApi = new StatusBarApiImpl_1.StatusBarApiImpl(adaptable);
-        this.notesApi = new NotesApiImpl_1.NotesApiImpl(adaptable);
+        this.noteApi = new NoteApiImpl_1.NoteApiImpl(adaptable);
         this.fdc3Api = new Fdc3ApiImpl_1.Fdc3ApiImpl(adaptable);
         this.dataImportApi = new DataImportApiImpl_1.DataImportApiImpl(adaptable);
         this.gridFilterApi = new GridFilterApiImpl_1.GridFilterApiImpl(adaptable);

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, 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, NotesOptions, NotificationsOptions, PluginsApi, PlusMinusApi, PredicateApi, PredicateOptions, QuickSearchApi, QuickSearchOptions, ScheduleApi, ScopeApi, 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, 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, ScopeApi, SettingsPanelApi, SettingsPanelOptions, ShortcutApi, SmartEditApi, StateOptions, StatusBarApi, StyledColumnApi, SystemStatusApi, TeamSharingApi, TeamSharingOptions, ThemeApi, ToolPanelApi, ToolPanelOptions, UserInterfaceApi, UserInterfaceOptions } from '../../types';
 import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export declare abstract class ApiBase {
     protected adaptable: IAdaptable;
@@ -53,7 +53,7 @@ export declare abstract class ApiBase {
     protected getActionColumnOptions(): ActionColumnOptions;
     protected getActionRowOptions(): ActionRowOptions;
     protected getColumnOptions(): ColumnOptions;
-    protected getNotesOptions(): NotesOptions;
+    protected getNoteOptions(): NoteOptions;
     protected getCustomSortOptions(): CustomSortOptions;
     protected getDataSetOptions(): DataSetOptions;
     protected getCalendarOptions(): CalendarOptions;

package/src/Api/Implementation/ApiBase.js

@@ -105,7 +105,7 @@ class ApiBase {
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }
-    getNotesOptions() {
+    getNoteOptions() {
         return this.getOptions().noteOptions;
     }
     getCustomSortOptions() {

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

@@ -63,4 +63,5 @@ export declare class ColumnApiImpl extends ApiBase implements ColumnApi {
     getDefaultAggFunc(columnId: string): string;
     isSpecialColumn(columnId: string): boolean;
     openColumnInfoSettingsPanel(): void;
+    getColumnTypes(): string[];
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -7,6 +7,7 @@ const GeneralConstants = tslib_1.__importStar(require("../../Utilities/Constants
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const ColumnInternalApi_1 = require("../Internal/ColumnInternalApi");
+const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
 class ColumnApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
@@ -337,5 +338,14 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     openColumnInfoSettingsPanel() {
         this.showModulePopup(ModuleConstants.ColumnInfoModuleId);
     }
+    getColumnTypes() {
+        const columnTypes = this.getOptions().columnOptions.columnTypes;
+        if (typeof columnTypes === 'function') {
+            return columnTypes((0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi()));
+        }
+        else {
+            return columnTypes;
+        }
+    }
 }
 exports.ColumnApiImpl = ColumnApiImpl;

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

@@ -1,6 +1,5 @@
 import { ApiBase } from './ApiBase';
-import { CellAddress } from '../../PredefinedConfig/CellAddress';
-import { CommentThread, AdaptableComment } from '../../types';
+import { CommentThread, AdaptableComment, CellAddress } from '../../types';
 import { CommentApi } from '../CommentApi';
 import { CommentsInternalApi } from '../Internal/CommentsInternalApi';
 import { IAdaptable } from '../../AdaptableInterfaces/IAdaptable';

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

@@ -20,7 +20,7 @@ import { AdaptableModule, AdaptableStateKey } from '../../PredefinedConfig/Commo
 import { AdaptableOptions, AdaptableSearchState, AdaptableSortState, NamedQueryState, ScheduleState } from '../../types';
 import { PredefinedConfig } from '../../PredefinedConfig/PredefinedConfig';
 import { ChartingState } from '../../PredefinedConfig/ChartingState';
-import { NotesState } from '../../PredefinedConfig/NotesState';
+import { NoteState } from '../../PredefinedConfig/NoteState';
 export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     configInit(): void;
     copyAllStateToClipboard(): void;
@@ -48,7 +48,7 @@ export declare class ConfigApiImpl extends ApiBase implements ConfigApi {
     getApplicationState(returnJson?: boolean): ApplicationState;
     getCalculatedColumnState(returnJson?: boolean): CalculatedColumnState;
     getChartingState(returnJson?: boolean): ChartingState;
-    getNotesState(returnJson?: boolean): NotesState;
+    getNoteState(returnJson?: boolean): NoteState;
     getCustomSortState(returnJson?: boolean): CustomSortState;
     getDashboardState(returnJson?: boolean): DashboardState;
     getExportState(returnJson?: boolean): ExportState;

package/src/Api/Implementation/ConfigApiImpl.js

@@ -262,7 +262,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
     getChartingState(returnJson = false) {
         return this.getUserStateByStateKey('Charting', returnJson);
     }
-    getNotesState(returnJson = false) {
+    getNoteState(returnJson = false) {
         return this.getUserStateByStateKey('Notes', returnJson);
     }
     getCustomSortState(returnJson = false) {
@@ -319,7 +319,7 @@ class ConfigApiImpl extends ApiBase_1.ApiBase {
                 this.dispatchAction(ChartingRedux.ChartingReady(this.getChartingState()));
                 break;
             case 'Notes':
-                this.dispatchAction(NotesRedux.NotesReady(this.getNotesState()));
+                this.dispatchAction(NotesRedux.NotesReady(this.getNoteState()));
                 break;
             case 'CustomSort':
                 this.dispatchAction(CustomSortRedux.CustomSortReady(this.getCustomSortState()));

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

@@ -23,6 +23,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     setInitialGridData(data: any): void;
     getGridData(): any[];
     getFilteredData(): any[];
+    getVisibleData(): any[];
     updateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<IRowNode[]>;
     addOrUpdateGridData(dataRows: any[], dataUpdateConfig?: DataUpdateConfig): Promise<{
         addedRows: IRowNode[];

package/src/Api/Implementation/GridApiImpl.js

@@ -37,6 +37,15 @@ class GridApiImpl extends ApiBase_1.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');

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

@@ -1,17 +1,17 @@
 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/NotesInternalApi';
+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[];
     getNoteByUuid(uuid: string): AdaptableNote | undefined;

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

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NotesApiImpl = void 0;
+exports.NoteApiImpl = void 0;
 const tslib_1 = require("tslib");
 const ApiBase_1 = require("./ApiBase");
 const NotesRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/NotesRedux"));
 const NotesInternalApi_1 = require("../Internal/NotesInternalApi");
-class NotesApiImpl extends ApiBase_1.ApiBase {
+class NoteApiImpl extends ApiBase_1.ApiBase {
     constructor(adaptable) {
         super(adaptable);
-        this.internalApi = new NotesInternalApi_1.NotesInternalApi(adaptable);
+        this.internalApi = new NotesInternalApi_1.NoteInternalApi(adaptable);
     }
     addNote(noteStr, primaryKeyValue, columnId) {
         const note = {
@@ -29,11 +29,11 @@ class NotesApiImpl extends ApiBase_1.ApiBase {
     deleteNote(note) {
         this.dispatchAction(NotesRedux.NotesDelete(note));
     }
-    getNotesState() {
+    getNoteState() {
         return this.getAdaptableState().Notes;
     }
     getAllNotes() {
-        return this.getNotesState().Notes;
+        return this.getNoteState().Notes;
     }
     getCellNotes(address) {
         return NotesRedux.GetNotesSelector(this.getAdaptableState().Notes, address);
@@ -42,4 +42,4 @@ class NotesApiImpl extends ApiBase_1.ApiBase {
         return this.getAllNotes().find((note) => note.Uuid === uuid);
     }
 }
-exports.NotesApiImpl = NotesApiImpl;
+exports.NoteApiImpl = NoteApiImpl;

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OptionsApiImpl = void 0;
 const ApiBase_1 = require("./ApiBase");
-const ObjectFactory_1 = require("../../Utilities/ObjectFactory");
 class OptionsApiImpl extends ApiBase_1.ApiBase {
     getAdaptableId() {
         return this.adaptable.adaptableOptions.adaptableId;
@@ -28,15 +27,6 @@ class OptionsApiImpl extends ApiBase_1.ApiBase {
     getActionColumnOptions() {
         return this.getOptions().actionColumnOptions;
     }
-    getColumnTypes() {
-        const columnTypes = this.getOptions().columnOptions.columnTypes;
-        if (typeof columnTypes === 'function') {
-            return columnTypes((0, ObjectFactory_1.createBaseContext)(this.getAdaptableApi()));
-        }
-        else {
-            return columnTypes;
-        }
-    }
     getActionRowOptions() {
         return this.getOptions().actionRowOptions;
     }
@@ -49,10 +39,10 @@ class OptionsApiImpl extends ApiBase_1.ApiBase {
     getColumnOptions() {
         return this.getOptions().columnOptions;
     }
-    getNotesOptions() {
+    getNoteOptions() {
         return this.getOptions().noteOptions;
     }
-    getCommentsOptions() {
+    getCommentOptions() {
         return this.getOptions().commentOptions;
     }
     getCustomSortOptions() {

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;

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

@@ -95,7 +95,7 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
         }
     }
     isVisualDataExportInProgress() {
-        return this.getAdaptableState().System.Export.inProgressVisualData;
+        return this.getAdaptableState().System.Export.visualDataExportInProgress;
     }
     isDateCellExportedAsFormattedValue() {
         return (!!this.getExportOptions().exportDateFormat ||
@@ -126,5 +126,8 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
         }
         return true;
     }
+    getExcelStylesForVisualDataExport(original_excelStyles) {
+        return [];
+    }
 }
 exports.ExportInternalApi = ExportInternalApi;

package/src/Api/Internal/NotesInternalApi.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;
 }