Skip to content

Commit aba8b1f

Browse files
authored
Merge branch 'master' into bpenkov/igx-date-range
2 parents 0f86cf8 + 15e6385 commit aba8b1f

File tree

10 files changed

+21
-19
lines changed

10 files changed

+21
-19
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FilterMode, ColumnPinningPosition, RowPinningPosition } from './enums';
1+
import { FilterMode } from './enums';
22
import { DisplayDensity } from '../../core/displayDensity';
33
import { EventEmitter } from '@angular/core';
44
import { IFilteringExpressionsTree } from '../../data-operations/filtering-expressions-tree';
@@ -67,8 +67,3 @@ export interface GridType extends IGridDataBindable {
6767
isDetailRecord(rec: any): boolean;
6868
isGroupByRecord(rec: any): boolean;
6969
}
70-
71-
export interface IPinningConfig {
72-
columns?: ColumnPinningPosition;
73-
rows?: RowPinningPosition;
74-
}

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ import { GridBaseAPIService } from './api.service';
5151
import { IgxGridCellComponent } from './cell.component';
5252
import { IColumnVisibilityChangedEventArgs } from './hiding/column-hiding-item.directive';
5353
import { ISummaryExpression } from './summaries/grid-summary';
54-
import { RowEditPositionStrategy } from './grid.common';
54+
import { RowEditPositionStrategy, IPinningConfig } from './grid.common';
5555
import { IgxGridToolbarComponent } from './toolbar/grid-toolbar.component';
5656
import { IgxRowDirective } from './row.directive';
5757
import { IgxGridHeaderComponent } from './headers/grid-header.component';
@@ -138,7 +138,7 @@ import {
138138
IPinRowEventArgs
139139
} from './common/events';
140140
import { IgxAdvancedFilteringDialogComponent } from './filtering/advanced-filtering/advanced-filtering-dialog.component';
141-
import { GridType, IPinningConfig } from './common/grid.interface';
141+
import { GridType } from './common/grid.interface';
142142
import { IgxDecimalPipeComponent, IgxDatePipeComponent } from './common/pipes';
143143
import { DropPosition } from './moving/moving.service';
144144
import { IgxHeadSelectorDirective, IgxRowSelectorDirective } from './selection/row-selectors';

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { ConnectedPositioningStrategy } from '../services';
33
import { VerticalAlignment, PositionSettings } from '../services/overlay/utilities';
44
import { scaleInVerBottom, scaleInVerTop } from '../animations/main';
55
import { IgxForOfSyncService } from '../directives/for-of/for_of.sync.service';
6+
import { ColumnPinningPosition, RowPinningPosition } from './common/enums';
67

78

89
@Directive({
@@ -19,6 +20,14 @@ export interface RowEditPositionSettings extends PositionSettings {
1920
container?: HTMLElement;
2021
}
2122

23+
/**
24+
* An interface describing settings for row/column pinning position.
25+
*/
26+
export interface IPinningConfig {
27+
columns?: ColumnPinningPosition;
28+
rows?: RowPinningPosition;
29+
}
30+
2231
/**
2332
* @hidden
2433
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { IgxGridComponent } from './grid.component';
66
import { IgxGridModule } from './index';
77
import { configureTestSuite } from '../../test-utils/configure-suite';
88
import { ColumnPinningPosition, RowPinningPosition } from '../common/enums';
9-
import { IPinningConfig } from '../common/grid.interface';
9+
import { IPinningConfig } from '../grid.common';
1010
import { SampleTestData } from '../../test-utils/sample-test-data.spec';
1111
import { GridFunctions } from '../../test-utils/grid-functions.spec';
1212
import { SortingDirection } from '../../data-operations/sorting-expression.interface';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { IgxGridModule } from './index';
66
import { IgxStringFilteringOperand } from '../../data-operations/filtering-condition';
77
import { configureTestSuite } from '../../test-utils/configure-suite';
88
import { ColumnPinningPosition, GridSelectionMode } from '../common/enums';
9-
import { IPinningConfig } from '../common/grid.interface';
9+
import { IPinningConfig } from '../grid.common';
1010
import { wait, UIInteractions } from '../../test-utils/ui-interactions.spec';
1111
import { GridSummaryFunctions,
1212
GridSelectionFunctions,

projects/igniteui-angular/src/lib/grids/state.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { GridSelectionRange } from './selection/selection.service';
1212
import { IGroupByExpandState } from '../data-operations/groupby-expand-state.interface';
1313
import { IGroupingState } from '../data-operations/groupby-state.interface';
1414
import { IgxGridComponent } from './grid/grid.component';
15-
import { IPinningConfig } from './common/grid.interface';
15+
import { IPinningConfig } from './grid.common';
1616

1717
export interface IGridState {
1818
columns?: IColumnState[];

projects/igniteui-angular/src/lib/test-utils/hierarchical-grid-components.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { IgxColumnComponent } from '../grids';
44
import { IgxHierarchicalTransactionServiceFactory } from '../grids/hierarchical-grid/hierarchical-grid-base.directive';
55
import { IgxHierarchicalGridComponent } from '../grids/hierarchical-grid/hierarchical-grid.component';
66
import { IgxRowIslandComponent } from '../grids/hierarchical-grid/row-island.component';
7-
import { IPinningConfig } from '../grids/common/grid.interface';
7+
import { IPinningConfig } from '../grids/grid.common';
88
import { ColumnPinningPosition, RowPinningPosition } from '../grids/common/enums';
99

1010
@Component({

src/app/grid-column-pinning/grid-column-pinning.sample.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Component, OnInit, ViewChild } from '@angular/core';
2-
import { IgxGridComponent, ColumnPinningPosition, RowPinningPosition, GridSelectionMode, IgxGridRowComponent } from 'igniteui-angular';
3-
import { IPinningConfig } from 'projects/igniteui-angular/src/lib/grids/common/grid.interface';
2+
import { IgxGridComponent, ColumnPinningPosition, RowPinningPosition, GridSelectionMode, IgxGridRowComponent, IPinningConfig } from 'igniteui-angular';
43

54
@Component({
65
providers: [],

src/app/grid-row-pinning/grid-row-pinning.sample.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import {
1212
DisplayDensity,
1313
IgxHierarchicalGridComponent,
1414
IDisplayDensityOptions,
15-
GridSelectionMode
15+
GridSelectionMode,
16+
IPinningConfig
1617
} from 'igniteui-angular';
17-
import { IPinningConfig } from 'projects/igniteui-angular/src/lib/grids/common/grid.interface';
1818
import { IgxIconService } from 'projects/igniteui-angular/src/lib/icon/icon.service';
1919
import icons from 'projects/igniteui-angular/src/lib/grids/filtering/svgIcons';
2020

src/app/grid-summaries/grid-summaries.sample.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ import {
44
IgxGridComponent,
55
IgxNumberSummaryOperand,
66
IgxSummaryResult,
7-
ColumnPinningPosition
7+
ColumnPinningPosition,
8+
IPinningConfig
89
} from 'igniteui-angular';
9-
import { IPinningConfig } from 'projects/igniteui-angular/src/lib/grids/common/grid.interface';
10-
1110

1211
class MySummary extends IgxNumberSummaryOperand {
1312

0 commit comments

Comments
 (0)