Skip to content

Commit 809df0e

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

File tree

5 files changed

+53
-6
lines changed

5 files changed

+53
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ let warningShown = false;
1515
* Method for handling click on Host()
1616
*/
1717
@Directive({
18-
selector: '[IgxDropDownItemBase]'
18+
selector: '[igxDropDownItemBase]'
1919
})
2020
export class IgxDropDownItemBase implements DoCheck {
2121
/**

projects/igniteui-angular/src/lib/grids/columns/column.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ import { IgxGridFilteringCellComponent } from '../filtering/base/grid-filtering-
3232
import { IgxGridHeaderGroupComponent } from '../headers/grid-header-group.component';
3333
import { getNodeSizeViaRange } from '../../core/utils';
3434
import { IgxSummaryOperand, IgxNumberSummaryOperand, IgxDateSummaryOperand } from '../summaries/grid-summary';
35-
import { IgxCellTemplateDirective, IgxCellHeaderTemplateDirective, IgxCellEditorTemplateDirective, IgxFilterCellTemplateDirective } from './templates.directive';
35+
import {
36+
IgxCellTemplateDirective,
37+
IgxCellHeaderTemplateDirective,
38+
IgxCellEditorTemplateDirective,
39+
IgxFilterCellTemplateDirective
40+
} from './templates.directive';
3641
import { MRLResizeColumnInfo, MRLColumnSizeInfo } from './interfaces';
3742

3843
/**

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

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,14 @@ import { IGridResourceStrings } from '../core/i18n/grid-resources';
7878
import { CurrentResourceStrings } from '../core/i18n/resources';
7979
import { IgxGridSummaryService } from './summaries/grid-summary.service';
8080
import { IgxSummaryRowComponent } from './summaries/summary-row.component';
81-
import { IgxGridSelectionService, GridSelectionRange, IgxGridCRUDService, IgxRow, IgxCell, isChromium } from './selection/selection.service';
81+
import {
82+
IgxGridSelectionService,
83+
GridSelectionRange,
84+
IgxGridCRUDService,
85+
IgxRow,
86+
IgxCell,
87+
isChromium
88+
} from './selection/selection.service';
8289
import { DragScrollDirection } from './selection/drag-select.directive';
8390
import { ICachedViewLoadedEventArgs, IgxTemplateOutletDirective } from '../directives/template-outlet/template_outlet.directive';
8491
import { IgxExcelStyleLoadingValuesTemplateDirective } from './filtering/excel-style/excel-style-search.component';
@@ -97,7 +104,25 @@ import { IFilteringStrategy } from '../data-operations/filtering-strategy';
97104
import { IgxRowExpandedIndicatorDirective, IgxRowCollapsedIndicatorDirective,
98105
IgxHeaderExpandIndicatorDirective, IgxHeaderCollapseIndicatorDirective } from './grid/grid.directives';
99106
import { GridKeydownTargetType, GridSelectionMode, GridSummaryPosition, GridSummaryCalculationMode, FilterMode } from './common/enums';
100-
import { IGridCellEventArgs, IRowSelectionEventArgs, IPinColumnEventArgs, IGridEditEventArgs, IPageEventArgs, IRowDataEventArgs, IColumnResizeEventArgs, IColumnMovingStartEventArgs, IColumnMovingEventArgs, IColumnMovingEndEventArgs, IGridKeydownEventArgs, IRowDragStartEventArgs, IRowDragEndEventArgs, IGridClipboardEvent, IGridToolbarExportEventArgs, ISearchInfo, ICellPosition } from './common/events';
107+
import {
108+
IGridCellEventArgs,
109+
IRowSelectionEventArgs,
110+
IPinColumnEventArgs,
111+
IGridEditEventArgs,
112+
IPageEventArgs,
113+
IRowDataEventArgs,
114+
IColumnResizeEventArgs,
115+
IColumnMovingStartEventArgs,
116+
IColumnMovingEventArgs,
117+
IColumnMovingEndEventArgs,
118+
IGridKeydownEventArgs,
119+
IRowDragStartEventArgs,
120+
IRowDragEndEventArgs,
121+
IGridClipboardEvent,
122+
IGridToolbarExportEventArgs,
123+
ISearchInfo,
124+
ICellPosition
125+
} from './common/events';
101126
import { IgxAdvancedFilteringDialogComponent } from './filtering/advanced-filtering/advanced-filtering-dialog.component';
102127
import { GridType } from './common/grid.interface';
103128
import { IgxDecimalPipeComponent, IgxDatePipeComponent } from './common/pipes';

projects/igniteui-angular/src/lib/grids/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export * from './api.service';
22
export * from './cell.component';
33
export * from './columns/column.component';
4-
export * from './common/events'
4+
export * from './common/events';
55
export * from './row.component';
66
export * from './grid-base.component';
77
export * from './grid.common';

projects/igniteui-angular/src/lib/navigation-drawer/navigation-drawer.component.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
1-
import { AfterContentInit, Component, ContentChild, ElementRef, EventEmitter, HostBinding, Inject, Input, OnChanges, OnDestroy, OnInit, Optional, Output, SimpleChange, ViewChild, Renderer2 } from '@angular/core';
1+
import {
2+
AfterContentInit,
3+
Component,
4+
ContentChild,
5+
ElementRef,
6+
EventEmitter,
7+
HostBinding,
8+
Inject,
9+
Input,
10+
OnChanges,
11+
OnDestroy,
12+
OnInit,
13+
Optional,
14+
Output,
15+
SimpleChange,
16+
ViewChild,
17+
Renderer2
18+
} from '@angular/core';
219
import { fromEvent, interval, Subscription } from 'rxjs';
320
import { debounce } from 'rxjs/operators';
421
import { IgxNavigationService, IToggleView } from '../core/navigation';

0 commit comments

Comments
 (0)