@megha-ui/react 1.2.347 → 1.2.349
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -362,7 +362,6 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
362
362
|
];
|
|
363
363
|
_groupedKeys.forEach((grouped) => {
|
|
364
364
|
const { groupedValue, groupedColumns } = grouped;
|
|
365
|
-
console.log(grouped);
|
|
366
365
|
const filterValue = _groupedKeys.length > 1 ? groupedValue : "";
|
|
367
366
|
const columnTokens = groupedColumns
|
|
368
367
|
? groupedColumns.split(">").filter((item) => item)
|
|
@@ -570,6 +569,8 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
570
569
|
}
|
|
571
570
|
}, [gridColumns, groupBy]);
|
|
572
571
|
const groupByMultipleKeys = (data, groupByKeys) => {
|
|
572
|
+
// Backward compatibility: if compositeGroupBy is true and no '+' is used,
|
|
573
|
+
// and more than one key is provided, group all keys into a single composite bucket.
|
|
573
574
|
const hasPlus = groupByKeys.some((k) => k === null || k === void 0 ? void 0 : k.includes("+"));
|
|
574
575
|
if (groupByKeys.length > 1 && !hasPlus) {
|
|
575
576
|
const groupsMap = new Map();
|
|
@@ -599,6 +600,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
599
600
|
});
|
|
600
601
|
return groupedResult;
|
|
601
602
|
}
|
|
603
|
+
// Parse keys into levels, where each level can be a composite (split by '+')
|
|
602
604
|
const parsedKeys = groupByKeys
|
|
603
605
|
.map((k) => (k !== null && k !== void 0 ? k : "").trim())
|
|
604
606
|
.filter((k) => k)
|
|
@@ -608,6 +610,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
608
610
|
.map((s) => s.trim())
|
|
609
611
|
.filter(Boolean)
|
|
610
612
|
: [k]);
|
|
613
|
+
console.log(parsedKeys);
|
|
611
614
|
const groupData = (items, keys, level = 0) => {
|
|
612
615
|
if (level >= keys.length)
|
|
613
616
|
return items;
|
|
@@ -651,7 +654,6 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
651
654
|
});
|
|
652
655
|
return groupedResult;
|
|
653
656
|
};
|
|
654
|
-
console.log({ parsedKeys });
|
|
655
657
|
return groupData(data, parsedKeys);
|
|
656
658
|
};
|
|
657
659
|
const flattenGroupedData = (groupedData, level, groupedValues = [], parentKeys = []) => {
|
|
@@ -660,7 +662,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
660
662
|
groupedData.forEach((group) => {
|
|
661
663
|
const _groupedValues = [...groupedValues, group.value].map((item) => item ? item : "row");
|
|
662
664
|
const currentKeys = (group.allKeys
|
|
663
|
-
? [...parentKeys, group.allKeys.join("
|
|
665
|
+
? [...parentKeys, group.allKeys.join("+")]
|
|
664
666
|
: [...parentKeys, group.key]).filter((item) => item);
|
|
665
667
|
const groupedValue = _groupedValues.join(">");
|
|
666
668
|
const groupedColumns = currentKeys.join(">");
|
package/package.json
CHANGED