@adaptabletools/adaptable 23.0.21 → 23.0.22

package/package.json

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

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -206,6 +206,24 @@ export interface InFilterValueResult {
      * Search changes reset the list and set `offset` back to 0.
      */
     hasMore?: boolean;
+    /**
+     * Custom text for the collapsed IN Filter input.
+     *
+     * Receives the currently selected items (and their count) and must return a
+     * string.
+     *
+     * When omitted, the input shows the selected count (e.g. `(3)`) followed by the
+     * selected labels joined with a comma. When provided, it fully replaces that
+     * text (including the count - render one yourself if you want it).
+     *
+     * For tree-shaped filters (group columns and date columns), each selected leaf
+     * is one entry in `selectedValues`: its `value` is the full leaf path and its
+     * `label` the joined path label. `selectedCount` is the number of selected leaves.
+     */
+    renderInputValues?: (params: {
+        selectedValues: InFilterValue[];
+        selectedCount: number;
+    }) => string;
 }
 /**
  * Information about items in the IN Column Filter

package/src/Api/GridApi.d.ts

@@ -35,9 +35,13 @@ export interface GridApi {
      */
     getFilteredData(): any[];
     /**
-     * Retrieves visible data from the grid (filtered and sorted)
+     * Retrieves visible data from the grid (filtered and sorted from visible columns only)
      */
     getVisibleData(): any[];
+    /**
+     * Retrieves the displayed (formatted but not styled) data from the grid (filtered and sorted and visible columns only)
+     */
+    getDisplayedData(): any[];
     /**
      * Retrieves all the values for a single Column.
      *

package/src/Api/Implementation/GridApiImpl.d.ts

@@ -27,6 +27,7 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getGridData(): any[];
     getFilteredData(): any[];
     getVisibleData(): any[];
+    getDisplayedData(): any[];
     getColumnData(columnId: string): any[];
     getFilteredColumnData(columnId: string): any[];
     getVisibleColumnData(columnId: string): any[];

package/src/Api/Implementation/GridApiImpl.js

@@ -36,9 +36,30 @@ export class GridApiImpl extends ApiBase {
     }
     getVisibleData() {
         const data = [];
+        const visibleColumns = this.getColumnApi().getVisibleColumns();
         this.getAdaptableInternalApi().forAllVisibleRowNodesDo((rowNode) => {
             if (!this.isGroupRowNode(rowNode)) {
-                data.push(rowNode.data);
+                const visibleRow = {};
+                visibleColumns.forEach((column) => {
+                    const key = column.field ?? column.columnId;
+                    visibleRow[key] = this.getRawValueFromRowNode(rowNode, column.columnId);
+                });
+                data.push(visibleRow);
+            }
+        });
+        return data;
+    }
+    getDisplayedData() {
+        const data = [];
+        const visibleColumns = this.getColumnApi().getVisibleColumns();
+        this.getAdaptableInternalApi().forAllVisibleRowNodesDo((rowNode) => {
+            if (!this.isGroupRowNode(rowNode)) {
+                const displayedRow = {};
+                visibleColumns.forEach((column) => {
+                    const key = column.field ?? column.columnId;
+                    displayedRow[key] = this.getDisplayValueFromRowNode(rowNode, column.columnId);
+                });
+                data.push(displayedRow);
             }
         });
         return data;

package/src/Utilities/Helpers/DisplayFormatHelper.js

@@ -14,9 +14,21 @@ const getFractionDigitsAfterMultiplier = (input, multiplier, explicitFractionDig
     if (multiplier === 1) {
         return getInputFractionDigitCount(input);
     }
+    if (!Number.isFinite(multiplier) || multiplier === 0) {
+        return getInputFractionDigitCount(input);
+    }
     const multiplierPower = Math.round(Math.log10(Math.abs(multiplier)));
+    if (!Number.isFinite(multiplierPower)) {
+        return getInputFractionDigitCount(input);
+    }
     return Math.max(0, getInputFractionDigitCount(input) - multiplierPower);
 };
+const normalizeMultiplier = (multiplier) => {
+    if (multiplier == null || !Number.isFinite(multiplier) || multiplier === 0) {
+        return undefined;
+    }
+    return multiplier;
+};
 export function NumberFormatter(input, options = {}, rowNode, column, api) {
     let preparedInput;
     if (options.Content) {
@@ -41,11 +53,11 @@ export function NumberFormatter(input, options = {}, rowNode, column, api) {
     if (isNaN(n)) {
         return preparedInput.toString();
     }
-    let multiplier = options.Multiplier ? options.Multiplier : 1;
+    const effectiveMultiplier = normalizeMultiplier(options.Multiplier);
     let multiplierFractionDigits;
-    if (options.Multiplier !== undefined) {
-        n *= multiplier;
-        multiplierFractionDigits = getFractionDigitsAfterMultiplier(preparedInput, options.Multiplier, options.FractionDigits);
+    if (effectiveMultiplier !== undefined) {
+        n *= effectiveMultiplier;
+        multiplierFractionDigits = getFractionDigitsAfterMultiplier(preparedInput, effectiveMultiplier, options.FractionDigits);
         n = parseFloat(n.toFixed(multiplierFractionDigits));
     }
     if (options.IntegerDigits > 20) {

package/src/View/Components/ColumnFilter/components/FloatingFilterValues.d.ts

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { ColumnValuesSelectProps } from '../../FilterForm/ListBoxFilterForm';
+import { InFilterValue } from '../../../../types';
 /** Suggested page size passed to `customInFilterValues` as `context.limit`. */
 export declare const IN_FILTER_VALUES_PAGE_SIZE = 1000;
 export interface FloatingFilterValuesProps {
@@ -31,6 +32,10 @@ export declare function useDistinctFilterColumnValues(options: {
         skipDefaultSearch: boolean;
         searchValueUsedInFilterValue: boolean;
         hasMore: boolean;
+        renderInputValues?: (params: {
+            selectedValues: InFilterValue[];
+            selectedCount: number;
+        }) => string;
     };
     setQuickFilterValues: React.Dispatch<React.SetStateAction<{
         values: {
@@ -41,6 +46,10 @@ export declare function useDistinctFilterColumnValues(options: {
         skipDefaultSearch: boolean;
         searchValueUsedInFilterValue: boolean;
         hasMore: boolean;
+        renderInputValues?: (params: {
+            selectedValues: InFilterValue[];
+            selectedCount: number;
+        }) => string;
     }>>;
     triggerValuesLoad: (options?: {
         usePrevious: boolean;

package/src/View/Components/ColumnFilter/components/FloatingFilterValues.js

@@ -118,6 +118,7 @@ export function useDistinctFilterColumnValues(options) {
                 skipDefaultSearch: !!result.skipDefaultSearch,
                 searchValueUsedInFilterValue: prev.searchValueUsedInFilterValue || searchValueUsedInFilterValue,
                 hasMore: !!result.hasMore,
+                renderInputValues: result.renderInputValues,
                 dataLoadIsComplete: true,
             }));
         })
@@ -171,6 +172,7 @@ export function useDistinctFilterColumnValues(options) {
                 skipDefaultSearch: !!distinctFilterDisplayValues.skipDefaultSearch,
                 searchValueUsedInFilterValue,
                 hasMore: !!distinctFilterDisplayValues.hasMore,
+                renderInputValues: distinctFilterDisplayValues.renderInputValues,
             });
             lastRequestedOffsetRef.current = 0;
             setIsDistinctColumnValuesLoading(false);
@@ -335,7 +337,10 @@ export const FloatingFilterValues = (props) => {
             triggerValuesLoad();
         }
     }, []);
-    const { skipDefaultSearch } = quickFilterValues;
+    const { skipDefaultSearch, renderInputValues } = quickFilterValues;
+    const renderComboboxInputValues = React.useMemo(() => renderInputValues
+        ? (items) => renderInputValues({ selectedValues: items, selectedCount: items.length })
+        : undefined, [renderInputValues]);
     if (props.columnId === AG_GRID_GROUPED_COLUMN) {
         if (Array.isArray(props.value) && !props.value.every((value) => Array.isArray(value))) {
             logOnce(`All the inputs for the IN predicate for the column "${props.columnId}" need to be arrays. Example:
@@ -358,11 +363,17 @@ export const FloatingFilterValues = (props) => {
                 ...props.selectProps,
                 'data-name': 'Select Values',
                 showSelectedCount: true,
+                ...(renderComboboxInputValues
+                    ? { renderInputValues: renderComboboxInputValues }
+                    : {}),
                 filter: skipDefaultSearch ? null : undefined,
                 onInputValueChange: onInputChange,
             }
             : {
                 ...props.selectProps,
+                ...(renderComboboxInputValues
+                    ? { renderInputValues: renderComboboxInputValues }
+                    : {}),
                 filter: skipDefaultSearch ? null : undefined,
                 onInputValueChange: onInputChange,
             }, disabled: props.disabled, onMenuOpen: onMenuOpen, isLoading: isDistinctColumnValuesLoading, column: currentColumn, dataType: currentColumn.dataType, options: quickFilterValues.values, value: props.value, onChange: props.onChange }));

package/src/View/Components/FilterForm/ListBoxFilterForm.js

@@ -117,7 +117,7 @@ export const ColumnValuesSelect = (props) => {
             }
         }
         : undefined;
-    const component = column.dataType === 'date' || column.columnId === AG_GRID_GROUPED_COLUMN ? (_jsx(GridFilterTreeDropdown, { toDisplayValue: treeDropdownToDisplayValue, resizable: true, onValueChange: column.dataType === 'date'
+    const component = column.dataType === 'date' || column.columnId === AG_GRID_GROUPED_COLUMN ? (_jsx(GridFilterTreeDropdown, { toDisplayValue: treeDropdownToDisplayValue, renderInputValues: selectProps.renderInputValues, resizable: true, onValueChange: column.dataType === 'date'
             ? (value) => props.onChange(dateOnChangeParser(value))
             : props.onChange, items: options, value: selectedColumnValues, "data-name": "Select Values", primaryKey: 'value', isLoading: props.isLoading, onOpenChange: onOpenChange, showClear: isEmbeddedColumnFilterLocation(location) })) : (_jsx(GridFilterCombobox, { disabled: props.disabled, ...selectProps, onOpenChange: onOpenChange, items: options, value: value, lookupItems: lookupItems, isLoading: props.isLoading, onValueChange: props.onChange, showClear: isEmbeddedColumnFilterLocation(location) }, "select"));
     return (_jsx("div", { className: join(baseClassName, 'twa:relative', props.isLoading && `${baseClassName}--loading`, !value.length && `${baseClassName}--empty`), onKeyDownCapture: (e) => {

package/src/View/Components/PredicateEditor/PredicateEditor.js

@@ -64,7 +64,10 @@ export const PredicateEditor = (props) => {
             triggerValuesLoad();
         }
     }, []);
-    const { skipDefaultSearch } = quickFilterValues;
+    const { skipDefaultSearch, renderInputValues } = quickFilterValues;
+    const renderComboboxInputValues = React.useMemo(() => renderInputValues
+        ? (items) => renderInputValues({ selectedValues: items, selectedCount: items.length })
+        : undefined, [renderInputValues]);
     return (_jsxs(Box, { className: baseClassName, children: [_jsxs(Flex, { alignItems: "center", className: "twa:justify-stretch", children: [icon && _jsx(Tag, { className: "twa:mr-2", children: icon }), _jsx(SingleSelect, { items: predicateDefsOptions, "data-name": "select-predicate", placeholder: "Select Rule", value: props.predicate?.PredicateId ?? null, onValueChange: (value) => {
                             const option = predicateDefsOptions.find((x) => x.value === value);
                             props.onChange({
@@ -75,5 +78,8 @@ export const PredicateEditor = (props) => {
                         } })] }), _jsx(Flex, { children: currentPredicateDef?.inputs?.map((predicateDefInput, index) => (_jsxs(_Fragment, { children: [index > 0 && _jsx(HelpBlock, { className: "twa:m-2", children: "AND" }), _jsx(Flex, { className: "twa:flex-1", flexDirection: "column", children: _jsx(AdaptableInput, { "data-name": `predicate-input-${index}`, className: "twa:mt-2", type: predicateDefInput.type, autoFocus: index === 0, value: props.predicate.Inputs?.[index] ?? '', onChange: (e) => handlePredicateInputChange(e, index) }) }, index)] }))) }), adaptable.api.predicateApi.internalApi.IsInOrNotInPredicateDef(currentPredicateDef) && (_jsx(Box, { className: "twa:mt-2", children: _jsx(ColumnValuesSelect, { isLoading: isDistinctColumnValuesLoading, column: column, options: quickFilterValues.values, onMenuOpen: onMenuOpen, selectProps: {
                         onInputValueChange: onInputChange,
                         filter: skipDefaultSearch ? null : undefined,
+                        ...(renderComboboxInputValues
+                            ? { renderInputValues: renderComboboxInputValues }
+                            : {}),
                     }, dataType: column.dataType, value: props.predicate.Inputs, onChange: handlePredicateValuesChange }) }))] }));
 };

package/src/View/FormatColumn/Wizard/FormatColumnFormatWizardSection.js

@@ -71,7 +71,7 @@ const appendNumberFormatOptions = (items, options) => {
         });
     }
     appendDisplayFormatItem(items, 'Content', options.Content);
-    if (options.Multiplier != null && options.Multiplier !== 1) {
+    if (options.Multiplier != null && options.Multiplier !== 0 && options.Multiplier !== 1) {
         items.push({ label: 'Multiplier', value: String(options.Multiplier) });
     }
     appendDisplayFormatItem(items, 'Parentheses', options.Parentheses);
@@ -342,7 +342,11 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                                                     ? clamp(Number(e.currentTarget.value), 0, 20)
                                                     : undefined) }) }), _jsx(FormRow, { label: "Integer Digits", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "integer-digits", type: "number", min: "0", value: resolved.Options.IntegerDigits, onChange: (e) => setFormatOption('IntegerDigits', StringExtensions.IsNumeric(e.currentTarget.value)
                                                     ? clamp(Number(e.currentTarget.value), 0, 20)
-                                                    : undefined) }) }), _jsx(FormRow, { label: "Fraction Separator", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "fraction-separator", value: resolved.Options.FractionSeparator ?? '', onChange: (e) => setFormatOption('FractionSeparator', e.currentTarget.value) }) }), _jsx(FormRow, { label: "Integer Separator", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "integer-separator", value: resolved.Options.IntegerSeparator ?? '', onChange: (e) => setFormatOption('IntegerSeparator', e.currentTarget.value) }) })] }), _jsxs(FormLayout, { sizes: NUMBER_FORMAT_VALUE_FORM_SIZES, columns: [NUMBER_FORMAT_LABEL_COLUMN, NUMBER_FORMAT_VALUE_CHILDREN_COLUMN], className: "twa:mr-5 twa:shrink-0", children: [_jsx(FormRow, { label: "Multiplier", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "multiplier", type: "number", value: resolved.Options.Multiplier, onChange: (e) => setFormatOption('Multiplier', Number(e.currentTarget.value)) }) }), _jsx(FormRow, { label: "Prefix", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "prefix", value: resolved.Options.Prefix ?? '', onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) }) }), _jsx(FormRow, { label: "Suffix", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "suffix", value: resolved.Options.Suffix ?? '', onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) }) }), _jsx(FormRow, { label: "Zero Display", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "zero-display", value: resolved.Options.ZeroDisplay === undefined ||
+                                                    : undefined) }) }), _jsx(FormRow, { label: "Fraction Separator", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "fraction-separator", value: resolved.Options.FractionSeparator ?? '', onChange: (e) => setFormatOption('FractionSeparator', e.currentTarget.value) }) }), _jsx(FormRow, { label: "Integer Separator", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "integer-separator", value: resolved.Options.IntegerSeparator ?? '', onChange: (e) => setFormatOption('IntegerSeparator', e.currentTarget.value) }) })] }), _jsxs(FormLayout, { sizes: NUMBER_FORMAT_VALUE_FORM_SIZES, columns: [NUMBER_FORMAT_LABEL_COLUMN, NUMBER_FORMAT_VALUE_CHILDREN_COLUMN], className: "twa:mr-5 twa:shrink-0", children: [_jsx(FormRow, { label: "Multiplier", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "multiplier", type: "number", value: typeof resolved.Options.Multiplier === 'number'
+                                                    ? resolved.Options.Multiplier
+                                                    : '', onChange: (e) => setFormatOption('Multiplier', StringExtensions.IsNumeric(e.currentTarget.value)
+                                                    ? Number(e.currentTarget.value)
+                                                    : undefined) }) }), _jsx(FormRow, { label: "Prefix", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "prefix", value: resolved.Options.Prefix ?? '', onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) }) }), _jsx(FormRow, { label: "Suffix", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "suffix", value: resolved.Options.Suffix ?? '', onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) }) }), _jsx(FormRow, { label: "Zero Display", children: _jsx(Input, { className: NUMBER_FORMAT_INPUT_CLASS, "data-name": "zero-display", value: resolved.Options.ZeroDisplay === undefined ||
                                                     resolved.Options.ZeroDisplay === '0'
                                                     ? '0'
                                                     : resolved.Options.ZeroDisplay, onChange: (e) => {

package/src/components/Combobox/index.d.ts

@@ -33,7 +33,18 @@ export type MultiComboboxProps<T extends ComboboxItemType> = Omit<AdaptableCombo
 } & ComboboxDataProps<T>;
 export declare const MultiCombobox: <T extends ComboboxItemType>(props: MultiComboboxProps<T>) => React.JSX.Element;
 export type GridFilterComboboxProps<T extends ComboboxItemType> = Omit<MultiComboboxProps<T>, 'showSelectAllCheckbox' | 'searchable' | 'renderInput' | 'renderInputValues'> & {
+    /**
+     * When true, prefix the selected values in the collapsed input with the
+     * selected count (e.g. `(3)`). Ignored when `renderInputValues` is provided.
+     */
     showSelectedCount?: boolean;
+    /**
+     * Custom content for the selected values in the collapsed input (rendered inside the
+     * standard wrapper). When provided, the built-in selected count is not rendered -
+     * include one in the returned content if needed.
+     * When omitted, selected labels are joined with a comma.
+     */
+    renderInputValues?: (items: T[]) => React.ReactNode;
 };
 export declare const GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME: string;
 export declare const GridFilterCombobox: <T extends ComboboxItemType>(props: GridFilterComboboxProps<T>) => React.JSX.Element;

package/src/components/Combobox/index.js

@@ -567,7 +567,7 @@ export const MultiCombobox = (props) => {
 };
 export const GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME = cn('twa:[.ab-FloatingFilter_&]:border-none twa:[.ab-FloatingFilter_&]:inset-y-0.5 twa:[.ab-FloatingFilter_&]:inset-x-0 twa:[.ab-FloatingFilter_&]:absolute twa:[.ab-FloatingFilter_&]:shadow-none twa:[.ab-FloatingFilter_&]:min-h-auto!', 'twa:[.ab-FloatingFilter_&]:[line-height:1]', 'twa:[.ab-FloatingFilter_[data-slot=combobox-trigger]]:py-0', 'twa:[.ab-FloatingFilter_&]:[container-type:size]');
 export const GridFilterCombobox = (props) => {
-    const { showSelectedCount = false, placeholder = 'Select...', ...comboboxProps } = props;
+    const { showSelectedCount = false, placeholder = 'Select...', renderInputValues: renderInputValuesProp, ...comboboxProps } = props;
     const sharedProps = {
         placeholder,
         showSelectAllCheckbox: true,
@@ -579,11 +579,13 @@ export const GridFilterCombobox = (props) => {
         showClear: false,
         showTrigger: false,
         renderInputValues: (items) => {
-            let children = items.map((item) => getItemTextLabel(item)).join(', ');
+            let children = renderInputValuesProp
+                ? renderInputValuesProp(items)
+                : items.map((item) => getItemTextLabel(item)).join(', ');
             if (items.length === 0) {
                 children = (_jsx("span", { "data-name": "placeholder", className: "twa:text-muted-foreground", children: placeholder }));
             }
-            return (_jsx(_Fragment, { children: _jsxs("div", { className: "twa:text-ellipsis twa:overflow-hidden twa:whitespace-nowrap twa:flex-1000", "data-slot": "combobox-selected-values", children: [showSelectedCount && items.length > 0 && (_jsxs("span", { "data-name": "multiple-values-count", className: "twa:mr-0.5", children: ["(", items.length, ")"] })), children] }) }));
+            return (_jsx(_Fragment, { children: _jsxs("div", { className: "twa:text-ellipsis twa:overflow-hidden twa:whitespace-nowrap twa:flex-1000", "data-slot": "combobox-selected-values", children: [showSelectedCount && !renderInputValuesProp && items.length > 0 && (_jsxs(_Fragment, { children: [_jsxs("span", { "data-name": "multiple-values-count", children: ["(", items.length, ")"] }), ' '] })), children] }) }));
         },
     };
     const className = cn(GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME, comboboxProps.className);

package/src/components/Tree/TreeDropdown/index.d.ts

@@ -48,7 +48,18 @@ export type GridFilterTreeDropdownProps<T extends TreeListItem<any>> = Omit<NewT
     /**
      * When true, prefix the selected-values summary with `(N)` where N is the
      * number of selected leaves. Mirrors `GridFilterCombobox.showSelectedCount`.
+     * Ignored when `renderInputValues` is provided.
      */
     showSelectedCount?: boolean;
+    /**
+     * Custom content for the selected values in the collapsed input (rendered inside the
+     * standard wrapper). Mirrors `GridFilterCombobox.renderInputValues`: called with one
+     * item per selected leaf (`value` is the full leaf path, `label` its display label).
+     * When provided, the built-in selected count is not rendered.
+     */
+    renderInputValues?: (items: {
+        value: any;
+        label: string;
+    }[]) => React.ReactNode;
 };
 export declare function GridFilterTreeDropdown<T extends TreeListItem<any>>(props: GridFilterTreeDropdownProps<T>): React.JSX.Element;

package/src/components/Tree/TreeDropdown/index.js

@@ -399,17 +399,20 @@ export function TreeDropdown(props) {
     return (_jsx(MultiCombobox, { ...comboboxProps }));
 }
 export function GridFilterTreeDropdown(props) {
-    const { showSelectedCount = false, placeholder = 'Select...', className, ...rest } = props;
+    const { showSelectedCount = false, placeholder = 'Select...', renderInputValues: renderInputValuesProp, className, ...rest } = props;
     const renderSelectedValues = useCallback(({ selectedLeafPaths, getLabelForPath }) => {
         let children;
         if (selectedLeafPaths.length === 0) {
             children = (_jsx("span", { "data-name": "placeholder", className: "twa:text-muted-foreground", children: placeholder }));
         }
+        else if (renderInputValuesProp) {
+            children = renderInputValuesProp(selectedLeafPaths.map((path) => ({ value: path, label: getLabelForPath(path) })));
+        }
         else {
             children = selectedLeafPaths.map((path) => getLabelForPath(path)).join(', ');
         }
-        return (_jsxs("div", { className: "twa:text-ellipsis twa:overflow-hidden twa:whitespace-nowrap twa:flex-1000", "data-slot": "combobox-selected-values", children: [showSelectedCount && selectedLeafPaths.length > 0 && (_jsxs("span", { "data-name": "multiple-values-count", className: "twa:mr-0.5", children: ["(", selectedLeafPaths.length, ")"] })), children] }));
-    }, [placeholder, showSelectedCount]);
+        return (_jsxs("div", { className: "twa:text-ellipsis twa:overflow-hidden twa:whitespace-nowrap twa:flex-1000", "data-slot": "combobox-selected-values", children: [showSelectedCount && !renderInputValuesProp && selectedLeafPaths.length > 0 && (_jsxs("span", { "data-name": "multiple-values-count", className: "twa:mr-0.5", children: ["(", selectedLeafPaths.length, ")"] })), children] }));
+    }, [placeholder, showSelectedCount, renderInputValuesProp]);
     const mergedClassName = cn(GRID_FILTER_COMBBOX_ADJUSTMENTS_CLASSNAME, className);
     return (_jsx(TreeDropdown, { ...rest, placeholder: placeholder, className: mergedClassName, showClear: rest.showClear ?? false, resizable: rest.resizable ?? true, renderSelectedValues: renderSelectedValues }));
 }

package/src/env.js

@@ -1,5 +1,5 @@
 export 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: 1787139899825 || Date.now(),
-    VERSION: "23.0.21" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1789246590646 || Date.now(),
+    VERSION: "23.0.22" || '--current-version--',
 };