@adaptabletools/adaptable 15.3.6 → 15.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "15.3.6",
+  "version": "15.4.1",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1686558881853;
+declare const _default: 1686647280452;
 export default _default;

package/publishTimestamp.js

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

package/src/Utilities/Helpers/FormatHelper.js

@@ -113,7 +113,7 @@ function StringFormatter(input, options = {}) {
         return undefined;
     }
     if (options.Empty) {
-        return '';
+        return ' ';
     }
     let s = preparedInput;
     if (options.Prefix !== undefined) {

package/src/Utilities/Helpers/StyleHelper.d.ts

@@ -1,5 +1,9 @@
 import { AdaptableStyle } from '../../types';
 export declare const AgGridCellStyleProperties: readonly ["backgroundColor", "color", "fontWeight", "fontStyle", "fontSize", "borderColor"];
+export declare const normalizeStyleForAgGrid: (style: Record<string, any>) => {
+    [x: string]: any;
+};
+export declare const sanitizeStyle: (style: Record<string, any>) => Record<string, any>;
 export declare const convertAdaptableStyleToCSS: (style: AdaptableStyle) => {
     [cssProperty: string]: string;
 };

package/src/Utilities/Helpers/StyleHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getVariableColor = exports.toStyle = exports.convertCSSAbsoluteFontSizeToPt = exports.convertAdaptableStyleToCSS = exports.AgGridCellStyleProperties = void 0;
+exports.getVariableColor = exports.toStyle = exports.convertCSSAbsoluteFontSizeToPt = exports.convertAdaptableStyleToCSS = exports.sanitizeStyle = exports.normalizeStyleForAgGrid = exports.AgGridCellStyleProperties = void 0;
 const EnumExtensions_1 = require("../Extensions/EnumExtensions");
 // required for hacky fix for https://github.com/AdaptableTools/adaptable/issues/2119
 exports.AgGridCellStyleProperties = [
@@ -11,6 +11,30 @@ exports.AgGridCellStyleProperties = [
     'fontSize',
     'borderColor',
 ];
+// see https://github.com/AdaptableTools/adaptable/issues/2119
+// since v29 AG Grid ignores style properties with null or undefined values
+// Fix: pass empty string instead of null/undefined
+const normalizeStyleForAgGrid = (style) => {
+    const normalizedStyle = Object.assign({}, style);
+    exports.AgGridCellStyleProperties.forEach((cellStylePropKey) => {
+        if (normalizedStyle[cellStylePropKey] == null) {
+            normalizedStyle[cellStylePropKey] = '';
+        }
+    });
+    return normalizedStyle;
+};
+exports.normalizeStyleForAgGrid = normalizeStyleForAgGrid;
+// the inverse of normalizeStyleForAgGrid, see comments above
+const sanitizeStyle = (style) => {
+    const sanitizedStyle = {};
+    Object.keys(style).forEach((key) => {
+        if (style[key] != null && style[key] !== '') {
+            sanitizedStyle[key] = style[key];
+        }
+    });
+    return sanitizedStyle;
+};
+exports.sanitizeStyle = sanitizeStyle;
 const convertAdaptableStyleToCSS = (style) => {
     let result = {};
     if (style.BackColor !== undefined && style.BackColor !== null) {

package/src/agGrid/Adaptable.js

@@ -3277,13 +3277,7 @@ class Adaptable {
             const cellStyle = (params) => {
                 const isQuickSearchActive = hasQuickSearchStyle && this.isQuickSearchActive(abColumn, params);
                 const result = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, this.getReadOnlyCellStyle(abColumn, params)), this.getEditableCellStyle(abColumn, params)), (typeof userCellStyle === 'function' ? userCellStyle(params) : userCellStyle)), this.getFormatColumnAndStyledColumnCellStyle(abColumn, colId, params)), (isQuickSearchActive ? quickSearchStyle : {})), this.getAlertCellStyle(abColumn, params)), this.getFlashingCellStyle(abColumn, params)), this.getCellHighlightStyle(abColumn, params));
-                // see https://github.com/AdaptableTools/adaptable/issues/2119
-                StyleHelper_1.AgGridCellStyleProperties.forEach((cellStylePropKey) => {
-                    if (result[cellStylePropKey] == null) {
-                        result[cellStylePropKey] = '';
-                    }
-                });
-                return result;
+                return (0, StyleHelper_1.normalizeStyleForAgGrid)(result);
             };
             return cellStyle;
         });
@@ -3614,7 +3608,7 @@ class Adaptable {
                     }
                     // we allowed it go reach this point
                     // just to run isCellEditable
-                    // and since this has already run and we have no other valitaions
+                    // and since this has already run and we have no other validations
                     // just assign the new value and exit
                     if (field) {
                         params.data[field] = params.newValue;
@@ -4654,8 +4648,9 @@ class Adaptable {
                         }
                         return result;
                     }, {}));
-                    if (Object.values(adaptableStyle).some((style) => style != null)) {
-                        excelStyles.push(this.convertCSSToExcelStyle(adaptableStyle));
+                    const sanitizedAdaptableStyle = (0, StyleHelper_1.sanitizeStyle)(adaptableStyle);
+                    if (Object.values(sanitizedAdaptableStyle).some((style) => style != null)) {
+                        excelStyles.push(this.convertCSSToExcelStyle(sanitizedAdaptableStyle));
                     }
                     const excelDataType = this.api.exportApi.internalApi.getExcelDataType(colDef === null || colDef === void 0 ? void 0 : colDef.type);
                     const rawValue = this.getRawValueFromRowNode(node, column.getId());

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "15.3.6";
+declare const _default: "15.4.1";
 export default _default;

package/version.js

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