@revolist/revogrid 3.2.18 → 3.3.1

package/dist/cjs/revo-grid_11.cjs.entry.js

@@ -229,9 +229,9 @@ var isArguments_1 = isArguments;
  * _.isArray(_.noop);
  * // => false
  */
-var isArray$1 = Array.isArray;
+var isArray = Array.isArray;
 
-var isArray_1 = isArray$1;
+var isArray_1 = isArray;
 
 /**
  * This method returns `false`.
@@ -5904,123 +5904,91 @@ const PSEUDO_GROUP_ITEM_ID = `${GRID_INTERNALS}-id`;
 const PSEUDO_GROUP_ITEM_VALUE = `${GRID_INTERNALS}-value`;
 const PSEUDO_GROUP_COLUMN = `${GRID_INTERNALS}-column`;
 const GROUP_EXPANDED = `${GRID_INTERNALS}-expanded`;
+const GROUP_ORIGINAL_INDEX = `${GRID_INTERNALS}-original-index`;
 const GROUP_EXPAND_BTN = `group-expand`;
 const GROUP_EXPAND_EVENT = `groupExpandClick`;
 const GROUPING_ROW_TYPE = 'rgRow';
 
-/**
- * Do actual grouping
- * @param array - items to group
- * @param f - function responsible for grouping, returns property to group by
- */
-function groupBy(array, f) {
-  const groupsOrder = [];
-  const itemsByGroup = {};
-  array.forEach((item, i) => {
-    // get grouping values
-    const groupKeys = JSON.stringify(f(item));
-    // new group identification
-    if (!itemsByGroup[groupKeys]) {
-      itemsByGroup[groupKeys] = new Map();
-      // create group parents
-      groupsOrder.push({
-        children: itemsByGroup[groupKeys],
-        id: groupKeys,
-      });
-    }
-    // save to group with previous index
-    itemsByGroup[groupKeys].set(i, item);
-  });
-  return groupsOrder;
-}
 /**
  * Gather data for grouping
  * @param array - flat data array
- * @param mapFunc - mapping function for stringify
+ * @param groupIds - ids of groups
  * @param expanded - potentially expanded items if present
  */
-function gatherGrouping(array, mapFunc, { prevExpanded, expandedAll }) {
-  // build groups
-  const groupsOrder = groupBy(array, mapFunc);
-  const itemsMirror = []; // grouped source
-  const pseudoGroupTest = {}; // check if group header exists
-  // item index in source
-  let itemIndex = 0;
-  // to save max group depth
-  let groupingDepth = 0;
+function gatherGrouping(array, groupIds, { prevExpanded, expandedAll }) {
+  const groupedItems = new Map();
+  array.forEach((item, originalIndex) => {
+    const groupLevelValues = groupIds.map((groupId) => item[groupId] || null);
+    const lastLevelValue = groupLevelValues.pop();
+    let currentGroupLevel = groupedItems;
+    groupLevelValues.forEach((value) => {
+      if (!currentGroupLevel.has(value)) {
+        currentGroupLevel.set(value, new Map());
+      }
+      currentGroupLevel = currentGroupLevel.get(value);
+    });
+    if (!currentGroupLevel.has(lastLevelValue)) {
+      currentGroupLevel.set(lastLevelValue, []);
+    }
+    item[GROUP_ORIGINAL_INDEX] = originalIndex;
+    const lastLevelItems = currentGroupLevel.get(lastLevelValue);
+    lastLevelItems.push(item);
+  });
+  let itemIndex = -1;
+  const groupingDepth = groupIds.length;
   // collapse all groups in the beginning
   const trimmed = {};
   // index mapping
   const oldNewIndexMap = {};
-  // go through groups
-  groupsOrder.forEach(group => {
-    const parseGroup = getParsedGroup(group.id);
-    // extra precaution and type safe guard
-    if (!parseGroup) {
-      return;
-    }
-    let depth = 0;
-    let skipTrim = !!expandedAll;
-    let isExpanded = skipTrim;
-    const children = [];
-    // add group headers
-    parseGroup.reduce((prevVal, groupValue) => {
-      prevVal.push(groupValue);
-      const newVal = prevVal.join(',');
-      // if header not added, add new header
-      if (!pseudoGroupTest[newVal]) {
-        isExpanded = expandedAll || (prevExpanded && prevExpanded[newVal]);
-        itemsMirror.push(getPseudoGroup(groupValue, newVal, depth, group.id, isExpanded));
-        // if not first level auto collapse
-        if (depth && !isExpanded && !skipTrim) {
-          // check if parent expanded, expand this layer too
-          const parent = prevVal.slice(0, prevVal.length - 1);
-          if (!(prevExpanded && parent.length && prevExpanded[parent.join(',')])) {
+  // check if group header exists
+  const pseudoGroupTest = {};
+  const sourceWithGroups = [];
+  function flattenGroupMaps(groupedValues, parentIds, isExpanded) {
+    const depth = parentIds.length;
+    groupedValues.forEach((innerGroupedValues, groupId) => {
+      const levelIds = [...parentIds, groupId];
+      const mergedIds = levelIds.join(',');
+      const isGroupExpanded = isExpanded && (!!expandedAll || !!(prevExpanded === null || prevExpanded === void 0 ? void 0 : prevExpanded[mergedIds]));
+      sourceWithGroups.push({
+        [PSEUDO_GROUP_ITEM]: groupId,
+        [GROUP_DEPTH]: depth,
+        [PSEUDO_GROUP_ITEM_ID]: JSON.stringify(levelIds),
+        [PSEUDO_GROUP_ITEM_VALUE]: mergedIds,
+        [GROUP_EXPANDED]: isGroupExpanded,
+      });
+      itemIndex += 1;
+      if (!isGroupExpanded && depth) {
+        trimmed[itemIndex] = true;
+      }
+      if (Array.isArray(innerGroupedValues)) {
+        innerGroupedValues.forEach((value) => {
+          itemIndex += 1;
+          if (!isGroupExpanded) {
             trimmed[itemIndex] = true;
           }
-        }
-        itemIndex++;
-        pseudoGroupTest[newVal] = children;
+          oldNewIndexMap[value[GROUP_ORIGINAL_INDEX]] = itemIndex;
+          const pseudoGroupTestIds = levelIds.map((_value, index) => levelIds.slice(0, index + 1).join(','));
+          pseudoGroupTestIds.forEach((pseudoGroupTestId) => {
+            if (!pseudoGroupTest[pseudoGroupTestId]) {
+              pseudoGroupTest[pseudoGroupTestId] = [];
+            }
+            pseudoGroupTest[pseudoGroupTestId].push(itemIndex);
+          });
+        });
+        sourceWithGroups.push(...innerGroupedValues);
       }
-      // calculate depth
-      depth++;
-      groupingDepth = depth;
-      return prevVal;
-    }, []);
-    // add regular items
-    group.children.forEach((item, oldIndex) => {
-      // hide items if group colapsed
-      if (!isExpanded && !skipTrim) {
-        // collapse rgRow
-        trimmed[itemIndex] = true;
+      else {
+        flattenGroupMaps(innerGroupedValues, levelIds, isGroupExpanded);
       }
-      // add items to new source
-      itemsMirror.push(item);
-      oldNewIndexMap[oldIndex] = itemIndex;
-      children.push(itemIndex);
-      itemIndex++;
     });
-  });
+  }
+  flattenGroupMaps(groupedItems, [], true);
   return {
-    // updates source mirror
-    sourceWithGroups: itemsMirror,
-    // largest depth for grouping
+    sourceWithGroups,
     depth: groupingDepth,
-    // used for expand/collapse grouping values
     trimmed,
-    // used for mapping old values to new
     oldNewIndexMap,
-    // used to get child items in group
-    childrenByGroup: pseudoGroupTest,
-  };
-}
-function getPseudoGroup(groupValue, value, depth, id, isExpanded = false) {
-  return {
-    [PSEUDO_GROUP_ITEM]: groupValue,
-    [GROUP_DEPTH]: depth,
-    [PSEUDO_GROUP_ITEM_ID]: id,
-    [PSEUDO_GROUP_ITEM_VALUE]: value,
-    [GROUP_EXPANDED]: isExpanded,
+    childrenByGroup: pseudoGroupTest, // used to get child items in group
   };
 }
 function getGroupingName(rgRow) {
@@ -6032,9 +6000,6 @@ function isGrouping(rgRow) {
 function isGroupingColumn(column) {
   return column && typeof column[PSEUDO_GROUP_COLUMN] !== 'undefined';
 }
-function isArray(data) {
-  return typeof data.push !== 'undefined';
-}
 function measureEqualDepth(groupA, groupB) {
   const ln = groupA.length;
   let i = 0;
@@ -6048,7 +6013,7 @@ function measureEqualDepth(groupA, groupB) {
 function getParsedGroup(id) {
   const parseGroup = JSON.parse(id);
   // extra precaution and type safe guard
-  if (!isArray(parseGroup)) {
+  if (!Array.isArray(parseGroup)) {
     return null;
   }
   return parseGroup;
@@ -6295,19 +6260,18 @@ class ExportFilePlugin extends BasePlugin {
 // provide collapse data
 function doCollapse(pIndex, source) {
   const model = source[pIndex];
-  const currentId = model[PSEUDO_GROUP_ITEM_ID];
+  const collapseValue = model[PSEUDO_GROUP_ITEM_VALUE];
   const trimmed = {};
   let i = pIndex + 1;
   const total = source.length;
   while (i < total) {
     const currentModel = source[i];
     if (isGrouping(currentModel)) {
-      if (currentId !== currentModel[PSEUDO_GROUP_ITEM_ID]) {
+      const currentValue = currentModel[PSEUDO_GROUP_ITEM_VALUE];
+      if (!currentValue.length || !currentValue.startsWith(collapseValue + ',')) {
         break;
       }
-      else {
-        currentModel[GROUP_EXPANDED] = false;
-      }
+      currentModel[GROUP_EXPANDED] = false;
     }
     trimmed[i++] = true;
   }
@@ -6547,7 +6511,7 @@ class GroupingRowPlugin extends BasePlugin {
      * sorting applied need to clear grouping and apply again
      * based on new results whole grouping order will changed
      */
-    this.addEventListener('afterSortingApply', () => this.doSourceUpdate());
+    this.addEventListener('afterSortingApply', () => this.doSourceUpdate(Object.assign({}, this.options)));
     /**
      * Apply logic for focus inside of grouping
      * We can't focus on grouping rows, navigation only inside of groups for now
@@ -6567,6 +6531,7 @@ class GroupingRowPlugin extends BasePlugin {
    * Initiated when need to reapply grouping
    */
   doSourceUpdate(options) {
+    var _a;
     if (!this.hasProps) {
       return;
     }
@@ -6579,11 +6544,9 @@ class GroupingRowPlugin extends BasePlugin {
      * Group again
      * @param oldNewIndexMap - provides us mapping with new indexes vs old indexes
      */
-    const { sourceWithGroups, depth, trimmed, oldNewIndexMap, childrenByGroup } = gatherGrouping(source, 
-    // filter
-    item => { var _a; return (_a = this.options) === null || _a === void 0 ? void 0 : _a.props.map(key => item[key]); }, Object.assign({ prevExpanded }, options));
+    const { sourceWithGroups, depth, trimmed, oldNewIndexMap, childrenByGroup } = gatherGrouping(source, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.props) || [], Object.assign({ prevExpanded }, options));
     // setup source
-    this.providers.dataProvider.setData(sourceWithGroups, GROUPING_ROW_TYPE, { depth, customRenderer: options.groupLabelTemplate }, true);
+    this.providers.dataProvider.setData(sourceWithGroups, GROUPING_ROW_TYPE, { depth, customRenderer: options === null || options === void 0 ? void 0 : options.groupLabelTemplate }, true);
     this.updateTrimmed(trimmed, childrenByGroup, oldNewIndexes, oldNewIndexMap);
   }
   /**
@@ -6592,14 +6555,13 @@ class GroupingRowPlugin extends BasePlugin {
    * If source came from other plugin
    */
   onDataSet(data) {
+    var _a;
     if (!this.hasProps || !(data === null || data === void 0 ? void 0 : data.source) || !data.source.length) {
       return;
     }
     const source = data.source.filter(s => !isGrouping(s));
     const expanded = this.revogrid.grouping || {};
-    const { sourceWithGroups, depth, trimmed, oldNewIndexMap, childrenByGroup } = gatherGrouping(source, 
-    // filter
-    item => { var _a; return (_a = this.options) === null || _a === void 0 ? void 0 : _a.props.map(key => item[key]); }, Object.assign({}, (expanded || {})));
+    const { sourceWithGroups, depth, trimmed, oldNewIndexMap, childrenByGroup } = gatherGrouping(source, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.props) || [], Object.assign({}, (expanded || {})));
     data.source = sourceWithGroups;
     this.providers.dataProvider.setGrouping({ depth });
     this.updateTrimmed(trimmed, childrenByGroup, oldNewIndexMap);
@@ -25054,7 +25016,8 @@ const RevoGridComponent = class {
       return;
     }
     await timeout();
-    (_a = this.viewport) === null || _a === void 0 ? void 0 : _a.setEdit(rgRow, this.columnProvider.getColumnIndexByProp(prop, 'rgCol'), rgCol.pin || 'rgCol', rowSource);
+    const colGroup = rgCol.pin || 'rgCol';
+    (_a = this.viewport) === null || _a === void 0 ? void 0 : _a.setEdit(rgRow, this.columnProvider.getColumnIndexByProp(prop, colGroup), colGroup, rowSource);
   }
   /**
    * Register new virtual node inside of grid
@@ -25732,11 +25695,15 @@ const GroupingRowRenderer = (props) => {
   if (!hasExpand) {
     return index.h(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }));
   }
+  if (groupingCustomRenderer) {
+    return (index.h(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }),
+      index.h("div", { onClick: e => expandEvent(e, model, itemIndex) }, groupingCustomRenderer(index.h, { name, itemIndex, expanded, depth }))));
+  }
   return (index.h(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }),
     index.h("button", { class: { [GROUP_EXPAND_BTN]: true }, onClick: e => expandEvent(e, model, itemIndex) },
       index.h("svg", { "aria-hidden": "true", style: { transform: `rotate(${!expanded ? -90 : 0}deg)` }, focusable: "false", viewBox: "0 0 448 512" },
         index.h("path", { fill: "currentColor", d: "M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z" }))),
-    groupingCustomRenderer ? groupingCustomRenderer(index.h, { name, itemIndex, expanded, depth }) : name));
+    name));
 };
 
 const revogrDataStyleCss = ".revo-drag-icon{-webkit-mask-image:url(\"data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg viewBox='0 0 438 383' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg%3E%3Cpath d='M421.875,70.40625 C426.432292,70.40625 430.175781,68.9414062 433.105469,66.0117188 C436.035156,63.0820312 437.5,59.3385417 437.5,54.78125 L437.5,54.78125 L437.5,15.71875 C437.5,11.1614583 436.035156,7.41796875 433.105469,4.48828125 C430.175781,1.55859375 426.432292,0.09375 421.875,0.09375 L421.875,0.09375 L15.625,0.09375 C11.0677083,0.09375 7.32421875,1.55859375 4.39453125,4.48828125 C1.46484375,7.41796875 0,11.1614583 0,15.71875 L0,15.71875 L0,54.78125 C0,59.3385417 1.46484375,63.0820312 4.39453125,66.0117188 C7.32421875,68.9414062 11.0677083,70.40625 15.625,70.40625 L15.625,70.40625 L421.875,70.40625 Z M421.875,226.65625 C426.432292,226.65625 430.175781,225.191406 433.105469,222.261719 C436.035156,219.332031 437.5,215.588542 437.5,211.03125 L437.5,211.03125 L437.5,171.96875 C437.5,167.411458 436.035156,163.667969 433.105469,160.738281 C430.175781,157.808594 426.432292,156.34375 421.875,156.34375 L421.875,156.34375 L15.625,156.34375 C11.0677083,156.34375 7.32421875,157.808594 4.39453125,160.738281 C1.46484375,163.667969 0,167.411458 0,171.96875 L0,171.96875 L0,211.03125 C0,215.588542 1.46484375,219.332031 4.39453125,222.261719 C7.32421875,225.191406 11.0677083,226.65625 15.625,226.65625 L15.625,226.65625 L421.875,226.65625 Z M421.875,382.90625 C426.432292,382.90625 430.175781,381.441406 433.105469,378.511719 C436.035156,375.582031 437.5,371.838542 437.5,367.28125 L437.5,367.28125 L437.5,328.21875 C437.5,323.661458 436.035156,319.917969 433.105469,316.988281 C430.175781,314.058594 426.432292,312.59375 421.875,312.59375 L421.875,312.59375 L15.625,312.59375 C11.0677083,312.59375 7.32421875,314.058594 4.39453125,316.988281 C1.46484375,319.917969 0,323.661458 0,328.21875 L0,328.21875 L0,367.28125 C0,371.838542 1.46484375,375.582031 4.39453125,378.511719 C7.32421875,381.441406 11.0677083,382.90625 15.625,382.90625 L15.625,382.90625 L421.875,382.90625 Z'%3E%3C/path%3E%3C/g%3E%3C/svg%3E\");mask-image:url(\"data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg viewBox='0 0 438 383' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg%3E%3Cpath d='M421.875,70.40625 C426.432292,70.40625 430.175781,68.9414062 433.105469,66.0117188 C436.035156,63.0820312 437.5,59.3385417 437.5,54.78125 L437.5,54.78125 L437.5,15.71875 C437.5,11.1614583 436.035156,7.41796875 433.105469,4.48828125 C430.175781,1.55859375 426.432292,0.09375 421.875,0.09375 L421.875,0.09375 L15.625,0.09375 C11.0677083,0.09375 7.32421875,1.55859375 4.39453125,4.48828125 C1.46484375,7.41796875 0,11.1614583 0,15.71875 L0,15.71875 L0,54.78125 C0,59.3385417 1.46484375,63.0820312 4.39453125,66.0117188 C7.32421875,68.9414062 11.0677083,70.40625 15.625,70.40625 L15.625,70.40625 L421.875,70.40625 Z M421.875,226.65625 C426.432292,226.65625 430.175781,225.191406 433.105469,222.261719 C436.035156,219.332031 437.5,215.588542 437.5,211.03125 L437.5,211.03125 L437.5,171.96875 C437.5,167.411458 436.035156,163.667969 433.105469,160.738281 C430.175781,157.808594 426.432292,156.34375 421.875,156.34375 L421.875,156.34375 L15.625,156.34375 C11.0677083,156.34375 7.32421875,157.808594 4.39453125,160.738281 C1.46484375,163.667969 0,167.411458 0,171.96875 L0,171.96875 L0,211.03125 C0,215.588542 1.46484375,219.332031 4.39453125,222.261719 C7.32421875,225.191406 11.0677083,226.65625 15.625,226.65625 L15.625,226.65625 L421.875,226.65625 Z M421.875,382.90625 C426.432292,382.90625 430.175781,381.441406 433.105469,378.511719 C436.035156,375.582031 437.5,371.838542 437.5,367.28125 L437.5,367.28125 L437.5,328.21875 C437.5,323.661458 436.035156,319.917969 433.105469,316.988281 C430.175781,314.058594 426.432292,312.59375 421.875,312.59375 L421.875,312.59375 L15.625,312.59375 C11.0677083,312.59375 7.32421875,314.058594 4.39453125,316.988281 C1.46484375,319.917969 0,323.661458 0,328.21875 L0,328.21875 L0,367.28125 C0,371.838542 1.46484375,375.582031 4.39453125,378.511719 C7.32421875,381.441406 11.0677083,382.90625 15.625,382.90625 L15.625,382.90625 L421.875,382.90625 Z'%3E%3C/path%3E%3C/g%3E%3C/svg%3E\");width:11px;height:7px;background-size:cover;background-repeat:no-repeat}.revo-alt-icon{-webkit-mask-image:url(\"data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg viewBox='0 0 384 383' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg%3E%3Cpath d='M192.4375,383 C197.424479,383 201.663411,381.254557 205.154297,377.763672 L205.154297,377.763672 L264.25,318.667969 C270.234375,312.683594 271.605794,306.075846 268.364258,298.844727 C265.122721,291.613607 259.51237,287.998047 251.533203,287.998047 L251.533203,287.998047 L213.382812,287.998047 L213.382812,212.445312 L288.935547,212.445312 L288.935547,250.595703 C288.935547,258.57487 292.551107,264.185221 299.782227,267.426758 C307.013346,270.668294 313.621094,269.296875 319.605469,263.3125 L319.605469,263.3125 L378.701172,204.216797 C382.192057,200.725911 383.9375,196.486979 383.9375,191.5 C383.9375,186.513021 382.192057,182.274089 378.701172,178.783203 L378.701172,178.783203 L319.605469,119.6875 C313.621094,114.201823 307.013346,112.955078 299.782227,115.947266 C292.551107,118.939453 288.935547,124.42513 288.935547,132.404297 L288.935547,132.404297 L288.935547,170.554688 L213.382812,170.554688 L213.382812,95.0019531 L251.533203,95.0019531 C259.51237,95.0019531 264.998047,91.3863932 267.990234,84.1552734 C270.982422,76.9241536 269.735677,70.3164062 264.25,64.3320312 L264.25,64.3320312 L205.154297,5.23632812 C201.663411,1.74544271 197.424479,0 192.4375,0 C187.450521,0 183.211589,1.74544271 179.720703,5.23632812 L179.720703,5.23632812 L120.625,64.3320312 C114.640625,70.3164062 113.269206,76.9241536 116.510742,84.1552734 C119.752279,91.3863932 125.36263,95.0019531 133.341797,95.0019531 L133.341797,95.0019531 L171.492188,95.0019531 L171.492188,170.554688 L95.9394531,170.554688 L95.9394531,132.404297 C95.9394531,124.42513 92.3238932,118.814779 85.0927734,115.573242 C77.8616536,112.331706 71.2539062,113.703125 65.2695312,119.6875 L65.2695312,119.6875 L6.17382812,178.783203 C2.68294271,182.274089 0.9375,186.513021 0.9375,191.5 C0.9375,196.486979 2.68294271,200.725911 6.17382812,204.216797 L6.17382812,204.216797 L65.2695312,263.3125 C71.2539062,268.798177 77.8616536,270.044922 85.0927734,267.052734 C92.3238932,264.060547 95.9394531,258.57487 95.9394531,250.595703 L95.9394531,250.595703 L95.9394531,212.445312 L171.492188,212.445312 L171.492188,287.998047 L133.341797,287.998047 C125.36263,287.998047 119.876953,291.613607 116.884766,298.844727 C113.892578,306.075846 115.139323,312.683594 120.625,318.667969 L120.625,318.667969 L179.720703,377.763672 C183.211589,381.254557 187.450521,383 192.4375,383 Z'%3E%3C/path%3E%3C/g%3E%3C/svg%3E\");mask-image:url(\"data:image/svg+xml,%3C%3Fxml version='1.0' encoding='UTF-8'%3F%3E%3Csvg viewBox='0 0 384 383' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cg%3E%3Cpath d='M192.4375,383 C197.424479,383 201.663411,381.254557 205.154297,377.763672 L205.154297,377.763672 L264.25,318.667969 C270.234375,312.683594 271.605794,306.075846 268.364258,298.844727 C265.122721,291.613607 259.51237,287.998047 251.533203,287.998047 L251.533203,287.998047 L213.382812,287.998047 L213.382812,212.445312 L288.935547,212.445312 L288.935547,250.595703 C288.935547,258.57487 292.551107,264.185221 299.782227,267.426758 C307.013346,270.668294 313.621094,269.296875 319.605469,263.3125 L319.605469,263.3125 L378.701172,204.216797 C382.192057,200.725911 383.9375,196.486979 383.9375,191.5 C383.9375,186.513021 382.192057,182.274089 378.701172,178.783203 L378.701172,178.783203 L319.605469,119.6875 C313.621094,114.201823 307.013346,112.955078 299.782227,115.947266 C292.551107,118.939453 288.935547,124.42513 288.935547,132.404297 L288.935547,132.404297 L288.935547,170.554688 L213.382812,170.554688 L213.382812,95.0019531 L251.533203,95.0019531 C259.51237,95.0019531 264.998047,91.3863932 267.990234,84.1552734 C270.982422,76.9241536 269.735677,70.3164062 264.25,64.3320312 L264.25,64.3320312 L205.154297,5.23632812 C201.663411,1.74544271 197.424479,0 192.4375,0 C187.450521,0 183.211589,1.74544271 179.720703,5.23632812 L179.720703,5.23632812 L120.625,64.3320312 C114.640625,70.3164062 113.269206,76.9241536 116.510742,84.1552734 C119.752279,91.3863932 125.36263,95.0019531 133.341797,95.0019531 L133.341797,95.0019531 L171.492188,95.0019531 L171.492188,170.554688 L95.9394531,170.554688 L95.9394531,132.404297 C95.9394531,124.42513 92.3238932,118.814779 85.0927734,115.573242 C77.8616536,112.331706 71.2539062,113.703125 65.2695312,119.6875 L65.2695312,119.6875 L6.17382812,178.783203 C2.68294271,182.274089 0.9375,186.513021 0.9375,191.5 C0.9375,196.486979 2.68294271,200.725911 6.17382812,204.216797 L6.17382812,204.216797 L65.2695312,263.3125 C71.2539062,268.798177 77.8616536,270.044922 85.0927734,267.052734 C92.3238932,264.060547 95.9394531,258.57487 95.9394531,250.595703 L95.9394531,250.595703 L95.9394531,212.445312 L171.492188,212.445312 L171.492188,287.998047 L133.341797,287.998047 C125.36263,287.998047 119.876953,291.613607 116.884766,298.844727 C113.892578,306.075846 115.139323,312.683594 120.625,318.667969 L120.625,318.667969 L179.720703,377.763672 C183.211589,381.254557 187.450521,383 192.4375,383 Z'%3E%3C/path%3E%3C/g%3E%3C/svg%3E\");width:11px;height:11px;background-size:cover;background-repeat:no-repeat}.arrow-down{position:absolute;right:5px;top:0}.arrow-down svg{width:8px;margin-top:5px;margin-left:5px;opacity:0.4}.cell-value-wrapper{margin-right:10px;overflow:hidden;text-overflow:ellipsis}.revo-button{position:relative;overflow:hidden;color:#fff;background-color:#6200ee;height:34px;line-height:34px;padding:0 15px;outline:0;border:0;border-radius:7px;box-sizing:border-box;cursor:pointer}.revo-button.green{background-color:#2ee072;border:1px solid #20d565}.revo-button.red{background-color:#E0662E;border:1px solid #d55920}.revo-button:disabled,.revo-button[disabled]{cursor:not-allowed !important;filter:opacity(0.35) !important}.revo-button.light{border:2px solid #cedefa;line-height:32px;background:none;color:#4876ca;box-shadow:none}revogr-data{display:block;width:100%;position:relative}revogr-data .rgRow{position:absolute;width:100%;left:0}revogr-data .rgRow.groupingRow{font-weight:600}revogr-data .rgRow.groupingRow .group-expand{width:25px;height:100%;max-height:25px;margin-right:2px;background-color:transparent;border-color:transparent}revogr-data .rgRow.groupingRow .group-expand svg{width:7px}revogr-data .revo-draggable{border:none;height:32px;display:inline-flex;outline:0;padding:0;font-size:0.8125rem;box-sizing:border-box;align-items:center;white-space:nowrap;vertical-align:middle;justify-content:center;text-decoration:none;width:24px;height:100%;cursor:pointer}revogr-data .revo-draggable>.revo-drag-icon{vertical-align:middle;display:inline-block;pointer-events:none;transition:background-color 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms, box-shadow 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms}revogr-data .rgCell{top:0;position:absolute;box-sizing:border-box;height:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}revogr-data .rgCell.align-center{text-align:center}revogr-data .rgCell.align-left{text-align:left}revogr-data .rgCell.align-right{text-align:right}";

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

@@ -203,7 +203,8 @@ export class RevoGridComponent {
       return;
     }
     await timeout();
-    (_a = this.viewport) === null || _a === void 0 ? void 0 : _a.setEdit(rgRow, this.columnProvider.getColumnIndexByProp(prop, 'rgCol'), rgCol.pin || 'rgCol', rowSource);
+    const colGroup = rgCol.pin || 'rgCol';
+    (_a = this.viewport) === null || _a === void 0 ? void 0 : _a.setEdit(rgRow, this.columnProvider.getColumnIndexByProp(prop, colGroup), colGroup, rowSource);
   }
   /**
    * Register new virtual node inside of grid

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

@@ -8,6 +8,7 @@ export const PSEUDO_GROUP_ITEM_ID = `${GRID_INTERNALS}-id`;
 export const PSEUDO_GROUP_ITEM_VALUE = `${GRID_INTERNALS}-value`;
 export const PSEUDO_GROUP_COLUMN = `${GRID_INTERNALS}-column`;
 export const GROUP_EXPANDED = `${GRID_INTERNALS}-expanded`;
+export const GROUP_ORIGINAL_INDEX = `${GRID_INTERNALS}-original-index`;
 export const GROUP_EXPAND_BTN = `group-expand`;
 export const GROUP_EXPAND_EVENT = `groupExpandClick`;
 export const GROUPING_ROW_TYPE = 'rgRow';

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

@@ -1,24 +1,23 @@
 /*!
  * Built by Revolist
  */
-import { PSEUDO_GROUP_ITEM_ID, GROUP_EXPANDED, GROUP_DEPTH } from './grouping.const';
+import { PSEUDO_GROUP_ITEM_ID, PSEUDO_GROUP_ITEM_VALUE, GROUP_EXPANDED, GROUP_DEPTH } from './grouping.const';
 import { isGrouping, getParsedGroup, isSameGroup } from './grouping.service';
 // provide collapse data
 export function doCollapse(pIndex, source) {
   const model = source[pIndex];
-  const currentId = model[PSEUDO_GROUP_ITEM_ID];
+  const collapseValue = model[PSEUDO_GROUP_ITEM_VALUE];
   const trimmed = {};
   let i = pIndex + 1;
   const total = source.length;
   while (i < total) {
     const currentModel = source[i];
     if (isGrouping(currentModel)) {
-      if (currentId !== currentModel[PSEUDO_GROUP_ITEM_ID]) {
+      const currentValue = currentModel[PSEUDO_GROUP_ITEM_VALUE];
+      if (!currentValue.length || !currentValue.startsWith(collapseValue + ',')) {
         break;
       }
-      else {
-        currentModel[GROUP_EXPANDED] = false;
-      }
+      currentModel[GROUP_EXPANDED] = false;
     }
     trimmed[i++] = true;
   }

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

@@ -144,7 +144,7 @@ export default class GroupingRowPlugin extends BasePlugin {
      * sorting applied need to clear grouping and apply again
      * based on new results whole grouping order will changed
      */
-    this.addEventListener('afterSortingApply', () => this.doSourceUpdate());
+    this.addEventListener('afterSortingApply', () => this.doSourceUpdate(Object.assign({}, this.options)));
     /**
      * Apply logic for focus inside of grouping
      * We can't focus on grouping rows, navigation only inside of groups for now
@@ -164,6 +164,7 @@ export default class GroupingRowPlugin extends BasePlugin {
    * Initiated when need to reapply grouping
    */
   doSourceUpdate(options) {
+    var _a;
     if (!this.hasProps) {
       return;
     }
@@ -176,11 +177,9 @@ export default class GroupingRowPlugin extends BasePlugin {
      * Group again
      * @param oldNewIndexMap - provides us mapping with new indexes vs old indexes
      */
-    const { sourceWithGroups, depth, trimmed, oldNewIndexMap, childrenByGroup } = gatherGrouping(source, 
-    // filter
-    item => { var _a; return (_a = this.options) === null || _a === void 0 ? void 0 : _a.props.map(key => item[key]); }, Object.assign({ prevExpanded }, options));
+    const { sourceWithGroups, depth, trimmed, oldNewIndexMap, childrenByGroup } = gatherGrouping(source, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.props) || [], Object.assign({ prevExpanded }, options));
     // setup source
-    this.providers.dataProvider.setData(sourceWithGroups, GROUPING_ROW_TYPE, { depth, customRenderer: options.groupLabelTemplate }, true);
+    this.providers.dataProvider.setData(sourceWithGroups, GROUPING_ROW_TYPE, { depth, customRenderer: options === null || options === void 0 ? void 0 : options.groupLabelTemplate }, true);
     this.updateTrimmed(trimmed, childrenByGroup, oldNewIndexes, oldNewIndexMap);
   }
   /**
@@ -189,14 +188,13 @@ export default class GroupingRowPlugin extends BasePlugin {
    * If source came from other plugin
    */
   onDataSet(data) {
+    var _a;
     if (!this.hasProps || !(data === null || data === void 0 ? void 0 : data.source) || !data.source.length) {
       return;
     }
     const source = data.source.filter(s => !isGrouping(s));
     const expanded = this.revogrid.grouping || {};
-    const { sourceWithGroups, depth, trimmed, oldNewIndexMap, childrenByGroup } = gatherGrouping(source, 
-    // filter
-    item => { var _a; return (_a = this.options) === null || _a === void 0 ? void 0 : _a.props.map(key => item[key]); }, Object.assign({}, (expanded || {})));
+    const { sourceWithGroups, depth, trimmed, oldNewIndexMap, childrenByGroup } = gatherGrouping(source, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.props) || [], Object.assign({}, (expanded || {})));
     data.source = sourceWithGroups;
     this.providers.dataProvider.setGrouping({ depth });
     this.updateTrimmed(trimmed, childrenByGroup, oldNewIndexMap);

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

@@ -23,10 +23,14 @@ const GroupingRowRenderer = (props) => {
   if (!hasExpand) {
     return h(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }));
   }
+  if (groupingCustomRenderer) {
+    return (h(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }),
+      h("div", { onClick: e => expandEvent(e, model, itemIndex) }, groupingCustomRenderer(h, { name, itemIndex, expanded, depth }))));
+  }
   return (h(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }),
     h("button", { class: { [GROUP_EXPAND_BTN]: true }, onClick: e => expandEvent(e, model, itemIndex) },
       h("svg", { "aria-hidden": "true", style: { transform: `rotate(${!expanded ? -90 : 0}deg)` }, focusable: "false", viewBox: "0 0 448 512" },
         h("path", { fill: "currentColor", d: "M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z" }))),
-    groupingCustomRenderer ? groupingCustomRenderer(h, { name, itemIndex, expanded, depth }) : name));
+    name));
 };
 export default GroupingRowRenderer;