Merge branch '20.1.x' into sstoychev/revert-ci-node-matrix

Author: kdinev

package-lock.json

@@ -75,7 +75,7 @@
     "@types/source-map": "0.5.2",
     "express": "^5.1.0",
     "fflate": "^0.8.1",
-    "igniteui-theming": "^21.0.2",
+    "igniteui-theming": "^22.0.0",
     "igniteui-trial-watermark": "^3.1.0",
     "lodash-es": "^4.17.21",
     "rxjs": "^7.8.2",

package.json

@@ -12,7 +12,7 @@ import { IgxPivotDateDimension } from 'projects/igniteui-angular/src/lib/grids/p
 import { PivotDimensionType } from 'projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.interface';
 import { IgxDateSummaryOperand, IgxNumberSummaryOperand, IgxSummaryOperand, IgxTimeSummaryOperand } from 'projects/igniteui-angular/src/lib/grids/summaries/grid-summary';
 import { HorizontalAlignment, VerticalAlignment } from 'projects/igniteui-angular/src/lib/services/overlay/utilities';
-import { ByLevelTreeGridMergeStrategy, DefaultTreeGridMergeStrategy } from 'projects/igniteui-angular/src/lib/data-operations/merge-strategy';
+import { ByLevelTreeGridMergeStrategy, DefaultMergeStrategy, DefaultTreeGridMergeStrategy } from 'projects/igniteui-angular/src/lib/data-operations/merge-strategy';
 
 /** Export Public API, TODO: reorganize, Generate all w/ renames? */
 export {
@@ -35,6 +35,7 @@ export {
 
     NoopSortingStrategy as IgcNoopSortingStrategy,
     NoopFilteringStrategy as IgcNoopFilteringStrategy,
+    DefaultMergeStrategy as IgcDefaultMergeStrategy,
     DefaultTreeGridMergeStrategy as IgcDefaultTreeGridMergeStrategy,
     ByLevelTreeGridMergeStrategy as IgcByLevelTreeGridMergeStrategy,
 

projects/igniteui-angular-elements/src/public_api.ts

@@ -73,7 +73,7 @@
         "tslib": "^2.3.0",
         "igniteui-trial-watermark": "^3.1.0",
         "lodash-es": "^4.17.21",
-        "igniteui-theming": "^21.0.2",
+        "igniteui-theming": "^22.0.0",
         "@igniteui/material-icons-extended": "^3.1.0"
     },
     "peerDependencies": {

projects/igniteui-angular/package.json

@@ -2,64 +2,6 @@
 @use '../../base' as *;
 @use '../../themes/schemas' as *;
 
-////
-/// @group themes
-/// @access public
-/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
-/// @author <a href="https://github.com/desig9stein" target="_blank">Marin Popov</a>
-////
-
-/// If only background color is specified, text/icon color will be assigned automatically to a contrasting color.
-/// @param {Map} $schema [$light-material-schema] - The schema used as basis for styling the component.
-///
-/// @param {Color} $icon-color [null] - The color used for the actions icons.
-/// @param {Color} $background [null] - The color used for the action strip component content background.
-/// @param {Color} $actions-background [null] - The color used for the actions background.
-/// @param {Color} $delete-action [null] - The color used for the delete icon in action strip component.
-/// @param {List} $actions-border-radius [null] - The border radius used for actions container inside action strip component.
-///
-/// @example scss Change the background and icon colors in action strip
-///   $my-action-strip-theme: action-strip-theme($background: black);
-///   // Pass the theme to the css-vars() mixin
-///   @include css-vars($my-action-strip-theme);
-@function action-strip-theme(
-    $schema: $light-material-schema,
-
-    $background: null,
-    $actions-background: null,
-    $icon-color: null,
-    $delete-action: null,
-    $actions-border-radius: null,
-) {
-    $name: 'igx-action-strip';
-    $action-strip-schema: ();
-
-    @if map.has-key($schema, 'action-strip') {
-        $action-strip-schema: map.get($schema, 'action-strip');
-    } @else {
-        $action-strip-schema: $schema;
-    }
-
-    $theme: digest-schema($action-strip-schema);
-
-    @if not($icon-color) and $actions-background {
-        $icon-color: adaptive-contrast(var(--actions-background));
-    }
-
-    @if not($actions-border-radius) {
-        $actions-border-radius: map.get($theme, 'actions-border-radius');
-    }
-
-    @return extend($theme, (
-        name: $name,
-        background: $background,
-        actions-background: $actions-background,
-        icon-color: $icon-color,
-        delete-action: $delete-action,
-        actions-border-radius: $actions-border-radius,
-    ));
-}
-
 /// @deprecated Use the `css-vars` mixin instead.
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.

projects/igniteui-angular/src/lib/core/styles/components/action-strip/_action-strip-theme.scss

@@ -3,31 +3,6 @@
 @use '../../base' as *;
 @use '../../themes/schemas' as *;
 
-/// @deprecated Use the `css-vars` mixin instead.
-/// @see {mixin} css-vars
-/// @param {Map} $schema [$light-material-schema] - The schema used as basis for styling the component.
-@function pivot-data-selector-theme(
-    $schema: $light-material-schema,
-    $background: null
-) {
-    $name: 'igx-pivot-data-selector';
-    $selector: '.igx-pivot-data-selector';
-    $pivot-data-selector-schema: ();
-
-    @if map.has-key($schema, 'pivot-data-selector') {
-        $pivot-data-selector-schema: map.get($schema, 'pivot-data-selector');
-    } @else {
-        $pivot-data-selector-schema: $schema;
-    }
-
-    $theme: digest-schema($pivot-data-selector-schema);
-
-    @return extend($theme, (
-        name: $name,
-        selector: $selector,
-    ));
-}
-
 /// @deprecated Use the `css-vars` mixin instead.
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.

projects/igniteui-angular/src/lib/core/styles/components/grid/_pivot-data-selector-theme.scss

@@ -4,88 +4,6 @@
 @use '../../themes/schemas' as *;
 @use 'igniteui-theming/sass/animations/easings' as *;
 
-////
-/// @group themes
-/// @access public
-////
-
-/// @param {Map} $schema [$light-material-schema] - The schema used as basis for styling the component.
-/// @param {Color} $file-names-background [null] - The file names container background color.
-/// @param {Color} $file-names-background--focused [null] - The file names container background color when the file input is focused.
-/// @param {Color} $file-names-background--filled [null] - The file names container background color when the file input is filled.
-/// @param {Color} $file-names-background--disabled [null] - The file names container background color when the file input is disabled.
-/// @param {Color} $file-names-foreground [null] - The file names color.
-/// @param {Color} $file-names-foreground--focused [null] - The file names color when the file input is focused.
-/// @param {Color} $file-names-foreground--filled [null] - The file names color when the file input is filled.
-/// @param {Color} $file-names-foreground--disabled [null] - The file names color when the file input is disabled.
-/// @param {Color} $file-selector-button-background [null] - The file input selector button background color.
-/// @param {Color} $file-selector-button-background--focused [null] - The selector button background color when the file input is focused.
-/// @param {Color} $file-selector-button-background--filled [null] - The selector button background color when the file input is filled.
-/// @param {Color} $file-selector-button-background--disabled [null] - The selector button background color when the file input is disabled.
-/// @param {Color} $file-selector-button-foreground [null] - The file input selector button foreground color.
-/// @param {Color} $file-selector-button-foreground--focused [null] - The selector button foreground color when the file input is focused.
-/// @param {Color} $file-selector-button-foreground--filled [null] - The selector button foreground color when the file input is filled.
-/// @param {Color} $file-selector-button-foreground--disabled [null] - The selector button foreground color when the file input is disabled.
-/// @example scss Change the focused border and label colors
-///   $my-file-input-theme: file-input-theme($file-names-foreground: #09f);
-///   // Pass the theme to the css-vars() mixin
-///   @include css-vars($my-file-input-theme);
-@function file-input-theme(
-    $schema: $light-material-schema,
-    $file-names-background: null,
-    $file-names-background--focused: null,
-    $file-names-background--filled: null,
-    $file-names-background--disabled: null,
-    $file-names-foreground: null,
-    $file-names-foreground--focused: null,
-    $file-names-foreground--filled: null,
-    $file-names-foreground--disabled: null,
-
-    $file-selector-button-background: null,
-    $file-selector-button-background--focused: null,
-    $file-selector-button-background--filled: null,
-    $file-selector-button-background--disabled: null,
-    $file-selector-button-foreground: null,
-    $file-selector-button-foreground--focused: null,
-    $file-selector-button-foreground--filled: null,
-    $file-selector-button-foreground--disabled: null,
-) {
-    $name: 'igx-file-input';
-    $file-input-schema: ();
-
-    @if map.has-key($schema, 'file-input') {
-        $file-input-schema: map.get($schema, 'file-input');
-    } @else {
-        $file-input-schema: $schema;
-    }
-
-    $theme: digest-schema($file-input-schema);
-
-    @return extend(
-        $theme,
-        (
-            name: $name,
-            file-names-background: $file-names-background,
-            file-names-background--focused: $file-names-background--focused,
-            file-names-background--filled: $file-names-background--filled,
-            file-names-background--disabled: $file-names-background--disabled,
-            file-names-foreground: $file-names-foreground,
-            file-names-foreground--focused: $file-names-foreground--focused,
-            file-names-foreground--filled: $file-names-foreground--filled,
-            file-names-foreground--disabled: $file-names-foreground--disabled,
-
-            file-selector-button-background: $file-selector-button-background,
-            file-selector-button-background--focused: $file-selector-button-background--focused,
-            file-selector-button-background--filled: $file-selector-button-background--filled,
-            file-selector-button-background--disabled: $file-selector-button-background--disabled,
-            file-selector-button-foreground: $file-selector-button-foreground,
-            file-selector-button-foreground--focused: $file-selector-button-foreground--focused,
-            file-selector-button-foreground--filled: $file-selector-button-foreground--filled,
-            file-selector-button-foreground--disabled: $file-selector-button-foreground--disabled,
-        ),
-    );
-}
-
 /// @deprecated Use the `css-vars` mixin instead.
 /// @see {mixin} css-vars
 /// @param {Map} $theme - The theme used to style the component.

projects/igniteui-angular/src/lib/core/styles/components/input/_file-input-theme.scss

@@ -24,34 +24,46 @@ describe('Unit testing SortingStrategy', () => {
                 strategy: DefaultSortingStrategy.instance()
             }]);
         expect(dataGenerator.getValuesForColumn(res, 'number'))
-                    .toEqual([4, 2, 0, 3, 1]);
+            .toEqual([4, 2, 0, 3, 1]);
     });
     it('tests `compareObjects`', () => {
         const strategy = DefaultSortingStrategy.instance();
         expect(strategy.compareValues(1, 0) === 1 &&
-                strategy.compareValues(true, false) === 1 &&
-                strategy.compareValues('bc', 'adfc') === 1)
+            strategy.compareValues(true, false) === 1 &&
+            strategy.compareValues('bc', 'adfc') === 1)
             .toBeTruthy('compare first argument greater than second');
         expect(strategy.compareValues(1, 2) === -1 &&
-                strategy.compareValues('a', 'b') === -1 &&
-                strategy.compareValues(false, true) === -1)
+            strategy.compareValues('a', 'b') === -1 &&
+            strategy.compareValues(false, true) === -1)
             .toBeTruthy('compare 0, 1');
         expect(strategy.compareValues(0, 0) === 0 &&
-                strategy.compareValues(true, true) === 0 &&
-                strategy.compareValues('test', 'test') === 0
-                )
+            strategy.compareValues(true, true) === 0 &&
+            strategy.compareValues('test', 'test') === 0
+        )
             .toBeTruthy('Comare equal variables');
     });
     it('tests default settings', () => {
         (data[4] as { string: string }).string = 'ROW';
         const res = sorting.sort(data, [{
-                dir: SortingDirection.Asc,
-                fieldName: 'string',
-                ignoreCase: true,
-                strategy: DefaultSortingStrategy.instance()
-            }]);
+            dir: SortingDirection.Asc,
+            fieldName: 'string',
+            ignoreCase: true,
+            strategy: DefaultSortingStrategy.instance()
+        }]);
         expect(dataGenerator.getValuesForColumn(res, 'number'))
-                    .toEqual([4, 0, 1, 2, 3]);
+            .toEqual([4, 0, 1, 2, 3]);
+    });
+
+    it('should not sort when sorting direction is None', () => {
+        const unsortedData = [{ number: 3 }, { number: 1 }, { number: 4 }, { number: 0 }, { number: 2 }];
+        const res = sorting.sort(unsortedData, [{
+            dir: SortingDirection.None,
+            fieldName: 'number',
+            ignoreCase: false,
+            strategy: DefaultSortingStrategy.instance()
+        }]);
+        expect(res.map(d => d.number))
+            .toEqual([3, 1, 4, 0, 2]);
     });
 
 });

projects/igniteui-angular/src/lib/data-operations/sorting-strategy.spec.ts

@@ -5,7 +5,7 @@ import { IGroupingState } from '../../data-operations/groupby-state.interface';
 import { IGroupingExpression } from '../../data-operations/grouping-expression.interface';
 import { IGroupByResult } from '../../data-operations/grouping-result.interface';
 import { getHierarchy, isHierarchyMatch } from '../../data-operations/operations';
-import { DefaultSortingStrategy, ISortingExpression } from '../../data-operations/sorting-strategy';
+import { DefaultSortingStrategy, ISortingExpression, SortingDirection } from '../../data-operations/sorting-strategy';
 import { GridType } from './grid.interface';
 
 const DATE_TYPE = 'date';
@@ -141,6 +141,9 @@ export class IgxSorting implements IGridSortingStrategy {
     private prepareExpressions(expressions: ISortingExpression[], grid: GridType): IGridInternalSortingExpression[] {
         const multipleSortingExpressions: IGridInternalSortingExpression[] = [];
         for (const expr of expressions) {
+            if (expr.dir === SortingDirection.None) {
+                continue;
+            }
             if (!expr.strategy) {
                 expr.strategy = DefaultSortingStrategy.instance();
             }