@adaptabletools/adaptable 11.1.1 → 11.1.2

package/src/agGrid/Adaptable.js

@@ -817,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;
@@ -1483,27 +1484,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 {
@@ -1511,9 +1508,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;
                         }
                     }
@@ -1521,6 +1517,9 @@ class Adaptable {
             }
         }
     }
+    setCellValue(cellDataChangedInfo) {
+        this.setDataValue(cellDataChangedInfo.newValue, cellDataChangedInfo.column, cellDataChangedInfo.primaryKeyValue, cellDataChangedInfo.rowNode);
+    }
     cancelEdit() {
         this.gridOptions.api.stopEditing(true);
     }
@@ -4195,7 +4194,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/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.js

@@ -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
             }
         ]
     },

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "11.1.1";
+declare const _default: "11.1.2";
 export default _default;

package/version.js

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