Merge branch '16.1.x' into ibarakov/feat-13524-master

Author: ChronosSF

.eslintignore

@@ -0,0 +1,6 @@
+dist/
+projects/igniteui-angular/migrations/
+projects/igniteui-angular/schematics/
+projects/igniteui-angular/cypress/
+cypress/
+cypress.config.ts

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes for each version of this project will be documented in this file.
 
+## 16.1.5
+### General
+- `IgxButtonGroup`:
+    - Reverted cancellable on `selected` and `deselected` events (added in 15.1.24) as it was breaking firing order and related handling.
+
 ## 16.1.4
 ### New Features
 - `Themes`:

angular.json

@@ -163,54 +163,6 @@
         }
       }
     },
-    "igniteui-dev-demos-e2e": {
-      "root": "e2e/",
-      "projectType": "application",
-      "architect": {
-        "e2e": {
-          "builder": "@cypress/schematic:cypress",
-          "options": {
-            "devServerTarget": "igniteui-dev-demos-e2e:serve",
-            "watch": true,
-            "headless": false
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "igniteui-dev-demos-e2e:serve:production"
-            }
-          }
-        },
-        "lint": {
-          "builder": "@angular-eslint/builder:lint",
-          "options": {
-            "lintFilePatterns": [
-              "e2e/**/*.ts",
-              "e2e/**/*.html"
-            ]
-          }
-        },
-        "cypress-run": {
-          "builder": "@cypress/schematic:cypress",
-          "options": {
-            "devServerTarget": "igniteui-dev-demos-e2e:serve",
-            "configFile": "e2e//cypress.json"
-          },
-          "configurations": {
-            "production": {
-              "devServerTarget": "igniteui-dev-demos-e2e:serve:production"
-            }
-          }
-        },
-        "cypress-open": {
-          "builder": "@cypress/schematic:cypress",
-          "options": {
-            "watch": true,
-            "headless": false,
-            "configFile": "e2e//cypress.json"
-          }
-        }
-      }
-    },
     "igniteui-angular": {
       "root": "projects/igniteui-angular",
       "sourceRoot": "projects/igniteui-angular/src",

e2e/cypress.json

@@ -23,7 +23,7 @@ import { IgxRippleDirective } from '../directives/ripple/ripple.directive';
 
 import { takeUntil } from 'rxjs/operators';
 import { DisplayDensityBase, DisplayDensityToken, IDisplayDensityOptions } from '../core/density';
-import { CancelableEventArgs, IBaseEventArgs } from '../core/utils';
+import { IBaseEventArgs } from '../core/utils';
 import { mkenum } from '../core/utils';
 import { IgxIconComponent } from '../icon/icon.component';
 
@@ -481,33 +481,29 @@ export class IgxButtonGroupComponent extends DisplayDensityBase implements After
      */
     public _clickHandler(index: number) {
         const button = this.buttons[index];
-        const args: IButtonGroupEventArgs = { cancel: false, owner: this, button, index };
+        const args: IButtonGroupEventArgs = { owner: this, button, index };
 
         if (this.selectionMode !== 'multi') {
             this.buttons.forEach((b, i) => {
                 if (i !== index && this.selectedIndexes.indexOf(i) !== -1) {
-                    this.deselected.emit({ cancel: false, owner: this, button: b, index: i });
+                    this.deselected.emit({ owner: this, button: b, index: i });
                 }
             });
         }
 
         if (this.selectedIndexes.indexOf(index) === -1) {
+            this.selectButton(index);
             this.selected.emit(args);
-            if(!args.cancel){
-                this.selectButton(index);
-            }
         } else {
             if (this.selectionMode !== 'singleRequired') {
+                this.deselectButton(index);
                 this.deselected.emit(args);
-                if(!args.cancel){
-                    this.deselectButton(index);
-                }
             }
         }
     }
 }
 
-export interface IButtonGroupEventArgs extends IBaseEventArgs, CancelableEventArgs {
+export interface IButtonGroupEventArgs extends IBaseEventArgs {
     owner: IgxButtonGroupComponent;
     button: IgxButtonDirective;
     index: number;