@adaptabletools/adaptable-cjs 21.1.3-canary.0 → 21.2.0

package/src/agGrid/AdaptableAgGrid.js

@@ -1768,7 +1768,8 @@ You need to define at least one Layout!`);
         let _displayValue = defaults ? defaults.displayValue : undefined;
         let _normalisedValue = defaults ? defaults.normalisedValue : undefined;
         let _isRowGroupCell;
-        const _isPivotCell = this.api.columnApi.isPivotResultColumn(columnId);
+        const _isPivotCell = this.api.columnApi.isPivotResultColumn(columnId) ||
+            this.api.columnApi.isPivotAggColumnWithNoPivotColumns(columnId);
         const self = this;
         const api = this.api;
         const getRawValue = () => {

package/src/agGrid/AgGridAdapter.js

@@ -158,7 +158,8 @@ class AgGridAdapter {
             const pivotColumnFilters = self.adaptableApi.filterApi.columnFilterApi
                 .getActiveColumnFilters()
                 .filter((columnFilter) => self.adaptableApi.columnApi.isPivotResultColumn(columnFilter.ColumnId) ||
-                self.adaptableApi.columnApi.isAutoRowGroupColumnForSingle(columnFilter.ColumnId));
+                self.adaptableApi.columnApi.isAutoRowGroupColumnForSingle(columnFilter.ColumnId) ||
+                self.adaptableApi.columnApi.isPivotAggColumnWithNoPivotColumns(columnFilter.ColumnId));
             try {
                 if (pivotColumnFilters.length > 0) {
                     for (const columnFilter of pivotColumnFilters) {
@@ -182,7 +183,8 @@ class AgGridAdapter {
         this.DANGER_isAggFilterPresentMonkeyPatcher = function () {
             const columnFilters = self.adaptableApi.filterApi.columnFilterApi.getActiveColumnFilters();
             return columnFilters.some((colFilter) => self.adaptableApi.columnApi.isPivotResultColumn(colFilter.ColumnId) ||
-                self.adaptableApi.columnApi.isAutoRowGroupColumnForSingle(colFilter.ColumnId));
+                self.adaptableApi.columnApi.isAutoRowGroupColumnForSingle(colFilter.ColumnId) ||
+                self.adaptableApi.columnApi.isPivotAggColumnWithNoPivotColumns(colFilter.ColumnId));
         };
         agGridColumnFilterService.isAggFilterPresent = this.DANGER_isAggFilterPresentMonkeyPatcher;
     }

package/src/agGrid/AgGridColumnAdapter.js

@@ -190,7 +190,7 @@ class AgGridColumnAdapter {
                     }
                     if (isVisualDataExport) {
                         const cellClassKey = AgGridExportAdapter_1.AgGridExportAdapter.getExcelClassNameForCell(colId, gridCell.primaryKeyValue, userDefinedCellClass);
-                        const customCellClass = this.adaptableInstance.agGridExportAdapter.getExcelStyleIdForCellClassKey(cellClassKey);
+                        const customCellClass = this.adaptableInstance.agGridExportAdapter.getExcelStyleIdForClassKey(cellClassKey);
                         if (customCellClass) {
                             excelStyleClasses.push(customCellClass);
                         }
@@ -256,6 +256,27 @@ class AgGridColumnAdapter {
                     // see https://github.com/AdaptableTools/adaptable/issues/2947#issuecomment-3062304655
                     return baseHeaderClass;
                 }
+                const isExcelExport = this.adaptableApi.exportApi.internalApi.isExcelExportInProgress();
+                const isVisualDataExport = this.adaptableApi.exportApi.internalApi.isVisualDataExportInProgress();
+                if (isExcelExport || isVisualDataExport) {
+                    const excelStyleHeaderClasses = [];
+                    if (userDefinedHeaderClass) {
+                        if (Array.isArray(userDefinedHeaderClass)) {
+                            excelStyleHeaderClasses.push(...userDefinedHeaderClass.filter(Boolean));
+                        }
+                        else {
+                            excelStyleHeaderClasses.push(userDefinedHeaderClass);
+                        }
+                    }
+                    if (isVisualDataExport) {
+                        const headerClassKey = AgGridExportAdapter_1.AgGridExportAdapter.getExcelClassNameForHeader(colId, userDefinedHeaderClass);
+                        const customHeaderClass = this.adaptableInstance.agGridExportAdapter.getExcelStyleIdForClassKey(headerClassKey);
+                        if (customHeaderClass) {
+                            excelStyleHeaderClasses.push(customHeaderClass);
+                        }
+                    }
+                    return excelStyleHeaderClasses.length ? excelStyleHeaderClasses : null;
+                }
                 const columnId = params.column.getColId();
                 const adaptableColumn = this.adaptableApi.columnApi.getColumnWithColumnId(columnId);
                 if (!adaptableColumn) {

package/src/agGrid/AgGridExportAdapter.d.ts

@@ -35,7 +35,7 @@ export declare class AgGridExportAdapter {
     DANGER_excelStyles: ExcelStyle[];
     originalExcelStyles: ExcelStyle[];
     private excelStylesCache;
-    private cellClassKey2excelStyleIdMap;
+    private cellOrHeaderClassKey2ExcelStyleIdMap;
     private excelStylesWithFormattedDate;
     constructor(_adaptableInstance: AdaptableAgGrid);
     private get agGridApi();
@@ -43,6 +43,7 @@ export declare class AgGridExportAdapter {
     private get exportOptions();
     private get logger();
     static getExcelClassNameForCell(colId: string, primaryKeyValue: any, userDefinedCellClass?: string | string[]): string;
+    static getExcelClassNameForHeader(colId: string, userDefinedHeaderClass?: string | string[]): string;
     destroy(): void;
     exportData(config: ExportConfig): Promise<null | ExportResultData>;
     /**
@@ -66,7 +67,7 @@ export declare class AgGridExportAdapter {
     private isDateCellExportedAsFormattedValue;
     private convertCSSToExcelStyle;
     private getExcelDataType;
-    getExcelStyleIdForCellClassKey(cellClassKey: string): string;
+    getExcelStyleIdForClassKey(cellOrHeaderClassKey: string): string;
     private getExcelStyleWithFormattedDate;
     private mapCsvToJson;
     private getCsvSeparator;

package/src/agGrid/AgGridExportAdapter.js

@@ -21,7 +21,7 @@ class AgGridExportAdapter {
         this.DANGER_excelStyles = [];
         this.originalExcelStyles = [];
         this.excelStylesCache = {};
-        this.cellClassKey2excelStyleIdMap = {};
+        this.cellOrHeaderClassKey2ExcelStyleIdMap = {};
         this.excelStylesWithFormattedDate = {};
     }
     get agGridApi() {
@@ -47,9 +47,20 @@ class AgGridExportAdapter {
                 : userDefinedCellClass}`
             : excelClassName;
     }
+    static getExcelClassNameForHeader(colId, userDefinedHeaderClass) {
+        let excelClassName = `--excel-header-${colId}`;
+        if (excelClassName.indexOf(' ') > 0) {
+            excelClassName = excelClassName.replace(/\s/g, '_');
+        }
+        return userDefinedHeaderClass != null
+            ? `${excelClassName}-${Array.isArray(userDefinedHeaderClass)
+                ? userDefinedHeaderClass.join('-')
+                : userDefinedHeaderClass}`
+            : excelClassName;
+    }
     destroy() {
         this.excelStylesCache = null;
-        this.cellClassKey2excelStyleIdMap = null;
+        this.cellOrHeaderClassKey2ExcelStyleIdMap = null;
         this.excelStylesWithFormattedDate = null;
     }
     async exportData(config) {
@@ -457,7 +468,7 @@ class AgGridExportAdapter {
         // Revert to original state without changing the array reference
         this.DANGER_excelStyles.splice(0, this.DANGER_excelStyles.length, ...this.originalExcelStyles);
         this.excelStylesCache = {};
-        this.cellClassKey2excelStyleIdMap = {};
+        this.cellOrHeaderClassKey2ExcelStyleIdMap = {};
         this.excelStylesWithFormattedDate = {};
     }
     buildExcelStyles(exportContext) {
@@ -494,6 +505,60 @@ class AgGridExportAdapter {
         });
         const forAllVisibleRowNodesDoConfig = { includeGroupRows: true };
         const userExcelStyles = this.DANGER_excelStyles;
+        // 1. Header Styles
+        agGridDisplayedColumns.forEach((column, columnIndex) => {
+            const colDef = colDefs[columnIndex];
+            const columnId = column.getId();
+            const adaptableColumn = getAdaptableColumnWithColumnId(columnId);
+            if (!adaptableColumn) {
+                this.logger.warn(`Export Styling: Column with id ${columnId} not found in Adaptable`);
+                return;
+            }
+            let headerClassParams = {
+                colDef,
+                column,
+                floatingFilter: false,
+                api: this.agGridApi,
+                context: this.agGridApi.getGridOption('context'),
+            };
+            const headerStyle = typeof colDef.headerStyle === 'function' ? colDef.headerStyle(headerClassParams) : {};
+            const excelHeaderStyles = [];
+            // add user defined excel styles
+            let userColDefHeaderClass = this._adaptableInstance.agGridColumnAdapter.getUserColDefProperty(column.getColId(), 'headerClass');
+            const userDefinedHeaderClass = typeof userColDefHeaderClass === 'function'
+                ? userColDefHeaderClass(headerClassParams)
+                : userColDefHeaderClass;
+            const userDefinedExcelHeaderStyle = userDefinedHeaderClass &&
+                userExcelStyles.find((excelStyle) => {
+                    return typeof userDefinedHeaderClass === 'string'
+                        ? userDefinedHeaderClass === excelStyle.id
+                        : userDefinedHeaderClass?.includes?.(excelStyle.id);
+                });
+            if (userDefinedExcelHeaderStyle) {
+                excelHeaderStyles.push(userDefinedExcelHeaderStyle);
+            }
+            // add adaptable derived styles (format column etc.)
+            const adaptableHeaderStyle = {
+                ...Object.keys(headerStyle).reduce((result, key) => {
+                    if (headerStyle[key] !== null) {
+                        result[key] = headerStyle[key];
+                    }
+                    return result;
+                }, {}),
+            };
+            const sanitizedAdaptableHeaderStyle = (0, StyleHelper_1.sanitizeStyle)(adaptableHeaderStyle);
+            if (Object.values(sanitizedAdaptableHeaderStyle).some((style) => style != null)) {
+                excelHeaderStyles.push(this.convertCSSToExcelStyle(sanitizedAdaptableHeaderStyle));
+            }
+            // don't add the header style if it has no adaptable custom styles
+            if (!excelHeaderStyles.length) {
+                return;
+            }
+            const headerClassId = AgGridExportAdapter.getExcelClassNameForHeader(column.getId(), userDefinedHeaderClass);
+            const finalHeaderExcelStyle = Object.assign({}, ...excelHeaderStyles);
+            this.registerExcelStyle(finalHeaderExcelStyle, headerClassId);
+        });
+        // 2. Cell Styles
         this.adaptableApi.internalApi.forAllVisibleRowNodesDo((node, rowIndex) => {
             const rowParams = {
                 node,
@@ -530,7 +595,7 @@ class AgGridExportAdapter {
                     return cellClassParams;
                 };
                 const cellStyle = typeof colDef.cellStyle === 'function' ? colDef.cellStyle(getLazyCellClassParams()) : {};
-                const excelStyles = [];
+                const excelCellStyles = [];
                 // add user defined excel styles
                 let userColDefCellClass = this._adaptableInstance.agGridColumnAdapter.getUserColDefProperty(column.getColId(), 'cellClass');
                 const userDefinedCellClass = typeof userColDefCellClass === 'function'
@@ -543,10 +608,10 @@ class AgGridExportAdapter {
                             : userDefinedCellClass?.includes?.(excelStyle.id);
                     });
                 if (userDefinedExcelStyle) {
-                    excelStyles.push(userDefinedExcelStyle);
+                    excelCellStyles.push(userDefinedExcelStyle);
                 }
                 // add adaptable derived styles (format column etc.)
-                const adaptableStyle = {
+                const adaptableCellStyle = {
                     ...rowStyle,
                     ...Object.keys(cellStyle).reduce((result, key) => {
                         if (cellStyle[key] !== null) {
@@ -555,20 +620,20 @@ class AgGridExportAdapter {
                         return result;
                     }, {}),
                 };
-                const sanitizedAdaptableStyle = (0, StyleHelper_1.sanitizeStyle)(adaptableStyle);
-                if (Object.values(sanitizedAdaptableStyle).some((style) => style != null)) {
-                    excelStyles.push(this.convertCSSToExcelStyle(sanitizedAdaptableStyle));
+                const sanitizedAdaptableCellStyle = (0, StyleHelper_1.sanitizeStyle)(adaptableCellStyle);
+                if (Object.values(sanitizedAdaptableCellStyle).some((style) => style != null)) {
+                    excelCellStyles.push(this.convertCSSToExcelStyle(sanitizedAdaptableCellStyle));
                 }
                 const excelDataType = this.getExcelDataType(adaptableColumn.dataType);
                 const rawValue = this.adaptableApi.gridApi.getRawValueFromRowNode(node, column.getId());
                 // don't add the cell style if it has no adaptable custom styles
-                if (!excelStyles.length &&
+                if (!excelCellStyles.length &&
                     // if this is a formatted Date value, we still need to add the AG GRID specific type & numberFormat below
                     !(excelDataType === 'DateTime' && isDateCellExportedAsFormattedValue)) {
                     return;
                 }
                 const cellClassId = AgGridExportAdapter.getExcelClassNameForCell(column.getId(), this.adaptableApi.gridApi.getPrimaryKeyValueForRowNode(node), userDefinedCellClass);
-                const finalCellExcelStyle = Object.assign({}, ...excelStyles);
+                const finalCellExcelStyle = Object.assign({}, ...excelCellStyles);
                 if (excelDataType === 'DateTime' && isDateCellExportedAsFormattedValue) {
                     let dateFormatPattern = this.exportOptions.exportDateFormat;
                     const abColumn = getAdaptableColumnWithColumnId(column.getColId());
@@ -616,7 +681,8 @@ class AgGridExportAdapter {
             const excelStyleWithId = { ...excelStyle, id: excelStyleId };
             this.excelStylesCache[excelStyleKey] = excelStyleWithId;
         }
-        this.cellClassKey2excelStyleIdMap[cellClassKey] = this.excelStylesCache[excelStyleKey].id;
+        this.cellOrHeaderClassKey2ExcelStyleIdMap[cellClassKey] =
+            this.excelStylesCache[excelStyleKey].id;
     }
     registerExcelStyleWithFormattedDate(cellClassId, isoFormattedValue) {
         this.excelStylesWithFormattedDate[cellClassId] = isoFormattedValue;
@@ -700,8 +766,8 @@ class AgGridExportAdapter {
                 return 'String';
         }
     }
-    getExcelStyleIdForCellClassKey(cellClassKey) {
-        return this.cellClassKey2excelStyleIdMap[cellClassKey];
+    getExcelStyleIdForClassKey(cellOrHeaderClassKey) {
+        return this.cellOrHeaderClassKey2ExcelStyleIdMap[cellOrHeaderClassKey];
     }
     getExcelStyleWithFormattedDate(cellClassId) {
         return this.excelStylesWithFormattedDate[cellClassId];

package/src/agGrid/cellRenderers/BadgeRenderer.js

@@ -63,6 +63,7 @@ const getBadgeRendererForColumn = (badgeStyle, abColumn, api) => {
             for (const value of params.value) {
                 const predicateDefHandlerContext = {
                     value: value,
+                    rawValue: value,
                     oldValue: null,
                     displayValue: params.formatValue,
                     node: params.node,
@@ -86,6 +87,7 @@ const getBadgeRendererForColumn = (badgeStyle, abColumn, api) => {
             let formattedValue = params.formatValue?.(params.value) ?? params.value ?? '';
             const predicateDefHandlerContext = {
                 value: params.value,
+                rawValue: params.value,
                 oldValue: null,
                 displayValue: params.formatValue,
                 node: params.node,

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1765279179972 || Date.now(),
-    VERSION: "21.1.3-canary.0" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1767878413718 || Date.now(),
+    VERSION: "21.2.0" || '--current-version--',
 };