@adaptabletools/adaptable 16.0.0-canary.2 → 16.0.0-canary.4

package/src/View/Components/AdaptableIconComponent/useCustomIcon.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useCustomIcon = void 0;
+const AdaptableContext_1 = require("../../AdaptableContext");
+const useCustomIcon = (icon) => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    if (!icon) {
+        return icon;
+    }
+    return adaptable.api.userInterfaceApi.internalApi.prepareAdaptableIconDef(icon);
+};
+exports.useCustomIcon = useCustomIcon;

package/src/{components → View/Components}/Badge/index.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableIcon, AdaptableStyle } from '../../types';
+import { AdaptableIcon, AdaptableStyle } from '../../../types';
 export interface BadgeProps {
     adaptableStyle: AdaptableStyle;
     icon?: AdaptableIcon;

package/src/{components → View/Components}/Badge/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Badge = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
-const StyleHelper_1 = require("../../Utilities/Helpers/StyleHelper");
+const StyleHelper_1 = require("../../../Utilities/Helpers/StyleHelper");
 const AdaptableIconComponent_1 = require("../AdaptableIconComponent");
 const Badge = (props) => {
     const { iconPosition = 'start', icon: iconProps } = props;

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

@@ -125,7 +125,7 @@ class FilterFormComponent extends React.Component {
         const filterOptions = this.props.api.optionsApi.getFilterOptions();
         const predicateDefs = this.props.api.filterApi
             .getFilterPredicateDefsForColumn(this.props.currentColumn)
-            .filter((predicate) => !predicate.onlyQuickFilter);
+            .filter((predicate) => predicate.id !== 'BooleanToggle');
         let uiSelectedColumnValues = ((_b = (_a = this.state.editedColumnFilter) === null || _a === void 0 ? void 0 : _a.Predicate) === null || _b === void 0 ? void 0 : _b.PredicateId) === 'Values'
             ? this.state.editedColumnFilter.Predicate.Inputs
             : [];

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

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const ListGroupItem_1 = tslib_1.__importDefault(require("../../../components/List/ListGroupItem"));
 const ListGroup_1 = tslib_1.__importDefault(require("../../../components/List/ListGroup"));
-const AdaptableIconComponent_1 = require("../../../components/AdaptableIconComponent");
+const Icon_1 = require("../../../components/Icon");
 class ListBoxMenu extends React.Component {
     constructor(props) {
         super(props);
@@ -14,7 +14,7 @@ class ListBoxMenu extends React.Component {
     render() {
         let menuItems = this.props.MenuItems.map((menuItem, index) => {
             return (React.createElement(ListGroupItem_1.default, { key: index, onClick: () => this.onClick(menuItem) },
-                menuItem.icon && React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: menuItem.icon }),
+                menuItem.icon && React.createElement(Icon_1.IconComponent, { icon: menuItem.icon }),
                 menuItem.label));
         });
         return (React.createElement("div", { style: divStyle },

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

@@ -16,8 +16,9 @@ const AdaptableInput_1 = tslib_1.__importDefault(require("../AdaptableInput"));
 const renderWithAdaptableContext_1 = require("../../renderWithAdaptableContext");
 const CheckBox_1 = require("../../../components/CheckBox");
 const getDefaultColumnFilterPredicate_1 = require("./getDefaultColumnFilterPredicate");
-const AdaptableIconComponent_1 = require("../../../components/AdaptableIconComponent");
+const Icon_1 = require("../../../components/Icon");
 const QuickFilterValues_1 = require("./QuickFilterValues");
+const AdaptableIconComponent_1 = require("../AdaptableIconComponent");
 class QuickFilterFormComponent extends React.Component {
     constructor(props) {
         super(props);
@@ -113,7 +114,7 @@ class QuickFilterFormComponent extends React.Component {
         if ('text' in predicateDef.icon) {
             return React.createElement("span", null, predicateDef.icon.text);
         }
-        if ((0, AdaptableIconComponent_1.isAdaptableIcon)(predicateDef.icon)) {
+        if ((0, Icon_1.isAdaptableIcon)(predicateDef.icon)) {
             return React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: predicateDef.icon });
         }
     }

package/src/View/Components/Panels/PanelWithButton.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { PanelProps } from '../../../components/Panel';
 import { BoxProps } from 'rebass';
-import { AdaptableInternalIconName } from '../../../PredefinedConfig/Common/AdaptableIcon';
+import { AdaptableSystemIconName } from '../../../PredefinedConfig/Common/AdaptableIcon';
 export interface PanelWithButtonProps extends PanelProps {
     buttonContent?: React.ReactNode;
     buttonClick?: () => void;
@@ -11,7 +11,7 @@ export interface PanelWithButtonProps extends PanelProps {
     headerProps?: BoxProps & {
         'data-name': string;
     };
-    glyphicon?: AdaptableInternalIconName;
+    glyphicon?: AdaptableSystemIconName;
     buttonDisabled?: boolean;
     buttonStyle?: string;
     borderRadius?: string;

package/src/View/Components/Panels/PanelWithImage.d.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
 import { PanelProps } from '../../../components/Panel';
 import { BoxProps } from 'rebass';
-import { AdaptableInternalIconName } from '../../../PredefinedConfig/Common/AdaptableIcon';
+import { AdaptableSystemIconName } from '../../../PredefinedConfig/Common/AdaptableIcon';
 export interface PanelWithImageProps extends PanelProps {
-    glyphicon?: AdaptableInternalIconName;
-    icon?: AdaptableInternalIconName;
+    glyphicon?: AdaptableSystemIconName;
+    icon?: AdaptableSystemIconName;
     infoLink?: string;
     infoLinkDisabled?: boolean;
     borderRadius?: string;

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

@@ -6,7 +6,7 @@ const React = tslib_1.__importStar(require("react"));
 const react_redux_1 = require("react-redux");
 const join_1 = tslib_1.__importDefault(require("../../../../components/utils/join"));
 const useGlobalEvent_1 = require("../../../../components/utils/useGlobalEvent");
-const AdaptableIconComponent_1 = require("../../../../components/AdaptableIconComponent");
+const AdaptableIconComponent_1 = require("../../AdaptableIconComponent");
 const Navigation = (props) => {
     const dispatch = (0, react_redux_1.useDispatch)();
     const handleKeyPress = React.useCallback((event) => {

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

@@ -4,9 +4,8 @@ exports.TopBar = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
-const icons_1 = require("../../../../components/icons");
 const AdaptableContext_1 = require("../../../AdaptableContext");
-const AdaptableIconComponent_1 = require("../../../../components/AdaptableIconComponent");
+const AdaptableIconComponent_1 = require("../../AdaptableIconComponent");
 const TopBar = (props) => {
     var _a;
     const baseClassName = 'ab-Adaptable-Popup__TopBar';
@@ -15,7 +14,7 @@ const TopBar = (props) => {
     let icon = React.createElement(React.Fragment, null);
     const iconClassName = `${baseClassName}__Icon`;
     if (props.icon === 'ConfigurationIcon') {
-        icon = React.createElement(icons_1.Icon, { className: iconClassName, name: "settings" });
+        icon = React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { iconClassName: iconClassName, icon: { name: 'settings' } });
     }
     else if (props.icon === 'ApplicationIcon' && applicationIcon) {
         icon = React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: applicationIcon, iconClassName: iconClassName });

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

@@ -10,7 +10,7 @@ const Dialog_1 = tslib_1.__importDefault(require("../../../components/Dialog"));
 const AdaptableFormComponent_1 = require("../../../components/AdaptableFormComponent");
 const react_1 = require("react");
 const AdaptableContext_1 = require("../../AdaptableContext");
-const AdaptableIconComponent_1 = require("../../../components/AdaptableIconComponent");
+const AdaptableIconComponent_1 = require("../AdaptableIconComponent");
 const AdaptablePopupAlert = (props) => {
     var _a;
     const messageType = props.adaptableAlert.alertDefinition.MessageType || 'Error';

package/src/View/Components/PredicateEditor/PredicateEditor.js

@@ -4,13 +4,13 @@ exports.PredicateEditor = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
-const AdaptableIconComponent_1 = require("../../../components/AdaptableIconComponent");
+const Icon_1 = require("../../../components/Icon");
 const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
 const HelpBlock_1 = tslib_1.__importDefault(require("../../../components/HelpBlock"));
-const icons_1 = require("../../../components/icons");
 const Tag_1 = require("../../../components/Tag");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../AdaptableInput"));
 const PermittedValuesSelector_1 = require("../PermittedValuesSelector");
+const AdaptableIconComponent_1 = require("../AdaptableIconComponent");
 const isValuesPredicateDef = (colDef) => colDef && ['Values', 'ExcludeValues'].includes(colDef.id);
 const PredicateEditor = (props) => {
     var _a, _b, _c;
@@ -40,8 +40,8 @@ const PredicateEditor = (props) => {
     const currentPredicateDef = (_b = props === null || props === void 0 ? void 0 : props.predicateDefs) === null || _b === void 0 ? void 0 : _b.find((item) => { var _a; return item.id === ((_a = props.predicate) === null || _a === void 0 ? void 0 : _a.PredicateId); });
     let icon = null;
     if (currentPredicateDef) {
-        if ((0, AdaptableIconComponent_1.isAdaptableInternalIcon)(currentPredicateDef === null || currentPredicateDef === void 0 ? void 0 : currentPredicateDef.icon)) {
-            icon = React.createElement(icons_1.Icon, { name: currentPredicateDef.icon.name });
+        if ((0, Icon_1.isAdaptableSystemIcon)(currentPredicateDef === null || currentPredicateDef === void 0 ? void 0 : currentPredicateDef.icon)) {
+            icon = React.createElement(AdaptableIconComponent_1.AdaptableIconComponent, { icon: currentPredicateDef.icon });
         }
         else if ((currentPredicateDef === null || currentPredicateDef === void 0 ? void 0 : currentPredicateDef.icon) && 'text' in (currentPredicateDef === null || currentPredicateDef === void 0 ? void 0 : currentPredicateDef.icon)) {
             icon = React.createElement("span", null, currentPredicateDef.icon.text);

package/src/View/Dashboard/CustomToolbarWrapper.js

@@ -5,8 +5,8 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const PanelDashboard_1 = require("../Components/Panels/PanelDashboard");
-const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const AdaptableContext_1 = require("../AdaptableContext");
+const AdaptableButton_1 = require("../Components/AdaptableButton");
 const CustomToolbarWrapper = (props) => {
     let contentsDivId = 'ab-CustomToolbar__' + props.customToolbar.name + '__contents';
     let buttonsDivId = 'ab-CustomToolbar__' + props.customToolbar.name + '__buttons';
@@ -97,7 +97,7 @@ const CustomToolbarWrapper = (props) => {
                 const disabled = button.disabled && button.disabled(button, dashboardContext);
                 let buttonVariant = buttonStyle && buttonStyle.variant ? buttonStyle.variant : 'outlined';
                 let buttonTone = buttonStyle && buttonStyle.tone ? buttonStyle.tone : 'neutral';
-                return (React.createElement(SimpleButton_1.default, { style: { marginLeft: index ? 'var(--ab-space-1)' : 0 }, key: index, disabled: disabled, tooltip: buttonTooltip, icon: buttonIcon, variant: buttonVariant, tone: buttonTone, className: (buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className) || '', onClick: () => {
+                return (React.createElement(AdaptableButton_1.AdaptableButtonComponent, { style: { marginLeft: index ? 'var(--ab-space-1)' : 0 }, key: index, disabled: disabled, tooltip: buttonTooltip, icon: buttonIcon, variant: buttonVariant, tone: buttonTone, className: (buttonStyle === null || buttonStyle === void 0 ? void 0 : buttonStyle.className) || '', onClick: () => {
                         button.onClick ? button.onClick(button, dashboardContext) : null;
                         setTimeout(() => {
                             // mutate state to force a re-rendering

package/src/View/Dashboard/Dashboard.js

@@ -10,7 +10,6 @@ const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
 const DashboardRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/DashboardRedux"));
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const QuickSearchRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QuickSearchRedux"));
-const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const rebass_1 = require("rebass");
 const Dashboard_1 = require("../../components/Dashboard");
 const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
@@ -20,7 +19,8 @@ const UIHelper_1 = tslib_1.__importDefault(require("../UIHelper"));
 const ModuleToolbarWrapper_1 = require("./ModuleToolbarWrapper");
 const CustomToolbarWrapper_1 = require("./CustomToolbarWrapper");
 const CustomDashboardButton_1 = require("./CustomDashboardButton");
-const AdaptableIconComponent_1 = require("../../components/AdaptableIconComponent");
+const AdaptableIconComponent_1 = require("../Components/AdaptableIconComponent");
+const AdaptableButton_1 = require("../Components/AdaptableButton");
 const DashboardComponent = (props) => {
     const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)(props);
     const dashboardAccessLevel = props.api.internalApi
@@ -80,7 +80,7 @@ const DashboardComponent = (props) => {
                 var _a, _b, _c;
                 let menuItem = props.GridState.ModuleButtonMenuItems.find((y) => y.isVisible && y.module == x);
                 if (menuItem) {
-                    return (React.createElement(SimpleButton_1.default, { "data-name": `dashboard-module-button-${(_a = menuItem.module) !== null && _a !== void 0 ? _a : 'custom-' + index}`, key: menuItem.label, variant: menuItem.module === 'SystemStatus' ? 'outlined' : 'text', tone: menuItem.module === 'SystemStatus' ? 'neutral' : 'none', className: `ab-DashboardToolbar__Home__${(0, kebabCase_1.default)(menuItem.label)}`, icon: menuItem.icon, tooltip: menuItem.label, disabled: props.accessLevel == 'ReadOnly', onClick: () => props.dispatch(menuItem.reduxAction), accessLevel: 'Full', style: menuItem.module === 'SystemStatus'
+                    return (React.createElement(AdaptableButton_1.AdaptableButtonComponent, { "data-name": `dashboard-module-button-${(_a = menuItem.module) !== null && _a !== void 0 ? _a : 'custom-' + index}`, key: menuItem.label, variant: menuItem.module === 'SystemStatus' ? 'outlined' : 'text', tone: menuItem.module === 'SystemStatus' ? 'neutral' : 'none', className: `ab-DashboardToolbar__Home__${(0, kebabCase_1.default)(menuItem.label)}`, icon: menuItem.icon, tooltip: menuItem.label, disabled: props.accessLevel == 'ReadOnly', onClick: () => props.dispatch(menuItem.reduxAction), accessLevel: 'Full', style: menuItem.module === 'SystemStatus'
                             ? Object.assign(Object.assign({}, UIHelper_1.default.getStyleForMessageType((_c = (_b = props.api.systemStatusApi.getCurrentSystemStatusMessageInfo()) === null || _b === void 0 ? void 0 : _b.statusType) !== null && _c !== void 0 ? _c : 'Success')), { border: 0 }) : {} }));
                 }
             });

package/src/View/DataChangeHistory/DataChangeHistoryGrid.d.ts

@@ -12,5 +12,6 @@ export interface DataChangeHistoryGridProps {
     agGridContainerId: string;
     changeHistoryLog: Record<string, CellDataChangedInfo>;
     onUndoChange: (changeKey: string) => void;
+    onClearRow: (changeKey: string) => void;
 }
 export declare const DataChangeHistoryGrid: (props: DataChangeHistoryGridProps) => JSX.Element;

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -9,7 +9,7 @@ const usePrevious_1 = tslib_1.__importDefault(require("../../components/utils/us
 const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
 const buildActionColumnButton_1 = require("./buildActionColumnButton");
 const DataChangeHistoryGrid = (props) => {
-    const { changeHistoryLog, adaptableContainerId, agGridContainerId, onUndoChange } = props;
+    const { changeHistoryLog, adaptableContainerId, agGridContainerId, onUndoChange, onClearRow } = props;
     const mainAdaptableInstance = (0, AdaptableContext_1.useAdaptable)();
     const [_adaptableApi, setAdaptableApi] = (0, react_1.useState)(null);
     const adaptableApiRef = (0, react_1.useRef)(null);
@@ -22,14 +22,15 @@ const DataChangeHistoryGrid = (props) => {
     (0, react_1.useEffect)(() => {
         const initializeAdaptableGrid = async () => {
             const gridOptions = buildGridOptions(mainAdaptableInstance, changeHistoryLog);
-            const adaptableOptions = buildAdaptableOptions(mainAdaptableInstance, gridOptions, adaptableContainerId, agGridContainerId, undoChangeEnabled, onUndoChange);
-            const agGridOptions = {
+            const adaptableOptions = buildAdaptableOptions(mainAdaptableInstance, gridOptions, adaptableContainerId, agGridContainerId, undoChangeEnabled, onUndoChange, onClearRow);
+            const modules = mainAdaptableInstance.getAgGridRegisteredModules();
+            const agGridConfig = {
                 gridOptions,
-                modules: mainAdaptableInstance.getAgGridRegisteredModules(),
+                modules: modules,
             };
             // to avoid direct dependency to Adaptable.ts and thus creating a circular dependency;
             const adaptableInitFn = Object.getPrototypeOf(mainAdaptableInstance).constructor.init;
-            const dataChangeHistoryAdaptableApi = await adaptableInitFn(adaptableOptions, agGridOptions);
+            const dataChangeHistoryAdaptableApi = await adaptableInitFn(adaptableOptions, agGridConfig);
             setAdaptableApi(dataChangeHistoryAdaptableApi);
         };
         initializeAdaptableGrid();
@@ -76,7 +77,7 @@ const DataChangeHistoryGrid = (props) => {
     return React.createElement(React.Fragment, null);
 };
 exports.DataChangeHistoryGrid = DataChangeHistoryGrid;
-const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableContainerId, agGridContainerId, undoChangeEnabled, onUndoChange) => {
+const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableContainerId, agGridContainerId, undoChangeEnabled, onUndoChange, onClearRow) => {
     var _a, _b, _c;
     const mainAdaptableOptions = mainAdaptableInstance.adaptableOptions;
     const mainAdaptableTheme = mainAdaptableInstance.api.themeApi.getCurrentTheme();
@@ -85,7 +86,12 @@ const buildAdaptableOptions = (mainAdaptableInstance, gridOptions, adaptableCont
         const changeKey = rowData === null || rowData === void 0 ? void 0 : rowData['changeKey'];
         changeKey && onUndoChange(changeKey);
     };
-    const actionColumnButton = (0, buildActionColumnButton_1.buildActionColumnButton)((_a = mainAdaptableInstance.adaptableOptions) === null || _a === void 0 ? void 0 : _a.dataChangeHistoryOptions, mainAdaptableInstance.api, undoRowNode);
+    const clearRow = (rowNode) => {
+        const rowData = rowNode === null || rowNode === void 0 ? void 0 : rowNode.data;
+        const changeKey = rowData === null || rowData === void 0 ? void 0 : rowData['changeKey'];
+        changeKey && onClearRow(changeKey);
+    };
+    const actionColumnButton = (0, buildActionColumnButton_1.buildActionColumnButton)((_a = mainAdaptableInstance.adaptableOptions) === null || _a === void 0 ? void 0 : _a.dataChangeHistoryOptions, mainAdaptableInstance.api, undoRowNode, clearRow);
     let actionColumnOptions = undefined;
     if (actionColumnButton) {
         actionColumnOptions = {

package/src/View/DataChangeHistory/DataChangeHistoryPopup.js

@@ -52,6 +52,12 @@ class DataChangeHistoryPopupComponent extends React.Component {
                 this.props.api.dataChangeHistoryApi.undoDataChangeHistoryEntry(changeToBeUndone);
             }
         };
+        const handleClearRow = (changeKey) => {
+            const changeToBeUndone = this.props.changeHistoryLog[changeKey];
+            if (changeToBeUndone) {
+                this.props.api.dataChangeHistoryApi.clearDataChangeHistoryEntry(changeToBeUndone);
+            }
+        };
         const currentAgGridTheme = this.props.api.themeApi.getAgGridCurrentThemeName();
         return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
             React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPopup", flexDirection: "column", style: { height: '100%' } },
@@ -65,7 +71,7 @@ class DataChangeHistoryPopupComponent extends React.Component {
                 React.createElement(rebass_1.Flex, { className: "ab-DataChangeHistoryPopup--grid", "data-name": 'data-change-history--grid', flex: 1, alignSelf: 'stretch', flexDirection: 'column' },
                     React.createElement("div", { id: adaptableContainerId }),
                     React.createElement("div", { id: agGridContainerId, className: currentAgGridTheme, style: { height: '100%' } }),
-                    React.createElement(DataChangeHistoryGrid_1.DataChangeHistoryGrid, { adaptableContainerId: adaptableContainerId, agGridContainerId: agGridContainerId, changeHistoryLog: this.props.changeHistoryLog, onUndoChange: handleChangeUndo })))));
+                    React.createElement(DataChangeHistoryGrid_1.DataChangeHistoryGrid, { adaptableContainerId: adaptableContainerId, agGridContainerId: agGridContainerId, changeHistoryLog: this.props.changeHistoryLog, onUndoChange: handleChangeUndo, onClearRow: handleClearRow })))));
     }
 }
 function mapStateToProps(state, ownProps) {

package/src/View/DataChangeHistory/buildActionColumnButton.d.ts

@@ -1,3 +1,3 @@
 import { IRowNode } from '@ag-grid-community/core';
 import { ActionColumnContext, AdaptableApi, AdaptableButton, DataChangeHistoryOptions } from '../../types';
-export declare const buildActionColumnButton: (options: DataChangeHistoryOptions, parentAdapTableApi: AdaptableApi, undoRowNode: (rowNode: IRowNode) => void) => AdaptableButton<ActionColumnContext<any>>[];
+export declare const buildActionColumnButton: (options: DataChangeHistoryOptions, parentAdapTableApi: AdaptableApi, undoRowNode: (rowNode: IRowNode) => void, clearRow: (rowNode: IRowNode) => void) => AdaptableButton<ActionColumnContext<any>>[];

package/src/View/DataChangeHistory/buildActionColumnButton.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildActionColumnButton = void 0;
-const buildActionColumnButton = (options, parentAdapTableApi, undoRowNode) => {
+const buildActionColumnButton = (options, parentAdapTableApi, undoRowNode, clearRow) => {
     let changeHistoryButtons = options.changeHistoryButton;
     if (!changeHistoryButtons ||
         (Array.isArray(changeHistoryButtons) && changeHistoryButtons.length === 0)) {
@@ -25,9 +25,13 @@ const buildActionColumnButton = (options, parentAdapTableApi, undoRowNode) => {
             undoRowNode(rowNode);
         }
     };
+    const onClearRow = (context) => {
+        const rowNode = context.rowNode;
+        clearRow(rowNode);
+    };
     const buildContext = (context) => {
         const dataChangedInfo = context.rowNode.data.changeInfo;
-        return Object.assign(Object.assign({}, context), { isGroupNode: isGroupNode(context), undoDataChange: () => onUndo(context), dataChangedInfo,
+        return Object.assign(Object.assign({}, context), { isGroupNode: isGroupNode(context), undoDataChange: () => onUndo(context), clearRow: () => onClearRow(context), dataChangedInfo,
             parentAdapTableApi });
     };
     return changeHistoryButtons.map((actionColumnOption) => ({
@@ -59,6 +63,9 @@ const buildActionColumnButton = (options, parentAdapTableApi, undoRowNode) => {
             if (actionColumnOption.action === 'undo') {
                 onUndo(buildContext(context));
             }
+            if (actionColumnOption.action === 'clear') {
+                onClearRow(buildContext(context));
+            }
             if (typeof actionColumnOption.onClick === 'function') {
                 actionColumnOption.onClick(button, buildContext(context));
             }

package/src/View/FormatColumn/Wizard/FormatColumnSettingsWizardSection.js

@@ -40,7 +40,7 @@ const FormatColumnSettingsWizardSection = (props) => {
         props.onChange(Object.assign(Object.assign({}, data), { IncludeGroupedRows }));
     };
     return (React.createElement(Tabs_1.Tabs, null,
-        React.createElement(Tabs_1.Tabs.Tab, null, "Format"),
+        React.createElement(Tabs_1.Tabs.Tab, null, "Settings"),
         React.createElement(Tabs_1.Tabs.Content, null,
             React.createElement(rebass_1.Flex, { flexDirection: "row" },
                 React.createElement(FormLayout_1.default, null,

package/src/View/QuickSearch/FloatingQuickSearch/FloatingQuickSearch.d.ts

@@ -0,0 +1,2 @@
+import * as React from 'react';
+export declare const QuickSearchDrawer: React.FunctionComponent;

package/src/View/QuickSearch/FloatingQuickSearch/FloatingQuickSearch.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QuickSearchDrawer = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const react_redux_1 = require("react-redux");
+const rebass_1 = require("rebass");
+const index_1 = require("../../../components/Drawer/index");
+const SystemRedux_1 = require("../../../Redux/ActionsReducers/SystemRedux");
+const AdaptableContext_1 = require("../../AdaptableContext");
+const QuickSearchInput_1 = require("../QuickSearchInput");
+const QuickSearchDrawer = () => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const isOpen = (0, react_redux_1.useSelector)((state) => (0, SystemRedux_1.SystemQuickSearchFloatingVisibilitySelector)(state.System));
+    return (React.createElement(index_1.Drawer, { open: isOpen, onOpenChange: (open) => {
+            if (open) {
+                adaptable.api.quickSearchApi.showFloatingQuickSearch();
+            }
+            else {
+                adaptable.api.quickSearchApi.hideFloatingQuickSearch();
+            }
+        } },
+        React.createElement(rebass_1.Flex, { className: "ab-FloatinQuickSearch" },
+            React.createElement(QuickSearchInput_1.QuickSearchInput, { autoFocus: true }))));
+};
+exports.QuickSearchDrawer = QuickSearchDrawer;

package/src/View/QuickSearch/QuickSearchInput.d.ts

@@ -0,0 +1,6 @@
+import React from 'react';
+export interface QuickSearchInputProps {
+    className?: string;
+    autoFocus?: boolean;
+}
+export declare const QuickSearchInput: React.FunctionComponent<QuickSearchInputProps>;

package/src/View/QuickSearch/QuickSearchInput.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QuickSearchInput = void 0;
+const tslib_1 = require("tslib");
+const react_1 = tslib_1.__importDefault(require("react"));
+const react_redux_1 = require("react-redux");
+const QuickSearchRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QuickSearchRedux"));
+const AdaptableFormControlTextClear_1 = require("../Components/Forms/AdaptableFormControlTextClear");
+const useQuickSearchDebounced_1 = require("./useQuickSearchDebounced");
+const AdaptableContext_1 = require("../AdaptableContext");
+const QuickSearchInput = (props) => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const QuickSearchText = (0, react_redux_1.useSelector)((state) => state.QuickSearch.QuickSearchText);
+    const dispatch = (0, react_redux_1.useDispatch)();
+    const onRunQuickSearch = (newQuickSearchText) => dispatch(QuickSearchRedux.QuickSearchRun(newQuickSearchText));
+    const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)({
+        QuickSearchText,
+        onRunQuickSearch,
+    });
+    return (react_1.default.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { type: "text", autoFocus: props.autoFocus, placeholder: adaptable.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: props.className, value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: '7rem' } }));
+};
+exports.QuickSearchInput = QuickSearchInput;

package/src/View/QuickSearch/QuickSearchViewPanel.d.ts

@@ -1,8 +1,5 @@
-/// <reference types="react" />
 import { ViewPanelProps } from '../Components/SharedProps/ViewPanelProps';
-import * as QuickSearchRedux from '../../Redux/ActionsReducers/QuickSearchRedux';
+import * as React from 'react';
 export interface QuickSearchViewPanelComponentProps extends ViewPanelProps {
-    onRunQuickSearch: (quickSearchText: string) => QuickSearchRedux.QuickSearchRunAction;
-    QuickSearchText: string;
 }
-export declare const QuickSearchViewPanelControl: import("react-redux").ConnectedComponent<(props: QuickSearchViewPanelComponentProps) => JSX.Element, import("react-redux").Omit<QuickSearchViewPanelComponentProps, "api" | "accessLevel" | "moduleInfo" | "QuickSearchText" | "onRunQuickSearch" | "viewType">>;
+export declare const QuickSearchViewPanelControl: React.FunctionComponent<QuickSearchViewPanelComponentProps>;

package/src/View/QuickSearch/QuickSearchViewPanel.js

@@ -2,24 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuickSearchViewPanelControl = void 0;
 const tslib_1 = require("tslib");
-const QuickSearchRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QuickSearchRedux"));
-const useQuickSearchDebounced_1 = require("./useQuickSearchDebounced");
-const AdaptableFormControlTextClear_1 = require("../Components/Forms/AdaptableFormControlTextClear");
-const react_redux_1 = require("react-redux");
 const React = tslib_1.__importStar(require("react"));
-const QuickSearchViewPanelComponent = (props) => {
-    const [searchText, search] = (0, useQuickSearchDebounced_1.useQuickSearchDebounced)(props);
-    const elementType = props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-    return (React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { type: "text", placeholder: props.api.optionsApi.getQuickSearchOptions().quickSearchPlaceholder, className: `ab-${elementType}__QuickSearch__text`, value: searchText, OnTextChange: search, style: { height: '100%' }, inputStyle: { width: '7rem' } }));
+const QuickSearchInput_1 = require("./QuickSearchInput");
+const QuickSearchViewPanelControl = (props) => {
+    let elementType = props.viewType === 'ToolPanel' ? 'DashboardToolbar' : 'ToolPanel';
+    return React.createElement(QuickSearchInput_1.QuickSearchInput, { className: `ab-${elementType}__QuickSearch__text` });
 };
-function mapStateToProps(state) {
-    return {
-        QuickSearchText: state.QuickSearch.QuickSearchText,
-    };
-}
-function mapDispatchToProps(dispatch) {
-    return {
-        onRunQuickSearch: (newQuickSearchText) => dispatch(QuickSearchRedux.QuickSearchRun(newQuickSearchText)),
-    };
-}
-exports.QuickSearchViewPanelControl = (0, react_redux_1.connect)(mapStateToProps, mapDispatchToProps)(QuickSearchViewPanelComponent);
+exports.QuickSearchViewPanelControl = QuickSearchViewPanelControl;

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReminder.js

@@ -39,13 +39,13 @@ const ScheduleSettingsReminder = (props) => {
             React.createElement(Tabs_1.Tabs.Content, null,
                 React.createElement(FormLayout_1.default, null,
                     React.createElement(FormLayout_1.FormRow, { label: "Header" },
-                        React.createElement(Input_1.default, { "data-name": "header", width: 300, onChange: handleHeaderChange, placeholder: "Enter Reminder Header (optional)", type: "string", value: (_a = props.reminderSchedule) === null || _a === void 0 ? void 0 : _a.Header })),
+                        React.createElement(Input_1.default, { "data-name": "header", width: 300, onChange: handleHeaderChange, placeholder: "Enter Reminder Header", type: "string", value: (_a = props.reminderSchedule) === null || _a === void 0 ? void 0 : _a.Header })),
                     React.createElement(FormLayout_1.FormRow, { label: "Message" },
                         React.createElement(Input_1.default, { "data-name": "message", width: 300, onChange: handleMessageChange, placeholder: "Enter Reminder Message", type: "string", value: (_b = props.reminderSchedule) === null || _b === void 0 ? void 0 : _b.Message })),
                     React.createElement(FormLayout_1.FormRow, { label: "Type" },
                         React.createElement(DropdownButton_1.default, { "data-name": "message-type", style: { width: 300 }, columns: ['label'], placeholder: "Select Option", items: messageTypes }, ((_c = props.reminderSchedule) === null || _c === void 0 ? void 0 : _c.MessageType) || 'Select Option')),
                     React.createElement(FormLayout_1.FormRow, { label: "" },
-                        React.createElement(CheckBox_1.CheckBox, { "data-name": "display-notification", checked: (_d = props.reminderSchedule) === null || _d === void 0 ? void 0 : _d.DisplayNotification, onChange: handleDisplayNotificationChange }, "Show the Reminder as an Alert")),
+                        React.createElement(CheckBox_1.CheckBox, { "data-name": "display-notification", checked: (_d = props.reminderSchedule) === null || _d === void 0 ? void 0 : _d.DisplayNotification, onChange: handleDisplayNotificationChange }, "Show the Reminder as a Notification")),
                     React.createElement(FormLayout_1.FormRow, { label: "" },
                         React.createElement(CheckBox_1.CheckBox, { "data-name": "display-system-status", checked: (_e = props.reminderSchedule) === null || _e === void 0 ? void 0 : _e.DisplaySystemStatusMessage, onChange: handleDisplaySystemStatusChange }, "Display a System Status Message")))))));
 };

package/src/View/StyledColumn/Wizard/StyledColumnBadgeSection.js

@@ -4,8 +4,6 @@ exports.StyledColumnBadgeSection = exports.renderBadgeSummary = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
-const AdaptableIconComponent_1 = require("../../../components/AdaptableIconComponent");
-const Badge_1 = require("../../../components/Badge");
 const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
 const ErrorBox_1 = tslib_1.__importDefault(require("../../../components/ErrorBox"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
@@ -19,6 +17,8 @@ const PredicateEditor_1 = require("../../Components/PredicateEditor/PredicateEdi
 const StyleComponent_1 = require("../../Components/StyleComponent");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const StyledColumnBadgePreview_1 = require("./StyledColumnWizardStyleSection/Components/StyledColumnBadgePreview");
+const Badge_1 = require("../../Components/Badge");
+const AdaptableIconComponent_1 = require("../../Components/AdaptableIconComponent");
 const BadgeEditor = (props) => {
     var _a, _b;
     const { api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();

package/src/View/StyledColumn/Wizard/StyledColumnWizardColumnSection.js

@@ -33,11 +33,7 @@ const StyledColumnWizardColumnSection = (props) => {
             sortableColumns = api.columnApi.getBooleanColumns();
         }
         else if (data.SparkLineStyle) {
-            sortableColumns = [
-                ...api.columnApi.getNumberArrayColumns(),
-                ...api.columnApi.getTupleNumberArrayColumns(),
-                ...api.columnApi.getObjectNumberArrayColumns(),
-            ];
+            sortableColumns = api.columnApi.getNumericArrayColumns();
         }
         else if (data.BadgeStyle) {
             sortableColumns = [...api.columnApi.getNumericColumns(), ...api.columnApi.getStringColumns()];

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/StyledColumnBadgePreview.js

@@ -4,9 +4,9 @@ exports.StyledColumnBadgePreview = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
-const Badge_1 = require("../../../../../components/Badge");
 const Tag_1 = require("../../../../../components/Tag");
 const AdaptableContext_1 = require("../../../../AdaptableContext");
+const Badge_1 = require("../../../../Components/Badge");
 const StyledColumnBadgePreview = ({ data }) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const badgeStyle = data.BadgeStyle;
@@ -21,15 +21,8 @@ const StyledColumnBadgePreview = ({ data }) => {
         const predicateStr = badge.Predicate
             ? adaptable.api.predicateApi.predicateToString(badge.Predicate)
             : 'No Predicate';
-        let icon = badge.Icon;
-        const customIcon = badge.Icon &&
-            'name' in badge.Icon &&
-            adaptable.api.userInterfaceApi.getCustomIconDefinition(badge.Icon.name);
-        if (customIcon) {
-            icon = customIcon;
-        }
         return (React.createElement(rebass_1.Box, { mb: 1, key: index },
-            React.createElement(Badge_1.Badge, { icon: icon, adaptableStyle: badge.Style, iconPosition: badge.IconPosition }, value),
+            React.createElement(Badge_1.Badge, { icon: badge.Icon, adaptableStyle: badge.Style, iconPosition: badge.IconPosition }, value),
             React.createElement(Tag_1.Tag, { ml: 2 }, predicateStr)));
     })));
 };

package/src/View/StyledColumn/Wizard/StyledColumnWizardTypeSection.js

@@ -74,7 +74,6 @@ const StyledColumnWizardTypeSection = (props) => {
             React.createElement(Tabs_1.Tabs.Content, null,
                 React.createElement(TypeRadio_1.TypeRadio, { text: "Gradient", description: "Colour each cell in the column using a gradient value (Numeric Columns)", checked: Boolean(data.GradientStyle), onClick: () => handleTypeChange('gradient') }),
                 React.createElement(TypeRadio_1.TypeRadio, { text: "Percent Bar", description: "Display a coloured bar where the width is based on the cell (Numeric Columns)", checked: Boolean(data.PercentBarStyle), onClick: () => handleTypeChange('percent') }),
-                React.createElement(TypeRadio_1.TypeRadio, { text: "Check Box", description: "Display a checkbox (Boolean Columns)", checked: Boolean(data.CheckBoxStyle), onClick: () => handleTypeChange('checkbox') }),
                 adaptable.api.styledColumnApi.canDisplaySparklines() && (React.createElement(TypeRadio_1.TypeRadio, { text: "Sparkline", description: "Render the column as a Sparkline (Numeric Array Columns)", checked: Boolean(data.SparkLineStyle), onClick: () => handleTypeChange('sparkline') })),
                 React.createElement(TypeRadio_1.TypeRadio, { text: "Badge", description: "Display the column's values as Badges (All Columns)", checked: Boolean(data.BadgeStyle), onClick: () => handleTypeChange('badge') })))));
 };

package/src/View/UIHelper.d.ts

@@ -3,7 +3,7 @@ import { EditableConfigEntityState } from './Components/SharedProps/EditableConf
 import { StatusColour } from '../PredefinedConfig/Common/Enums';
 import { AdaptableStyle } from '../PredefinedConfig/Common/AdaptableStyle';
 import { Schedule, Weekday } from '../PredefinedConfig/Common/Schedule';
-import { AdaptableColumnDataType, AdaptableInternalIconName, AdaptableOptions } from '../types';
+import { AdaptableColumnDataType, AdaptableSystemIconName, AdaptableOptions } from '../types';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessageType';
 export declare const BLACK: string;
@@ -36,7 +36,7 @@ export declare function IsEmptyStyle(style: AdaptableStyle): boolean;
 export declare function IsNotEmptyStyle(style: AdaptableStyle): boolean;
 export declare function getMessageTypeByStatusColour(statusColour: StatusColour): AdaptableMessageType;
 export declare function getButtonToneByMessageType(messageType: AdaptableMessageType): 'success' | 'error' | 'neutral' | 'none' | 'warning' | 'info' | 'accent';
-export declare function getGlyphByMessageType(messageType: AdaptableMessageType): AdaptableInternalIconName;
+export declare function getGlyphByMessageType(messageType: AdaptableMessageType): AdaptableSystemIconName;
 export declare function getColorByMessageType(messageType: AdaptableMessageType): string;
 export declare function getStyleForStatusColour(statusColour: StatusColour): CSSProperties;
 export declare function getStyleForMessageType(messageType: AdaptableMessageType): CSSProperties;

package/src/agGrid/ActionColumnRenderer.d.ts

@@ -1,8 +1,6 @@
 /// <reference types="react" />
 import { ICellRendererComp, ICellRendererParams } from '@ag-grid-community/core';
-import { ActionColumn } from '../types';
 interface ActionColumnCellRendererParams extends ICellRendererParams {
-    actionColumn?: ActionColumn;
 }
 export declare const ReactActionColumnRenderer: (props: ActionColumnCellRendererParams) => JSX.Element;
 export declare class ActionColumnRenderer implements ICellRendererComp {