Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion projects/igniteui-angular/src/lib/grids/cell.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import { IgxGridBaseComponent, IGridDataBindable } from './grid-base.component';
import { IgxGridSelectionService, ISelectionNode, IgxGridCRUDService } from '../core/grid-selection';
import { DeprecateProperty, DeprecateMethod } from '../core/deprecateDecorators';
import { HammerGesturesManager } from '../core/touch';
import { ColumnType, RowType, GridSelectionMode } from './types';
import { ColumnType } from './common/column.interface';
import { RowType } from './common/row.interface';
import { GridSelectionMode } from './common/enums';

/**
* Providing reference to `IgxGridCellComponent`:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import {
IgxCellHeaderTemplateDirective,
IgxCellEditorTemplateDirective,
IgxFilterCellTemplateDirective
} from './types';
} from './common/templates';

/**
* **Ignite UI for Angular Column** -
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ import { IgxGridColumnResizerComponent } from './grid-column-resizer.component';
import { IgxGridFilteringRowComponent } from './filtering/grid-filtering-row.component';
import { IgxDragDirective } from '../directives/drag-drop/drag-drop.directive';
import { CharSeparatedValueData } from '../services/csv/char-separated-value-data';
import { FilterMode, GridKeydownTargetType, GridSelectionMode, GridSummaryPosition, GridSummaryCalculationMode } from './types';
import { IgxColumnResizingService } from './grid-column-resizing.service';
import { IgxHeadSelectorDirective, IgxRowSelectorDirective } from './igx-row-selectors.module';
import { DeprecateProperty } from '../core/deprecateDecorators';
import { IgxRowExpandedIndicatorDirective, IgxRowCollapsedIndicatorDirective,
IgxHeaderExpandIndicatorDirective, IgxHeaderCollapseIndicatorDirective } from './grid/grid.directives';
import { GridKeydownTargetType, GridSelectionMode, GridSummaryPosition, GridSummaryCalculationMode, FilterMode } from './common/enums';

const MINIMUM_COLUMN_WIDTH = 136;
const FILTER_ROW_HEIGHT = 50;
Expand Down Expand Up @@ -2924,9 +2924,6 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
public notifyChanges(repaint = false) {
this._cdrRequests = true;
this._cdrRequestRepaint = repaint;
if (!this._tick) {
this._tick = Promise.resolve().then(() => this._tick = null);
}
this.cdr.markForCheck();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import {
IgxCellEditorTemplateDirective,
IgxCellTemplateDirective,
IgxFilterCellTemplateDirective
} from './types';
} from './common/templates';
import { IgxRowSelectorsModule } from './igx-row-selectors.module';
/**
* @hidden
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import { IgxColumnComponent } from './column.component';
import { IgxGridGroupByRowComponent } from './grid/groupby-row.component';
import { ISelectionNode } from '../core/grid-selection';
import { IgxForOfDirective } from '../directives/for-of/for_of.directive';
import { GridType, FilterMode } from './types';
import { GridType } from './common/grid.interface';
import { FilterMode } from './common/enums';

enum MoveDirection {
LEFT = 'left',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Directive, ElementRef, HostListener } from '@angular/core';
import { GridBaseAPIService } from './api.service';
import { GridType } from './types';
import { GridType } from './common/grid.interface';

/** @hidden */
@Directive({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { HelperUtils } from '../../test-utils/helper-utils.spec';
import { SortingDirection } from '../../data-operations/sorting-expression.interface';
import { configureTestSuite } from '../../test-utils/configure-suite';
import { take } from 'rxjs/operators';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';

describe('Column Hiding UI #grid', () => {
configureTestSuite();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { IgxStringFilteringOperand } from '../../data-operations/filtering-condi
import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';
import { setupGridScrollDetection, resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec';
import { DefaultSortingStrategy } from 'igniteui-angular';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';

import { GridSelectionFunctions } from '../../test-utils/grid-functions.spec';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import {
IgxGridFilteringESFLoadOnDemandComponent
} from '../../test-utils/grid-samples.spec';
import { HelperUtils, resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec';
import { GridSelectionMode, FilterMode } from '../types';
import { GridSelectionMode, FilterMode } from '../common/enums';

const FILTER_UI_ROW = 'igx-grid-filtering-row';
const FILTER_UI_CELL = 'igx-grid-filtering-cell';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
VirtualGridComponent, ScrollsComponent,
GridWithPrimaryKeyComponent, SelectionComponent
} from '../../test-utils/grid-samples.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';
import { GridFunctions } from '../../test-utils/grid-functions.spec';

const DEBOUNCETIME = 30;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
} from '../../test-utils/grid-samples.spec';
import { GridFunctions, GridSelectionFunctions } from '../../test-utils/grid-functions.spec';
import { SampleTestData } from '../../test-utils/sample-test-data.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';
import { IgxRowSelectorsModule } from '../igx-row-selectors.module';

const DEBOUNCETIME = 30;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { setupGridScrollDetection, resizeObserverIgnoreError } from '../../test-
import { SampleTestData } from '../../test-utils/sample-test-data.spec';
import { IgxStringFilteringOperand, IgxNumberFilteringOperand, SortingDirection, IgxChipComponent } from 'igniteui-angular';
import { ColumnGroupFourLevelTestComponent } from './column-group.spec';
import { GridSummaryCalculationMode } from '../types';
import { GridSummaryCalculationMode } from '../common/enums';

describe('IgxGrid - Summaries #grid', () => {
configureTestSuite();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { SortingDirection, ISortingExpression } from '../../data-operations/sort
import { configureTestSuite } from '../../test-utils/configure-suite';
import { IgxTabsModule, IgxTabsComponent } from '../../tabs';
import { resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';


describe('IgxGrid Component Tests #grid', () => {
Expand Down
30 changes: 1 addition & 29 deletions projects/igniteui-angular/src/lib/grids/grid/grid.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,20 @@ import { cloneArray, IBaseEventArgs } from '../../core/utils';
import { IGroupByRecord } from '../../data-operations/groupby-record.interface';
import { IgxGroupByRowTemplateDirective } from './grid.directives';
import { IgxGridGroupByRowComponent } from './groupby-row.component';
// import { IDisplayDensityOptions, DisplayDensityToken } from '../../core/displayDensity';
import { IGroupByExpandState } from '../../data-operations/groupby-expand-state.interface';
import { IBaseChipEventArgs, IChipClickEventArgs, IChipKeyDownEventArgs } from '../../chips/chip.component';
import { IChipsAreaReorderEventArgs } from '../../chips/chips-area.component';
// import { TransactionService, Transaction, State } from '../../services/transaction/transaction';
// import { DOCUMENT } from '@angular/common';
import { IgxColumnComponent } from '../column.component';
import { takeUntil } from 'rxjs/operators';
import { IgxFilteringService } from '../filtering/grid-filtering.service';
import { IGroupingExpression } from '../../data-operations/grouping-expression.interface';
import { IgxColumnResizingService } from '../grid-column-resizing.service';
import { IgxGridSummaryService } from '../summaries/grid-summary.service';
import { IgxGridSelectionService, IgxGridCRUDService } from '../../core/grid-selection';
// import { IgxOverlayService } from '../../services/index';
import { IgxForOfSyncService } from '../../directives/for-of/for_of.sync.service';
import { IgxDragIndicatorIconDirective } from '../row-drag.directive';
import { IgxGridMRLNavigationService } from '../grid-mrl-navigation.service';
import { FilterMode } from '../types';
import { FilterMode } from '../common/enums';

let NEXT_ID = 0;

Expand Down Expand Up @@ -221,30 +217,6 @@ export class IgxGridComponent extends IgxGridBaseComponent implements IGridDataB
}
private _filteredData = null;

// constructor(
// selectionService: IgxGridSelectionService,
// crudService: IgxGridCRUDService,
// public colResizingService: IgxColumnResizingService,
// gridAPI: GridBaseAPIService<IgxGridBaseComponent & IGridDataBindable>,
// @Inject(IgxGridTransaction) _transactions: TransactionService<Transaction, State>,
// elementRef: ElementRef,
// zone: NgZone,
// @Inject(DOCUMENT) public document,
// cdr: ChangeDetectorRef,
// resolver: ComponentFactoryResolver,
// differs: IterableDiffers,
// viewRef: ViewContainerRef,
// navigation: IgxGridNavigationService,
// filteringService: IgxFilteringService,
// @Inject(IgxOverlayService) protected overlayService: IgxOverlayService,
// summaryService: IgxGridSummaryService,
// @Optional() @Inject(DisplayDensityToken) protected _displayDensityOptions: IDisplayDensityOptions) {
// super(selectionService,
// crudService, gridAPI, _transactions, elementRef, zone, document, cdr, resolver, differs, viewRef, navigation,
// filteringService, overlayService, summaryService, _displayDensityOptions);
// this._gridAPI = <IgxGridAPIService>gridAPI;
// }

/**
* Returns the group by state of the `IgxGridComponent`.
* ```typescript
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { DataParent } from '../../test-utils/sample-test-data.spec';
import { MultiColumnHeadersWithGroupingComponent } from '../../test-utils/grid-samples.spec';
import { resizeObserverIgnoreError, HelperUtils } from '../../test-utils/helper-utils.spec';
import { GridSelectionFunctions } from '../../test-utils/grid-functions.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';

describe('IgxGrid - GroupBy #grid', () => {
configureTestSuite();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { IgxGridComponent } from './grid.component';
import { ISummaryRecord } from '../summaries/grid-summary';
import { IGroupByRecord } from '../../data-operations/groupby-record.interface';
import { IGroupByResult } from '../../data-operations/grouping-result.interface';
import { GridSummaryCalculationMode, GridSummaryPosition } from '../types';
import { GridSummaryCalculationMode, GridSummaryPosition } from '../common/enums';

/** @hidden */
interface ISkipRecord {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { IgxHierarchicalGridComponent, IgxHierarchicalGridModule, IgxRowComponen
import { IgxRowIslandComponent } from '../hierarchical-grid/row-island.component';
import { IgxTreeGridComponent, IgxTreeGridModule } from '../tree-grid';
import { resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';


const DEBOUNCE_TIME = 50;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { first } from 'rxjs/operators';
import { IgxColumnComponent } from '../../grids/column.component';
import { ISelectionNode } from '../../core/grid-selection';
import { isIE } from '../../core/utils';
import { FilterMode } from '../types';
import { FilterMode } from '../common/enums';

export class IgxHierarchicalGridNavigationService extends IgxGridNavigationService {
public grid: IgxHierarchicalGridComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { IgxHierarchicalTransactionServiceFactory } from './hierarchical-grid-ba
import { IgxIconModule } from '../../icon';
import { IgxHierarchicalGridCellComponent } from './hierarchical-cell.component';
import { resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';
import { GridFunctions } from '../../test-utils/grid-functions.spec';

describe('IgxHierarchicalGrid Integration #hGrid', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
import { IgxRowSelectorsModule } from '../igx-row-selectors.module';
import { HelperUtils } from '../../test-utils/helper-utils.spec';
import { GridSelectionFunctions } from '../../test-utils/grid-functions.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';

describe('IgxHierarchicalGrid selection #hGrid', () => {
configureTestSuite();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { IgxChildGridRowComponent } from './child-grid-row.component';
import { DisplayDensity } from '../../core/displayDensity';
import { IgxStringFilteringOperand } from '../../data-operations/filtering-condition';
import { IGridCellEventArgs } from '../grid';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';

describe('Basic IgxHierarchicalGrid #hGrid', () => {
configureTestSuite();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { wait } from '../../test-utils/ui-interactions.spec';
import { IgxGridModule } from '../grid';
import { resizeObserverIgnoreError } from '../../test-utils/helper-utils.spec';
import { GridFunctions } from '../../test-utils/grid-functions.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';

describe('IgxTreeGrid - Expanding / Collapsing #tGrid', () => {
configureTestSuite();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { TreeGridFunctions } from '../../test-utils/tree-grid-functions.spec';
import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';
import { configureTestSuite } from '../../test-utils/configure-suite';
import { setupGridScrollDetection } from '../../test-utils/helper-utils.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';

const DEBOUNCETIME = 30;
const treeColumns = ['ID', 'Name', 'HireDate', 'Age', 'OnPTO'];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { IgxTreeGridModule } from './tree-grid.module';
import { setupGridScrollDetection } from '../../test-utils/helper-utils.spec';
import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec';
import { GridSelectionFunctions, GridSummaryFunctions } from '../../test-utils/grid-functions.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';

describe('IgxTreeGrid - Multi Cell selection #tGrid', () => {
configureTestSuite();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { configureTestSuite } from '../../test-utils/configure-suite';
import { wait, UIInteractions } from '../../test-utils/ui-interactions.spec';
import { IgxRowSelectorsModule } from '../igx-row-selectors.module';
import { GridFunctions } from '../../test-utils/grid-functions.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';

describe('IgxTreeGrid - Selection #tGrid', () => {
configureTestSuite();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
IgxTreeGridCellSelectionComponent
} from '../../test-utils/tree-grid-components.spec';
import { wait } from '../../test-utils/ui-interactions.spec';
import { GridSelectionMode } from '../types';
import { GridSelectionMode } from '../common/enums';

describe('IgxTreeGrid Component Tests #tGrid', () => {
configureTestSuite();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { IgxGridBaseComponent, IGridDataBindable } from '../grid-base.component'
import { ITreeGridRecord } from './tree-grid.interfaces';
import { IgxTreeGridComponent } from './tree-grid.component';
import { ISummaryRecord } from '../summaries/grid-summary';
import { GridSummaryCalculationMode, GridSummaryPosition } from '../types';
import { GridSummaryCalculationMode, GridSummaryPosition } from '../common/enums';

/** @hidden */
@Pipe({
Expand Down
5 changes: 0 additions & 5 deletions projects/igniteui-angular/src/lib/grids/types/index.ts

This file was deleted.