Merge branch '15.1.x' into iminchev/fix-header-autosize-15.1.x

Author: kdinev

CHANGELOG.md

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

projects/igniteui-angular/src/lib/buttonGroup/buttonGroup.component.ts

@@ -23,7 +23,7 @@ import { IgxRippleModule } from '../directives/ripple/ripple.directive';
 import { IgxIconModule } from '../icon/public_api';
 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';
 
 /**
@@ -442,31 +442,27 @@ export class IgxButtonGroupComponent extends DisplayDensityBase implements After
      */
     public _clickHandler(index: number) {
         const button = this.buttons[index];
-        const args: IButtonGroupEventArgs = { cancel: false, button, index };
+        const args: IButtonGroupEventArgs = { button, index };
 
         if (!this.multiSelection) {
             this.buttons.forEach((b, i) => {
                 if (i !== index && this.selectedIndexes.indexOf(i) !== -1) {
-                    this.deselected.emit({ cancel: false, button: b, index: i });
+                    this.deselected.emit({ button: b, index: i });
                 }
             });
         }
 
         if (this.selectedIndexes.indexOf(index) === -1) {
+            this.selectButton(index);
             this.selected.emit(args);
-            if(!args.cancel){
-                this.selectButton(index);
-            }
         } else {
+            this.deselectButton(index);
             this.deselected.emit(args);
-            if(!args.cancel){
-                this.deselectButton(index);
-            }
         }
     }
 }
 
-export interface IButtonGroupEventArgs extends IBaseEventArgs, CancelableEventArgs {
+export interface IButtonGroupEventArgs extends IBaseEventArgs {
     button: IgxButtonDirective;
     index: number;
 }

projects/igniteui-angular/src/lib/buttonGroup/buttongroup.component.spec.ts

@@ -146,47 +146,6 @@ describe('IgxButtonGroup', () => {
         expect(btnGroupInstance.deselected.emit).toHaveBeenCalled();
     });
 
-    it('should not select the button on click if event is canceled ', () => {
-        const fixture = TestBed.createComponent(ButtonGroupWithSelectedButtonComponent);
-        fixture.detectChanges();
-
-        const btnGroupInstance = fixture.componentInstance.buttonGroup;
-        fixture.detectChanges();
-
-        btnGroupInstance.buttons[1].select();
-        fixture.detectChanges();
-
-        btnGroupInstance.selected.subscribe((e) => {
-            e.cancel = true;
-        });
-        fixture.detectChanges();
-
-        const button = fixture.debugElement.nativeElement.querySelector('button');
-        button.click();
-        fixture.detectChanges();
-
-        expect(btnGroupInstance.buttons[0].selected).toBe(false);
-    });
-
-    it('should not deselect the button on click if event is canceled ', () => {
-        const fixture = TestBed.createComponent(ButtonGroupWithSelectedButtonComponent);
-        fixture.detectChanges();
-
-        const btnGroupInstance = fixture.componentInstance.buttonGroup;
-        fixture.detectChanges();
-
-        btnGroupInstance.deselected.subscribe((e) => {
-            e.cancel = true;
-        });
-        fixture.detectChanges();
-
-        const button = fixture.debugElement.nativeElement.querySelector('button');
-        button.click();
-        fixture.detectChanges();
-
-        expect(btnGroupInstance.buttons[0].selected).toBe(true);
-    });
-
    it('Button Group single selection', () => {
         const fixture = TestBed.createComponent(InitButtonGroupComponent);
         fixture.detectChanges();

projects/igniteui-angular/src/lib/date-range-picker/date-range-picker.component.spec.ts

@@ -133,6 +133,7 @@ describe('IgxDateRangePicker', () => {
             mockDocument = {
                 body: mockElement,
                 defaultView: mockElement,
+                documentElement: document.documentElement,
                 createElement: () => mockElement,
                 appendChild: () => { },
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars

projects/igniteui-angular/src/lib/services/overlay/overlay.ts

@@ -436,7 +436,7 @@ export class IgxOverlayService implements OnDestroy {
         info.settings.positionStrategy.position(
             info.elementRef.nativeElement.parentElement,
             { width: info.initialSize.width, height: info.initialSize.height },
-            document,
+            this._document,
             true,
             info.settings.target);
         this.addModalClasses(info);