igniteui-angular 13.0.2 → 13.0.3

package/fesm2020/igniteui-angular.mjs

@@ -2389,6 +2389,7 @@ DefaultSortingStrategy._instance = null;
 const DATE_TYPE = 'date';
 const TIME_TYPE = 'time';
 const DATE_TIME_TYPE = 'dateTime';
+const STRING_TYPE = 'string';
 class IgxSorting {
     sort(data, expressions, grid) {
         return this.sortDataRecursive(data, expressions, 0, grid);
@@ -2402,7 +2403,8 @@ class IgxSorting {
             const column = grid ? grid.getColumnByName(expressions[level].fieldName) : null;
             const isDate = column?.dataType === DATE_TYPE || column?.dataType === DATE_TIME_TYPE;
             const isTime = column?.dataType === TIME_TYPE;
-            const group = this.groupedRecordsByExpression(data, i, expressions[level], isDate);
+            const isString = column?.dataType === STRING_TYPE;
+            const group = this.groupedRecordsByExpression(data, i, expressions[level], isDate, isString);
             const groupRow = {
                 expression: expressions[level],
                 level,
@@ -2456,16 +2458,22 @@ class IgxSorting {
         }
         return resolvedValue;
     }
-    groupedRecordsByExpression(data, index, expression, isDate = false) {
+    groupedRecordsByExpression(data, index, expression, isDate = false, isString) {
         const res = [];
         const key = expression.fieldName;
         const len = data.length;
-        const groupval = this.getFieldValue(data[index], key, isDate);
+        let groupval = this.getFieldValue(data[index], key, isDate);
         res.push(data[index]);
         index++;
         const comparer = expression.groupingComparer || DefaultSortingStrategy.instance().compareValues;
         for (let i = index; i < len; i++) {
-            if (comparer(this.getFieldValue(data[i], key, isDate), groupval) === 0) {
+            let fieldValue = this.getFieldValue(data[i], key, isDate);
+            if (expression.ignoreCase && isString) {
+                // when column's dataType is string but the value is number
+                fieldValue = fieldValue?.toString().toLowerCase();
+                groupval = groupval?.toString().toLowerCase();
+            }
+            if (comparer(fieldValue, groupval) === 0) {
                 res.push(data[i]);
             }
             else {
@@ -2492,13 +2500,14 @@ class IgxSorting {
         const column = grid?.getColumnByName(expr.fieldName);
         const isDate = column?.dataType === DATE_TYPE || column?.dataType === DATE_TIME_TYPE;
         const isTime = column?.dataType === TIME_TYPE;
+        const isString = column?.dataType === STRING_TYPE;
         data = expr.strategy.sort(data, expr.fieldName, expr.dir, expr.ignoreCase, this.getFieldValue, isDate, isTime);
         if (expressionIndex === exprsLen - 1) {
             return data;
         }
         // in case of multiple sorting
         for (i = 0; i < dataLen; i++) {
-            gbData = this.groupedRecordsByExpression(data, i, expr, isDate);
+            gbData = this.groupedRecordsByExpression(data, i, expr, isDate, isString);
             gbDataLen = gbData.length;
             if (gbDataLen > 1) {
                 gbData = this.sortDataRecursive(gbData, expressions, expressionIndex + 1, grid);