@adaptabletools/adaptable 11.1.1-canary.2 → 11.1.3

package/src/View/Query/ExpandedQueryPopup.js

@@ -9,62 +9,47 @@ const ExpressionEditor_1 = require("../../components/ExpressionEditor");
 const SimpleButton_1 = tslib_1.__importDefault(require("../../components/SimpleButton"));
 const QueryRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/QueryRedux"));
 const StringExtensions_1 = require("../../Utilities/Extensions/StringExtensions");
-const PanelWithButton_1 = require("../Components/Panels/PanelWithButton");
 const NamedQueryContext_1 = require("../../components/ExpressionEditor/NamedQueryContext");
 const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
-class ExpandedQueryPopupComponent extends React.Component {
-    constructor(props) {
-        super(props);
-        this.state = {
-            namedQuery: false,
-            expression: this.props.popupParams.value,
-        };
-    }
-    render() {
-        const isExpressionValid = this.props.api.internalApi
-            .getQueryLanguageService()
-            .validateBoolean(this.state.expression, ModuleConstants_1.QueryModuleId).isValid;
-        const initialData = this.props.api.internalApi.getQueryPreviewData();
-        const namedQueryValidationError = this.state.namedQuery
-            ? this.props.api.queryApi.isValidNamedQueryName(this.state.namedQuery).message
-            : '';
-        const hasNamedQueryError = StringExtensions_1.IsNotNullOrEmpty(namedQueryValidationError);
-        return (React.createElement(NamedQueryContext_1.NamedQueryContext.Provider, { value: {
-                namedQuery: this.state.namedQuery,
-                setNamedQuery: (namedQuery) => this.setState({ namedQuery }),
-            } },
-            React.createElement(PanelWithButton_1.PanelWithButton, { headerText: "Current Query", bodyProps: {
-                    padding: 0,
-                    style: { display: 'flex', flexDirection: 'column' },
-                }, glyphicon: this.props.moduleInfo.Glyph },
-                React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'boolean', module: ModuleConstants_1.QueryModuleId, value: this.state.expression, onChange: (expression) => this.setState({ expression }), initialData: initialData, columns: this.props.api.columnApi.getQueryableColumns(), namedQueries: this.props.api.queryApi.getAllNamedQuery(), api: this.props.api }),
-                React.createElement(rebass_1.Flex, { flexDirection: "row", padding: 1, backgroundColor: "primary", alignItems: "center" },
-                    React.createElement(SimpleButton_1.default, { margin: 1, variant: "text", "data-name": "action-close", onClick: () => {
-                            this.props.onClosePopup();
-                        } }, "CLOSE"),
-                    React.createElement(rebass_1.Text, { fontSize: 2, mr: 3, style: {
-                            flex: 1,
-                            color: 'var(--ab-color-error)',
-                            textAlign: 'end',
-                        } }, namedQueryValidationError),
-                    React.createElement(SimpleButton_1.default, { variant: "raised", tone: "accent", "data-name": "action-run", margin: 1, onClick: () => {
-                            if (this.state.namedQuery) {
-                                this.props.onAddNamedQuery(this.state.namedQuery);
-                            }
-                            this.props.onRunQuery(this.state.expression);
-                            this.props.onClosePopup();
-                        }, disabled: !isExpressionValid || StringExtensions_1.IsNullOrEmpty(this.state.expression) || hasNamedQueryError }, "Run Query")))));
-    }
-}
-function mapStateToProps() {
-    return {
-    // GridState: state.Grid,
-    };
-}
-function mapDispatchToProps(dispatch) {
-    return {
-        onRunQuery: (expression) => dispatch(QueryRedux.QueryRun(expression)),
-        onAddNamedQuery: (namedQuery) => dispatch(QueryRedux.NamedQueryAdd(namedQuery)),
-    };
-}
-exports.ExpandedQueryPopup = react_redux_1.connect(mapStateToProps, mapDispatchToProps)(ExpandedQueryPopupComponent);
+exports.ExpandedQueryPopup = (props) => {
+    const dispatch = react_redux_1.useDispatch();
+    const [namedQuery, setNamedQuery] = React.useState(null);
+    const [expression, setExpression] = React.useState(props.popupProps.value);
+    const isExpressionValid = props.api.internalApi
+        .getQueryLanguageService()
+        .validateBoolean(expression, ModuleConstants_1.QueryModuleId).isValid;
+    const initialData = React.useMemo(() => props.api.internalApi.getQueryPreviewData(), []);
+    const namedQueryValidationError = namedQuery
+        ? props.api.queryApi.isValidNamedQueryName(namedQuery).message
+        : '';
+    const hasNamedQueryError = StringExtensions_1.IsNotNullOrEmpty(namedQueryValidationError);
+    const onRunQuery = (expression) => dispatch(QueryRedux.QueryRun(expression));
+    const onAddNamedQuery = (namedQuery) => dispatch(QueryRedux.NamedQueryAdd(namedQuery));
+    return (React.createElement(NamedQueryContext_1.NamedQueryContext.Provider, { value: {
+            namedQuery: namedQuery,
+            setNamedQuery: (newQuery) => {
+                setNamedQuery(newQuery);
+            },
+        } },
+        React.createElement(rebass_1.Flex, { height: "100%", flexDirection: "column" },
+            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'boolean', module: ModuleConstants_1.QueryModuleId, value: expression, onChange: (expression) => setExpression(expression), initialData: initialData, columns: props.api.columnApi.getQueryableColumns(), namedQueries: props.api.queryApi.getAllNamedQuery(), api: props.api }),
+            React.createElement(rebass_1.Flex, { flexDirection: "row", padding: 1, backgroundColor: "primary", alignItems: "center" },
+                React.createElement(SimpleButton_1.default, { margin: 1, variant: "text", "data-name": "action-close", onClick: () => {
+                        props.onDismiss();
+                    } }, "CLOSE"),
+                React.createElement(rebass_1.Text, { fontSize: 2, mr: 3, style: {
+                        flex: 1,
+                        color: 'var(--ab-color-error)',
+                        textAlign: 'end',
+                    } }, namedQueryValidationError),
+                React.createElement(SimpleButton_1.default, { variant: "raised", tone: "accent", "data-name": "action-run", margin: 1, onClick: () => {
+                        if (namedQuery) {
+                            onAddNamedQuery({
+                                Name: namedQuery.Name,
+                                BooleanExpression: expression,
+                            });
+                        }
+                        onRunQuery(expression);
+                        props.onDismiss();
+                    }, disabled: !isExpressionValid || StringExtensions_1.IsNullOrEmpty(expression) || hasNamedQueryError }, "Run Query")))));
+};

package/src/View/Query/QueryViewPanel.js

@@ -22,6 +22,7 @@ const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Exte
 const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/ModuleConstants"));
 const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
 const react_redux_1 = require("react-redux");
+const windowFactory_1 = require("../Components/Popups/WindowPopups/windowFactory");
 class QueryViewPanelComponent extends React.Component {
     constructor(props) {
         super(props);
@@ -165,11 +166,13 @@ function mapDispatchToProps(dispatch) {
             source: 'Toolbar',
             value,
         })),
-        onExpand: (value) => dispatch(PopupRedux.PopupShowScreen(ModuleConstants.QueryModuleId, 'ExpandedQueryPopup', {
-            source: 'Toolbar',
-            value,
-        }, {
-            footer: null,
+        onExpand: (value) => dispatch(PopupRedux.PopupShowWindow({
+            Id: windowFactory_1.WINDOW_QUERY_EDITOR,
+            Title: 'Current Query',
+            Icon: 'query',
+            PopupProps: {
+                value: value,
+            },
         })),
     };
 }

package/src/agGrid/Adaptable.d.ts

@@ -131,6 +131,7 @@ export declare class Adaptable implements IAdaptable {
     private getAlertRowClass;
     private getAlertRowStyle;
     private getFlashingCellStyle;
+    private getFlashingCellClass;
     private getCellHighlightStyle;
     private getRowHighlightStyle;
     private getRowHighlightClass;
@@ -150,7 +151,8 @@ export declare class Adaptable implements IAdaptable {
     private updateLayoutFromGrid;
     setSelectedCells(): SelectedCellInfo | undefined;
     setSelectedRows(): SelectedRowInfo | undefined;
-    setValue(cellDataChangedInfo: CellDataChangedInfo): void;
+    setDataValue(value: any, column: AdaptableColumn, primaryKeyValue: any, rowNode?: RowNode): void;
+    setCellValue(cellDataChangedInfo: CellDataChangedInfo): void;
     cancelEdit(): void;
     isCellEditable(rowNode: RowNode, column: Column): boolean;
     getDistinctValuesForColumn(column: AdaptableColumn, visibleRowsOnly: boolean, skipRowNode?: RowNode, permittedValues?: any[]): GridCell[];

package/src/agGrid/Adaptable.js

@@ -202,7 +202,6 @@ class Adaptable {
         this.getGroupAndColumnDefs = () => {
             const colDefs = [].concat(this.currentColumnDefs || this.gridOptions.columnDefs);
             return colDefs;
-            // return this.gridOptions.columnApi.getAllColumns().map((c) => c.getColDef());
         };
         this.getColumnDefsWithCorrectVisibility = () => {
             const visibleColIds = this.api.layoutApi.getCurrentVisibleColumnIdsMap();
@@ -818,7 +817,8 @@ class Adaptable {
                 if (reverseGradient) {
                     alpha = 1 - alpha;
                 }
-                style.backgroundColor = tinycolor(cellBackColor).setAlpha(alpha).toRgbString();
+                const preparedColor = StyleHelper_1.getVariableColor(cellBackColor);
+                style.backgroundColor = tinycolor(preparedColor).setAlpha(alpha).toRgbString();
             }
             if (columnStyle.PercentBarStyle && columnStyle.PercentBarStyle.CellText) {
                 style.paddingTop = 0;
@@ -903,6 +903,20 @@ class Adaptable {
                 ? flashingCell.flashingCellDefinition.DownChangeStyle
                 : flashingCell.flashingCellDefinition.NeutralChangeStyle)) !== null && _a !== void 0 ? _a : {});
     }
+    getFlashingCellClass(col, params) {
+        var _a, _b, _c;
+        const primaryKey = params.node.aggData
+            ? params.node.id
+            : this.getPrimaryKeyValueFromRowNode(params.node);
+        const flashingCell = this.api.internalApi.getAdaptableFlashingCellFor(primaryKey, col.columnId);
+        if (!flashingCell) {
+            return;
+        }
+        return flashingCell.direction === 'up'
+            ? (_a = flashingCell.flashingCellDefinition.UpChangeStyle) === null || _a === void 0 ? void 0 : _a.ClassName : flashingCell.direction === 'down'
+            ? (_b = flashingCell.flashingCellDefinition.DownChangeStyle) === null || _b === void 0 ? void 0 : _b.ClassName : flashingCell.direction === 'neutral'
+            ? (_c = flashingCell.flashingCellDefinition.NeutralChangeStyle) === null || _c === void 0 ? void 0 : _c.ClassName : undefined;
+    }
     getCellHighlightStyle(col, params) {
         const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
         const cellHightlight = this.api.internalApi
@@ -994,8 +1008,7 @@ class Adaptable {
                 return (_b = conditionalStyle.Style) === null || _b === void 0 ? void 0 : _b.ClassName;
             }
         })
-            .filter((x) => !!x)
-            .join(' ');
+            .filter((x) => !!x);
         return classNames;
     }
     getEditableCellClass(abColumn, params) {
@@ -1484,27 +1497,23 @@ class Adaptable {
         this.agGridHelper.fireSelectionChangedEvent();
         return selectedRowInfo;
     }
-    setValue(cellDataChangedInfo) {
+    setDataValue(value, column, primaryKeyValue, rowNode) {
         // note: because we use RowNode.setDataValue() this will cause Validation to fire
         // see https://www.ag-grid.com/javascript-data-grid/change-detection/#triggering-value-change-detection
         let newValue;
-        let dataType = cellDataChangedInfo.column.dataType;
-        newValue =
-            dataType == Enums_1.DataType.Number
-                ? Number(cellDataChangedInfo.newValue)
-                : cellDataChangedInfo.newValue;
+        let dataType = column.dataType;
+        newValue = dataType == Enums_1.DataType.Number ? Number(value) : value;
         if (dataType == undefined) {
             return; // no point continuing as probably a wrong  column
         }
-        if (cellDataChangedInfo.rowNode) {
-            cellDataChangedInfo.rowNode.setDataValue(cellDataChangedInfo.column.columnId, newValue);
+        if (rowNode) {
+            rowNode.setDataValue(column.columnId, newValue);
         }
         else {
             if (this.useRowNodeLookUp) {
-                const rowNode = this.gridOptions.api.getRowNode(cellDataChangedInfo.primaryKeyValue);
+                const rowNode = this.gridOptions.api.getRowNode(primaryKeyValue);
                 if (rowNode != null) {
-                    rowNode.setDataValue(cellDataChangedInfo.column.columnId, newValue);
-                    cellDataChangedInfo.rowNode = rowNode;
+                    rowNode.setDataValue(column.columnId, newValue);
                 }
             }
             else {
@@ -1512,9 +1521,8 @@ class Adaptable {
                 // prefer not to use this method but if we do then at least we can prevent further lookups once we find
                 this.gridOptions.api.getModel().forEachNode((rowNode) => {
                     if (!isUpdated) {
-                        if (cellDataChangedInfo.primaryKeyValue == this.getPrimaryKeyValueFromRowNode(rowNode)) {
-                            rowNode.setDataValue(cellDataChangedInfo.column.columnId, newValue);
-                            cellDataChangedInfo.rowNode = rowNode;
+                        if (primaryKeyValue == this.getPrimaryKeyValueFromRowNode(rowNode)) {
+                            rowNode.setDataValue(column.columnId, newValue);
                             isUpdated = true;
                         }
                     }
@@ -1522,6 +1530,9 @@ class Adaptable {
             }
         }
     }
+    setCellValue(cellDataChangedInfo) {
+        this.setDataValue(cellDataChangedInfo.newValue, cellDataChangedInfo.column, cellDataChangedInfo.primaryKeyValue, cellDataChangedInfo.rowNode);
+    }
     cancelEdit() {
         this.gridOptions.api.stopEditing(true);
     }
@@ -2064,20 +2075,57 @@ class Adaptable {
         });
     }
     updateColDefsForSpecialColumns() {
+        const allColDefs = this.getGroupAndColumnDefs();
         const specialColDefs = this.getColDefsForSpecialColumns();
-        const isUserColDef = (colDef) => {
+        const isSpecialColDef = (colDef) => {
             const { type } = colDef;
             if (type === GeneralConstants_1.AB_SPECIAL_COLUMN || (Array.isArray(type) && type.includes(GeneralConstants_1.AB_SPECIAL_COLUMN))) {
-                return false;
+                return true;
             }
-            return true;
+            return false;
         };
-        // const userColDefs = this.gridOptions.columnApi
-        //   .getAllColumns()
-        // .map((col) => col.getColDef())
-        const userColDefs = this.getGroupAndColumnDefs().filter(isUserColDef);
-        const allDefs = [...userColDefs, ...specialColDefs];
-        this.safeSetColDefs(allDefs);
+        const isColGroupDef = (columnDefinition) => {
+            // @ts-ignore
+            return columnDefinition['children'] != null;
+        };
+        const processedSpecialColDefIds = [];
+        const mapColDefs = (colDefs) => {
+            return colDefs.map((colDef) => {
+                if (isColGroupDef(colDef)) {
+                    // if it's a group column, recursively map its children
+                    colDef.children = mapColDefs(colDef.children);
+                    return colDef;
+                }
+                else {
+                    if (!isSpecialColDef(colDef)) {
+                        // if it's not a special column, return it as is
+                        return colDef;
+                    }
+                    const newlyCreatedSpecialColDef = specialColDefs.find((specialColDef) => specialColDef.colId === colDef.colId);
+                    if (newlyCreatedSpecialColDef) {
+                        // if it's a special column and we have a special col def for it, return the special col def
+                        processedSpecialColDefIds.push(colDef.colId);
+                        // merge the user defined colDef with the special col def
+                        // this way the user may provide some custom settings for the special col def (tooltip, etc)
+                        const mergedColDef = Object.assign(Object.assign({}, colDef), newlyCreatedSpecialColDef);
+                        return mergedColDef;
+                    }
+                    else {
+                        // otherwise, return the original col def
+                        return colDef;
+                    }
+                }
+            });
+        };
+        const resultColDefs = mapColDefs(allColDefs);
+        // check if there are any special colDefs that were not processed
+        // in that case, add them to the end of the colDefs
+        specialColDefs.forEach((specialColDef) => {
+            if (!processedSpecialColDefIds.includes(specialColDef.colId)) {
+                resultColDefs.push(specialColDef);
+            }
+        });
+        this.safeSetColDefs(resultColDefs);
         this.setLayout();
     }
     cleanupFloatingFilters_WORKAROUND() {
@@ -2809,14 +2857,13 @@ class Adaptable {
             const hasConditionalStylesWithClassNames = ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(conditionalStyles);
             const quickSearchStyleClassName = this.api.quickSearchApi.getQuickSearchStyle().ClassName;
             const hasQuickSearchStyleClassName = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(quickSearchStyleClassName);
-            const classNameMap = {};
             const cellClass = (params) => {
-                var _a;
                 const isQuickSearchActive = hasQuickSearchStyleClassName && this.isQuickSearchActive(abColumn, params);
                 const primaryKeyValue = this.getPrimaryKeyValueFromRowNode(params.node);
                 const editableClassName = this.getEditableCellClass(abColumn, params);
                 const readonlyClassName = this.getReadonlyCellClass(abColumn, params);
                 const highlightAlertClassName = this.getAlertCellClass(abColumn, params);
+                const flashingClassName = this.getFlashingCellClass(abColumn, params);
                 const returnValue = [
                     this.getExcelClassNameForCell(colId, primaryKeyValue),
                     typeof userCellClass === 'function' ? userCellClass(params) : userCellClass,
@@ -2828,29 +2875,11 @@ class Adaptable {
                     editableClassName,
                     readonlyClassName,
                     highlightAlertClassName,
+                    flashingClassName,
                 ]
-                    // we flatten the array because 'userCellClass' might return a string[]
+                    // we flatten the array because some rules ('userCellClass',conditionalStyles etc)  might return a string[]
                     .flat()
                     .filter((x) => !!x);
-                const returnValueHash = returnValue.join(' ');
-                const primaryKey = this.getPrimaryKeyValueFromRowNode(params.node);
-                const key = `${primaryKey}:${params.colDef.colId}`;
-                if (classNameMap[key] &&
-                    classNameMap[key] !== returnValueHash &&
-                    // only hard-reset when removing class-names
-                    // ag-grid does not remove class-names, it accumulates them
-                    // https://www.ag-grid.com/javascript-data-grid/cell-styles/#refresh-of-styles
-                    returnValueHash.length < ((_a = classNameMap[key]) === null || _a === void 0 ? void 0 : _a.length)) {
-                    setTimeout(() => {
-                        /**
-                         * This is called inside a getter function, inside ag-grid.
-                         * To allow ag-grid run it's logic, the redraw is done inside an timeout
-                         * to make sure it is not done in an inappropriate time.
-                         */
-                        params.api.redrawRows({ rowNodes: [params.node] });
-                    }, 0);
-                }
-                classNameMap[key] = returnValueHash;
                 return returnValue.length ? returnValue : undefined;
             };
             return cellClass;
@@ -4162,7 +4191,8 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
     }
     convertCSSToExcelStyle(style) {
         const getHexColor = (color) => {
-            const t = tinycolor(color);
+            const preparedColor = StyleHelper_1.getVariableColor(color);
+            const t = tinycolor(preparedColor);
             const a = t.getAlpha();
             return tinycolor.mix(tinycolor('white'), t, a * 100).toHexString();
         };

package/src/agGrid/editors/AdaptableNumberEditor/index.d.ts

@@ -50,6 +50,8 @@ export declare class AdaptableNumberEditor implements ICellEditorComp {
     afterGuiAttached(): void;
     destroy(): void;
     private onValueChange;
+    private getStartValue;
     private shouldClearExistingValue;
+    private isValidChar;
 }
 export {};

package/src/agGrid/editors/AdaptableNumberEditor/index.js

@@ -40,7 +40,7 @@ class AdaptableNumberEditor {
         };
     }
     init(params) {
-        this.value = this.shouldClearExistingValue(params) ? '' : params.value;
+        this.value = this.getStartValue(params);
         this.params = params;
         this.columnId = params.column.getColId();
         const { valueParser } = params.column.getColDef();
@@ -72,7 +72,7 @@ class AdaptableNumberEditor {
     afterGuiAttached() {
         var _a, _b;
         const adaptable = this.params.api.__adaptable;
-        const defaultValue = this.shouldClearExistingValue(this.params) ? '' : this.params.value;
+        const defaultValue = this.value;
         const editorElement = (React.createElement(InternalAdaptableNumberEditor_1.InternalAdaptableNumberEditor, { defaultValue: defaultValue, showClearButton: (_a = this.params.showClearButton) !== null && _a !== void 0 ? _a : true, emptyValue: (_b = this.params.emptyValue) !== null && _b !== void 0 ? _b : '', onValueChange: this.onValueChange, ref: (editor) => {
                 this.editor = editor;
                 editor === null || editor === void 0 ? void 0 : editor.focus();
@@ -92,8 +92,22 @@ class AdaptableNumberEditor {
     destroy() {
         react_dom_1.unmountComponentAtNode(this.el);
     }
+    getStartValue(params) {
+        if (this.shouldClearExistingValue(params)) {
+            return '';
+        }
+        if (params.charPress && this.isValidChar(params.charPress)) {
+            return params.charPress;
+        }
+        return params.value;
+    }
     shouldClearExistingValue(params) {
         return params.eventKey === all_modules_1.KeyCode.BACKSPACE || params.eventKey === all_modules_1.KeyCode.DELETE;
     }
+    isValidChar(char) {
+        // allow only digits
+        return ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'].includes(char);
+        // we do NOT allow key shortcuts for starting non-digits (minus sign, decimal separators) as the input[number] handling is very buggy and we would open a can of worms
+    }
 }
 exports.AdaptableNumberEditor = AdaptableNumberEditor;

package/src/components/ExpressionEditor/index.js

@@ -135,7 +135,6 @@ function ExpressionEditor(props) {
                     React.createElement(rebass_1.Box, { "data-name": "expression-column-picker", pb: 2, paddingLeft: 2, style: {
                             overflow: 'auto',
                             minWidth: 220,
-                            maxWidth: '30%',
                             height: '100%',
                             paddingRight: 'var(--ab-space-2)',
                         } },

package/src/components/OverlayTrigger/index.js

@@ -173,6 +173,7 @@ const OverlayTrigger = React.forwardRef((props, ref) => {
                 width: 0,
                 height: 0,
                 pointerEvents: 'none',
+                display: 'inline-flex',
             } }),
         overlay));
 });

package/src/components/Radio/index.d.ts

@@ -17,7 +17,7 @@ export declare const useRadioContext: <T extends unknown>() => {
     onChange: (value: T) => void;
     name: string;
 };
-declare const Radio: ({ children, checked, onChange, value, name, gapDistance, childrenPosition, as, id, tabIndex, ...props }: RadioProps) => JSX.Element;
+declare const Radio: ({ children, checked, onChange, value, name, gapDistance, childrenPosition, as, id, tabIndex, disabled, ...props }: RadioProps) => JSX.Element;
 export declare const RadioGroup: <T extends unknown>(props: FlexProps & {
     orientation: 'horizontal' | 'vertical';
     value?: T;

package/src/components/Radio/index.js

@@ -15,7 +15,7 @@ exports.useRadioContext = () => {
     return React.useContext(RadioContext);
 };
 const Radio = (_a) => {
-    var { children, checked, onChange, value, name, gapDistance = 10, childrenPosition = 'end', as = 'label', id, tabIndex } = _a, props = tslib_1.__rest(_a, ["children", "checked", "onChange", "value", "name", "gapDistance", "childrenPosition", "as", "id", "tabIndex"]);
+    var { children, checked, onChange, value, name, gapDistance = 10, childrenPosition = 'end', as = 'label', id, tabIndex, disabled } = _a, props = tslib_1.__rest(_a, ["children", "checked", "onChange", "value", "name", "gapDistance", "childrenPosition", "as", "id", "tabIndex", "disabled"]);
     const context = exports.useRadioContext();
     const { value: contextValue, onChange: contextOnChange, name: contextName } = context;
     const [stateChecked, setStateChecked] = react_1.useState(false);
@@ -44,7 +44,7 @@ const Radio = (_a) => {
     return (React.createElement(rebass_1.Box, Object.assign({ className: "ab-Radio", my: 2 }, props, { style: Object.assign({ display: 'inline-flex', flexFlow: 'row', alignItems: 'center', cursor: 'pointer', position: 'relative' }, props.style), as: as }),
         before,
         beforeGap,
-        React.createElement("input", { className: "ab-Radio-input", id: id, checked: computedChecked, type: "radio", name: name !== null && name !== void 0 ? name : contextName, value: value, tabIndex: tabIndex, style: {
+        React.createElement("input", { disabled: disabled, className: "ab-Radio-input", id: id, checked: computedChecked, type: "radio", name: name !== null && name !== void 0 ? name : contextName, value: value, tabIndex: tabIndex, style: {
                 verticalAlign: 'middle',
                 borderRadius: '50%',
                 cursor: 'pointer',

package/src/metamodel/adaptable.metamodel.d.ts

@@ -3601,6 +3601,11 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
         }[];
     };
+    TOAST_POSITIONS: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     ToolPanelApi: {
         name: string;
         kind: string;

package/src/metamodel/adaptable.metamodel.js

@@ -3574,7 +3574,7 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "agGridContainerWaitTimeout",
                 "kind": "number",
-                "description": "how long AdapTable waits for AG Grid before giving up connecting to it; useful when AG Grid is instantiated separately (eg: by AdapTable React or AdapTable Angular)",
+                "description": "How long AdapTable waits for AG Grid before giving up connecting to it",
                 "uiLabel": "Ag Grid Container Wait Timeout",
                 "isOptional": true,
                 "gridInfo": "item",
@@ -8365,6 +8365,13 @@ exports.ADAPTABLE_METAMODEL = {
                 "isOptional": true,
                 "gridInfo": "item",
                 "defaultValue": "false"
+            },
+            {
+                "name": "view",
+                "kind": "unknown",
+                "description": "Options to customize how layout items are shown in Settings Panel",
+                "uiLabel": "View",
+                "isOptional": true
             }
         ]
     },
@@ -8592,12 +8599,12 @@ exports.ADAPTABLE_METAMODEL = {
                 "isOptional": true,
                 "gridInfo": "item",
                 "defaultValue": "'BottomRight'",
-                "reference": "unknown"
+                "reference": "TOAST_POSITIONS"
             },
             {
                 "name": "showApplicationIcon",
                 "kind": "boolean",
-                "description": "Displays the application icon in Notifications (if provided in `UserInterfaceOptions`)",
+                "description": "Displays the application icon in Notifications",
                 "uiLabel": "Show Application Icon",
                 "isOptional": true,
                 "defaultValue": "false"
@@ -8614,7 +8621,7 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "showSystemStatusMessageNotifications",
                 "kind": "boolean",
-                "description": "Display an Alert when a System Status Message is set",
+                "description": "Display System Status Messages as Notifications",
                 "uiLabel": "Show System Status Message Notifications",
                 "isOptional": true,
                 "gridInfo": "item",
@@ -9495,24 +9502,24 @@ exports.ADAPTABLE_METAMODEL = {
     "QueryLanguageApi": {
         "name": "QueryLanguageApi",
         "kind": "Interface",
-        "description": "Manages AdapTableQL (Query Language)",
+        "description": "Functions related to AdapTableQL (the Adaptable Query Language)",
         "properties": [
             {
                 "name": "getAdaptableQueryExpression",
                 "kind": "function",
-                "description": "Returns the Expression string of the given AdaptableQuery, which may be either a Boolean, an AggregatedBoolean, a Scalar, an AggregatedScalar or an ObservableExpression expression",
+                "description": "Returns the Expression string of the given AdaptableQuery: can be Boolean, AggregatedBoolean, Scalar, AggregatedScalar or Observable Expression",
                 "uiLabel": "Get Adaptable Query Expression"
             },
             {
                 "name": "getASTForExpression",
                 "kind": "function",
-                "description": "Runs the AST that AdapTableQL creates for a expression - useful when evaluating remotely",
+                "description": "Runs the AST that AdapTableQL creates for an Expression - useful when evaluating remotely",
                 "uiLabel": "Get AST For Expression"
             },
             {
                 "name": "getColumnsFromExpression",
                 "kind": "function",
-                "description": "Returns all Columns referenced in a QueryExpression",
+                "description": "Returns all Columns referenced in an Expression",
                 "uiLabel": "Get Columns From Expression"
             },
             {
@@ -11172,6 +11179,11 @@ exports.ADAPTABLE_METAMODEL = {
             }
         ]
     },
+    "TOAST_POSITIONS": {
+        "name": "TOAST_POSITIONS",
+        "kind": "TypeAlias",
+        "description": "Different positions offered by Notifications"
+    },
     "ToolPanelApi": {
         "name": "ToolPanelApi",
         "kind": "Interface",

package/src/types.d.ts

@@ -9,7 +9,7 @@ export type { AdaptableOptions } from './AdaptableOptions/AdaptableOptions';
 export { AdaptablePlugin } from './AdaptableOptions/AdaptablePlugin';
 export type { ContainerOptions } from './AdaptableOptions/ContainerOptions';
 export type { FlashingCellOptions } from './AdaptableOptions/FlashingCellOptions';
-export type { NotificationsOptions } from './AdaptableOptions/NotificationsOptions';
+export type { TOAST_POSITIONS, NotificationsOptions, } from './AdaptableOptions/NotificationsOptions';
 export type { AlertOptions, ActionHandler, AlertForm, AlertButtonContext, } from './AdaptableOptions/AlertOptions';
 export type { DashboardOptions, CustomToolbar, DashboardButtonContext, CustomToolbarButtonContext, } from './AdaptableOptions/DashboardOptions';
 export type { EditOptions, ValidationResult } from './AdaptableOptions/EditOptions';

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "11.1.1-canary.2";
+declare const _default: "11.1.3";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '11.1.1-canary.2'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '11.1.3'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version