Skip to content

Commit 9722bbd

Browse files
committed
Merge branch 'rkaraivanov/grids-restructure' of https://github.com/IgniteUI/igniteui-angular into rkaraivanov/grids-restructure
2 parents dacdc44 + 2f71e14 commit 9722bbd

27 files changed

+124
-125
lines changed

projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,6 +1576,7 @@ export class IgxGridForOfDirective<T> extends IgxForOfDirective<T> implements On
15761576

15771577
this.dc.instance._viewContainer.element.nativeElement.style.top = -(scrollOffset) + 'px';
15781578
this.recalcUpdateSizes();
1579+
this.cdr.markForCheck();
15791580
}
15801581

15811582
onHScroll(scrollAmount) {

projects/igniteui-angular/src/lib/drop-down/drop-down-item.base.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { IDropDownBase, IGX_DROPDOWN_BASE } from './drop-down.common';
2-
import { Input, HostBinding, HostListener, ElementRef, Optional, Inject, DoCheck } from '@angular/core';
2+
import { Input, HostBinding, HostListener, ElementRef, Optional, Inject, DoCheck, Directive } from '@angular/core';
33
import { IgxSelectionAPIService } from '../core/selection';
44
import { DeprecateProperty, showMessage } from '../core/deprecateDecorators';
55
import { IgxDropDownGroupComponent } from './drop-down-group.component';
@@ -14,7 +14,10 @@ let warningShown = false;
1414
* Parent component (has to be used under a parent with type `IDropDownBase`)
1515
* Method for handling click on Host()
1616
*/
17-
export abstract class IgxDropDownItemBase implements DoCheck {
17+
@Directive({
18+
selector: '[IgxDropDownItemBase]'
19+
})
20+
export class IgxDropDownItemBase implements DoCheck {
1821
/**
1922
* @hidden
2023
*/

projects/igniteui-angular/src/lib/drop-down/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { IgxToggleModule } from '../directives/toggle/toggle.directive';
77
import { IgxSelectionAPIService } from '../core/selection';
88
import { IgxDropDownGroupComponent } from './drop-down-group.component';
99
import { IgxDropDownBase } from './drop-down.base';
10+
import { IgxDropDownItemBase } from './drop-down-item.base';
1011

1112
export * from './drop-down.component';
1213
export * from './drop-down-item.component';
@@ -23,6 +24,7 @@ export * from './drop-down-group.component';
2324
declarations: [
2425
IgxDropDownBase,
2526
IgxDropDownComponent,
27+
IgxDropDownItemBase,
2628
IgxDropDownItemComponent,
2729
IgxDropDownGroupComponent,
2830
IgxDropDownItemNavigationDirective

projects/igniteui-angular/src/lib/grids/grid/column-group.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import { IgxGridComponent } from './grid.component';
44
import { Component, ViewChild, DebugElement, OnInit, TemplateRef, ElementRef } from '@angular/core';
55

66
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
7-
import { IgxColumnComponent, IgxColumnGroupComponent } from '../column.component';
7+
import { IgxColumnComponent } from '../columns/column.component';
8+
import { IgxColumnGroupComponent } from '../columns/column-group.component';
89
import { SortingDirection } from '../../data-operations/sorting-expression.interface';
910
import { By } from '@angular/platform-browser';
1011
import { SampleTestData } from '../../test-utils/sample-test-data.spec';

projects/igniteui-angular/src/lib/grids/grid/column-moving.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms';
44
import { By } from '@angular/platform-browser';
55
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
66
import { IgxGridModule } from './index';
7-
import { IgxColumnGroupComponent } from '../column.component';
7+
import { IgxColumnGroupComponent } from '../columns/column-group.component';
88
import { IgxInputDirective } from '../../directives/input/input.directive';
99
import { SortingDirection } from '../../data-operations/sorting-expression.interface';
1010
import {

projects/igniteui-angular/src/lib/grids/grid/column-pinning.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ import { DebugElement } from '@angular/core';
33
import { TestBed, async, fakeAsync } from '@angular/core/testing';
44
import { By } from '@angular/platform-browser';
55
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
6-
import { IgxColumnPinningComponent, IgxColumnPinningModule } from '../pinning/column-pinning.component';
6+
import { IgxColumnPinningComponent } from '../pinning/column-pinning.component';
7+
import { IgxColumnPinningModule } from '../pinning/pinning.module';
78
import { IgxGridComponent } from './grid.component';
8-
import { IPinColumnEventArgs } from '../grid-base.component';
9+
import { IPinColumnEventArgs } from '../common/events';
910
import { IgxGridModule } from './index';
1011
import { IgxButtonModule } from '../../directives/button/button.directive';
1112
import { HelperUtils } from '../../test-utils/helper-utils.spec';

projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
} from './index';
1212
import { IgxGridComponent } from './grid.component';
1313
import { DataParent } from '../../test-utils/sample-test-data.spec';
14-
import { IGridCellEventArgs } from '../grid-base.component';
14+
import { IGridCellEventArgs } from '../common/events';
1515
import { SortingDirection } from '../../data-operations/sorting-expression.interface';
1616
import { DefaultSortingStrategy } from '../../data-operations/sorting-strategy';
1717
import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';

projects/igniteui-angular/src/lib/grids/grid/grid-row-editing.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import { By } from '@angular/platform-browser';
44
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
55
import { IgxGridAPIService } from './grid-api.service';
66
import { IgxGridComponent } from './grid.component';
7-
import { IGridEditEventArgs } from '../grid-base.component';
8-
import { IgxColumnComponent } from '../column.component';
7+
import { IGridEditEventArgs } from '../common/events';
8+
import { IgxColumnComponent } from '../columns/column.component';
99
import { IgxGridModule } from './index';
1010
import { DisplayDensity } from '../../core/displayDensity';
1111
import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';

projects/igniteui-angular/src/lib/grids/grid/grid-row-selection.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import {
1818
import { GridFunctions, GridSelectionFunctions } from '../../test-utils/grid-functions.spec';
1919
import { SampleTestData } from '../../test-utils/sample-test-data.spec';
2020
import { GridSelectionMode } from '../common/enums';
21-
import { IgxRowSelectorsModule } from '../igx-row-selectors.module';
21+
import { IgxGridSelectionModule } from '../selection/selection.module';
2222

2323
const DEBOUNCETIME = 30;
2424

@@ -39,7 +39,7 @@ describe('IgxGrid - Row Selection #grid', () => {
3939
imports: [
4040
NoopAnimationsModule,
4141
IgxGridModule,
42-
IgxRowSelectorsModule
42+
IgxGridSelectionModule
4343
]
4444
})
4545
.compileComponents();

projects/igniteui-angular/src/lib/grids/grid/grid.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { By } from '@angular/platform-browser';
88
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
99
import { IgxGridComponent } from './grid.component';
1010
import { IgxRowComponent } from '../row.component';
11-
import { IgxColumnComponent } from '../column.component';
11+
import { IgxColumnComponent } from '../columns/column.component';
1212
import { IForOfState } from '../../directives/for-of/for_of.directive';
1313
import { IgxGridModule } from './index';
1414
import { DisplayDensity } from '../../core/displayDensity';

0 commit comments

Comments
 (0)