Merge branch 'master' into bpachilova/fix-12608

Author: kdinev

CHANGELOG.md

@@ -2,14 +2,21 @@
 
 All notable changes for each version of this project will be documented in this file.
 
+## 15.1.0
+
+ - `IgxPivotGrid`
+    - The `IgxPivotDateDimension` properties `inBaseDimension` and `inOption` have been deprecated and renamed to `baseDimension` and `options` respectively.
+
 ## 15.0.1
 
 - `IgxGrid`
     - Added new auto-sizing API `recalculateAutoSizes` that recalculates widths of columns that have size set to `auto`. Can be used in scenarios where you want to auto-size the columns again post initialization.
 - `igxPivotGrid`
     - Adding `aggregatorName` for pivot value configuration as an alternative to setting `aggregator` function. If both are set `aggregatorName` takes precedent. If none are set an error is thrown.
 - `IgxSimpleCombo`
-    - **Behavioral Change** - Keyboard navigation `ArrowUp` - when the combo is opened `ArrowUp` will close the dropdown if the search input is focused. If the active item is the first one in the list, the focus will be moved back to the search input while also selecting all of the text in the input. Otherwise `ArrowUp` will move to the previous list item.
+    - **Behavioral Change** 
+    - When the user clicks on the combo's input, the dropdown opens up.
+    - Keyboard navigation `ArrowUp` - when the combo is opened `ArrowUp` will close the dropdown if the search input is focused. If the active item is the first one in the list, the focus will be moved back to the search input while also selecting all of the text in the input. Otherwise `ArrowUp` will move to the previous list item.
 
 ## 15.0.0
 

projects/igniteui-angular/src/lib/core/styles/themes/generators/_base.scss

@@ -10,8 +10,12 @@
 @use 'igniteui-theming/sass/themes' as *;
 @use 'igniteui-theming/sass/themes/charts' as *;
 
+////
 /// @group themes
 /// @access public
+/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
+////
+
 /// Generates an Ignite UI for Angular global theme.
 /// @param {Map} $palette - An palette to be used by the global theme.
 /// @param {Map} $schema [$light-schema] - The schema used as basis for styling the components.
@@ -442,11 +446,10 @@
     }
 }
 
-/// @group themes
-/// @access public
-/// Creates a global material theme that can be used with light backgrounds.
+/// A wrapper around the theme mixin. Creates a global material theme that can be used with light backgrounds.
 /// @param {Map} $palette - An palette to be used by the global theme.
 /// @param {List} $exclude [( )] - A list of ig components to be excluded from the global theme styles.
+/// @see {mixin} theme
 @mixin light-theme(
     $palette,
     $exclude: (),
@@ -476,11 +479,10 @@
     );
 }
 
-/// @group themes
-/// @access public
-/// Creates a global material theme that can be used with dark backgrounds.
+/// A wrapper around the theme mixin. Creates a global material theme that can be used with dark backgrounds.
 /// @param {Map} $palette - An palette to be used by the global theme.
 /// @param {List} $exclude [( )] - A list of igx components to be excluded from the global theme styles.
+/// @see {mixin} theme
 @mixin dark-theme(
     $palette,
     $exclude: (),

projects/igniteui-angular/src/lib/core/styles/themes/generators/_bootstrap.scss

@@ -2,11 +2,16 @@
 @use '../schemas' as *;
 @use 'igniteui-theming/sass/color' as *;
 
+////
 /// @group themes
 /// @access public
-/// Creates a global bootstrap-like theme that can be used with light backgrounds.
+/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
+////
+
+/// A wrapper around the theme mixin. Creates a global bootstrap-like theme that can be used with light backgrounds.
 /// @param {Map} $palette - An palette to be used by the global theme.
 /// @param {List} $exclude [( )] - A list of ig components to be excluded from the global theme styles.
+/// @see {mixin} theme
 @mixin bootstrap-light-theme(
     $palette,
     $exclude: (),
@@ -39,11 +44,10 @@
     );
 }
 
-/// @group themes
-/// @access public
-/// Creates a global bootstrap-like theme that can be used with dark backgrounds.
+/// A wrapper around the theme mixin. Creates a global bootstrap-like theme that can be used with dark backgrounds.
 /// @param {Map} $palette - An palette to be used by the global theme.
 /// @param {List} $exclude [( )] - A list of ig components to be excluded from the global theme styles.
+/// @see {mixin} theme
 @mixin bootstrap-dark-theme(
     $palette,
     $exclude: (),

projects/igniteui-angular/src/lib/core/styles/themes/generators/_fluent.scss

@@ -2,11 +2,16 @@
 @use '../schemas' as *;
 @use 'igniteui-theming/sass/color' as *;
 
+////
 /// @group themes
 /// @access public
-/// Creates a global fluent theme that can be used with light backgrounds.
+/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
+////
+
+/// A wrapper around the theme mixin. Creates a global fluent theme that can be used with light backgrounds.
 /// @param {Map} $palette - An palette to be used by the global theme.
 /// @param {List} $exclude [( )] - A list of ig components to be excluded from the global theme styles.
+/// @see {mixin} theme
 @mixin fluent-light-theme(
     $palette,
     $exclude: (),
@@ -39,11 +44,10 @@
     );
 }
 
-/// @group themes
-/// @access public
-/// Creates a global fluent theme that can be used with dark backgrounds.
+/// A wrapper around the theme mixin. Creates a global fluent theme that can be used with dark backgrounds.
 /// @param {Map} $palette - An palette to be used by the global theme.
 /// @param {List} $exclude [( )] - A list of ig components to be excluded from the global theme styles.
+/// @see {mixin} theme
 @mixin fluent-dark-theme(
     $palette,
     $exclude: (),

projects/igniteui-angular/src/lib/core/styles/themes/generators/_indigo.scss

@@ -2,11 +2,16 @@
 @use '../schemas' as *;
 @use 'igniteui-theming/sass/color' as *;
 
+////
 /// @group themes
 /// @access public
-/// Creates a global indigo theme that can be used with light backgrounds.
+/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
+////
+
+/// A wrapper around the theme mixin. Creates a global indigo theme that can be used with light backgrounds.
 /// @param {Map} $palette - An palette to be used by the global theme.
 /// @param {List} $exclude [( )] - A list of ig components to be excluded from the global theme styles.
+/// @see {mixin} theme
 @mixin indigo-light-theme(
     $palette,
     $exclude: (),
@@ -39,11 +44,10 @@
     );
 }
 
-/// @group themes
-/// @access public
-/// Creates a global indigo theme that can be used with dark backgrounds.
+/// A wrapper around the theme mixin. Creates a global indigo theme that can be used with dark backgrounds.
 /// @param {Map} $palette - An palette to be used by the global theme.
 /// @param {List} $exclude [( )] - A list of ig components to be excluded from the global theme styles.
+/// @see {mixin} theme
 @mixin indigo-dark-theme(
     $palette,
     $exclude: (),

projects/igniteui-angular/src/lib/grids/common/strategy.ts

@@ -43,9 +43,9 @@ export class IgxSorting implements IGridSortingStrategy {
         while (i < data.length) {
             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 isTime = column?.dataType === TIME_TYPE || column?.dataType === DATE_TIME_TYPE;
             const isString = column?.dataType === STRING_TYPE;
-            const group = this.groupedRecordsByExpression(data, i, expressions[level], isDate, isString);
+            const group = this.groupedRecordsByExpression(data, i, expressions[level], isDate, isTime, isString);
             const groupRow: IGroupByRecord = {
                 expression: expressions[level],
                 level,
@@ -93,11 +93,13 @@ export class IgxSorting implements IGridSortingStrategy {
 
     protected getFieldValue<T>(obj: T, key: string, isDate: boolean = false, isTime: boolean = false) {
         let resolvedValue = resolveNestedPath(obj, key);
-        if (isDate || isTime) {
-            const date = parseDate(resolvedValue);
-            resolvedValue = isTime && date ?
-                new Date().setHours(date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds()) : date;
-
+        const date = parseDate(resolvedValue);
+        if (date && isDate && isTime) {
+            resolvedValue = date;
+        } else if (date && isDate && !isTime) {
+            resolvedValue = new Date(date.setHours(0, 0, 0, 0));
+        } else if (date && isTime && !isDate) {
+            resolvedValue = new Date().setHours(date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds());
         }
         return resolvedValue;
     }
@@ -107,17 +109,18 @@ export class IgxSorting implements IGridSortingStrategy {
         index: number,
         expression: IGroupingExpression,
         isDate: boolean = false,
+        isTime: boolean = false,
         isString: boolean
     ): T[] {
         const res = [];
         const key = expression.fieldName;
         const len = data.length;
-        let groupval = this.getFieldValue(data[index], key, isDate);
+        let groupval = this.getFieldValue(data[index], key, isDate, isTime);
         res.push(data[index]);
         index++;
         const comparer = expression.groupingComparer || DefaultSortingStrategy.instance().compareValues;
         for (let i = index; i < len; i++) {
-            let fieldValue = this.getFieldValue(data[i], key, isDate);
+            let fieldValue = this.getFieldValue(data[i], key, isDate, isTime);
             if (expression.ignoreCase && isString) {
                 // when column's dataType is string but the value is number
                 fieldValue = fieldValue?.toString().toLowerCase();
@@ -155,15 +158,15 @@ export class IgxSorting implements IGridSortingStrategy {
         }
         const column = grid?.getColumnByName(expr.fieldName);
         const isDate = column?.dataType === DATE_TYPE || column?.dataType === DATE_TIME_TYPE;
-        const isTime = column?.dataType === TIME_TYPE;
+        const isTime = column?.dataType === TIME_TYPE || column?.dataType === DATE_TIME_TYPE;
         const isString = column?.dataType === STRING_TYPE;
         data = expr.strategy.sort(data, expr.fieldName, expr.dir, expr.ignoreCase, this.getFieldValue, isDate, isTime, grid);
         if (expressionIndex === exprsLen - 1) {
             return data;
         }
         // in case of multiple sorting
         for (i = 0; i < dataLen; i++) {
-            gbData = this.groupedRecordsByExpression(data, i, expr, isDate, isString);
+            gbData = this.groupedRecordsByExpression(data, i, expr, isDate, isTime, isString);
             gbDataLen = gbData.length;
             if (gbDataLen > 1) {
                 gbData = this.sortDataRecursive(gbData, expressions, expressionIndex + 1, grid);