Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: IgniteUI/igniteui-angular
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 14.2.10
Choose a base ref
...
head repository: IgniteUI/igniteui-angular
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 14.2.11
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Dec 14, 2022

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    40d2930 View commit details

Commits on Dec 15, 2022

  1. Verified

    This commit was signed with the committer’s verified signature.
    crazy-max CrazyMax
    Copy the full SHA
    f4010d7 View commit details

Commits on Dec 19, 2022

  1. Merge pull request #12458 from IgniteUI/mdragnev/fix-12447-14.2.x

    fix(grid): Emit groupingExpressionChange when sorting through the gro…
    dkamburov authored Dec 19, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    881a85a View commit details
Original file line number Diff line number Diff line change
@@ -216,6 +216,11 @@
&[igxButton] {
border-radius: 0;
border-color: var-get($theme, 'item-border-color');

@if $bootstrap-theme {
margin: 0 !important;
border: none;
}
}

&:not(:nth-child(0)) {
19 changes: 19 additions & 0 deletions projects/igniteui-angular/src/lib/grids/grid/grid.groupby.spec.ts
Original file line number Diff line number Diff line change
@@ -627,6 +627,25 @@ describe('IgxGrid - GroupBy #grid', () => {
expect(grid.groupingExpressionsChange.emit).toHaveBeenCalledTimes(0);
}));

it('should emit groupingExpressionsChange when a group is sorted through the chip', fakeAsync(() => {
const fix = TestBed.createComponent(DefaultGridComponent);
fix.detectChanges();

// group by string column
const grid = fix.componentInstance.instance;
fix.detectChanges();
grid.groupBy({
fieldName: 'ReleaseDate', dir: SortingDirection.Asc, ignoreCase: false
});
fix.detectChanges();
spyOn(grid.groupingExpressionsChange, 'emit');
fix.detectChanges();
const chips = grid.groupArea.chips;
grid.groupArea.handleClick(chips.first.id);
fix.detectChanges();
expect(grid.groupingExpressionsChange.emit).toHaveBeenCalledTimes(1);
}));

it('should group unbound column with custom grouping strategy', fakeAsync(() => {
const fix = TestBed.createComponent(GroupableGridComponent);
fix.componentInstance.data.forEach((r, i) => {
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ import { IgxColumnMovingDragDirective } from '../moving/moving.drag.directive';
*
* @hidden @internal
*/
@Directive()
@Directive()
export abstract class IgxGroupByAreaDirective {
/**
* The drop area template if provided by the parent grid.
@@ -37,7 +37,7 @@ export abstract class IgxGroupByAreaDirective {
public density: DisplayDensity = DisplayDensity.comfortable;

@HostBinding('class.igx-grid-grouparea')
public defaultClass = true;
public defaultClass = true;

@HostBinding('class.igx-grid-grouparea--cosy')
public get cosyStyle() {
@@ -118,7 +118,7 @@ export abstract class IgxGroupByAreaDirective {
this.updateGroupSorting(id);
}

public onDragDrop(event) {
public onDragDrop(event) {
const drag: IgxColumnMovingDragDirective = event.detail.owner;
if (drag instanceof IgxColumnMovingDragDirective) {
const column = drag.column;
@@ -161,6 +161,8 @@ export abstract class IgxGroupByAreaDirective {
protected updateGroupSorting(id: string) {
const expr = this.expressions.find(e => e.fieldName === id);
expr.dir = 3 - expr.dir;
const expressionsChangeEvent = this.grid.groupingExpressionsChange || this.expressionsChange;
expressionsChangeEvent.emit(this.expressions);
this.grid.pipeTrigger++;
this.grid.notifyChanges();
}