@adaptabletools/adaptable-cjs 23.0.0-canary.0 → 23.0.0-canary.10

package/src/agGrid/AdaptableFrameworkComponent.d.ts

@@ -1,5 +1,5 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { ReactElement } from 'react';
+import { ComponentType, ReactElement } from 'react';
 import { BaseContext } from '../types';
 /**
  * Base Component for Bespoke Components: can be Angular, React or Vue
@@ -21,12 +21,34 @@ export type AngularFrameworkComponent<T = unknown> = {
     }) => Partial<T>;
 };
 /**
- *
- * A function that returns a ReactNode
+ * A function that returns a ReactNode (toolbars, settings panels, tool panels, etc.).
+ * For custom Column / Context menu rows, use `ReactMenuItemFrameworkComponent` instead.
  */
 export type ReactFrameworkComponent = ({ adaptableApi, }: {
     adaptableApi: AdaptableApi;
 }) => ReactElement;
+/** AdapTable extras passed on AG Grid `menuItemParams` for custom menu items. */
+export interface AdaptableMenuItemParams<TMenuContext = unknown> {
+    adaptableApi: AdaptableApi;
+    menuContext: TMenuContext;
+}
+/**
+ * Props AG Grid passes to React custom menu item components, with AdapTable
+ * `menuItemParams` (see `AgGridMenuAdapter.mapCustomMenuItemToAgGridMenuDefinition`).
+ */
+export interface AdaptableReactMenuItemProps<TMenuContext = unknown> {
+    name: string;
+    menuItemParams: AdaptableMenuItemParams<TMenuContext> & Record<string, unknown>;
+}
+/**
+ * React component for custom Column / Context menu rows (AG Grid `menuItem`).
+ * Unlike `ReactFrameworkComponent`, receives `name` and `menuItemParams`, not only `adaptableApi`.
+ */
+export type ReactMenuItemFrameworkComponent<TMenuContext = unknown> = ComponentType<AdaptableReactMenuItemProps<TMenuContext>>;
+/**
+ * Framework component for a custom menu item (Column Menu or Context Menu).
+ */
+export type MenuItemFrameworkComponent<TMenuContext = unknown> = AngularFrameworkComponent | VueFrameworkComponent | ReactMenuItemFrameworkComponent<TMenuContext>;
 /**
  * Creates a Vue Component to be used in AdapTable UI controls
  */

package/src/agGrid/AgGridAdapter.d.ts

@@ -50,6 +50,7 @@ export declare class AgGridAdapter {
     deriveSelectedRowInfoFromAgGrid(): SelectedRowInfo;
     isPinnedRowNode(rowNode: IRowNode): boolean;
     createAdaptableColumnFromAgGridColumn(agGridColumn: Column, colsToGroups: Record<string, AdaptableColumnGroup>): AdaptableColumn;
+    private getUserAllowedAggFuncs;
     private deriveAdaptableColumnDataType;
     private isColumnReadonly;
     private isColumnFieldonly;
@@ -57,7 +58,6 @@ export declare class AgGridAdapter {
     private isColumnRowGroupable;
     private isColumnPivotable;
     private isColumnAggregetable;
-    private getUserAllowedAggFuncs;
     private getColumnAggregationFunctions;
     private isTreeColumn;
     private isColumnMoveable;

package/src/agGrid/AgGridAdapter.js

@@ -12,8 +12,7 @@ const agGridDataTypeDefinitions_1 = require("./agGridDataTypeDefinitions");
 const ColumnApiImpl_1 = require("../Api/Implementation/ColumnApiImpl");
 const isPivotColumnTotal_1 = require("../layout-manager/src/isPivotColumnTotal");
 const isPivotAggTotalColumn_1 = require("../layout-manager/src/isPivotAggTotalColumn");
-const ParameterizedAggregationRegistry_1 = require("../Aggregation/ParameterizedAggregationRegistry");
-const ParameterizedAggregationRegistry_2 = require("../Aggregation/ParameterizedAggregationRegistry");
+const AggregationColumns_1 = require("../AdaptableState/Common/AggregationColumns");
 // AG GRID obfuscates its internals, this is (currently) the best way to get hold of its internal services
 const DANGER_AG_GRID_BEANS_MAP = {};
 const getColumnApiModule = () => ag_grid_enterprise_1.ColumnApiModule;
@@ -230,9 +229,8 @@ class AgGridAdapter {
             if (fctName === 'only') {
                 return 'Only';
             }
-            const parameterizedDefinition = (0, ParameterizedAggregationRegistry_1.getParameterizedAggregationDefinitionByAgGridName)(fctName);
-            if (parameterizedDefinition) {
-                return parameterizedDefinition.agGridAggFuncName;
+            if (fctName === 'weightedAvg') {
+                return 'Weighted Average';
             }
             return original_getDefaultFuncLabel.call(this, fctName);
         };
@@ -546,16 +544,23 @@ class AgGridAdapter {
         abColumn.exportable = this.isColumnExportable(abColumn);
         if (abColumn.aggregatable) {
             abColumn.availableAggregationFunctions = this.getColumnAggregationFunctions(colDef);
-            const userAllowedAggFuncs = this.getUserAllowedAggFuncs(ColumnId);
-            if (userAllowedAggFuncs) {
-                abColumn.userAllowedAggFuncs = userAllowedAggFuncs;
-            }
+            Object.defineProperty(abColumn, 'userAllowedAggFuncs', {
+                get: () => this.getUserAllowedAggFuncs(ColumnId),
+                enumerable: true,
+                configurable: true,
+            });
             if (typeof colDef.aggFunc === 'string') {
                 abColumn.aggregationFunction = colDef.aggFunc;
             }
         }
         return abColumn;
     }
+    getUserAllowedAggFuncs(columnId) {
+        const userColumnAllowed = this._adaptableInstance?.agGridColumnAdapter?.getUserColDefProperty(columnId, 'allowedAggFuncs');
+        const userDefaultColDef = this.getUserGridOptionsProperty('defaultColDef');
+        const userAllowed = userColumnAllowed ?? userDefaultColDef?.allowedAggFuncs;
+        return Array.isArray(userAllowed) ? [...userAllowed] : undefined;
+    }
     deriveAdaptableColumnDataType(agColumn, logWarning = true) {
         // Some columns can have no ID or Title. we return string as a consequence but it needs testing
         if (!agColumn) {
@@ -585,11 +590,6 @@ class AgGridAdapter {
             return 'unknown';
         }
         let dataType = 'unknown';
-        // get the column type if already in store (and not unknown)
-        const existingColumn = this.adaptableApi.columnApi.getColumnWithColumnId(agColumn.getId(), logWarning);
-        if (existingColumn && existingColumn.dataType !== 'unknown') {
-            return existingColumn.dataType;
-        }
         // check for colDef dataType
         const colDefDataType = agColumn.getColDef().cellDataType;
         if (typeof colDefDataType === 'string' && agGridDataTypeDefinitions_1.ALL_ADAPTABLE_DATA_TYPES.includes(colDefDataType)) {
@@ -688,12 +688,6 @@ class AgGridAdapter {
         }
         return false;
     }
-    getUserAllowedAggFuncs(columnId) {
-        const userColumnAllowed = this._adaptableInstance?.agGridColumnAdapter?.getUserColDefProperty(columnId, 'allowedAggFuncs');
-        const userDefaultColDef = this.getUserGridOptionsProperty('defaultColDef');
-        const userAllowed = userColumnAllowed ?? userDefaultColDef?.allowedAggFuncs;
-        return Array.isArray(userAllowed) ? [...userAllowed] : undefined;
-    }
     getColumnAggregationFunctions(colDef) {
         const defaultAggFuncs = ['sum', 'min', 'max', 'count', 'avg', 'first', 'last'];
         const hasAllowedAggFuncs = Array.isArray(colDef.allowedAggFuncs);
@@ -701,9 +695,20 @@ class AgGridAdapter {
         const gridOptionsAggFuncs = this.adaptableApi.agGridApi.getGridOption('aggFuncs') || {};
         const gridOptionsAggFuncNames = Object.keys(gridOptionsAggFuncs);
         if (!hasAllowedAggFuncs) {
-            result.push(...gridOptionsAggFuncNames);
+            // we assume gridOptionsAggFuncNames includes 'weightedAvg' and 'only'
+            const customAggFuncNames = gridOptionsAggFuncNames.filter((name) => name !== AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME && name !== AggregationColumns_1.ONLY_AGG_FN_NAME);
+            // 'weightedAvg' is displayed right after 'avg'
+            const avgIndex = result.indexOf('avg');
+            if (avgIndex >= 0) {
+                result.splice(avgIndex + 1, 0, AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME);
+            }
+            else {
+                result.push(AggregationColumns_1.WEIGHTED_AVERAGE_AGG_FN_NAME);
+            }
+            result.push(...customAggFuncNames);
+            // 'only' is always the last element
+            result.push(AggregationColumns_1.ONLY_AGG_FN_NAME);
         }
-        result = result.filter((func) => !(0, ParameterizedAggregationRegistry_2.isParameterizedAggFuncName)(func));
         return [...new Set(result)];
     }
     isTreeColumn(isGeneratedRowGroupColumn) {

package/src/agGrid/AgGridColumnAdapter.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgGridColumnAdapter = void 0;
 exports.getEditorForColumnDataType = getEditorForColumnDataType;
 const tslib_1 = require("tslib");
-const kebabCase_1 = tslib_1.__importDefault(require("../Utilities/utils/kebabCase"));
+const StringExtensions_1 = require("../Utilities/Extensions/StringExtensions");
 const AdaptableFormatPresets_1 = require("../AdaptableState/Common/AdaptableFormatPresets");
-const merge_1 = tslib_1.__importDefault(require("../Utilities/utils/merge"));
+const ObjectExtensions_1 = require("../Utilities/Extensions/ObjectExtensions");
+const SparklineStyleHelper_1 = require("../Utilities/Helpers/StyledColumns/SparklineStyleHelper");
+const BarStylesHelper_1 = require("../Utilities/Helpers/StyledColumns/BarStylesHelper");
 const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
-const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
+const StringExtensions_2 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
 const AdaptableColumn_1 = require("../AdaptableState/Common/AdaptableColumn");
 const tinycolor2_1 = tslib_1.__importDefault(require("tinycolor2"));
 const UIHelper_1 = tslib_1.__importDefault(require("../View/UIHelper"));
@@ -16,11 +18,11 @@ const BadgeRenderer_1 = require("./cellRenderers/BadgeRenderer");
 const BulletChartRenderer_1 = require("./cellRenderers/BulletChartRenderer");
 const RangeBarRenderer_1 = require("./cellRenderers/RangeBarRenderer");
 const RatingRenderer_1 = require("./cellRenderers/RatingRenderer");
-const shouldRenderStyledColumnOnRow_1 = require("./cellRenderers/shouldRenderStyledColumnOnRow");
+const StyledColumnHelper_1 = require("../Utilities/Helpers/StyledColumns/StyledColumnHelper");
 const IconRenderer_1 = require("./cellRenderers/IconRenderer");
-const Helper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/Helper"));
-const ScheduledAlertHelper_1 = require("../Utilities/Helpers/ScheduledAlertHelper");
-const StyledColumnGradientHelper_1 = require("../Utilities/Helpers/StyledColumnGradientHelper");
+const NumberExtensions_1 = require("../Utilities/Extensions/NumberExtensions");
+const ScheduledAlertHelper_1 = require("../Utilities/Helpers/Scheduling/ScheduledAlertHelper");
+const GradientStyleHelper_1 = require("../Utilities/Helpers/StyledColumns/GradientStyleHelper");
 const AdaptableNumberEditor_1 = require("./editors/AdaptableNumberEditor");
 const AdaptableDateEditor_1 = require("./editors/AdaptableDateEditor");
 const AgGridExportAdapter_1 = require("./AgGridExportAdapter");
@@ -30,8 +32,8 @@ const AdaptableFilterHandler_1 = require("./AdaptableFilterHandler");
 const AgGridFilterAdapter_1 = require("./AgGridFilterAdapter");
 const AgGridFloatingFilterAdapter_1 = require("./AgGridFloatingFilterAdapter");
 const AdaptableLogger_1 = require("./AdaptableLogger");
-const iconStyledColumnColumnSupport_1 = require("../Utilities/Helpers/iconStyledColumnColumnSupport");
-const ParameterizedAggregationRegistry_1 = require("../Aggregation/ParameterizedAggregationRegistry");
+const IconStyleHelper_1 = require("../Utilities/Helpers/StyledColumns/IconStyleHelper");
+const AggregationColumns_1 = require("../AdaptableState/Common/AggregationColumns");
 /**
  * CSS property keys produced by `convertAdaptableStyleToCSS` from a
  * `CellFontStyle` slice. Used to strip Format-Column-derived font CSS
@@ -374,7 +376,7 @@ class AgGridColumnAdapter {
         return Object.entries(style).reduce((acc, [key, value]) => {
             // needed as AG-Grid vanilla turns all CSS props to kebab, while AG Grid React does not
             // @ts-ignore
-            acc[`--ab-dynamic-${(0, kebabCase_1.default)(key)}`] = value;
+            acc[`--ab-dynamic-${(0, StringExtensions_1.kebabCase)(key)}`] = value;
             return acc;
         }, {});
     }
@@ -557,7 +559,7 @@ class AgGridColumnAdapter {
             if (styledColumn && !styledColumn.IsSuspended) {
                 if (styledColumn.SparklineStyle) {
                     const sanitizedSparklineOptions = AdaptableHelper_1.AdaptableHelper.removeAdaptableObjectPrimitives(styledColumn.SparklineStyle.options);
-                    const sparklineOptions = (0, merge_1.default)({}, userDefined?.sparklineOptions, sanitizedSparklineOptions);
+                    const sparklineOptions = (0, SparklineStyleHelper_1.resolveSparklineOptionsForRender)((0, ObjectExtensions_1.merge)({}, userDefined?.sparklineOptions, sanitizedSparklineOptions));
                     return {
                         ...userDefined,
                         sparklineOptions,
@@ -576,8 +578,7 @@ class AgGridColumnAdapter {
             // Icon Style has its own tooltip vocabulary (`'CellValue'` /
             // `'IconDescription'`) so we handle it before falling through to the
             // numeric tooltip branch.
-            if (styledColumn.IconStyle &&
-                !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType)) {
+            if (styledColumn.IconStyle && !(0, IconStyleHelper_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType)) {
                 const iconTokens = styledColumn.IconStyle.ToolTipText ?? [];
                 if (iconTokens.length === 0) {
                     return undefined;
@@ -615,7 +616,7 @@ class AgGridColumnAdapter {
                     if (ratingToolTip.includes('PercentageValue') && ratingMax > 0) {
                         const n = Number(params.value);
                         if (!isNaN(n)) {
-                            const clamped = Helper_1.default.clamp(n, 0, ratingMax);
+                            const clamped = (0, NumberExtensions_1.clamp)(n, 0, ratingMax);
                             const percentageValue = (clamped / ratingMax) * 100;
                             const pct = `${percentageValue.toFixed(0)}%`;
                             returnValue = returnValue ? `${returnValue} (${pct})` : pct;
@@ -655,9 +656,7 @@ class AgGridColumnAdapter {
                 if (textOptions.includes('CellValue')) {
                     returnValue = String(params.value ?? '');
                 }
-                if (textOptions.includes('PercentageValue') &&
-                    min != undefined &&
-                    max != undefined) {
+                if (textOptions.includes('PercentageValue') && min != undefined && max != undefined) {
                     let percentageValue;
                     if (styledColumn.PercentBarStyle?.ColumnComparison) {
                         const absMax = Math.abs(max);
@@ -665,9 +664,8 @@ class AgGridColumnAdapter {
                     }
                     else {
                         const scaleSpan = max - min;
-                        const clamped = Helper_1.default.clamp(Number(params.value), min, max);
-                        percentageValue =
-                            scaleSpan === 0 ? 0 : ((clamped - min) / scaleSpan) * 100;
+                        const clamped = (0, NumberExtensions_1.clamp)(Number(params.value), min, max);
+                        percentageValue = scaleSpan === 0 ? 0 : ((clamped - min) / scaleSpan) * 100;
                     }
                     returnValue += ` (${percentageValue.toFixed(0)}%)`;
                 }
@@ -733,8 +731,7 @@ class AgGridColumnAdapter {
             if (!abColumn.availableAggregationFunctions) {
                 return undefined;
             }
-            return abColumn.availableAggregationFunctions.filter((func) => !(0, ParameterizedAggregationRegistry_1.isParameterizedAggFuncName)(func));
-            // .filter((func) => func !== ONLY_AGG_FN_NAME);
+            return abColumn.availableAggregationFunctions.filter((func) => !(0, AggregationColumns_1.isWeightedAverageAggFuncName)(func));
         });
     }
     setupColumnType(columnSetupInfo) {
@@ -956,10 +953,7 @@ class AgGridColumnAdapter {
                 // 1. evaluate EditOptions.isCellEditable if provided
                 if (this.adaptableApi.gridApi.internalApi.hasCellEditableAccordingToEditOptions()) {
                     const gridCell = this.adaptableApi.gridApi.getGridCellFromRowNode(params.node, params.column.getColId());
-                    const editOptionsEditability = this.adaptableApi.gridApi.internalApi.isCellEditableAccordingToEditOptions(gridCell, getOriginalColDefEditable());
-                    if (editOptionsEditability) {
-                        return editOptionsEditability;
-                    }
+                    return this.adaptableApi.gridApi.internalApi.isCellEditableAccordingToEditOptions(gridCell, getOriginalColDefEditable());
                 }
                 // 2. otherwise, fallback to colDef.editable
                 return getOriginalColDefEditable();
@@ -1267,7 +1261,7 @@ class AgGridColumnAdapter {
     }
     getQuickSearchCellStyle() {
         const quickSearchStyle = this.adaptableApi.quickSearchApi.getQuickSearchCellMatchStyle();
-        if (!quickSearchStyle || StringExtensions_1.default.IsNotNullOrEmpty(quickSearchStyle.ClassName)) {
+        if (!quickSearchStyle || StringExtensions_2.default.IsNotNullOrEmpty(quickSearchStyle.ClassName)) {
             return undefined;
         }
         return (0, StyleHelper_1.convertAdaptableStyleToCSS)(quickSearchStyle);
@@ -1370,7 +1364,7 @@ class AgGridColumnAdapter {
      */
     styledColumnClaimsFontStyle(styledColumn, abColumn) {
         const iconFontClaims = !!styledColumn?.IconStyle &&
-            !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType) &&
+            !(0, IconStyleHelper_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType) &&
             (0, StyleHelper_1.hasCellFontStyle)(styledColumn.IconStyle.Font);
         return ((0, StyleHelper_1.hasCellFontStyle)(styledColumn?.GradientStyle?.Font) ||
             (0, StyleHelper_1.hasCellFontStyle)(styledColumn?.PercentBarStyle?.Font) ||
@@ -1384,7 +1378,7 @@ class AgGridColumnAdapter {
      */
     styledColumnClaimsCellBoxStyle(styledColumn, abColumn) {
         const iconCellClaims = !!styledColumn?.IconStyle &&
-            !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType) &&
+            !(0, IconStyleHelper_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType) &&
             (0, StyleHelper_1.hasCellBoxStyle)(styledColumn.IconStyle.Cell);
         return ((0, StyleHelper_1.hasCellBoxStyle)(styledColumn?.RatingStyle?.Cell) ||
             (0, StyleHelper_1.hasCellBoxStyle)(styledColumn?.SparklineStyle?.Cell) ||
@@ -1412,7 +1406,7 @@ class AgGridColumnAdapter {
         // Row-kind filtering: defer to the shared row-scope helper so the
         // cellStyle path (Gradient background, Font/Cell slots) follows the
         // same `StyledColumn.RowScope` rules as every cellRenderer.
-        if (!(0, shouldRenderStyledColumnOnRow_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, this.adaptableApi)) {
+        if (!(0, StyledColumnHelper_1.shouldRenderStyledColumnOnRow)(styledColumn, params.node, this.adaptableApi)) {
             return style;
         }
         let colValue = params.value;
@@ -1425,24 +1419,24 @@ class AgGridColumnAdapter {
                 cellBackColor = gradientStyle.ColumnComparison.Color;
             }
             else {
-                const matchingRange = this.adaptableApi.styledColumnApi.internalApi.findRangeForColumn((0, StyledColumnGradientHelper_1.expandGradientCellRanges)(gradientStyle), abColumn, (0, StyledColumnGradientHelper_1.gradientStyleRangeLookupValueType)(gradientStyle), colValue);
+                const matchingRange = this.adaptableApi.styledColumnApi.internalApi.findRangeForColumn((0, GradientStyleHelper_1.expandGradientCellRanges)(gradientStyle), abColumn, (0, GradientStyleHelper_1.gradientStyleRangeLookupValueType)(gradientStyle), colValue);
                 if (matchingRange) {
                     cellBackColor = matchingRange.Color;
                     // Flip the alpha ramp when (a) it's the negative band of a
                     // ZeroCentred diverging gradient, OR (b) the user has explicitly
                     // marked this band as `ReverseGradient` (lower-is-darker).
                     reverseGradient =
-                        (!!gradientStyle.ZeroCentred && (0, StyledColumnGradientHelper_1.isNegativeZeroCentredBand)(matchingRange)) ||
+                        (!!gradientStyle.ZeroCentred && (0, GradientStyleHelper_1.isNegativeZeroCentredBand)(matchingRange)) ||
                             !!matchingRange.ReverseGradient;
                 }
             }
-            const minAlphaBound = gradientStyle.MinAlpha ?? StyledColumnGradientHelper_1.DEFAULT_GRADIENT_MIN_ALPHA;
-            const maxAlphaBound = gradientStyle.MaxAlpha ?? StyledColumnGradientHelper_1.DEFAULT_GRADIENT_MAX_ALPHA;
-            const lo = Math.min(Helper_1.default.clamp(minAlphaBound, 0, 1), Helper_1.default.clamp(maxAlphaBound, 0, 1));
-            const hi = Math.max(Helper_1.default.clamp(minAlphaBound, 0, 1), Helper_1.default.clamp(maxAlphaBound, 0, 1));
+            const minAlphaBound = gradientStyle.MinAlpha ?? GradientStyleHelper_1.DEFAULT_GRADIENT_MIN_ALPHA;
+            const maxAlphaBound = gradientStyle.MaxAlpha ?? GradientStyleHelper_1.DEFAULT_GRADIENT_MAX_ALPHA;
+            const lo = Math.min((0, NumberExtensions_1.clamp)(minAlphaBound, 0, 1), (0, NumberExtensions_1.clamp)(maxAlphaBound, 0, 1));
+            const hi = Math.max((0, NumberExtensions_1.clamp)(minAlphaBound, 0, 1), (0, NumberExtensions_1.clamp)(maxAlphaBound, 0, 1));
             const span = Math.abs(max - min);
             let t = span === 0 ? 0.5 : (Number(colValue) - min) / span;
-            t = Helper_1.default.clamp(t, 0, 1);
+            t = (0, NumberExtensions_1.clamp)(t, 0, 1);
             if (reverseGradient) {
                 t = 1 - t;
             }
@@ -1453,11 +1447,12 @@ class AgGridColumnAdapter {
                 const bg = (0, tinycolor2_1.default)(preparedColor).setAlpha(alpha);
                 style.backgroundColor = bg.toRgbString();
                 if (gradientStyle.AutoContrastText) {
-                    style.color = bg.getLuminance() > 0.45 ? '#111111' : '#ffffff';
+                    style.color = (0, StyleHelper_1.getAutoContrastTextColor)(preparedColor, alpha);
                 }
             }
         }
-        if (styledColumn.PercentBarStyle && styledColumn.PercentBarStyle.CellText) {
+        if (styledColumn.PercentBarStyle &&
+            (0, BarStylesHelper_1.hasBarStyleCellTextConfigured)(styledColumn.PercentBarStyle.CellTextProperties)) {
             style.paddingTop = 0;
             style.paddingBottom = 0;
         }
@@ -1471,8 +1466,7 @@ class AgGridColumnAdapter {
         // basis when a Gradient cell has a tinted background, even if the user
         // also set `Font.ForeColor` as a baseline.
         const autoContrastColor = gradientStyle?.AutoContrastText && style.color ? style.color : undefined;
-        const iconStyleFontApplies = styledColumn.IconStyle &&
-            !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
+        const iconStyleFontApplies = styledColumn.IconStyle && !(0, IconStyleHelper_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
         const fontSlot = styledColumn.GradientStyle?.Font ??
             styledColumn.PercentBarStyle?.Font ??
             styledColumn.BulletChartStyle?.Font ??
@@ -1484,8 +1478,7 @@ class AgGridColumnAdapter {
         if (fontSlot) {
             style = { ...style, ...(0, StyleHelper_1.convertAdaptableStyleToCSS)(fontSlot) };
         }
-        const iconStyleCellApplies = styledColumn.IconStyle &&
-            !(0, iconStyledColumnColumnSupport_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
+        const iconStyleCellApplies = styledColumn.IconStyle && !(0, IconStyleHelper_1.isUnsupportedColumnDataTypeForIconStyle)(abColumn.dataType);
         const cellSlot = styledColumn.RatingStyle?.Cell ??
             styledColumn.SparklineStyle?.Cell ??
             styledColumn.BadgeStyle?.Cell ??

package/src/agGrid/AgGridExportAdapter.js

@@ -9,7 +9,7 @@ const Uuid_1 = require("../AdaptableState/Uuid");
 const GeneralConstants_1 = require("../Utilities/Constants/GeneralConstants");
 const ModuleConstants_1 = require("../Utilities/Constants/ModuleConstants");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
-const FormatHelper_1 = tslib_1.__importStar(require("../Utilities/Helpers/FormatHelper"));
+const DisplayFormatHelper_1 = tslib_1.__importStar(require("../Utilities/Helpers/DisplayFormatHelper"));
 const StyleHelper_1 = require("../Utilities/Helpers/StyleHelper");
 const waitForTimeout_1 = require("../Utilities/waitForTimeout");
 class AgGridExportAdapter {
@@ -661,7 +661,7 @@ class AgGridExportAdapter {
                             // we have to pass the date in the ISO format to Excel
                             // see https://www.ag-grid.com/javascript-data-grid/excel-export-data-types/#dates
                             // we can NOT use Date.toISOString() because we don't want the timezone corrections to kick in
-                            const isoFormattedValue = (0, FormatHelper_1.DateFormatter)(normalisedValue, {
+                            const isoFormattedValue = (0, DisplayFormatHelper_1.DateFormatter)(normalisedValue, {
                                 Pattern: `yyyy-MM-dd'T'HH:mm:ss.SSS`,
                             });
                             if (isoFormattedValue) {
@@ -900,7 +900,7 @@ class AgGridExportAdapter {
         if (isDateColumn) {
             const customExportDateFormat = this.getCustomExportDateFormat(column, exportContext);
             if (!!customExportDateFormat) {
-                return FormatHelper_1.default.DateFormatter(cellRawValue, {
+                return DisplayFormatHelper_1.default.DateFormatter(cellRawValue, {
                     Pattern: customExportDateFormat,
                 });
             }

package/src/agGrid/AgGridFilterAdapter.js

@@ -42,10 +42,12 @@ const AgGridFilterAdapterFactory = (adaptable) => {
             const columnId = this.column.getColId();
             let column = adaptable.api.columnApi.getColumnWithColumnId(columnId);
             if (column) {
+                const isFiltersToolPanel = typeof params?.hidePopup !== 'function';
+                const location = isFiltersToolPanel ? 'filtersToolPanel' : 'columnMenu';
                 this.unmountReactRoot = adaptable.renderReactRoot((0, renderWithAdaptableContext_1.renderWithAdaptableContext)(React.createElement(AdaptableColumnFilter_1.AdaptableColumnFilter, {
                     columnId,
                     wrapperProps: { className: 'twa:p-2' },
-                    location: 'columnMenu',
+                    location,
                 }), adaptable), this.filterContainer);
             }
         }

package/src/agGrid/AgGridMenuAdapter.d.ts

@@ -9,7 +9,6 @@ export declare class AgGridMenuAdapter {
     private get adaptableApi();
     destroy(): void;
     buildColumnMenu(params: GetMainMenuItemsParams, originalGetMainMenuItems: GetMainMenuItems): (DefaultMenuItem | MenuItemDef)[];
-    private injectParameterizedAggregationColumnMenuItems;
     buildContextMenu(params: GetContextMenuItemsParams, originalGetContextMenuItems: GetContextMenuItems): (DefaultMenuItem | MenuItemDef)[];
     private mapAgGridItemTypeToAgGridMenuItem;
     private removeConsecutiveSeparators;