Skip to content

Commit bc42564

Browse files
committed
fix(paginator): Removed circular deps
Column moving unit test refactor
1 parent 7b8be0a commit bc42564

File tree

6 files changed

+49
-22
lines changed

6 files changed

+49
-22
lines changed

projects/igniteui-angular/src/lib/grids/grid-common.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
IgxRowEditTextDirective,
1414
IgxRowEditTabStopDirective
1515
} from './grid.rowEdit.directive';
16-
import { IgxPaginatorModule } from '../paginator/paginator.component';
16+
import { IgxPaginatorModule } from '../paginator/public_api';
1717
import { IgxGridPipesModule } from './common/grid-pipes.module';
1818
import { IgxGridExcelStyleFilteringModule } from './filtering/excel-style/grid.excel-style-filtering.module';
1919
import { IgxRowDragModule } from './row-drag.directive';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -783,9 +783,9 @@ describe('IgxGrid - Column Moving #grid', () => {
783783
UIInteractions.simulatePointerEvent('pointerdown', header, 350, 50);
784784
await wait();
785785
UIInteractions.simulatePointerEvent('pointermove', header, 356, 56);
786-
await wait();
786+
await wait(50);
787787
UIInteractions.simulatePointerEvent('pointermove', header, 10, 30);
788-
await wait(250);
788+
await wait(500);
789789
fixture.detectChanges();
790790

791791
// step 3 - verify the column being moved can be reordered among new columns

projects/igniteui-angular/src/lib/paginator/paginator.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { TestBed, waitForAsync } from '@angular/core/testing';
22
import { By } from '@angular/platform-browser';
33
import { ViewChild, Component } from '@angular/core';
44
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
5-
import { IgxPaginatorComponent, IgxPaginatorModule } from './paginator.component';
5+
import { IgxPaginatorComponent, IgxPaginatorModule } from './public_api';
66
import { configureTestSuite } from '../test-utils/configure-suite';
77
import { GridFunctions } from '../test-utils/grid-functions.spec';
88
import { ControlsFunction } from '../test-utils/controls-functions.spec';

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

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1-
import { CommonModule } from '@angular/common';
2-
import { FormsModule } from '@angular/forms';
3-
import { Component, Input, Output, NgModule, Optional, Inject, EventEmitter,
1+
2+
import { Component, Input, Output, Optional, Inject, EventEmitter,
43
HostBinding, Directive, ContentChild } from '@angular/core';
54
import { CurrentResourceStrings } from '../core/i18n/resources';
65
import { IDisplayDensityOptions, DisplayDensityToken, DisplayDensityBase, DisplayDensity } from '../core/displayDensity';
76
import { OverlaySettings } from '../services/public_api';
8-
import { IgxSelectModule } from '../select/public_api';
9-
import { IgxIconModule } from '../icon/public_api';
10-
import { IgxButtonModule } from '../directives/button/button.directive';
11-
import { IgxRippleModule } from '../directives/ripple/ripple.directive';
12-
import { IgxInputGroupModule } from '../input-group/public_api';
137
import { IPaginatorResourceStrings } from '../core/i18n/paginator-resources';
148
import { IPageCancellableEventArgs, IPageEventArgs } from './paginator_interfaces';
15-
import { IgxPageNavigationComponent } from './pager.component';
16-
import { IgxPageSizeSelectorComponent } from './page_size_selector.component';
179

1810

1911
@Directive({ selector: '[igxPaginatorContent],igx-paginator-content' })
@@ -346,10 +338,3 @@ export class IgxPaginatorComponent extends DisplayDensityBase {
346338
return Array.from(new Set([...values, newOption])).sort((a, b) => a - b);
347339
}
348340
}
349-
350-
@NgModule({
351-
declarations: [IgxPaginatorComponent, IgxPageNavigationComponent, IgxPageSizeSelectorComponent, IgxPaginatorTemplateDirective],
352-
exports: [IgxPaginatorComponent, IgxPageNavigationComponent, IgxPageSizeSelectorComponent, IgxPaginatorTemplateDirective],
353-
imports: [CommonModule, IgxSelectModule, FormsModule, IgxIconModule, IgxButtonModule, IgxRippleModule, IgxInputGroupModule]
354-
})
355-
export class IgxPaginatorModule { }
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
import { NgModule } from '@angular/core';
2+
import { CommonModule } from '@angular/common';
3+
import { FormsModule } from '@angular/forms';
4+
5+
import { IgxSelectModule } from '../select/public_api';
6+
import { IgxIconModule } from '../icon/public_api';
7+
import { IgxButtonModule } from '../directives/button/button.directive';
8+
import { IgxRippleModule } from '../directives/ripple/ripple.directive';
9+
import { IgxInputGroupModule } from '../input-group/public_api';
10+
11+
import { IgxPageSizeSelectorComponent } from './page_size_selector.component';
12+
import { IgxPageNavigationComponent } from './pager.component';
13+
import { IgxPaginatorComponent, IgxPaginatorTemplateDirective } from './paginator.component';
14+
15+
export * from './page_size_selector.component';
16+
export * from './pager.component';
17+
export * from './paginator.component';
18+
19+
@NgModule({
20+
declarations: [
21+
IgxPaginatorComponent,
22+
IgxPageNavigationComponent,
23+
IgxPageSizeSelectorComponent,
24+
IgxPaginatorTemplateDirective
25+
],
26+
exports: [
27+
IgxPaginatorComponent,
28+
IgxPageNavigationComponent,
29+
IgxPageSizeSelectorComponent,
30+
IgxPaginatorTemplateDirective
31+
],
32+
imports: [
33+
CommonModule,
34+
FormsModule,
35+
IgxButtonModule,
36+
IgxIconModule,
37+
IgxInputGroupModule,
38+
IgxRippleModule,
39+
IgxSelectModule
40+
]
41+
})
42+
export class IgxPaginatorModule { }

projects/igniteui-angular/src/public_api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export * from './lib/list/public_api';
8383
export * from './lib/expansion-panel/public_api';
8484
export * from './lib/navbar/navbar.component';
8585
export * from './lib/navigation-drawer/public_api';
86-
export * from './lib/paginator/paginator.component';
86+
export * from './lib/paginator/public_api';
8787
export * from './lib/paginator/paginator_interfaces';
8888
export * from './lib/progressbar/progressbar.component';
8989
export * from './lib/radio/radio.component';

0 commit comments

Comments
 (0)