@revolist/revogrid 4.24.1 → 4.24.3

package/dist/cjs/{text-editor-B4W-m-r-.js → text-editor-CvgloQdG.js}

@@ -3,8 +3,8 @@
  */
 'use strict';
 
-var edit_utils = require('./edit.utils-pKeiYFLJ.js');
-var index = require('./index-DxaSE5uZ.js');
+var edit_utils = require('./edit.utils-DDxnq9lw.js');
+var index = require('./index-BF6JDcMr.js');
 
 class TextEditor {
     constructor(data, saveCallback) {

package/dist/cjs/{viewport.store-BscUCiUk.js → viewport.store-Ci8H1bI9.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var dimension_helpers = require('./dimension.helpers-B9HgANnM.js');
+var dimension_helpers = require('./dimension.helpers-CB5sNw5J.js');
 
 const LETTER_BLOCK_SIZE = 10;
 const calculateRowHeaderSize = (itemsLength, rowHeaderColumn, minWidth = 50) => {

package/dist/collection/components/data/revogr-data.js

@@ -101,6 +101,7 @@ export class RevogrData {
         const rowsEls = [];
         const depth = this.dataStore.get('groupingDepth');
         const groupingCustomRenderer = this.dataStore.get('groupingCustomRenderer');
+        const groupingCellRenderer = this.dataStore.get('groupingCellRenderer');
         const groupDepth = this.columnService.hasGrouping ? depth : 0;
         const rowRenderOffset = this.viewportRow.get('renderOffset') || 0;
         const colRenderOffset = this.viewportCol.get('renderOffset') || 0;
@@ -109,6 +110,7 @@ export class RevogrData {
             // #region Grouping
             if (isGrouping(dataItem)) {
                 const gmodel = Object.assign(Object.assign({}, rgRow), { start: rgRow.start - rowRenderOffset, index: rgRow.itemIndex, model: dataItem, groupingCustomRenderer,
+                    groupingCellRenderer, additionalData: this.additionalData,
                     // Only show expand button if grouping is enabled and not in row headers
                     hasExpand: this.columnService.hasGrouping && this.colType !== 'rowHeaders', columnItems: cols, providers: this.providers });
                 rowsEls.push(h(GroupingRowRenderer, Object.assign({}, gmodel)));

package/dist/collection/components/revoGrid/revo-grid.js

@@ -1776,7 +1776,7 @@ export class RevoGridComponent {
                 "mutable": false,
                 "complexType": {
                     "original": "GroupingOptions",
-                    "resolved": "{ props?: ColumnProp[] | undefined; preserveGroupingOnUpdate?: boolean | undefined; groupLabelTemplate?: GroupLabelTemplateFunc | undefined; } & ExpandedOptions",
+                    "resolved": "{ props?: ColumnProp[] | undefined; preserveGroupingOnUpdate?: boolean | undefined; groupLabelTemplate?: GroupLabelTemplateFunc | undefined; groupCellTemplate?: GroupCellTemplateFunc | undefined; } & ExpandedOptions",
                     "references": {
                         "GroupingOptions": {
                             "location": "import",

package/dist/collection/plugins/filter/filter.panel.js

@@ -50,6 +50,10 @@ export class FilterPanel {
          * If true, closes the filter panel when clicking outside
          */
         this.closeOnOutsideClick = true;
+        /**
+         * Whether the filter panel allows the same operator more than once per column.
+         */
+        this.allowDuplicateOperators = true;
         this.debouncedApplyFilter = debounce(() => {
             this.filterChange.emit(this.filterItems);
         }, 400);
@@ -363,11 +367,15 @@ export class FilterPanel {
         }
     }
     renderSelectOptions(type, isDefaultTypeRemoved = false) {
+        var _a;
         if (!this.changes) {
             return;
         }
         const options = [];
         const prop = this.changes.prop;
+        if (prop === undefined) {
+            return;
+        }
         const hidden = new Set();
         Object.keys(this.filterItems).forEach((prop) => {
             const values = this.filterItems[prop];
@@ -377,6 +385,9 @@ export class FilterPanel {
                 }
             });
         });
+        const selectedTypes = new Set(((_a = this.filterItems[prop]) !== null && _a !== void 0 ? _a : [])
+            .filter(filter => !filter.hidden)
+            .map(filter => filter.type));
         if (!isDefaultTypeRemoved) {
             const capts = Object.assign(Object.assign({}, this.filterCaptionsInternal), this.filterCaptions);
             options.push(h("option", { selected: this.currentFilterType === defaultType, value: defaultType }, prop && this.filterItems[prop] && this.filterItems[prop].length > 0
@@ -384,7 +395,9 @@ export class FilterPanel {
                 : this.filterNames[defaultType]));
         }
         for (let gIndex in this.changes.filterTypes) {
-            const group = this.changes.filterTypes[gIndex].filter(k => !hidden.has(k));
+            const group = this.changes.filterTypes[gIndex].filter(k => !hidden.has(k) && (this.allowDuplicateOperators ||
+                !selectedTypes.has(k) ||
+                (isDefaultTypeRemoved && type === k)));
             if (group.length) {
                 options.push(...group.map(k => (h("option", { value: k, selected: type === k }, this.filterNames[k]))));
                 options.push(h("option", { disabled: true }));
@@ -479,7 +492,7 @@ export class FilterPanel {
             top: `${(_d = (_c = this.changes) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0}px`,
         };
         const capts = Object.assign(Object.assign({}, this.filterCaptionsInternal), this.filterCaptions);
-        return (h(Host, { key: '2a19b35adb56fb7d23385fffebc768838edee162' }, h("dialog", { key: '94386d7cbc4bd9c631f72928938b1d1550a3de82', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
+        return (h(Host, { key: '8859c452eb08838f65f18efecbdde7f65fda2b49' }, h("dialog", { key: 'f603067ff0986a9f344cbbf816388d2bbac198bb', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
                 e.preventDefault();
                 this.onCancel();
             } }, this.changes && [
@@ -488,7 +501,7 @@ export class FilterPanel {
             ((_g = this.changes) === null || _g === void 0 ? void 0 : _g.hideDefaultFilters) !== true && [
                 h("label", { key: "filter-title" }, capts.title),
                 h("div", { key: "filter-holder", class: "filter-holder" }, this.getFilterItemsList()),
-                h("div", { key: "add-filter", class: "add-filter" }, h("select", { key: '4f7354e39d8e5cf9ae7b735290eff18d105ab87e', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
+                h("div", { key: "add-filter", class: "add-filter" }, h("select", { key: '2ec0a66918edf91bdde3962b6ec84c89f6f1c8f1', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
             ],
             h("slot", { key: "default-slot" }),
             ((_j = (_h = this.changes).extraBottomContent) === null || _j === void 0 ? void 0 : _j.call(_h, this.changes)) || '',
@@ -634,6 +647,26 @@ export class FilterPanel {
                 "reflect": false,
                 "attribute": "close-on-outside-click",
                 "defaultValue": "true"
+            },
+            "allowDuplicateOperators": {
+                "type": "boolean",
+                "mutable": false,
+                "complexType": {
+                    "original": "boolean",
+                    "resolved": "boolean",
+                    "references": {}
+                },
+                "required": false,
+                "optional": false,
+                "docs": {
+                    "tags": [],
+                    "text": "Whether the filter panel allows the same operator more than once per column."
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false,
+                "attribute": "allow-duplicate-operators",
+                "defaultValue": "true"
             }
         };
     }

package/dist/collection/plugins/filter/filter.plugin.js

@@ -52,13 +52,14 @@ export class FilterPlugin extends BasePlugin {
         this.filterNameIndexByType = Object.assign({}, filterNames);
         this.filterFunctionsIndexedByType = Object.assign({}, filterCoreFunctionsIndexedByType);
         this.filterProp = FILTER_PROP;
+        this.allowDuplicateOperators = true;
         if (config) {
             this.initConfig(config);
         }
         const existingNodes = this.revogrid.registerVNode.filter(n => typeof n === 'object' && n.$tag$ !== FILTE_PANEL);
         this.revogrid.registerVNode = [
             ...existingNodes,
-            h("revogr-filter-panel", { filterNames: this.filterNameIndexByType, filterEntities: this.filterFunctionsIndexedByType, filterCaptions: (_a = config === null || config === void 0 ? void 0 : config.localization) === null || _a === void 0 ? void 0 : _a.captions, onFilterChange: e => this.onFilterChange(e.detail), onResetChange: e => this.onFilterReset(e.detail), disableDynamicFiltering: config === null || config === void 0 ? void 0 : config.disableDynamicFiltering, closeOnOutsideClick: config === null || config === void 0 ? void 0 : config.closeFilterPanelOnOutsideClick, ref: e => (this.pop = e) }, ' ', this.extraContent()),
+            h("revogr-filter-panel", { filterNames: this.filterNameIndexByType, filterEntities: this.filterFunctionsIndexedByType, filterCaptions: (_a = config === null || config === void 0 ? void 0 : config.localization) === null || _a === void 0 ? void 0 : _a.captions, onFilterChange: e => this.onFilterChange(e.detail), onResetChange: e => this.onFilterReset(e.detail), disableDynamicFiltering: config === null || config === void 0 ? void 0 : config.disableDynamicFiltering, closeOnOutsideClick: config === null || config === void 0 ? void 0 : config.closeFilterPanelOnOutsideClick, allowDuplicateOperators: this.allowDuplicateOperators, ref: e => (this.pop = e) }, ' ', this.extraContent()),
         ];
         const aftersourceset = async () => {
             const filterCollectionProps = Object.keys(this.filterCollection);
@@ -85,15 +86,24 @@ export class FilterPlugin extends BasePlugin {
         };
         this.addEventListener('headerclick', e => this.headerclick(e));
         this.addEventListener(FILTER_CONFIG_CHANGED_EVENT, ({ detail }) => {
-            if (!detail ||
-                (typeof detail === 'object' &&
-                    (!detail.multiFilterItems ||
-                        !Object.keys(detail.multiFilterItems).length))) {
+            if (!detail) {
                 this.clearFiltering();
                 return;
             }
             if (typeof detail === 'object') {
-                this.initConfig(detail);
+                const detailKeys = Object.keys(detail);
+                const preserveCurrentFilters = !detailKeys.includes('multiFilterItems') &&
+                    detailKeys.includes('allowDuplicateOperators');
+                this.initConfig(preserveCurrentFilters
+                    ? Object.assign(Object.assign({}, detail), { multiFilterItems: this.multiFilterItems }) : detail);
+                if (!detail.multiFilterItems || !Object.keys(detail.multiFilterItems).length) {
+                    if (preserveCurrentFilters) {
+                        aftersourceset();
+                        return;
+                    }
+                    this.clearFiltering();
+                    return;
+                }
             }
             aftersourceset();
         });
@@ -107,6 +117,11 @@ export class FilterPlugin extends BasePlugin {
         return null;
     }
     initConfig(config) {
+        var _a;
+        this.allowDuplicateOperators = (_a = config.allowDuplicateOperators) !== null && _a !== void 0 ? _a : true;
+        if (this.pop) {
+            this.pop.allowDuplicateOperators = this.allowDuplicateOperators;
+        }
         if (config.multiFilterItems) {
             this.multiFilterItems = Object.assign({}, config.multiFilterItems);
         }

package/dist/collection/plugins/groupingRow/grouping.row.plugin.js

@@ -126,7 +126,7 @@ export class GroupingRowPlugin extends BasePlugin {
      * Initiated when need to reapply grouping
      */
     doSourceUpdate(options) {
-        var _a;
+        var _a, _b;
         /**
          * Get source without grouping
          * @param newOldIndexMap - provides us mapping with new indexes vs old indexes, we would use it for trimmed mapping
@@ -138,10 +138,11 @@ export class GroupingRowPlugin extends BasePlugin {
          * Group again
          * @param oldNewIndexMap - provides us mapping with new indexes vs old indexes
          */
-        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.props) || [], expanded);
+        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, (_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.props) !== null && _b !== void 0 ? _b : [], expanded);
         const customRenderer = options === null || options === void 0 ? void 0 : options.groupLabelTemplate;
+        const cellRenderer = options === null || options === void 0 ? void 0 : options.groupCellTemplate;
         // setup source
-        this.providers.data.setData(sourceWithGroups, GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, { depth, customRenderer }, true);
+        this.providers.data.setData(sourceWithGroups, GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, { depth, customRenderer, cellRenderer }, true);
         this.updateTrimmed(trimmed, oldNewIndexes !== null && oldNewIndexes !== void 0 ? oldNewIndexes : {}, oldNewIndexMap, sourceWithGroups);
     }
     /**
@@ -150,17 +151,21 @@ export class GroupingRowPlugin extends BasePlugin {
      * If source came from other plugin
      */
     onDataSet(data) {
-        var _a, _b;
+        var _a, _b, _c;
         let preservedExpanded = {};
         if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.preserveGroupingOnUpdate) !== false) {
             let { prevExpanded } = getSource(this.getStore().get('source'), this.getStore().get('proxyItems'), true);
             preservedExpanded = prevExpanded;
         }
         const source = data.source.filter(s => !isGrouping(s));
-        const options = Object.assign(Object.assign({}, (this.revogrid.grouping || {})), { prevExpanded: preservedExpanded });
-        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, ((_b = this.options) === null || _b === void 0 ? void 0 : _b.props) || [], options);
+        const options = Object.assign(Object.assign({}, this.options), { prevExpanded: preservedExpanded });
+        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, (_c = (_b = this.options) === null || _b === void 0 ? void 0 : _b.props) !== null && _c !== void 0 ? _c : [], options);
         data.source = sourceWithGroups;
-        this.providers.data.setGrouping({ depth });
+        this.providers.data.setGrouping({
+            depth,
+            customRenderer: options.groupLabelTemplate,
+            cellRenderer: options.groupCellTemplate,
+        });
         this.updateTrimmed(trimmed, oldNewIndexMap, undefined, sourceWithGroups);
     }
     /**

package/dist/collection/plugins/groupingRow/grouping.row.renderer.js

@@ -3,7 +3,10 @@
  */
 import { h } from "@stencil/core";
 import RowRenderer from "../../components/data/row-renderer";
-import { GROUP_DEPTH, GROUP_EXPANDED, GROUP_EXPAND_BTN, PSEUDO_GROUP_ITEM, GROUP_EXPAND_EVENT, } from "./grouping.const";
+import { GROUP_DEPTH, GROUP_EXPANDED, GROUP_EXPAND_BTN, PSEUDO_GROUP_ITEM, GROUP_EXPAND_EVENT, GROUP_COLUMN_PROP, } from "./grouping.const";
+import { getSourceItem } from "../../store/index";
+import { CELL_CLASS, DATA_COL, DATA_ROW, getCellRaw } from "../../utils";
+import { isGroupingColumn } from "./grouping.service";
 export function expandEvent(e, model, virtualIndex) {
     var _a;
     const event = new CustomEvent(GROUP_EXPAND_EVENT, {
@@ -16,8 +19,58 @@ export function expandEvent(e, model, virtualIndex) {
     });
     (_a = e.target) === null || _a === void 0 ? void 0 : _a.dispatchEvent(event);
 }
+export function renderGroupCells(props, { name, expanded, depth, }) {
+    const { additionalData, columnItems, groupingCellRenderer, hasExpand, itemIndex, model, providers, size, start, end, } = props;
+    if (!groupingCellRenderer) {
+        return [];
+    }
+    const renderOffset = providers.viewport.get('renderOffset') || 0;
+    const data = providers.data.get('source');
+    const rowItem = { itemIndex, size, start, end };
+    const onExpand = (event) => expandEvent(event, model, itemIndex);
+    return columnItems.map(columnItem => {
+        const column = getSourceItem(providers.columns, columnItem.itemIndex);
+        if (!column) {
+            return null;
+        }
+        const isLabelColumn = isGroupingColumn(column);
+        const templateProps = {
+            prop: column.prop,
+            model,
+            data,
+            column,
+            rowIndex: itemIndex,
+            colIndex: columnItem.itemIndex,
+            colType: providers.colType,
+            type: providers.type,
+            value: getCellRaw(model, column),
+            providers,
+            columnItem,
+            rowItem,
+            group: {
+                name,
+                depth,
+                expanded,
+                prop: model[GROUP_COLUMN_PROP],
+                isLabelColumn,
+                canExpand: hasExpand,
+                onExpand,
+            },
+        };
+        return (h("div", { key: columnItem.itemIndex, class: {
+                [CELL_CLASS]: true,
+                groupingCell: true,
+                groupingLabelCell: isLabelColumn,
+            }, [DATA_COL]: columnItem.itemIndex,
+            [DATA_ROW]: itemIndex, style: {
+                width: `${columnItem.size}px`,
+                transform: `translateX(${columnItem.start - renderOffset}px)`,
+                height: size ? `${size}px` : undefined,
+            } }, groupingCellRenderer(h, templateProps, additionalData)));
+    });
+}
 export const GroupingRowRenderer = (props) => {
-    const { model, itemIndex, hasExpand, groupingCustomRenderer } = props;
+    const { model, itemIndex, hasExpand, groupingCustomRenderer, groupingCellRenderer, } = props;
     const name = model[PSEUDO_GROUP_ITEM];
     const expanded = model[GROUP_EXPANDED];
     const depth = parseInt(model[GROUP_DEPTH], 10) || 0;
@@ -26,6 +79,9 @@ export const GroupingRowRenderer = (props) => {
         depth,
         expanded,
     };
+    if (groupingCellRenderer) {
+        return (h(RowRenderer, Object.assign({ index: props.index, size: props.size, start: props.start }, groupRowAttrs), renderGroupCells(props, { name, expanded, depth })));
+    }
     if (groupingCustomRenderer) {
         return (h(RowRenderer, Object.assign({}, props, groupRowAttrs), h("div", { onClick: e => expandEvent(e, model, itemIndex) }, groupingCustomRenderer(h, Object.assign(Object.assign({}, props), { colType: props.providers.colType, name,
             expanded,
@@ -33,7 +89,7 @@ export const GroupingRowRenderer = (props) => {
     }
     return (h(RowRenderer, Object.assign({}, props, groupRowAttrs), hasExpand && [
         h("button", { class: { [GROUP_EXPAND_BTN]: true }, onClick: e => expandEvent(e, model, itemIndex) }, expandSvgIconVNode(expanded)),
-        name,
+        String(name),
     ]));
 };
 export const expandSvgIconVNode = (expanded = false) => {

package/dist/collection/plugins/groupingRow/grouping.service.js

@@ -2,8 +2,9 @@
  * Built by Revolist OU ❤️
  */
 import { GROUP_DEPTH, GROUP_EXPANDED, PSEUDO_GROUP_COLUMN, PSEUDO_GROUP_ITEM, PSEUDO_GROUP_ITEM_ID, PSEUDO_GROUP_ITEM_VALUE, GROUP_ORIGINAL_INDEX, GROUP_COLUMN_PROP, } from "./grouping.const";
-function getGroupValueDefault(item, prop) {
-    return item[prop] || null;
+function getGroupValueDefault(item, prop, emptyGroupValue) {
+    var _a;
+    return (_a = item[prop]) !== null && _a !== void 0 ? _a : emptyGroupValue;
 }
 function isDataRow(item) {
     return item != null;
@@ -109,13 +110,15 @@ function flattenGroupMaps({ groupedValues, parentIds, isExpanded, itemIndex, exp
  * @param columnProps - ids of groups
  * @param expanded - potentially expanded items if present
  */
-export function gatherGrouping(array, columnProps, { prevExpanded = {}, expandedAll = false, getGroupValue = getGroupValueDefault, }) {
+export function gatherGrouping(array, columnProps, { prevExpanded = {}, expandedAll = false, getGroupValue, emptyGroupValue = '', }) {
     const groupedItems = new Map();
     array.forEach((item, originalIndex) => {
         if (!isDataRow(item)) {
             return;
         }
-        const groupLevelValues = columnProps.map(groupId => getGroupValue(item, groupId));
+        const groupLevelValues = columnProps.map(groupId => getGroupValue
+            ? getGroupValue(item, groupId)
+            : getGroupValueDefault(item, groupId, emptyGroupValue));
         const lastLevelValue = groupLevelValues.pop();
         let currentGroupLevel = groupedItems;
         groupLevelValues.forEach(value => {

package/dist/collection/services/data.provider.js

@@ -93,8 +93,12 @@ export class DataProvider {
         const items = this.stores[type].store.get('items');
         this.stores[type].setData({ items: [...items] });
     }
-    setGrouping({ depth }, type = 'rgRow') {
-        this.stores[type].setData({ groupingDepth: depth });
+    setGrouping({ depth, customRenderer, cellRenderer, }, type = 'rgRow') {
+        this.stores[type].setData({
+            groupingDepth: depth,
+            groupingCustomRenderer: customRenderer,
+            groupingCellRenderer: cellRenderer,
+        });
     }
     setTrimmed(trimmed, type = 'rgRow') {
         const store = this.stores[type];

package/dist/collection/store/dataSource/data.store.js

@@ -16,7 +16,7 @@ export class DataStore {
         return this.dataStore;
     }
     constructor(type, storeData) {
-        const store = (this.dataStore = createStore(Object.assign({ items: [], proxyItems: [], source: [], groupingDepth: 0, groups: {}, type, trimmed: {}, groupingCustomRenderer: undefined }, storeData)));
+        const store = (this.dataStore = createStore(Object.assign({ items: [], proxyItems: [], source: [], groupingDepth: 0, groups: {}, type, trimmed: {}, groupingCustomRenderer: undefined, groupingCellRenderer: undefined }, storeData)));
         store.use(proxyPlugin(store));
         store.use(trimmedPlugin(store));
     }
@@ -56,6 +56,7 @@ export class DataStore {
                 // if groups are not provided, we will consider that there is only one group with all items
                 groups: grouping.groups,
                 groupingCustomRenderer: grouping.customRenderer,
+                groupingCellRenderer: grouping.cellRenderer,
             });
         }
     }

package/dist/{revo-grid/cell-renderer-CLTRlCa5.js → esm/cell-renderer-BQjko1zB.js}

@@ -2,8 +2,8 @@
  * Built by Revolist OU ❤️
  */
 import { h, f as Build } from './index-Chp_81rd.js';
-import { n as DATA_ROW, w as DRAG_ICON_CLASS, x as DRAGGABLE_CLASS } from './dimension.helpers-CGKwSvw6.js';
-import { l as GROUP_EXPAND_BTN, m as GROUP_EXPAND_EVENT, G as GROUP_DEPTH, h as GROUP_EXPANDED, P as PSEUDO_GROUP_ITEM, O as isRowDragService, B as getCellDataParsed } from './column.service-C6hByxPy.js';
+import { n as DATA_ROW, b as getSourceItem, m as DATA_COL, C as CELL_CLASS, w as DRAG_ICON_CLASS, x as DRAGGABLE_CLASS } from './dimension.helpers-CXrsUc6f.js';
+import { A as getCellRaw, v as isGroupingColumn, l as GROUP_EXPAND_BTN, m as GROUP_EXPAND_EVENT, j as GROUP_COLUMN_PROP, P as PSEUDO_GROUP_ITEM, h as GROUP_EXPANDED, G as GROUP_DEPTH, O as isRowDragService, B as getCellDataParsed } from './column.service-BnFqXqQG.js';
 
 /**
  * Renders sorting direction and optional additive sorting rank.
@@ -53,8 +53,58 @@ function expandEvent(e, model, virtualIndex) {
     });
     (_a = e.target) === null || _a === void 0 ? void 0 : _a.dispatchEvent(event);
 }
+function renderGroupCells(props, { name, expanded, depth, }) {
+    const { additionalData, columnItems, groupingCellRenderer, hasExpand, itemIndex, model, providers, size, start, end, } = props;
+    if (!groupingCellRenderer) {
+        return [];
+    }
+    const renderOffset = providers.viewport.get('renderOffset') || 0;
+    const data = providers.data.get('source');
+    const rowItem = { itemIndex, size, start, end };
+    const onExpand = (event) => expandEvent(event, model, itemIndex);
+    return columnItems.map(columnItem => {
+        const column = getSourceItem(providers.columns, columnItem.itemIndex);
+        if (!column) {
+            return null;
+        }
+        const isLabelColumn = isGroupingColumn(column);
+        const templateProps = {
+            prop: column.prop,
+            model,
+            data,
+            column,
+            rowIndex: itemIndex,
+            colIndex: columnItem.itemIndex,
+            colType: providers.colType,
+            type: providers.type,
+            value: getCellRaw(model, column),
+            providers,
+            columnItem,
+            rowItem,
+            group: {
+                name,
+                depth,
+                expanded,
+                prop: model[GROUP_COLUMN_PROP],
+                isLabelColumn,
+                canExpand: hasExpand,
+                onExpand,
+            },
+        };
+        return (h("div", { key: columnItem.itemIndex, class: {
+                [CELL_CLASS]: true,
+                groupingCell: true,
+                groupingLabelCell: isLabelColumn,
+            }, [DATA_COL]: columnItem.itemIndex,
+            [DATA_ROW]: itemIndex, style: {
+                width: `${columnItem.size}px`,
+                transform: `translateX(${columnItem.start - renderOffset}px)`,
+                height: size ? `${size}px` : undefined,
+            } }, groupingCellRenderer(h, templateProps, additionalData)));
+    });
+}
 const GroupingRowRenderer = (props) => {
-    const { model, itemIndex, hasExpand, groupingCustomRenderer } = props;
+    const { model, itemIndex, hasExpand, groupingCustomRenderer, groupingCellRenderer, } = props;
     const name = model[PSEUDO_GROUP_ITEM];
     const expanded = model[GROUP_EXPANDED];
     const depth = parseInt(model[GROUP_DEPTH], 10) || 0;
@@ -63,6 +113,9 @@ const GroupingRowRenderer = (props) => {
         depth,
         expanded,
     };
+    if (groupingCellRenderer) {
+        return (h(RowRenderer, Object.assign({ index: props.index, size: props.size, start: props.start }, groupRowAttrs), renderGroupCells(props, { name, expanded, depth })));
+    }
     if (groupingCustomRenderer) {
         return (h(RowRenderer, Object.assign({}, props, groupRowAttrs), h("div", { onClick: e => expandEvent(e, model, itemIndex) }, groupingCustomRenderer(h, Object.assign(Object.assign({}, props), { colType: props.providers.colType, name,
             expanded,
@@ -70,7 +123,7 @@ const GroupingRowRenderer = (props) => {
     }
     return (h(RowRenderer, Object.assign({}, props, groupRowAttrs), hasExpand && [
         h("button", { class: { [GROUP_EXPAND_BTN]: true }, onClick: e => expandEvent(e, model, itemIndex) }, expandSvgIconVNode(expanded)),
-        name,
+        String(name),
     ]));
 };
 const expandSvgIconVNode = (expanded = false) => {
@@ -115,4 +168,4 @@ const CellRenderer = ({ renderProps, cellProps, }) => {
     return (h("div", Object.assign({}, cellProps, { redraw: render }), render()));
 };
 
-export { CellRenderer as C, GroupingRowRenderer as G, PADDING_DEPTH as P, RowRenderer as R, SortingSign as S, expandSvgIconVNode as a, expandEvent as e };
+export { CellRenderer as C, GroupingRowRenderer as G, PADDING_DEPTH as P, RowRenderer as R, SortingSign as S, expandSvgIconVNode as a, expandEvent as e, renderGroupCells as r };

package/dist/esm/{column.drag.plugin-DKkf7Zqb.js → column.drag.plugin-K0lXn2G3.js}

@@ -1,14 +1,14 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import { J as reduce, g as getRange, K as baseEach, C as getColumnType, c as columnTypes, L as toInteger, u as isGrouping, t as getGroupingName, r as rowTypes, B as getCellDataParsed, A as getCellRaw, j as GROUP_COLUMN_PROP, I as getColumnByProp, h as GROUP_EXPANDED, x as getParsedGroup, y as isSameGroup, G as GROUP_DEPTH, e as PSEUDO_GROUP_ITEM_VALUE, d as PSEUDO_GROUP_ITEM_ID, o as GROUPING_ROW_TYPE, p as getSource, f as PSEUDO_GROUP_COLUMN, s as gatherGrouping, m as GROUP_EXPAND_EVENT, v as isGroupingColumn, q as getExpanded, E as isColGrouping } from './column.service-C6hByxPy.js';
-import { K as createStore, l as setStore, i as calculateDimensionData, L as identity, N as isArray, b as getSourceItem, g as getPhysical, e as setItems, j as getItemByPosition } from './dimension.helpers-CGKwSvw6.js';
-import { j as calculateRowHeaderSize } from './viewport.store-_c579YyM.js';
-import { g as getScrollbarSize, t as timeout } from './index-Db3qZoW5.js';
+import { J as reduce, g as getRange, K as baseEach, C as getColumnType, c as columnTypes, L as toInteger, u as isGrouping, t as getGroupingName, r as rowTypes, B as getCellDataParsed, A as getCellRaw, j as GROUP_COLUMN_PROP, I as getColumnByProp, h as GROUP_EXPANDED, x as getParsedGroup, y as isSameGroup, G as GROUP_DEPTH, e as PSEUDO_GROUP_ITEM_VALUE, d as PSEUDO_GROUP_ITEM_ID, o as GROUPING_ROW_TYPE, p as getSource, f as PSEUDO_GROUP_COLUMN, s as gatherGrouping, m as GROUP_EXPAND_EVENT, v as isGroupingColumn, q as getExpanded, E as isColGrouping } from './column.service-BnFqXqQG.js';
+import { K as createStore, l as setStore, i as calculateDimensionData, L as identity, N as isArray, b as getSourceItem, g as getPhysical, e as setItems, j as getItemByPosition } from './dimension.helpers-CXrsUc6f.js';
+import { j as calculateRowHeaderSize } from './viewport.store-D5jEuhLq.js';
+import { g as getScrollbarSize, t as timeout } from './index-DBqlJITb.js';
 import { h } from './index-Chp_81rd.js';
 import { b as FILTER_PROP, i as isFilterBtn } from './filter.button-B-RBiF67.js';
 import { d as debounce } from './debounce-PCRWZliA.js';
-import { O as ON_COLUMN_CLICK, d as dispatch } from './header-cell-renderer-BMmXRsd_.js';
+import { O as ON_COLUMN_CLICK, d as dispatch } from './header-cell-renderer-B3mYpZD3.js';
 
 function calculateRealSize({ count, originItemSize, sizes, }) {
     const safeCount = Math.max(0, count);
@@ -1274,13 +1274,14 @@ class FilterPlugin extends BasePlugin {
         this.filterNameIndexByType = Object.assign({}, filterNames);
         this.filterFunctionsIndexedByType = Object.assign({}, filterCoreFunctionsIndexedByType);
         this.filterProp = FILTER_PROP;
+        this.allowDuplicateOperators = true;
         if (config) {
             this.initConfig(config);
         }
         const existingNodes = this.revogrid.registerVNode.filter(n => typeof n === 'object' && n.$tag$ !== FILTE_PANEL);
         this.revogrid.registerVNode = [
             ...existingNodes,
-            h("revogr-filter-panel", { filterNames: this.filterNameIndexByType, filterEntities: this.filterFunctionsIndexedByType, filterCaptions: (_a = config === null || config === void 0 ? void 0 : config.localization) === null || _a === void 0 ? void 0 : _a.captions, onFilterChange: e => this.onFilterChange(e.detail), onResetChange: e => this.onFilterReset(e.detail), disableDynamicFiltering: config === null || config === void 0 ? void 0 : config.disableDynamicFiltering, closeOnOutsideClick: config === null || config === void 0 ? void 0 : config.closeFilterPanelOnOutsideClick, ref: e => (this.pop = e) }, ' ', this.extraContent()),
+            h("revogr-filter-panel", { filterNames: this.filterNameIndexByType, filterEntities: this.filterFunctionsIndexedByType, filterCaptions: (_a = config === null || config === void 0 ? void 0 : config.localization) === null || _a === void 0 ? void 0 : _a.captions, onFilterChange: e => this.onFilterChange(e.detail), onResetChange: e => this.onFilterReset(e.detail), disableDynamicFiltering: config === null || config === void 0 ? void 0 : config.disableDynamicFiltering, closeOnOutsideClick: config === null || config === void 0 ? void 0 : config.closeFilterPanelOnOutsideClick, allowDuplicateOperators: this.allowDuplicateOperators, ref: e => (this.pop = e) }, ' ', this.extraContent()),
         ];
         const aftersourceset = async () => {
             const filterCollectionProps = Object.keys(this.filterCollection);
@@ -1307,15 +1308,24 @@ class FilterPlugin extends BasePlugin {
         };
         this.addEventListener('headerclick', e => this.headerclick(e));
         this.addEventListener(FILTER_CONFIG_CHANGED_EVENT, ({ detail }) => {
-            if (!detail ||
-                (typeof detail === 'object' &&
-                    (!detail.multiFilterItems ||
-                        !Object.keys(detail.multiFilterItems).length))) {
+            if (!detail) {
                 this.clearFiltering();
                 return;
             }
             if (typeof detail === 'object') {
-                this.initConfig(detail);
+                const detailKeys = Object.keys(detail);
+                const preserveCurrentFilters = !detailKeys.includes('multiFilterItems') &&
+                    detailKeys.includes('allowDuplicateOperators');
+                this.initConfig(preserveCurrentFilters
+                    ? Object.assign(Object.assign({}, detail), { multiFilterItems: this.multiFilterItems }) : detail);
+                if (!detail.multiFilterItems || !Object.keys(detail.multiFilterItems).length) {
+                    if (preserveCurrentFilters) {
+                        aftersourceset();
+                        return;
+                    }
+                    this.clearFiltering();
+                    return;
+                }
             }
             aftersourceset();
         });
@@ -1329,6 +1339,11 @@ class FilterPlugin extends BasePlugin {
         return null;
     }
     initConfig(config) {
+        var _a;
+        this.allowDuplicateOperators = (_a = config.allowDuplicateOperators) !== null && _a !== void 0 ? _a : true;
+        if (this.pop) {
+            this.pop.allowDuplicateOperators = this.allowDuplicateOperators;
+        }
         if (config.multiFilterItems) {
             this.multiFilterItems = Object.assign({}, config.multiFilterItems);
         }
@@ -2452,7 +2467,7 @@ class GroupingRowPlugin extends BasePlugin {
      * Initiated when need to reapply grouping
      */
     doSourceUpdate(options) {
-        var _a;
+        var _a, _b;
         /**
          * Get source without grouping
          * @param newOldIndexMap - provides us mapping with new indexes vs old indexes, we would use it for trimmed mapping
@@ -2464,10 +2479,11 @@ class GroupingRowPlugin extends BasePlugin {
          * Group again
          * @param oldNewIndexMap - provides us mapping with new indexes vs old indexes
          */
-        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.props) || [], expanded);
+        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, (_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.props) !== null && _b !== void 0 ? _b : [], expanded);
         const customRenderer = options === null || options === void 0 ? void 0 : options.groupLabelTemplate;
+        const cellRenderer = options === null || options === void 0 ? void 0 : options.groupCellTemplate;
         // setup source
-        this.providers.data.setData(sourceWithGroups, GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, { depth, customRenderer }, true);
+        this.providers.data.setData(sourceWithGroups, GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, { depth, customRenderer, cellRenderer }, true);
         this.updateTrimmed(trimmed, oldNewIndexes !== null && oldNewIndexes !== void 0 ? oldNewIndexes : {}, oldNewIndexMap, sourceWithGroups);
     }
     /**
@@ -2476,17 +2492,21 @@ class GroupingRowPlugin extends BasePlugin {
      * If source came from other plugin
      */
     onDataSet(data) {
-        var _a, _b;
+        var _a, _b, _c;
         let preservedExpanded = {};
         if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.preserveGroupingOnUpdate) !== false) {
             let { prevExpanded } = getSource(this.getStore().get('source'), this.getStore().get('proxyItems'), true);
             preservedExpanded = prevExpanded;
         }
         const source = data.source.filter(s => !isGrouping(s));
-        const options = Object.assign(Object.assign({}, (this.revogrid.grouping || {})), { prevExpanded: preservedExpanded });
-        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, ((_b = this.options) === null || _b === void 0 ? void 0 : _b.props) || [], options);
+        const options = Object.assign(Object.assign({}, this.options), { prevExpanded: preservedExpanded });
+        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, (_c = (_b = this.options) === null || _b === void 0 ? void 0 : _b.props) !== null && _c !== void 0 ? _c : [], options);
         data.source = sourceWithGroups;
-        this.providers.data.setGrouping({ depth });
+        this.providers.data.setGrouping({
+            depth,
+            customRenderer: options.groupLabelTemplate,
+            cellRenderer: options.groupCellTemplate,
+        });
         this.updateTrimmed(trimmed, oldNewIndexMap, undefined, sourceWithGroups);
     }
     /**