@adaptabletools/adaptable-cjs 18.0.0-canary.16 → 18.0.0-canary.18

package/src/agGrid/AdaptableAgGrid.js

@@ -99,7 +99,6 @@ const AdaptableUpgradeHelper_1 = require("../migration/AdaptableUpgradeHelper");
 const Modal_1 = require("../components/Modal");
 const AdaptableLoadingScreen_1 = require("../View/Components/Popups/AdaptableLoadingScreen");
 const react_1 = require("react");
-const SummaryService_1 = require("../Utilities/Services/SummaryService");
 const AdaptableHelper_1 = require("../Utilities/Helpers/AdaptableHelper");
 const RowNodeProto = core_1.RowNode.prototype;
 const RowNode_dispatchLocalEvent = RowNodeProto.dispatchLocalEvent;
@@ -902,7 +901,7 @@ class AdaptableAgGrid {
          */
         // this will have to go/be heavily extended with https://github.com/AdaptableTools/adaptable/issues/2230
         this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'columnTypes', (original_columnTypes) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
             const providedColumnTypes = original_columnTypes || {};
             const gridOptionsColumnTypes = gridOptions.columnTypes || {};
             const patchedColumnTypes = Object.assign(providedColumnTypes, {
@@ -919,6 +918,12 @@ class AdaptableAgGrid {
                 abColDefTupleNumberArray: (_j = gridOptionsColumnTypes.abColDefTupleNumberArray) !== null && _j !== void 0 ? _j : {},
                 abColDefObjectNumberArray: (_k = gridOptionsColumnTypes.abColDefObjectNumberArray) !== null && _k !== void 0 ? _k : {},
             });
+            const customColumnTypes = (_l = this.api.columnApi.getColumnTypes()) !== null && _l !== void 0 ? _l : [];
+            for (const customColumnType of customColumnTypes) {
+                if (!patchedColumnTypes[customColumnType]) {
+                    patchedColumnTypes[customColumnType] = {};
+                }
+            }
             if (patchedColumnTypes.abColDefNumber.cellEditor == undefined) {
                 patchedColumnTypes.abColDefNumber.cellEditor =
                     this.variant === 'react' ? AdaptableNumberEditor_1.ReactAdaptableNumberEditor : AdaptableNumberEditor_1.AdaptableNumberEditor;
@@ -1573,7 +1578,6 @@ class AdaptableAgGrid {
         this.AlertService = new AlertService_1.AlertService(this.api);
         this.TeamSharingService = new TeamSharingService_1.TeamSharingService(this.api);
         this.Fdc3Service = new Fdc3Service_1.Fdc3Service(this.api);
-        this.SummaryService = new SummaryService_1.SummaryService(this.api);
         this.CellPopupService = new CellPopupService_1.CellPopupService(this.api);
         this.RowEditService = new RowEditService_1.RowEditService(this.api);
         this.MetamodelService = new MetamodelService_1.MetamodelService(() => this.api.optionsApi.getAdaptableOptions(), true);

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ICellEditorParams, ICellEditorComp } from '@ag-grid-community/core';
+import { ICellEditorComp, ICellEditorParams } from '@ag-grid-community/core';
 import { IAdaptable } from '../../../AdaptableInterfaces/IAdaptable';
 export declare const ReactAdaptableDateEditor: React.ForwardRefExoticComponent<ICellEditorParams<any, any, any> & {
     showClearButton?: boolean;

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

@@ -6,8 +6,8 @@ const React = tslib_1.__importStar(require("react"));
 const renderWithAdaptableContext_1 = require("../../../View/renderWithAdaptableContext");
 const InternalAdaptableDateEditor_1 = require("./InternalAdaptableDateEditor");
 const core_1 = require("ag-grid-community");
-const FormatHelper_1 = require("../../../Utilities/Helpers/FormatHelper");
 const react_1 = require("react");
+const FormatHelper_1 = require("../../../Utilities/Helpers/FormatHelper");
 function shouldClearExistingValue(params) {
     return params.eventKey === core_1.KeyCode.BACKSPACE || params.eventKey === core_1.KeyCode.DELETE;
 }

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

@@ -6,12 +6,12 @@ import { ICellEditorComp, ICellEditorParams } from '@ag-grid-community/core';
 interface AdaptableNumberCellEditorParams extends ICellEditorParams {
     /**
      * Whether to show the clear button. If `true`, it works together with `cellEditorParams.emptyValue`
-     * @default true
+     * @defaultValue true
      */
     showClearButton: boolean;
     /**
      * Value to set for the cell, when the clear button is pressed
-     * @default '' (empty string)
+     * @defaultValue '' (empty string)
      */
     emptyValue: string;
 }

package/src/agGrid/weightedAverage.d.ts

@@ -1,9 +1,7 @@
 import { IAggFuncParams } from '@ag-grid-community/core';
-import { CellSummaryOperationContext } from '../types';
 export declare const getNumericValue: (input: unknown) => number | null;
 export declare const weightedAverage: (params: IAggFuncParams, columnId: string, weightColumnId: string) => {
     [x: string]: number | (() => number | "");
     toString: () => number | "";
     valueOf: () => number;
 };
-export declare const cellSummaryWeightedAverage: ({ numericColumns, selectedCellInfo, adaptableApi, }: CellSummaryOperationContext) => any;

package/src/agGrid/weightedAverage.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cellSummaryWeightedAverage = exports.weightedAverage = exports.getNumericValue = void 0;
+exports.weightedAverage = exports.getNumericValue = void 0;
 const tslib_1 = require("tslib");
-const FormatHelper_1 = tslib_1.__importDefault(require("../Utilities/Helpers/FormatHelper"));
 const toNumber_1 = tslib_1.__importDefault(require("lodash/toNumber"));
 const getNumericValue = (input) => {
     if (typeof input === 'number') {
@@ -52,57 +51,3 @@ const weightedAverage = (params, columnId, weightColumnId) => {
     };
 };
 exports.weightedAverage = weightedAverage;
-const cellSummaryWeightedAverage = ({ numericColumns, selectedCellInfo, adaptableApi, }) => {
-    if ((numericColumns === null || numericColumns === void 0 ? void 0 : numericColumns.length) != 1) {
-        return '';
-    }
-    const columnId = numericColumns[0];
-    const currentLayout = adaptableApi.layoutApi.getCurrentLayout();
-    const selectedColumnAgg = currentLayout.AggregationColumns[columnId];
-    if (!selectedColumnAgg ||
-        typeof selectedColumnAgg !== 'object' ||
-        selectedColumnAgg.type !== 'weightedAverage') {
-        return '';
-    }
-    const weightedColumnId = selectedColumnAgg.weightedColumnId;
-    if (weightedColumnId) {
-        let sumWeightedValue = 0;
-        let sumPrimaryValues = 0;
-        let isValid = true;
-        selectedCellInfo.gridCells.forEach((gridCell) => {
-            if (adaptableApi.gridApi.isGroupRowNode(gridCell.rowNode)) {
-                isValid = false;
-            }
-            if (isValid) {
-                const weightedGridCell = adaptableApi.gridApi.getGridCellFromRowNode(gridCell.rowNode, weightedColumnId);
-                sumWeightedValue += weightedGridCell.rawValue;
-                sumPrimaryValues += weightedGridCell.rawValue * gridCell.normalisedValue;
-            }
-        });
-        if (!isValid) {
-            return '';
-        }
-        const abColumn = adaptableApi.columnApi.getColumnWithColumnId(columnId);
-        if (!abColumn) {
-            return '';
-        }
-        const activeFormatColumnsWithDisplayFormat = adaptableApi.formatColumnApi.internalApi.getFormatColumnsWithDisplayFormatForColumn(abColumn);
-        if (activeFormatColumnsWithDisplayFormat.length === 1 &&
-            activeFormatColumnsWithDisplayFormat[0].DisplayFormat.Formatter === 'NumberFormatter') {
-            // there only one FormatColumn on this column, so we will use it to format the aggregated value
-            const [singleActiveFormatColumnsWithDisplayFormat] = activeFormatColumnsWithDisplayFormat;
-            const options = singleActiveFormatColumnsWithDisplayFormat
-                .DisplayFormat.Options;
-            if (options) {
-                return FormatHelper_1.default.NumberFormatter(sumPrimaryValues / sumWeightedValue, options);
-            }
-        }
-        else {
-            // there are multiple (possibly conflicting) FormatColumns for this column, we cannot know which to use
-            return FormatHelper_1.default.NumberFormatter(sumPrimaryValues / sumWeightedValue, {
-                FractionDigits: 2,
-            });
-        }
-    }
-};
-exports.cellSummaryWeightedAverage = cellSummaryWeightedAverage;

package/src/components/Datepicker/index.js

@@ -103,7 +103,9 @@ exports.Datepicker = React.forwardRef((props, ref) => {
                         setVisible(true);
                     }
                 } }),
-                React.createElement(AdaptableDateInlineInput_1.AdaptableDateInlineInput, { ref: ref, value: inputValue, placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : dateProps.format, onChange: (value) => {
+                React.createElement(AdaptableDateInlineInput_1.AdaptableDateInlineInput, { ref: ref, value: inputValue, 
+                    // We do not want to show the format when the date-picker is visible
+                    placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : '', onChange: (value) => {
                         const date = new Date(value);
                         if ((0, date_fns_1.isValid)(date)) {
                             updateValue(date);

package/src/env.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     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: 1711464557352 || Date.now(),
-    VERSION: "18.0.0-canary.16" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1711631076312 || Date.now(),
+    VERSION: "18.0.0-canary.18" || '--current-version--',
 };