@adaptabletools/adaptable 11.0.0-canary.3 → 11.0.0-canary.4

package/index.css

@@ -2233,6 +2233,7 @@ template {
   --ab-cmp-adaptable-popup--settings__height: 90vh;
   --ab-cmp-adaptable-popup__height: 90vh;
   --ab-cmp-adaptable-popup__max-height: 1200px;
+  --ab-cmp-adaptable-popup__box-shadow: 2px 2px 14px 0px rgb(0 0 0 / 26%);
   --ab-cmp-adaptable-popup-navigation-list__padding: var(--ab-space-1) var(--ab-space-2);
   --ab-cmp-adaptable-popup-navigation-list__border-right: 2px solid var(--ab-color-defaultbackground);
   --ab-cmp-adaptable-popup-navigation-list__font-size: var(--ab-font-size-3);
@@ -3510,6 +3511,9 @@ html.ab--theme-dark .ab-ListBoxFilterForm--aggrid-style {
   background: var(--ab-cmp-adaptable-popup__background);
   max-height: var(--ab-cmp-adaptable-popup__max-height); }
 
+.ab-Adaptable-Popup--window {
+    box-shadow: var(--ab-cmp-adaptable-popup__box-shadow); }
+
 .ab-Adaptable-Popup__Navigation {
   padding-top: 10px;
   overflow: auto;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "11.0.0-canary.3",
+  "version": "11.0.0-canary.4",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",
@@ -41,7 +41,7 @@
     "re-resizable": "^6.9.1",
     "react": ">=16.8.0",
     "react-beautiful-dnd": "13.1.0",
-    "react-day-picker": "8.0.0-beta.37",
+    "react-day-picker": "8.0.0-beta.38",
     "react-dom": ">=16.8.0",
     "react-redux": "7.2.4",
     "react-remove-scroll": "2.4.2",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1643989382977;
+declare const _default: 1644245839064;
 export default _default;

package/publishTimestamp.js

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

package/src/Api/GridApi.d.ts

@@ -5,7 +5,8 @@ import { ColumnSort } from '../PredefinedConfig/Common/ColumnSort';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
 import { DataUpdateConfig } from '../PredefinedConfig/Common/DataUpdateConfig';
 import { DataChangedInfo } from '../PredefinedConfig/Common/DataChangedInfo';
-import { CellHighlightInfo, RowHighlightInfo } from '../PredefinedConfig/Common/CellHighlightInfo';
+import { CellHighlightInfo } from '../PredefinedConfig/Common/CellHighlightInfo';
+import { RowHighlightInfo } from '../PredefinedConfig/Common/RowHighlightInfo';
 import { AdaptableModule } from '../PredefinedConfig/Common/Types';
 import { AccessLevel } from '../PredefinedConfig/Common/Entitlement';
 import { GridOptions, RowNode } from '@ag-grid-community/all-modules';

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

@@ -7,7 +7,8 @@ import { GridCell } from '../../PredefinedConfig/Selection/GridCell';
 import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
 import { DataUpdateConfig } from '../../PredefinedConfig/Common/DataUpdateConfig';
 import { DataChangedInfo, AccessLevel, AdaptableModule } from '../../types';
-import { CellHighlightInfo, RowHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
+import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
+import { RowHighlightInfo } from '../../PredefinedConfig/Common/RowHighlightInfo';
 import { GridOptions, RowNode } from '@ag-grid-community/all-modules';
 import { GridCellRange } from '../../PredefinedConfig/Selection/GridCellRange';
 export declare class GridApiImpl extends ApiBase implements GridApi {

package/src/Api/Implementation/InternalApiImpl.js

@@ -68,7 +68,7 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         const forPrimaryKey = (_a = AdaptableFlashingAlerts[primaryKey]) !== null && _a !== void 0 ? _a : {};
         const toFlashingAlert = (uuid) => { var _a; return uuid ? (_a = AdaptableFlashingAlertsMap[uuid]) !== null && _a !== void 0 ? _a : null : null; };
         if (!columnId) {
-            return toFlashingAlert(forPrimaryKey[SystemRedux_1.FLASHING_ALERT_ROW_KEY]);
+            return toFlashingAlert(forPrimaryKey[SystemRedux_1.FLASHING_CELL_ROW_KEY]);
         }
         return toFlashingAlert(forPrimaryKey[columnId]);
     }

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

@@ -15,19 +15,8 @@ export interface CellHighlightInfo {
      * Time after which Cell should be unhilighted
      */
     timeout?: number;
-    highlightStyle: AdaptableStyle;
-}
-export interface RowHighlightInfo {
-    /**
-     * Primary key value for the row to be highlighted
-     */
-    primaryKeyValue: any;
-    /**
-     * Timeout after which the highlight is removed
-     */
-    timeout?: number;
     /**
-     * Highlight style
+     * Adaptable Style to use in the Cell Highlight
      */
     highlightStyle: AdaptableStyle;
 }

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

@@ -0,0 +1,15 @@
+import { AdaptableStyle } from '../../../types';
+export interface RowHighlightInfo {
+    /**
+     * Primary key value for the row to be highlighted
+     */
+    primaryKeyValue: any;
+    /**
+     * Timeout after which the highlight is removed
+     */
+    timeout?: number;
+    /**
+     * Highlight style
+     */
+    highlightStyle: AdaptableStyle;
+}

package/src/PredefinedConfig/Common/RowHighlightInfo.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -22,7 +22,7 @@ export declare type AdaptableModuleButtons = AdaptableModuleButton[];
 export declare type AdaptableModuleButton = 'Alert' | 'FlashingCell' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme';
 export declare type AdaptableStateKeys = AdaptableStateKey[];
 export declare type AdaptableStateKey = 'Alert' | 'FlashingCell' | 'Application' | 'CalculatedColumn' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataSource' | 'Export' | 'Filter' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'Theme' | 'ToolPanel';
-export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel' | 'CustomSettingsPanelModule';
 export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare type TypeHint<Base, Literals> = (Base & {
     __subType?: true;

package/src/PredefinedConfig/SystemState.d.ts

@@ -6,7 +6,8 @@ import type { IPushPullState, IPushPullReport, IPushPullDomain } from './IPushPu
 import { Glue42State, Glue42Report } from './Glue42State';
 import { OpenFinState, OpenFinReport } from './OpenFinState';
 import { AdaptableAlert } from './Common/AdaptableAlert';
-import { CellHighlightInfo, RowHighlightInfo } from './Common/CellHighlightInfo';
+import { CellHighlightInfo } from './Common/CellHighlightInfo';
+import { RowHighlightInfo } from './Common/RowHighlightInfo';
 import { SystemStatusMessageInfo } from './Common/SystemStatusMessageInfo';
 import { CachedQuery } from './QueryState';
 import { AdaptableFlashingCell } from './Common/AdaptableFlashingCell';

package/src/Redux/ActionsReducers/SystemRedux.d.ts

@@ -1,6 +1,7 @@
 import * as Redux from 'redux';
 import { SystemState } from '../../PredefinedConfig/SystemState';
-import { CellHighlightInfo, RowHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
+import { CellHighlightInfo } from '../../PredefinedConfig/Common/CellHighlightInfo';
+import { RowHighlightInfo } from '../../PredefinedConfig/Common/RowHighlightInfo';
 import { PreviewInfo } from '../../Utilities/Interface/Preview';
 import { ExportCustomDestinationPopup, Report } from '../../PredefinedConfig/ExportState';
 import { BulkUpdateValidationResult } from '../../Strategy/Interface/IBulkUpdateModule';
@@ -11,14 +12,14 @@ import { CachedQuery } from '../../PredefinedConfig/QueryState';
 import { AdaptableFlashingCell } from '../../PredefinedConfig/Common/AdaptableFlashingCell';
 import { MathOperation, SummaryOperation } from '../../PredefinedConfig/Common/Enums';
 import { DataChangedInfo } from '../../PredefinedConfig/Common/DataChangedInfo';
-export declare const FLASHING_ALERT_ROW_KEY = "__ROW";
+export declare const FLASHING_CELL_ROW_KEY = "__ROW";
 export declare const SYSTEM_ALERT_ADD = "SYSTEM_ALERT_ADD";
 export declare const SYSTEM_ALERT_DELETE = "SYSTEM_ALERT_DELETE";
 export declare const SYSTEM_ALERT_DELETE_ALL = "SYSTEM_ALERT_DELETE_ALL";
 export declare const SYSTEM_ALERT_REMOVE_HIGHLIGHT = "SYSTEM_ALERT_REMOVE_HIGHLIGHT";
-export declare const SYSTEM_FLASHING_ALERT_ADD = "SYSTEM_FLASHING_ALERT_ADD";
-export declare const SYSTEM_FLASHING_ALERT_DELETE = "SYSTEM_FLASHING_ALERT_DELETE";
-export declare const SYSTEM_FLASHING_ALERT_DELETE_ALL = "SYSTEM_FLASHING_ALERT_DELETE_ALL";
+export declare const SYSTEM_FLASHING_CELL_ADD = "SYSTEM_FLASHING_CELL_ADD";
+export declare const SYSTEM_FLASHING_CELL_DELETE = "SYSTEM_FLASHING_CELL_DELETE";
+export declare const SYSTEM_FLASHING_CELL_DELETE_ALL = "SYSTEM_FLASHING_CELL_DELETE_ALL";
 export declare const SYSTEM_STATUS_MESSAGE_INFO_ADD = "SYSTEM_STATUS_MESSAGE_INFO_ADD";
 export declare const SYSTEM_STATUS_MESSAGE_INFO_DELETE = "SYSTEM_STATUS_MESSAGE_INFO_DELETE";
 export declare const SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = "SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL";

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemReducer = exports.getSystemExportCustomDestinationPopups = exports.SystemSettingsPanelSet = exports.SystemExportCustomDestinationPopupHide = exports.SystemExportCustomDestinationPopupShow = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowDelete = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_SETTINGS_PANEL_SET = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_ALERT_DELETE_ALL = exports.SYSTEM_FLASHING_ALERT_DELETE = exports.SYSTEM_FLASHING_ALERT_ADD = exports.SYSTEM_ALERT_REMOVE_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_ALERT_ROW_KEY = void 0;
+exports.SystemReducer = exports.getSystemExportCustomDestinationPopups = exports.SystemSettingsPanelSet = exports.SystemExportCustomDestinationPopupHide = exports.SystemExportCustomDestinationPopupShow = exports.SystemDataChangeHistoryResume = exports.SystemDataChangeHistorySuspend = exports.SystemDataChangeHistoryDisable = exports.SystemDataChangeHistoryEnable = exports.SystemDataChangeHistoryUndo = exports.SystemDataChangeHistoryAdd = exports.SystemLicenseDisablePersistence = exports.SystemLicenseShowWatermark = exports.SystemProgressIndicatorHide = exports.SystemProgressIndicatorShow = exports.SystemCellSummaryChangeOperation = exports.SystemCachedQueryAdd = exports.SetLastAppliedShortcut = exports.SetNewColumnListOrder = exports.BulkUpdateChangeValue = exports.BulkUpdateSetPreview = exports.BulkUpdateSetValidSelection = exports.BulkUpdateCheckCellSelection = exports.SmartEditSetPreview = exports.SmartEditSetValidSelection = exports.SmartEditCheckCellSelection = exports.SmartEditChangeOperation = exports.SmartEditChangeValue = exports.SystemStatusMessageInfoDeleteAll = exports.SystemStatusMessageInfoDelete = exports.SystemStatusMessageInfoAdd = exports.SystemFlashingCellDeleteAll = exports.SystemFlashingCellDelete = exports.SystemFlashingCellAdd = exports.SystemAlertRemoveHighlight = exports.SystemAlertDeleteAll = exports.SystemAlertDelete = exports.SystemAlertAdd = exports.SystemHighlightRowDeleteAll = exports.SystemHighlightRowDelete = exports.SystemHighlightRowAdd = exports.SystemHighlightCellDeleteAll = exports.SystemHighlightCellDelete = exports.SystemHighlightCellAdd = exports.SYSTEM_SETTINGS_PANEL_SET = exports.SYSTEM_DATA_CHANGE_HISTORY_RESUME = exports.SYSTEM_DATA_CHANGE_HISTORY_SUSPEND = exports.SYSTEM_DATA_CHANGE_HISTORY_DISABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_ENABLE = exports.SYSTEM_DATA_CHANGE_HISTORY_UNDO = exports.SYSTEM_DATA_CHANGE_HISTORY_ADD = exports.SYSTEM_LICENSE_DISABLE_PERSISTENCE = exports.SYSTEM_LICENSE_SHOW_WATERMARK = exports.SYSTEM_PROGRESS_INDICATOR_HIDE = exports.SYSTEM_PROGRESS_INDICATOR_SHOW = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_HIDE = exports.SYSTEM_EXPORT_CUSTOM_DESTINATION_POPUP_SHOW = exports.SYSTEM_CELL_SUMMARY_CHANGE_OPERATION = exports.SYSTEM_CACHED_QUERY_ADD = exports.SYSTEM_SET_LAST_APPLIED_SHORTCUT = exports.SYSTEM_SET_NEW_COLUMN_LIST_ORDER = exports.SYSTEM_HIGHLIGHT_ROW_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_ROW_DELETE = exports.SYSTEM_HIGHLIGHT_ROW_ADD = exports.SYSTEM_HIGHLIGHT_CELL_DELETE_ALL = exports.SYSTEM_HIGHLIGHT_CELL_DELETE = exports.SYSTEM_HIGHLIGHT_CELL_ADD = exports.SYSTEM_BULK_UPDATE_CHANGE_VALUE = exports.SYSTEM_BULK_UPDATE_SET_PREVIEW = exports.SYSTEM_BULK_UPDATE_SET_VALID_SELECTION = exports.SYSTEM_BULK_UPDATE_CHECK_CELL_SELECTION = exports.SYSTEM_SMART_EDIT_CHANGE_OPERATION = exports.SYSTEM_SMART_EDIT_CHANGE_VALUE = exports.SYSTEM_SMARTEDIT_SET_PREVIEW = exports.SYSTEM_SMARTEDIT_SET_VALID_SELECTION = exports.SYSTEM_SMARTEDIT_FETCH_PREVIEW = exports.SYSTEM_SMARTEDIT_CHECK_CELL_SELECTION = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE_ALL = exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = exports.SYSTEM_FLASHING_CELL_DELETE_ALL = exports.SYSTEM_FLASHING_CELL_DELETE = exports.SYSTEM_FLASHING_CELL_ADD = exports.SYSTEM_ALERT_REMOVE_HIGHLIGHT = exports.SYSTEM_ALERT_DELETE_ALL = exports.SYSTEM_ALERT_DELETE = exports.SYSTEM_ALERT_ADD = exports.FLASHING_CELL_ROW_KEY = void 0;
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
 const Helper_1 = require("../../Utilities/Helpers/Helper");
 /*
@@ -8,16 +8,16 @@ Bit of a mixed bag of actions but essentially its those that are related to Stra
 This allows us to keep the other reducers pure in terms of everything persists
 Not sure if its a good idea or not and perhaps we need 2 stores but I think its better than it was...
 */
-exports.FLASHING_ALERT_ROW_KEY = '__ROW';
+exports.FLASHING_CELL_ROW_KEY = '__ROW';
 // Alerts
 exports.SYSTEM_ALERT_ADD = 'SYSTEM_ALERT_ADD';
 exports.SYSTEM_ALERT_DELETE = 'SYSTEM_ALERT_DELETE';
 exports.SYSTEM_ALERT_DELETE_ALL = 'SYSTEM_ALERT_DELETE_ALL';
 exports.SYSTEM_ALERT_REMOVE_HIGHLIGHT = 'SYSTEM_ALERT_REMOVE_HIGHLIGHT';
 // Flashing Alerts
-exports.SYSTEM_FLASHING_ALERT_ADD = 'SYSTEM_FLASHING_ALERT_ADD';
-exports.SYSTEM_FLASHING_ALERT_DELETE = 'SYSTEM_FLASHING_ALERT_DELETE';
-exports.SYSTEM_FLASHING_ALERT_DELETE_ALL = 'SYSTEM_FLASHING_ALERT_DELETE_ALL';
+exports.SYSTEM_FLASHING_CELL_ADD = 'SYSTEM_FLASHING_CELL_ADD';
+exports.SYSTEM_FLASHING_CELL_DELETE = 'SYSTEM_FLASHING_CELL_DELETE';
+exports.SYSTEM_FLASHING_CELL_DELETE_ALL = 'SYSTEM_FLASHING_CELL_DELETE_ALL';
 // Status Message
 exports.SYSTEM_STATUS_MESSAGE_INFO_ADD = 'SYSTEM_STATUS_MESSAGE_INFO_ADD';
 exports.SYSTEM_STATUS_MESSAGE_INFO_DELETE = 'SYSTEM_STATUS_MESSAGE_INFO_DELETE';
@@ -113,15 +113,15 @@ exports.SystemAlertRemoveHighlight = (alert) => ({
     alert: alert,
 });
 exports.SystemFlashingCellAdd = (flashingCell) => ({
-    type: exports.SYSTEM_FLASHING_ALERT_ADD,
+    type: exports.SYSTEM_FLASHING_CELL_ADD,
     flashingCell: flashingCell,
 });
 exports.SystemFlashingCellDelete = (flashingCell) => ({
-    type: exports.SYSTEM_FLASHING_ALERT_DELETE,
+    type: exports.SYSTEM_FLASHING_CELL_DELETE,
     flashingCell: flashingCell,
 });
 exports.SystemFlashingCellDeleteAll = (flashingCells) => ({
-    type: exports.SYSTEM_FLASHING_ALERT_DELETE_ALL,
+    type: exports.SYSTEM_FLASHING_CELL_DELETE_ALL,
     flashingCells: flashingCells,
 });
 exports.SystemStatusMessageInfoAdd = (SystemStatusMessageInfo, MaxSystemStatusMessagesInStore) => ({
@@ -305,14 +305,14 @@ exports.SystemReducer = (state = initialState, action) => {
                     return abObject;
                 }) });
         }
-        case exports.SYSTEM_FLASHING_ALERT_ADD: {
+        case exports.SYSTEM_FLASHING_CELL_ADD: {
             const { flashingCell: FlashingCell } = action;
             const { rowPrimaryKey } = FlashingCell;
             const AdaptableFlashingCells = Object.assign({}, state.AdaptableFlashingCells);
             AdaptableFlashingCells[rowPrimaryKey] = Object.assign({}, AdaptableFlashingCells[rowPrimaryKey]);
             const secondaryIds = Object.keys(FlashingCell.flashColumnIds);
             if (FlashingCell.flashTarget === 'row') {
-                secondaryIds.push(exports.FLASHING_ALERT_ROW_KEY);
+                secondaryIds.push(exports.FLASHING_CELL_ROW_KEY);
             }
             secondaryIds.forEach((COL_ID) => {
                 AdaptableFlashingCells[rowPrimaryKey][COL_ID] = FlashingCell.Uuid;
@@ -324,7 +324,7 @@ exports.SystemReducer = (state = initialState, action) => {
                 AdaptableFlashingCellsMap: AdaptableFlashingCellsMap,
             });
         }
-        case exports.SYSTEM_FLASHING_ALERT_DELETE: {
+        case exports.SYSTEM_FLASHING_CELL_DELETE: {
             const { flashingCell: FlashingCell } = action;
             const { rowPrimaryKey } = FlashingCell;
             const AdaptableFlashingCells = Object.assign({}, state.AdaptableFlashingCells);
@@ -332,7 +332,7 @@ exports.SystemReducer = (state = initialState, action) => {
             AdaptableFlashingCells[rowPrimaryKey] = Object.assign({}, AdaptableFlashingCells[rowPrimaryKey]);
             const secondaryIds = Object.keys(FlashingCell.flashColumnIds);
             if (FlashingCell.flashTarget === 'row') {
-                secondaryIds.push(exports.FLASHING_ALERT_ROW_KEY);
+                secondaryIds.push(exports.FLASHING_CELL_ROW_KEY);
             }
             secondaryIds.forEach((COL_ID) => {
                 if (AdaptableFlashingCells[rowPrimaryKey][COL_ID] === FlashingCell.Uuid) {
@@ -345,7 +345,7 @@ exports.SystemReducer = (state = initialState, action) => {
             delete AdaptableFlashingCellsMap[FlashingCell.Uuid];
             return Object.assign(Object.assign({}, state), { AdaptableFlashingCells: AdaptableFlashingCells, AdaptableFlashingCellsMap: AdaptableFlashingCellsMap });
         }
-        case exports.SYSTEM_FLASHING_ALERT_DELETE_ALL: {
+        case exports.SYSTEM_FLASHING_CELL_DELETE_ALL: {
             return Object.assign({}, state, {
                 AdaptableFlashingCells: {},
                 AdaptableFlashingCellsMap: {},

package/src/Redux/Store/AdaptableStore.js

@@ -316,8 +316,8 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                 /*******************
                  * FLASHING ALERT ACTIONS
                  *******************/
-                case SystemRedux.SYSTEM_FLASHING_ALERT_ADD:
-                case SystemRedux.SYSTEM_FLASHING_ALERT_DELETE: {
+                case SystemRedux.SYSTEM_FLASHING_CELL_ADD:
+                case SystemRedux.SYSTEM_FLASHING_CELL_DELETE: {
                     const { flashingCell: FlashingCell, } = action;
                     const { dataChangedInfo } = FlashingCell;
                     let ret = next(action);

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -417,8 +417,7 @@ const getSlidingTimeframe$ = (source$, timeframeDuration, onTimeframeEnter, onTi
     }));
 };
 const getMaxTimeframeSize = (expressionValue, context) => {
-    let maxTimeframeSize = context.api.internalApi.getAdaptableOptions().queryLanguageOptions
-        .maxTimeframeSize;
+    let maxTimeframeSize = context.api.internalApi.getAdaptableOptions().queryLanguageOptions.maxTimeframeSize;
     if (maxTimeframeSize > SYSTEM_MAX_TIMEFRAME_SIZE) {
         maxTimeframeSize = SYSTEM_MAX_TIMEFRAME_SIZE;
     }

package/src/View/Components/FilterForm/QuickFilterForm.js

@@ -106,14 +106,12 @@ class QuickFilterFormComponent extends React.Component {
             hideEvent = 'blur';
         }
         let showQuickFilterDropdown = true;
-        let hideQuickFilterDropdownFunction = this.props.api.internalApi.getAdaptableOptions()
-            .filterOptions.hideQuickFilterDropdown;
+        let hideQuickFilterDropdownFunction = this.props.api.internalApi.getAdaptableOptions().filterOptions.hideQuickFilterDropdown;
         if (hideQuickFilterDropdownFunction) {
             showQuickFilterDropdown = !hideQuickFilterDropdownFunction(this.props.currentColumn);
         }
         let showQuickFilterInput = true;
-        let hideQuickFilterInputFunction = this.props.api.internalApi.getAdaptableOptions()
-            .filterOptions.hideQuickFilterInput;
+        let hideQuickFilterInputFunction = this.props.api.internalApi.getAdaptableOptions().filterOptions.hideQuickFilterInput;
         if (hideQuickFilterInputFunction) {
             showQuickFilterInput = !hideQuickFilterInputFunction(this.props.currentColumn);
         }

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopup.d.ts

@@ -3,9 +3,6 @@ import * as PopupRedux from '../../../../Redux/ActionsReducers/PopupRedux';
 import { ModuleParams } from '../../SharedProps/ModuleViewPopupProps';
 import { AdaptableModule } from '../../../../PredefinedConfig/Common/Types';
 import { AdaptableApi } from '../../../../Api/AdaptableApi';
-/**
- * This is the main popup that we use - so all Module popups will appear here.
- */
 export interface AdaptablePopupProps {
     componentName?: string;
     componentModule: AdaptableModule;

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopup.js

@@ -4,101 +4,63 @@ exports.AdaptablePopup = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
-const react_redux_1 = require("react-redux");
-const PopupRedux = tslib_1.__importStar(require("../../../../Redux/ActionsReducers/PopupRedux"));
 const GeneralConstants = tslib_1.__importStar(require("../../../../Utilities/Constants/GeneralConstants"));
 const TopBar_1 = tslib_1.__importDefault(require("./TopBar"));
 const join_1 = tslib_1.__importDefault(require("../../../../components/utils/join"));
 const Navigation_1 = require("./Navigation");
 const PopupContext_1 = tslib_1.__importDefault(require("./PopupContext"));
 const AdaptablePopupBody_1 = require("./AdaptablePopupBody");
-const Dialog_1 = tslib_1.__importDefault(require("../../../../components/Dialog"));
-const SystemRedux_1 = require("../../../../Redux/ActionsReducers/SystemRedux");
-const Utilities_1 = require("./Utilities");
 const DefaultSettingsPanel_1 = require("../../../../Utilities/Defaults/DefaultSettingsPanel");
 const AdaptableContext_1 = require("../../../AdaptableContext");
 const CustomSettingsPanelView_1 = require("./CustomSettingsPanelView");
+const useMenuItems_1 = require("./useMenuItems");
+const AdaptablePopupDialog_1 = require("./AdaptablePopupDialog");
 exports.AdaptablePopup = (props) => {
-    var _a, _b, _c, _d, _e;
     const adaptable = AdaptableContext_1.useAdaptable();
-    const dispatch = react_redux_1.useDispatch();
     const settingsPanelOptions = adaptable.adaptableOptions.settingsPanelOptions;
     const settingsPanelTitle = adaptable.api.internalApi.getModuleFriendlyName('SettingsPanel');
-    // Navigation
-    const allMenuItems = react_redux_1.useSelector((state) => { var _a; return (_a = state === null || state === void 0 ? void 0 : state.Grid) === null || _a === void 0 ? void 0 : _a.ModuleDropdownMenuItems; });
-    const menuItems = React.useMemo(() => {
-        var _a;
-        let navigationItems = (_a = settingsPanelOptions === null || settingsPanelOptions === void 0 ? void 0 : settingsPanelOptions.navigation) === null || _a === void 0 ? void 0 : _a.items;
-        if (!navigationItems) {
-            navigationItems = [...DefaultSettingsPanel_1.DEFAULT_NAVIGATION_ITEMS];
-            if (settingsPanelOptions.customSettingsPanels) {
-                navigationItems.push(...settingsPanelOptions.customSettingsPanels.map((panel) => panel.name));
-            }
-        }
-        const visibleItems = allMenuItems.filter((item) => item.module !== 'General' && !DefaultSettingsPanel_1.ACTION_POPUPS.includes(item.module) && item.isVisible);
-        return navigationItems
-            .map((moduleName) => {
-            var _a, _b;
-            if (moduleName === '-') {
-                return moduleName;
-            }
-            const customSettingsPanel = (_b = (_a = settingsPanelOptions === null || settingsPanelOptions === void 0 ? void 0 : settingsPanelOptions.customSettingsPanels) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (panel) => panel.name === moduleName);
-            let customPanelMenuItem = null;
-            if (customSettingsPanel) {
-                customPanelMenuItem = {
-                    label: customSettingsPanel.name,
-                    isVisible: true,
-                    reduxAction: PopupRedux.PopupShowScreen(null, customSettingsPanel.name, null, {
-                        isCustomSettingsPanel: true,
-                    }),
-                };
-            }
-            return customPanelMenuItem || visibleItems.find((item) => item.module === moduleName);
-        })
-            .filter(Boolean);
-    }, [allMenuItems]);
-    const isCustomSettingsPanel = (_a = props.moduleProps) === null || _a === void 0 ? void 0 : _a.isCustomSettingsPanel;
-    const customSettingsPanel = isCustomSettingsPanel &&
-        settingsPanelOptions.customSettingsPanels.find((settingsPanel) => settingsPanel.name === props.componentName);
-    let componentModule = props.componentModule;
-    // When it is opened without specifying a module
-    const firstMenuItem = (_b = menuItems.find((menuItem) => menuItem !== '-')) === null || _b === void 0 ? void 0 : _b.module;
-    if (!customSettingsPanel && !props.componentModule && firstMenuItem !== 'General') {
-        componentModule = firstMenuItem;
-    }
-    const accessLevel = props.api.internalApi
-        .getEntitlementService()
-        .getEntitlementAccessLevelForModule(componentModule);
-    const module = props.api.internalApi.getModuleService().getModuleById(componentModule);
-    const moduleInfo = module === null || module === void 0 ? void 0 : module.moduleInfo;
-    // action popups + non-primary module popups
-    const isActionModule = moduleInfo &&
-        (DefaultSettingsPanel_1.ACTION_POPUPS.includes(moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.ModuleName) ||
-            (props.componentName && props.componentName !== (moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.Popup)));
-    const baseClassName = 'ab-Adaptable-Popup';
-    const className = join_1.default(baseClassName, `${baseClassName}--${(_c = settingsPanelOptions.popupType) !== null && _c !== void 0 ? _c : 'window'}`, isActionModule ? `${baseClassName}--action-popup` : `${baseClassName}--settings-popup`);
+    const menuItems = useMenuItems_1.useMenuItems();
     const isWindowModal = settingsPanelOptions.popupType === 'window';
-    let style = { maxWidth: 1400, maxHeight: 1200 };
-    if (isWindowModal) {
-        style = { height: '100%' };
+    let friendlyName = null;
+    let isActionModule = false;
+    let moduleViewContent = null;
+    let activeItem = null;
+    let accessLevel = 'Full';
+    const firstMenuItem = menuItems.find((menuItem) => menuItem !== '-');
+    const firstMenuModule = firstMenuItem === null || firstMenuItem === void 0 ? void 0 : firstMenuItem.module;
+    let componentModule = props.componentModule;
+    let componentName = props.componentName;
+    // ts forces to check for General, there is no menu item General
+    const useFirstItem = !props.componentModule;
+    if (useFirstItem && firstMenuModule !== 'General') {
+        componentModule = firstMenuModule;
     }
-    else if (isActionModule) {
-        style = { maxWidth: 800, maxHeight: 450 };
+    const isCustomSettingsPanel = componentModule === 'CustomSettingsPanelModule';
+    if (isCustomSettingsPanel) {
+        if (useFirstItem) {
+            componentName = firstMenuItem.label;
+        }
+        const customSettingsPanel = settingsPanelOptions.customSettingsPanels.find((settingsPanel) => settingsPanel.name === componentName);
+        friendlyName = customSettingsPanel.name;
+        activeItem = customSettingsPanel.name;
+        moduleViewContent = React.createElement(CustomSettingsPanelView_1.CustomSettingsPanelView, { settingsPanel: customSettingsPanel });
     }
-    const settingsKey = isActionModule ? `action-${moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.FriendlyName}` : 'settings';
-    let popupSettings = react_redux_1.useSelector((state) => { var _a, _b; return (_b = (_a = state === null || state === void 0 ? void 0 : state.System) === null || _a === void 0 ? void 0 : _a.SettingsPanel) === null || _b === void 0 ? void 0 : _b[settingsKey]; });
-    if (!popupSettings) {
-        const size = isActionModule
-            ? Utilities_1.getActionPanelSize()
-            : (_d = settingsPanelOptions.size) !== null && _d !== void 0 ? _d : Utilities_1.getSettingsPanelSize();
-        popupSettings = {
-            size: size,
-            position: (_e = settingsPanelOptions.position) !== null && _e !== void 0 ? _e : Utilities_1.getMiddlePosition(size),
-        };
+    else {
+        const module = props.api.internalApi.getModuleService().getModuleById(componentModule);
+        const moduleInfo = module === null || module === void 0 ? void 0 : module.moduleInfo;
+        accessLevel = props.api.internalApi
+            .getEntitlementService()
+            .getEntitlementAccessLevelForModule(componentModule);
+        friendlyName = moduleInfo.FriendlyName;
+        isActionModule =
+            moduleInfo &&
+                (DefaultSettingsPanel_1.ACTION_POPUPS.includes(moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.ModuleName) ||
+                    (props.componentName && props.componentName !== (moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.Popup)));
+        activeItem = moduleInfo.ModuleName;
+        moduleViewContent = (React.createElement(AdaptablePopupBody_1.AdaptablePopupBody, { api: props.api, module: module, componentName: props.componentName, moduleParams: props.moduleParams, onClearParams: props.onClearParams, onHide: props.onHide }));
     }
-    const handleWindowSettings = (settings) => {
-        dispatch(SystemRedux_1.SystemSettingsPanelSet(settingsKey, settings));
-    };
+    const baseClassName = 'ab-Adaptable-Popup';
+    const className = join_1.default(baseClassName, `${baseClassName}--${isWindowModal ? 'window' : 'modal'}`, isActionModule ? `${baseClassName}--action-popup` : `${baseClassName}--settings-popup`);
     return (React.createElement(PopupContext_1.default.Provider, { value: {
             hidePopup: () => {
                 if (props.onHide) {
@@ -106,16 +68,9 @@ exports.AdaptablePopup = (props) => {
                 }
             },
         } },
-        React.createElement(Dialog_1.default, Object.assign({ windowModal: isWindowModal, fixed: false, windowModalProps: {
-                handleSelector: isActionModule
-                    ? `.${baseClassName} .ab-Panel__header`
-                    : '.ab-Adaptable-Popup__TopBar',
-                size: popupSettings.size,
-                position: popupSettings.position,
-                onChange: handleWindowSettings,
-            }, style: style, padding: 0, height: isWindowModal ? null : '90vh', width: isWindowModal ? null : '90vw', className: className, onDismiss: props.onHide, isOpen: true, showCloseButton: true }, props.moduleProps),
+        React.createElement(AdaptablePopupDialog_1.AdaptablePopupDialog, { baseClassName: baseClassName, className: className, friendlyName: friendlyName, isActionModule: isActionModule, isWindowModal: isWindowModal, onHide: props.onHide },
             !isActionModule && React.createElement(TopBar_1.default, { icon: settingsPanelOptions.icon }, settingsPanelTitle),
             React.createElement(rebass_1.Flex, { "data-name": props.componentName, flexDirection: "row", flex: "1 1 0", style: { minHeight: 0 }, className: accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '' },
-                !isActionModule && (React.createElement(Navigation_1.Navigation, { menuItems: menuItems, api: props.api, moduleInfo: moduleInfo, activeCustomSettingPanel: customSettingsPanel, customSettingsPanels: settingsPanelOptions.customSettingsPanels })),
-                React.createElement(rebass_1.Flex, { flex: 1, className: "ab-Adaptable-Popup__Body" }, isCustomSettingsPanel ? (React.createElement(CustomSettingsPanelView_1.CustomSettingsPanelView, { settingsPanel: customSettingsPanel })) : (React.createElement(AdaptablePopupBody_1.AdaptablePopupBody, { api: props.api, module: module, componentName: props.componentName, moduleParams: props.moduleParams, onClearParams: props.onClearParams, onHide: props.onHide })))))));
+                !isActionModule && (React.createElement(Navigation_1.Navigation, { menuItems: menuItems, api: props.api, activeItem: activeItem, customSettingsPanels: settingsPanelOptions.customSettingsPanels })),
+                React.createElement(rebass_1.Flex, { flex: 1, className: "ab-Adaptable-Popup__Body" }, moduleViewContent)))));
 };

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopupDialog.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+export declare const AdaptablePopupDialog: React.FunctionComponent<{
+    baseClassName: string;
+    className: string;
+    friendlyName: string;
+    isActionModule: boolean;
+    isWindowModal: boolean;
+    onHide: () => void;
+    style?: React.CSSProperties;
+}>;

package/src/View/Components/Popups/AdaptablePopup/AdaptablePopupDialog.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdaptablePopupDialog = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const react_redux_1 = require("react-redux");
+const Dialog_1 = tslib_1.__importDefault(require("../../../../components/Dialog"));
+const SystemRedux_1 = require("../../../../Redux/ActionsReducers/SystemRedux");
+const AdaptableContext_1 = require("../../../AdaptableContext");
+const Utilities_1 = require("./Utilities");
+const WindowDialog = (props) => {
+    var _a, _b;
+    const { onChange, style, baseClassName, className, isActionModule, settingsPanelOptionsKey, onHide } = props, dialogProps = tslib_1.__rest(props, ["onChange", "style", "baseClassName", "className", "isActionModule", "settingsPanelOptionsKey", "onHide"]);
+    const adaptable = AdaptableContext_1.useAdaptable();
+    const dispatch = react_redux_1.useDispatch();
+    const settingsPanelOptions = adaptable.adaptableOptions.settingsPanelOptions;
+    let popupSettings = react_redux_1.useSelector((state) => { var _a, _b; return (_b = (_a = state === null || state === void 0 ? void 0 : state.System) === null || _a === void 0 ? void 0 : _a.SettingsPanel) === null || _b === void 0 ? void 0 : _b[settingsPanelOptionsKey]; });
+    const handleWindowSettings = (settings) => {
+        dispatch(SystemRedux_1.SystemSettingsPanelSet(settingsPanelOptionsKey, settings));
+    };
+    if (!popupSettings) {
+        const size = isActionModule
+            ? Utilities_1.getActionPanelSize()
+            : (_a = settingsPanelOptions.size) !== null && _a !== void 0 ? _a : Utilities_1.getSettingsPanelSize();
+        popupSettings = {
+            size: size,
+            position: (_b = settingsPanelOptions.position) !== null && _b !== void 0 ? _b : Utilities_1.getMiddlePosition(size),
+        };
+    }
+    const windowModalProps = {
+        handleSelector: isActionModule
+            ? `.${baseClassName} .ab-Panel__header`
+            : '.ab-Adaptable-Popup__TopBar',
+        size: popupSettings.size,
+        position: popupSettings.position,
+        onChange: handleWindowSettings,
+    };
+    return (React.createElement(Dialog_1.default, Object.assign({ windowModal: true, fixed: false, windowModalProps: windowModalProps, style: Object.assign(Object.assign({}, props.style), { height: '100%' }), padding: 0, className: className, onDismiss: onHide, isOpen: true, showCloseButton: true }, dialogProps)));
+};
+const PopupDialog = (props) => {
+    const { style, className, onHide, children } = props, dialogProps = tslib_1.__rest(props, ["style", "className", "onHide", "children"]);
+    return (React.createElement(Dialog_1.default, Object.assign({ fixed: false, style: props.style, padding: 0, height: '90vh', width: '90vw', className: className, onDismiss: onHide, isOpen: true, showCloseButton: true }, dialogProps), children));
+};
+exports.AdaptablePopupDialog = (props) => {
+    const { isActionModule, style, friendlyName, baseClassName, className, children, onHide, isWindowModal, } = props;
+    if (isWindowModal) {
+        const settingsPanelOptionsKey = isActionModule ? `action-${friendlyName}` : 'settings';
+        return (React.createElement(WindowDialog, { settingsPanelOptionsKey: settingsPanelOptionsKey, isActionModule: isActionModule, onHide: onHide, style: style, baseClassName: baseClassName, className: className }, children));
+    }
+    else {
+        const modalStyle = Object.assign(Object.assign({}, style), (isActionModule ? { maxWidth: 800, maxHeight: 600 } : { maxWidth: 1200, maxHeight: 1000 }));
+        return (React.createElement(PopupDialog, { onHide: onHide, style: modalStyle, className: className }, children));
+    }
+};

package/src/View/Components/Popups/AdaptablePopup/Navigation.d.ts

@@ -1,12 +1,10 @@
 import * as React from 'react';
 import { AdaptableApi, AdaptableMenuItem } from '../../../../../types';
 import { CustomSettingsPanel } from '../../../../AdaptableOptions/SettingsPanelOptions';
-import { ModuleInfo } from '../../../../Strategy/Interface/IModule';
 interface NavigationProps {
     api: AdaptableApi;
     menuItems: (AdaptableMenuItem | '-')[];
-    moduleInfo?: ModuleInfo;
-    activeCustomSettingPanel?: CustomSettingsPanel;
+    activeItem: string;
     customSettingsPanels?: CustomSettingsPanel[];
 }
 export declare const Navigation: React.FunctionComponent<NavigationProps>;