@adaptabletools/adaptable 13.0.0-canary.0 → 13.0.0-canary.10

package/src/View/Components/ToolPanel/AdaptableToolPanel.d.ts

@@ -27,17 +27,21 @@ export declare const ConnectedAdaptableToolPanel: import("react-redux").Connecte
 export declare const getAdaptableToolPanelAgGridComponent: (adaptable?: IAdaptable) => {
     new (): {
         gui: HTMLElement;
+        unmountReactRoot?: VoidFunction;
         init(params?: IToolPanelParams): void;
         getGui(): HTMLElement;
         refresh(): void;
+        destroy(): void;
     };
 };
 export declare const AdaptableToolPanelAgGridComponent: {
     new (): {
         gui: HTMLElement;
+        unmountReactRoot?: VoidFunction;
         init(params?: IToolPanelParams): void;
         getGui(): HTMLElement;
         refresh(): void;
+        destroy(): void;
     };
 };
 export {};

package/src/View/Components/ToolPanel/AdaptableToolPanel.js

@@ -7,7 +7,6 @@ const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
 const ToolPanelRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/ToolPanelRedux"));
 const SystemRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/SystemRedux"));
 const react_redux_1 = require("react-redux");
-const react_dom_1 = require("react-dom");
 const rebass_1 = require("rebass");
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/ArrayExtensions"));
 const icons_1 = require("../../../components/icons");
@@ -238,7 +237,7 @@ const getAdaptableToolPanelAgGridComponent = (adaptable) => {
             this.gui.className = 'ag-adaptable-panel';
             this.gui.style.width = '100%';
             this.gui.style.overflow = 'auto';
-            (0, react_dom_1.render)((0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement(exports.ConnectedAdaptableToolPanel, { api: api, teamSharingActivated: false }), Adaptable), this.gui);
+            this.unmountReactRoot = Adaptable.renderReactRoot((0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement(exports.ConnectedAdaptableToolPanel, { api: api, teamSharingActivated: false }), Adaptable), this.gui);
         }
         getGui() {
             if (!this.gui) {
@@ -249,6 +248,10 @@ const getAdaptableToolPanelAgGridComponent = (adaptable) => {
         refresh() {
             // no refresh logic needed
         }
+        destroy() {
+            var _a;
+            (_a = this.unmountReactRoot) === null || _a === void 0 ? void 0 : _a.call(this);
+        }
     };
 };
 exports.getAdaptableToolPanelAgGridComponent = getAdaptableToolPanelAgGridComponent;

package/src/View/ConditionalStyle/ConditionalStylePopupHeader.d.ts

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

package/src/View/ConditionalStyle/ConditionalStylePopupHeader.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConditionalStylePopupHeader = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const HelpBlock_1 = tslib_1.__importDefault(require("../../components/HelpBlock"));
+const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const AdaptableContext_1 = require("../AdaptableContext");
+const ConditionalStylePopupHeader = () => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    return (React.createElement(HelpBlock_1.default, null,
+        "Conditional Styles are deprecated, use",
+        ' ',
+        React.createElement(SimpleButton_1.default, { onClick: () => adaptable.api.settingsPanelApi.showSettingsPanel('FormatColumn'), variant: "outlined" }, "Format Columns"),
+        ' ',
+        "instead."));
+};
+exports.ConditionalStylePopupHeader = ConditionalStylePopupHeader;

package/src/View/FormatColumn/MoveFormatColumn.d.ts

@@ -0,0 +1,7 @@
+import * as React from 'react';
+import { AccessLevel, FormatColumn } from '../../types';
+export declare const MoveFormatColumn: React.FunctionComponent<{
+    data: FormatColumn;
+    id?: string;
+    accessLevel: AccessLevel;
+}>;

package/src/View/FormatColumn/MoveFormatColumn.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MoveFormatColumn = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
+const FormatColumnRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/FormatColumnRedux"));
+const react_redux_1 = require("react-redux");
+const AdaptableContext_1 = require("../AdaptableContext");
+const MoveFormatColumn = (props) => {
+    const dispatch = (0, react_redux_1.useDispatch)();
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const formatColumn = adaptable.api.formatColumnApi.getAllFormatColumn();
+    const handleMoveUp = React.useCallback(() => {
+        dispatch(FormatColumnRedux.FormatColumnMoveUp(props.data));
+    }, []);
+    const handleMoveDown = React.useCallback(() => {
+        dispatch(FormatColumnRedux.FormatColumnMoveDown(props.data));
+    }, []);
+    if ((formatColumn === null || formatColumn === void 0 ? void 0 : formatColumn.length) <= 1) {
+        return React.createElement(React.Fragment, null);
+    }
+    return (React.createElement(React.Fragment, null,
+        React.createElement(SimpleButton_1.default, { "data-id": "move-up", title: "move up", onClick: handleMoveUp, variant: "text", icon: "arrow-up" }),
+        React.createElement(SimpleButton_1.default, { "data-name": "move-down", title: "move down", onClick: handleMoveDown, variant: "text", icon: "arrow-down" })));
+};
+exports.MoveFormatColumn = MoveFormatColumn;

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

@@ -125,7 +125,7 @@ const getFormatDisplayTypeForScope = (scope, api) => {
     }
     // need to see if all columns are numeric or date
     if ('ColumnIds' in scope) {
-        const columns = scope.ColumnIds.map((c) => api.columnApi.getColumnFromId(c));
+        const columns = scope.ColumnIds.map((c) => api.columnApi.getColumnFromId(c)).filter(Boolean);
         const columnDataTypes = (0, uniq_1.default)(columns.map((c) => c.dataType));
         if (columnDataTypes.length == 1 && columnDataTypes[0] == 'Number') {
             return 'Number';

package/src/View/FormatColumn/Wizard/FormatColumnRuleWizardSection.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+import { FormatColumn } from '../../../../types';
+declare type FormatColumnRuleWizardSectionProps = {
+    onChange: (data: FormatColumn) => void;
+    defaultPredicateId: string;
+};
+export declare function FormatColumnRuleWizardSection(props: FormatColumnRuleWizardSectionProps): JSX.Element;
+export {};

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormatColumnRuleWizardSection = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
+const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
+function FormatColumnRuleWizardSection(props) {
+    const { data, api, moduleInfo } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    const hasIncompatibleStyle = Boolean(data.ColumnStyle);
+    return (React.createElement(EntityRulesEditor_1.EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: props.defaultPredicateId, 
+        // TODO see what is this
+        predicateDefs: api.formatColumnApi.getFormatColumnDefsForScope(data.Scope), showNoRule: true, showBoolean: !hasIncompatibleStyle, showAggregation: false, showObservable: false, showPredicate: !hasIncompatibleStyle && !api.scopeApi.scopeIsAll(data.Scope), data: data, onChange: (formatColumn) => props.onChange(formatColumn), descriptions: {
+            selectPredicate: 'Select a Format Column Rule - to be applied when data changes',
+            useBooleanQuery: (React.createElement(React.Fragment, null,
+                "Use an BooleanQuery if ",
+                React.createElement("i", null, "Scope"),
+                " is 'Whole Row' - so any data change may be evaluated in a complex BooleanExpression")),
+            useObservableQuery: (React.createElement(React.Fragment, null,
+                "Use an ObservableQuery if ",
+                React.createElement("i", null, "Scope"),
+                " is 'Whole Row' - so any data change may be evaluated in a complex ObservableExpression")),
+            useAggregationQuery: (React.createElement(React.Fragment, null,
+                "Use an AggregatedBooleanQuery if ",
+                React.createElement("i", null, "Scope"),
+                " is 'Whole Row' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
+        } }));
+}
+exports.FormatColumnRuleWizardSection = FormatColumnRuleWizardSection;

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

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const NewScopeComponent_1 = require("../../Components/NewScopeComponent");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
+const constants_1 = require("./constants");
 const renderFormatColumnScopeSummary = (data) => {
     return (0, NewScopeComponent_1.renderScopeSummary)(data.Scope, {
         scopeWholeRow: 'Matching rows will be formatted',
@@ -14,12 +15,29 @@ const renderFormatColumnScopeSummary = (data) => {
 };
 exports.renderFormatColumnScopeSummary = renderFormatColumnScopeSummary;
 const FormatColumnScopeWizardSection = (props) => {
-    const { data } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
+    const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     return (React.createElement(NewScopeComponent_1.NewScopeComponent, { descriptions: {
             rowScope: 'Apply a style to an entire row',
             columnScope: 'Select columns to format',
         }, scope: data.Scope, updateScope: (Scope) => {
-            props.onChange(Object.assign(Object.assign({}, data), { Scope }));
+            var _a;
+            const newData = Object.assign(Object.assign({}, data), { Scope });
+            const wholeRow = api.scopeApi.scopeIsAll(Scope);
+            if ((_a = newData.Rule) === null || _a === void 0 ? void 0 : _a.Predicate) {
+                if (wholeRow) {
+                    // if scope is whole row, a predicate cannot be present, so we set the rule
+                    // to be a boolean expression
+                    delete newData.Rule.Predicate;
+                    newData.Rule.BooleanExpression = '';
+                }
+                else {
+                    // if scope is not whole row, if you have a predicate, reset it
+                    newData.Rule.Predicate = {
+                        PredicateId: constants_1.DEFAULT_PREDICATE_ID_FOR_FORMAT_COLUMN,
+                    };
+                }
+            }
+            props.onChange(newData);
         } }));
 };
 exports.FormatColumnScopeWizardSection = FormatColumnScopeWizardSection;

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

@@ -6,13 +6,9 @@ const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
 const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
-const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const CheckBox_1 = require("../../../components/CheckBox");
 const Tabs_1 = require("../../../components/Tabs");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
-const StringExtensions_1 = tslib_1.__importDefault(require("../../../Utilities/Extensions/StringExtensions"));
-const react_1 = require("react");
-const LoggingHelper_1 = require("../../../Utilities/Helpers/LoggingHelper");
 const Tag_1 = require("../../../components/Tag");
 let alignmentOptions = [
     { value: 'Left', label: 'Left' },
@@ -25,9 +21,6 @@ const renderFormatColumnSettingsSummary = (data) => {
         React.createElement(rebass_1.Text, null,
             "Cell alignment ",
             React.createElement(Tag_1.Tag, null, (_a = data.CellAlignment) !== null && _a !== void 0 ? _a : 'default')),
-        data.HeaderName ? (React.createElement(rebass_1.Text, { mt: 3 },
-            "Header name ",
-            React.createElement(Tag_1.Tag, null, data.HeaderName))) : null,
         React.createElement(rebass_1.Text, { mt: 3 },
             "Include grouped rows ",
             React.createElement(Tag_1.Tag, null, data.IncludeGroupedRows ? 'yes' : 'no'))));
@@ -41,18 +34,6 @@ const FormatColumnSettingsWizardSection = (props) => {
     const onIncludeGroupedRowsChanged = (IncludeGroupedRows) => {
         props.onChange(Object.assign(Object.assign({}, data), { IncludeGroupedRows }));
     };
-    const onHeaderNameChanged = (event) => {
-        let e = event.target;
-        props.onChange(Object.assign(Object.assign({}, data), { HeaderName: e.value }));
-    };
-    const [hasHeaderName, setHasHeaderName] = (0, react_1.useState)(false);
-    (0, react_1.useEffect)(() => {
-        const hasCustomHeaderName = StringExtensions_1.default.IsNotNullOrEmpty(data.HeaderName);
-        setHasHeaderName(hasCustomHeaderName);
-        if (hasCustomHeaderName) {
-            (0, LoggingHelper_1.ConsoleLogWarning)(`DEPRECATED: The 'FormatColumn.HeaderName' property is deprecated; use a Layout custom Column Header instead!`);
-        }
-    }, []);
     return (React.createElement(Tabs_1.Tabs, null,
         React.createElement(Tabs_1.Tabs.Tab, null, "Format"),
         React.createElement(Tabs_1.Tabs.Content, null,
@@ -70,9 +51,6 @@ const FormatColumnSettingsWizardSection = (props) => {
                                 label: item.label,
                                 onClick: () => onCellAlignmentSelectChanged(item.value),
                             })), columns: ['label'] }, data.CellAlignment ? data.CellAlignment : 'Select Option')),
-                    hasHeaderName && api.scopeApi.isSingleColumnScope(data.Scope) && (React.createElement(FormLayout_1.FormRow, { label: "Header Name" },
-                        React.createElement(Input_1.default, { value: data.HeaderName, onChange: (e) => onHeaderNameChanged(e), style: { minWidth: '15rem' } }),
-                        ' ')),
                     React.createElement(FormLayout_1.FormRow, { label: "Include Grouped Rows:" },
                         React.createElement(rebass_1.Flex, { alignItems: "center", marginLeft: 2 },
                             React.createElement(CheckBox_1.CheckBox, { checked: data.IncludeGroupedRows, onChange: onIncludeGroupedRowsChanged, mr: 2 }))))))));

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

@@ -22,7 +22,6 @@ const isFormatColumnStyleValid = (data, api) => {
         data.Style &&
         UIHelper_1.default.IsEmptyStyle(data.Style) &&
         data.DisplayFormat === undefined &&
-        data.HeaderName === undefined &&
         data.CellAlignment === undefined &&
         !api.scopeApi.isSingleBooleanColumnScope(data.Scope)) {
         return 'No format applied';
@@ -278,6 +277,7 @@ function FormatColumnStyleWizardSection(props) {
             props.onChange(newData);
         }
     };
+    const onlyStandardStyleAvailable = Boolean(data.Rule);
     return (React.createElement(React.Fragment, null,
         onlyBooleanColumnsInScope && (React.createElement(Tabs_1.Tabs, null,
             React.createElement(Tabs_1.Tabs.Tab, null, "CheckBox Column"),
@@ -293,7 +293,7 @@ function FormatColumnStyleWizardSection(props) {
                         }
                         props.onChange(formatColumn);
                     } }, "Display Column As CheckBox")))),
-        singleNumericColumn ? (React.createElement(React.Fragment, null,
+        singleNumericColumn && !onlyStandardStyleAvailable ? (React.createElement(React.Fragment, null,
             React.createElement(Tabs_1.Tabs, null,
                 React.createElement(Tabs_1.Tabs.Tab, null, "Create a Format Column Style"),
                 React.createElement(Tabs_1.Tabs.Content, null,

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

@@ -17,6 +17,9 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const FormatColumnRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/FormatColumnRedux"));
 const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
+const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
+const FormatColumnRuleWizardSection_1 = require("./FormatColumnRuleWizardSection");
+const constants_1 = require("./constants");
 const adjustDisplayFormat = (formatColumn, api) => {
     formatColumn = Object.assign({}, formatColumn);
     const formatDataType = (0, FormatColumnFormatWizardSection_1.getFormatDisplayTypeForScope)(formatColumn.Scope, api);
@@ -113,6 +116,16 @@ function FormatColumnWizard(props) {
                         React.createElement(FormatColumnScopeWizardSection_1.FormatColumnScopeWizardSection, { onChange: setFormatColumn })));
                 },
             },
+            {
+                isValid: (abObject, api, context) => {
+                    return abObject.Rule ? (0, EntityRulesEditor_1.isRuleValid)(abObject, api, context) : true;
+                },
+                title: 'Condition',
+                details: 'Build the rules when Format column should be applied',
+                render: () => {
+                    return (React.createElement(FormatColumnRuleWizardSection_1.FormatColumnRuleWizardSection, { onChange: setFormatColumn, defaultPredicateId: constants_1.DEFAULT_PREDICATE_ID_FOR_FORMAT_COLUMN }));
+                },
+            },
             {
                 title: 'Style',
                 details: 'Format Column Style',

package/src/View/FormatColumn/Wizard/constants.d.ts

@@ -0,0 +1 @@
+export declare const DEFAULT_PREDICATE_ID_FOR_FORMAT_COLUMN = "NonBlanks";

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

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_PREDICATE_ID_FOR_FORMAT_COLUMN = void 0;
+exports.DEFAULT_PREDICATE_ID_FOR_FORMAT_COLUMN = 'NonBlanks';

package/src/View/Layout/Wizard/sections/AggregationsSection.js

@@ -33,7 +33,7 @@ const AggregationsSectionSummary = () => {
     let content = null;
     if (entires.length) {
         content = (React.createElement(FormLayout_1.default, null, entires.map(([columnId, aggregation]) => (React.createElement(FormLayout_1.FormRow, { key: columnId, label: adaptable.api.columnApi.getFriendlyNameFromColumnId(columnId) },
-            React.createElement(Tag_1.Tag, null, aggregation))))));
+            React.createElement(Tag_1.Tag, null, aggregation /* TODO fix for Bogdan */))))));
     }
     else {
         content = React.createElement(Tag_1.Tag, null, "No Aggregations");

package/src/View/Layout/Wizard/sections/SettingsSection.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { Layout } from '../../../../../types';
-export declare const SettingsSectionSummary: React.FunctionComponent;
+export declare const SettingsSectionSummary: React.FunctionComponent<React.PropsWithChildren<unknown>>;
 interface SettingsSectionProps {
     onChange: (data: Layout) => void;
 }
-export declare const SettingsSection: React.FunctionComponent<SettingsSectionProps>;
+export declare const SettingsSection: React.FunctionComponent<React.PropsWithChildren<SettingsSectionProps>>;
 export {};

package/src/View/License/LicenseWatermark.d.ts

@@ -1,2 +1,2 @@
 import * as React from 'react';
-export declare const LicenseWatermark: React.FunctionComponent;
+export declare const LicenseWatermark: React.FunctionComponent<React.PropsWithChildren<unknown>>;

package/src/View/StateManagement/components/ClearButton.d.ts

@@ -2,5 +2,5 @@ import * as React from 'react';
 import { SimpleButtonProps } from '../../../components/SimpleButton';
 interface ClearButtonProps extends SimpleButtonProps {
 }
-export declare const ClearButton: React.FunctionComponent<ClearButtonProps>;
+export declare const ClearButton: React.FunctionComponent<React.PropsWithChildren<ClearButtonProps>>;
 export {};

package/src/View/StateManagement/components/LoadButton.d.ts

@@ -3,5 +3,5 @@ import { SimpleButtonProps } from '../../../components/SimpleButton';
 interface LoadButtonProps extends SimpleButtonProps {
     onLoad: (json: any) => void;
 }
-export declare const LoadButton: React.FunctionComponent<LoadButtonProps>;
+export declare const LoadButton: React.FunctionComponent<React.PropsWithChildren<LoadButtonProps>>;
 export {};

package/src/View/StatusBar/StatusBarPanel.d.ts

@@ -15,7 +15,7 @@ import { FlexProps } from 'rebass';
  */
 export interface StatusBarPanelProps extends Omit<FlexProps, 'content'> {
     icon?: string;
-    content?: React.ReactNode | React.FunctionComponent;
+    content?: React.ReactNode | React.FunctionComponent<React.PropsWithChildren<unknown>>;
     /**
      * weather to trigger onAction when the wrapper is clicked
      */
@@ -24,14 +24,14 @@ export interface StatusBarPanelProps extends Omit<FlexProps, 'content'> {
      * When specified this content will be rendered when the text
      * is clicked.
      */
-    popover?: React.ReactNode | React.FunctionComponent;
+    popover?: React.ReactNode | React.FunctionComponent<React.PropsWithChildren<unknown>>;
     popoverMinWidth?: number;
     /**
      * Allow to render custom content
      */
-    view?: React.FunctionComponent;
+    view?: React.FunctionComponent<React.PropsWithChildren<unknown>>;
     onAction?: () => void;
-    extraActions?: React.FunctionComponent[];
+    extraActions?: React.FunctionComponent<React.PropsWithChildren<unknown>>[];
     tooltip?: string;
 }
 /**

package/src/View/Wizard/OnePageAdaptableWizard.d.ts

@@ -11,9 +11,9 @@ export declare type OnePageAdaptableWizardContextType<T> = {
     api: AdaptableApi;
     namedQuery: ExpressionEditorNamedQuery;
 };
-export declare const SummaryTag: React.FunctionComponent<TextProps>;
-export declare const SummaryText: React.FunctionComponent<TextProps>;
-export declare const FormDescriptionText: React.FunctionComponent<TextProps>;
+export declare const SummaryTag: React.FunctionComponent<React.PropsWithChildren<TextProps>>;
+export declare const SummaryText: React.FunctionComponent<React.PropsWithChildren<TextProps>>;
+export declare const FormDescriptionText: React.FunctionComponent<React.PropsWithChildren<TextProps>>;
 export declare const OnePageAdaptableWizardContext: React.Context<OnePageAdaptableWizardContextType<any>>;
 export declare function useOnePageAdaptableWizardContext<ENTITY>(): OnePageAdaptableWizardContextType<ENTITY>;
 export interface OnePageAdaptableWizardSection<ENTITY> {

package/src/View/Wizard/OnePageAdaptableWizard.js

@@ -13,11 +13,11 @@ const Tabs_1 = require("../../components/Tabs");
 const NamedQueryContext_1 = require("../../components/ExpressionEditor/NamedQueryContext");
 const OnePageWizards_1 = require("./OnePageWizards");
 const kebabCase_1 = tslib_1.__importDefault(require("lodash/kebabCase"));
-const SummaryTag = (props) => React.createElement(rebass_1.Text, Object.assign({}, props));
+const SummaryTag = (props) => (React.createElement(rebass_1.Text, Object.assign({}, props)));
 exports.SummaryTag = SummaryTag;
 const SummaryText = (props) => (React.createElement(rebass_1.Text, Object.assign({ fontSize: 2, mb: 3 }, props)));
 exports.SummaryText = SummaryText;
-const FormDescriptionText = (props) => (React.createElement(rebass_1.Text, Object.assign({ fontSize: 2, mt: 1 }, props)));
+const FormDescriptionText = (props) => React.createElement(rebass_1.Text, Object.assign({ fontSize: 2, mt: 1 }, props));
 exports.FormDescriptionText = FormDescriptionText;
 exports.OnePageAdaptableWizardContext = React.createContext({
     data: null,

package/src/View/Wizard/OnePageWizards.d.ts

@@ -6,9 +6,9 @@ export declare type OnePageWizardContextType<T> = {
     sections: (OnePageWizardSection<T> | '-')[];
     setCurrentSection: (index: number) => void;
 };
-export declare const SummaryTag: React.FunctionComponent<TextProps>;
-export declare const SummaryText: React.FunctionComponent<TextProps>;
-export declare const FormDescriptionText: React.FunctionComponent<TextProps>;
+export declare const SummaryTag: React.FunctionComponent<React.PropsWithChildren<TextProps>>;
+export declare const SummaryText: React.FunctionComponent<React.PropsWithChildren<TextProps>>;
+export declare const FormDescriptionText: React.FunctionComponent<React.PropsWithChildren<TextProps>>;
 export declare const OnePageWizardContext: React.Context<OnePageWizardContextType<any>>;
 export declare function useOnePageWizardContext<ENTITY>(): OnePageWizardContextType<ENTITY>;
 export declare type OnePageWizardSection<ENTITY> = {

package/src/View/Wizard/OnePageWizards.js

@@ -14,11 +14,11 @@ const icons_1 = require("../../components/icons");
 const ResizeObserver_1 = require("../../components/ResizeObserver");
 const NamedQueryContext_1 = require("../../components/ExpressionEditor/NamedQueryContext");
 const useKeyboardNavigation_1 = require("./useKeyboardNavigation");
-const SummaryTag = (props) => React.createElement(rebass_1.Text, Object.assign({}, props));
+const SummaryTag = (props) => (React.createElement(rebass_1.Text, Object.assign({}, props)));
 exports.SummaryTag = SummaryTag;
 const SummaryText = (props) => (React.createElement(rebass_1.Text, Object.assign({ fontSize: 2, mb: 3 }, props)));
 exports.SummaryText = SummaryText;
-const FormDescriptionText = (props) => (React.createElement(rebass_1.Text, Object.assign({ fontSize: 2, mt: 1 }, props)));
+const FormDescriptionText = (props) => React.createElement(rebass_1.Text, Object.assign({ fontSize: 2, mt: 1 }, props));
 exports.FormDescriptionText = FormDescriptionText;
 exports.OnePageWizardContext = React.createContext({
     data: null,

package/src/agGrid/ActionColumnRenderer.d.ts

@@ -6,6 +6,7 @@ interface ActionColumnCellRendererParams extends ICellRendererParams {
 export declare class ActionColumnRenderer implements ICellRendererComp {
     private eGui;
     private eventListener;
+    private unmountReactRoot?;
     init(params: ActionColumnCellRendererParams): void;
     render(): void;
     getGui(): HTMLElement;

package/src/agGrid/ActionColumnRenderer.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionColumnRenderer = void 0;
 const tslib_1 = require("tslib");
 const SimpleButton_1 = tslib_1.__importDefault(require("../components/SimpleButton"));
-const react_dom_1 = require("react-dom");
 const React = tslib_1.__importStar(require("react"));
 const uuid_1 = require("../components/utils/uuid");
 class ActionColumnRenderer {
@@ -66,9 +65,9 @@ class ActionColumnRenderer {
                 })));
             };
             const eGui = this.eGui;
-            function doRender() {
-                (0, react_dom_1.render)(renderActionButtons(actionButtons, adaptable.api, buttonContext), eGui);
-            }
+            const doRender = () => {
+                this.unmountReactRoot = adaptable.renderReactRoot(renderActionButtons(actionButtons, adaptable.api, buttonContext), eGui);
+            };
             this.render = doRender;
             doRender();
         }
@@ -88,7 +87,8 @@ class ActionColumnRenderer {
     }
     // gets called when the cell is removed from the grid
     destroy() {
-        (0, react_dom_1.unmountComponentAtNode)(this.eGui);
+        var _a;
+        (_a = this.unmountReactRoot) === null || _a === void 0 ? void 0 : _a.call(this);
         // do cleanup, remove event listener from button
         if (this.eGui) {
             this.eGui.removeEventListener('click', this.eventListener);

package/src/agGrid/Adaptable.d.ts

@@ -1,4 +1,4 @@
-import { ChartModel, ChartRef, ColDef, ColGroupDef, Column, ExcelStyle, GridOptions, Module, RowNode } from '@ag-grid-community/core';
+import { ChartModel, ChartRef, ColDef, ColGroupDef, Column, ExcelStyle, GridOptions, Module, ModuleNames, RowNode } from '@ag-grid-community/core';
 import { AdaptableNoCodeWizardOptions, IAdaptableNoCodeWizard } from '../AdaptableInterfaces/AdaptableNoCodeWizard';
 import { IAdaptable } from '../AdaptableInterfaces/IAdaptable';
 import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
@@ -35,8 +35,11 @@ import { CustomSort } from '../PredefinedConfig/CustomSortState';
 import { ColumnValuesComparer } from '../AdaptableOptions/GeneralOptions';
 import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelService';
 import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
+import { RenderReactRootFn } from '../renderReactRoot';
 declare type RuntimeConfig = {
     waitForAgGrid?: boolean;
+    supressReact18RenderWarning?: boolean;
+    renderReactRoot?: RenderReactRootFn;
 };
 export declare class Adaptable implements IAdaptable {
     api: AdaptableApi;
@@ -75,6 +78,7 @@ export declare class Adaptable implements IAdaptable {
     private currentColumnDefs?;
     private rowListeners;
     private isCheckedColumnDataType;
+    private unmountReactRoot?;
     get isLive(): boolean;
     _on: (eventName: string, callback: EmitterCallback) => (() => void);
     _onIncludeFired: (eventName: string, callback: EmitterCallback) => (() => void);
@@ -83,6 +87,8 @@ export declare class Adaptable implements IAdaptable {
     private _adaptableReady;
     isDestroyed: boolean;
     private listenerKeydown;
+    supressReact18RenderWarning: boolean;
+    renderReactRoot: RenderReactRootFn;
     private listenerFirstDataRendered;
     private listenerPivotModeChanged;
     private listenerPivotChanged;
@@ -148,7 +154,11 @@ export declare class Adaptable implements IAdaptable {
     updateColumnsIntoStore(): void;
     private createAdaptableColumn;
     private safeSetColDefs;
+    private getFormatColumnSpecialColumnStyle;
+    private getFormatColumnColumnStyle;
     private getFormatColumnCellStyle;
+    private getFormatColumnCellClass;
+    private getFormatColumnRowClass;
     private getActiveAlertWithHighlightCell;
     private getActiveAlertWithHighlightRow;
     private getAlertCellStyle;
@@ -283,7 +293,7 @@ export declare class Adaptable implements IAdaptable {
     setupColumnComparator({ col, colId, abColumn }: ColumnSetupInfo): void;
     private applyCurrentTheme;
     private applyFinalRendering;
-    private isAgGridModulePresent;
+    isAgGridModulePresent(moduleName: ModuleNames): boolean;
     private getAgGridRegisteredModules;
     private onRowDataChanged;
     private onCellDataChanged;
@@ -352,6 +362,7 @@ export declare class Adaptable implements IAdaptable {
     private setupColumnHeaderAggregations;
     private getConditionalStyleRowClass;
     private getConditionalStyleRowStyle;
+    private getFormatColumnRowStyle;
     private getGridOptionsApi;
     canGenerateCharts(): boolean;
     canHaveSparklines(): boolean;