Skip to content

Commit 4f43ebd

Browse files
ChronosSFChronosSF
committed
chore(*): resolving double override
1 parent d5f779a commit 4f43ebd

File tree

2 files changed

+91
-96
lines changed

2 files changed

+91
-96
lines changed

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

Lines changed: 91 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -610,15 +610,15 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
610610
public dragRowID = null;
611611

612612

613-
/**
614-
* Gets/Sets whether the rows are editable.
615-
* @remarks
616-
* By default it is set to false.
617-
* @example
618-
* ```html
619-
* <igx-grid #grid [showToolbar]="true" [rowEditable]="true" [primaryKey]="'ProductID'" [columnHiding]="true"></igx-grid>
620-
* ```
621-
*/
613+
/**
614+
* Gets/Sets whether the rows are editable.
615+
* @remarks
616+
* By default it is set to false.
617+
* @example
618+
* ```html
619+
* <igx-grid #grid [showToolbar]="true" [rowEditable]="true" [primaryKey]="'ProductID'" [columnHiding]="true"></igx-grid>
620+
* ```
621+
*/
622622
@WatchChanges()
623623
@Input()
624624
get rowEditable(): boolean {
@@ -1096,13 +1096,13 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
10961096
@Output()
10971097
public onRowSelectionChange = new EventEmitter<IRowSelectionEventArgs>();
10981098

1099-
/**
1100-
* Emitted when `IgxColumnComponent` is selected.
1101-
* @example
1102-
* ```html
1103-
* <igx-grid #grid (onColumnSelectionChange)="onColumnSelectionChange($event)" [data]="localData" [autoGenerate]="true"></igx-grid>
1104-
* ```
1105-
*/
1099+
/**
1100+
* Emitted when `IgxColumnComponent` is selected.
1101+
* @example
1102+
* ```html
1103+
* <igx-grid #grid (onColumnSelectionChange)="onColumnSelectionChange($event)" [data]="localData" [autoGenerate]="true"></igx-grid>
1104+
* ```
1105+
*/
11061106
@Output()
11071107
public onColumnSelectionChange = new EventEmitter<IColumnSelectionEventArgs>();
11081108

@@ -2884,7 +2884,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
28842884
this.notifyChanges();
28852885
});
28862886

2887-
this.resizeNotify.pipe(destructor, filter(() => !this._init), throttleTime(100, undefined, {leading: true, trailing: true}))
2887+
this.resizeNotify.pipe(destructor, filter(() => !this._init), throttleTime(100, undefined, { leading: true, trailing: true }))
28882888
.subscribe(() => {
28892889
this.zone.run(() => {
28902890
this.notifyChanges(true);
@@ -3021,9 +3021,9 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
30213021
public setFilteredData(data, pinned: boolean) {
30223022
if (this.hasPinnedRecords && pinned) {
30233023
this._filteredPinnedData = data || [];
3024-
const filteredUnpinned = this._filteredUnpinnedData || [];
3025-
const filteredData = [... this._filteredPinnedData, ... filteredUnpinned];
3026-
this.filteredData = filteredData.length > 0 ? filteredData : this._filteredUnpinnedData;
3024+
const filteredUnpinned = this._filteredUnpinnedData || [];
3025+
const filteredData = [... this._filteredPinnedData, ...filteredUnpinned];
3026+
this.filteredData = filteredData.length > 0 ? filteredData : this._filteredUnpinnedData;
30273027
} else if (this.hasPinnedRecords && !pinned) {
30283028
this._filteredUnpinnedData = data;
30293029
} else {
@@ -3084,7 +3084,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
30843084
this._filteredSortedPinnedData = data;
30853085
this.pinnedRecords = data;
30863086
this._filteredSortedData = this.isRowPinningToTop ? [... this._filteredSortedPinnedData, ... this._filteredSortedUnpinnedData] :
3087-
[... this._filteredSortedUnpinnedData, ... this._filteredSortedPinnedData];
3087+
[... this._filteredSortedUnpinnedData, ... this._filteredSortedPinnedData];
30883088
this.refreshSearch(true, false);
30893089
} else if (this.pinnedRecordsCount > 0 && !pinned) {
30903090
this._filteredSortedUnpinnedData = data;
@@ -3136,16 +3136,16 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
31363136
this._setupRowObservers();
31373137
this._zoneBegoneListeners();
31383138

3139-
this.paginatorSettings = { outlet: this.outletDirective };
3139+
this.paginatorSettings = { outlet: this.outlet };
31403140

31413141
const vertScrDC = this.verticalScrollContainer.displayContainer;
31423142
vertScrDC.addEventListener('scroll', this.preventContainerScroll);
31433143

31443144
this._pinnedRowList.changes
3145-
.pipe(takeUntil(this.destroy$))
3146-
.subscribe((change: QueryList<IgxGridRowComponent>) => {
3147-
this.onPinnedRowsChanged(change);
3148-
});
3145+
.pipe(takeUntil(this.destroy$))
3146+
.subscribe((change: QueryList<IgxGridRowComponent>) => {
3147+
this.onPinnedRowsChanged(change);
3148+
});
31493149
}
31503150

31513151
/**
@@ -3850,7 +3850,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
38503850
'DropPosition.None is deprecated.' +
38513851
'Use DropPosition.AfterDropTarget instead.',
38523852
warningShown);
3853-
position = DropPosition.AfterDropTarget;
3853+
position = DropPosition.AfterDropTarget;
38543854
}
38553855
if ((column.level !== dropTarget.level) ||
38563856
(column.topLevelParent !== dropTarget.topLevelParent)) {
@@ -4300,7 +4300,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
43004300
* @param rowID The row id - primaryKey value or the data record instance.
43014301
*/
43024302
public unpinRow(rowID: any) {
4303-
const index = this._pinnedRecordIDs.indexOf(rowID);
4303+
const index = this._pinnedRecordIDs.indexOf(rowID);
43044304
if (index === -1) {
43054305
return false;
43064306
}
@@ -4900,7 +4900,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
49004900
const diff = this.rowListDiffer.diff(change);
49014901
if (diff) {
49024902
this.notifyChanges(true);
4903-
}
4903+
}
49044904
}
49054905

49064906
/**
@@ -5196,7 +5196,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
51965196
*/
51975197
protected reinitPinStates() {
51985198
this._pinnedColumns = this.columnList
5199-
.filter((c) => c.pinned).sort((a, b) => this._pinnedColumns.indexOf(a) - this._pinnedColumns.indexOf(b));
5199+
.filter((c) => c.pinned).sort((a, b) => this._pinnedColumns.indexOf(a) - this._pinnedColumns.indexOf(b));
52005200
this._unpinnedColumns = this.hasColumnGroups ? this.columnList.filter((c) => !c.pinned) :
52015201
this.columnList.filter((c) => !c.pinned)
52025202
.sort((a, b) => this._unpinnedColumns.indexOf(a) - this._unpinnedColumns.indexOf(b));
@@ -5522,14 +5522,14 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
55225522
return this.extractDataFromSelection(source, formatters, headers);
55235523
}
55245524

5525-
/**
5526-
* Get current selected columns.
5527-
* @example
5528-
* Returns an array with selected columns
5529-
* ```typescript
5530-
* const selectedColumns = this.grid.selectedColumns();
5531-
* ```
5532-
*/
5525+
/**
5526+
* Get current selected columns.
5527+
* @example
5528+
* Returns an array with selected columns
5529+
* ```typescript
5530+
* const selectedColumns = this.grid.selectedColumns();
5531+
* ```
5532+
*/
55335533
public selectedColumns(): IgxColumnComponent[] {
55345534
const fields = this.selectionService.getSelectedColumns();
55355535
return fields.map(field => this.getColumnByName(field)).filter(field => field);
@@ -5551,9 +5551,9 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
55515551
} else {
55525552
(columns as IgxColumnComponent[]).forEach(col => {
55535553
if (col.columnGroup) {
5554-
const children = col.allChildren.filter(c => !c.columnGroup).map(c => c.field);
5555-
fieldToSelect = [...fieldToSelect, ...children];
5556-
} else {
5554+
const children = col.allChildren.filter(c => !c.columnGroup).map(c => c.field);
5555+
fieldToSelect = [...fieldToSelect, ...children];
5556+
} else {
55575557
fieldToSelect.push(col.field);
55585558
}
55595559
});
@@ -5578,9 +5578,9 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
55785578
} else {
55795579
(columns as IgxColumnComponent[]).forEach(col => {
55805580
if (col.columnGroup) {
5581-
const children = col.allChildren.filter(c => !c.columnGroup).map(c => c.field);
5582-
fieldToDeselect = [...fieldToDeselect, ...children];
5583-
} else {
5581+
const children = col.allChildren.filter(c => !c.columnGroup).map(c => c.field);
5582+
fieldToDeselect = [...fieldToDeselect, ...children];
5583+
} else {
55845584
fieldToDeselect.push(col.field);
55855585
}
55865586
});
@@ -5589,25 +5589,25 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
55895589
this.notifyChanges();
55905590
}
55915591

5592-
/**
5593-
* Deselects all columns
5594-
* @example
5595-
* ```typescript
5596-
* this.grid.deselectAllColumns();
5597-
* ```
5598-
*/
5592+
/**
5593+
* Deselects all columns
5594+
* @example
5595+
* ```typescript
5596+
* this.grid.deselectAllColumns();
5597+
* ```
5598+
*/
55995599
public deselectAllColumns() {
56005600
this.selectionService.clearAllSelectedColumns();
56015601
this.notifyChanges();
56025602
}
56035603

5604-
/**
5605-
* Selects all columns
5606-
* @example
5607-
* ```typescript
5608-
* this.grid.deselectAllColumns();
5609-
* ```
5610-
*/
5604+
/**
5605+
* Selects all columns
5606+
* @example
5607+
* ```typescript
5608+
* this.grid.deselectAllColumns();
5609+
* ```
5610+
*/
56115611
public selectAllColumns() {
56125612
this.selectColumns(this.columnList.filter(c => !c.columnGroup));
56135613
}
@@ -5643,7 +5643,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
56435643
* If `headers` is enabled, it will use the column header (if any) instead of the column field.
56445644
*/
56455645
public getSelectedColumnsData(formatters = false, headers = false) {
5646-
const source = this.filteredSortedData ? this.filteredSortedData : this.data;
5646+
const source = this.filteredSortedData ? this.filteredSortedData : this.data;
56475647
return this.extractDataFromColumnsSelection(source, formatters, headers);
56485648
}
56495649

@@ -5734,34 +5734,36 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
57345734
this.navigation.performVerticalScrollToCell(rowIndex, visibleColIndex, () => {
57355735
if (shouldScrollHorizontally) {
57365736
this.navigation.performHorizontalScrollToCell(visibleColIndex, () =>
5737-
this.executeCallback(rowIndex, visibleColIndex, cb));
5737+
this.executeCallback(rowIndex, visibleColIndex, cb));
57385738
} else {
57395739
this.executeCallback(rowIndex, visibleColIndex, cb);
5740-
}});
5740+
}
5741+
});
57415742
} else if (shouldScrollHorizontally) {
57425743
this.navigation.performHorizontalScrollToCell(visibleColIndex, () => {
57435744
if (shouldScrollVertically) {
57445745
this.navigation.performVerticalScrollToCell(rowIndex, visibleColIndex, () =>
57455746
this.executeCallback(rowIndex, visibleColIndex, cb));
57465747
} else {
57475748
this.executeCallback(rowIndex, visibleColIndex, cb);
5748-
}});
5749+
}
5750+
});
57495751
} else {
57505752
this.executeCallback(rowIndex, visibleColIndex, cb);
57515753
}
57525754
}
57535755

5754-
/**
5755-
* Returns `ICellPosition` which defines the next cell,
5756-
* according to the current position, that match specific criteria.
5757-
* @remarks
5758-
* You can pass callback function as a third parameter of `getPreviousCell` method.
5759-
* The callback function accepts IgxColumnComponent as a param
5760-
* @example
5761-
* ```typescript
5762-
* const nextEditableCellPosition = this.grid.getNextCell(0, 3, (column) => column.editable);
5763-
* ```
5764-
*/
5756+
/**
5757+
* Returns `ICellPosition` which defines the next cell,
5758+
* according to the current position, that match specific criteria.
5759+
* @remarks
5760+
* You can pass callback function as a third parameter of `getPreviousCell` method.
5761+
* The callback function accepts IgxColumnComponent as a param
5762+
* @example
5763+
* ```typescript
5764+
* const nextEditableCellPosition = this.grid.getNextCell(0, 3, (column) => column.editable);
5765+
* ```
5766+
*/
57655767
public getNextCell(currRowIndex: number, curVisibleColIndex: number,
57665768
callback: (IgxColumnComponent) => boolean = null): ICellPosition {
57675769
const columns = this.columnList.filter(col => !col.columnGroup && col.visibleIndex >= 0);
@@ -5784,17 +5786,17 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
57845786
}
57855787
}
57865788

5787-
/**
5788-
* Returns `ICellPosition` which defines the previous cell,
5789-
* according to the current position, that match specific criteria.
5790-
* @remarks
5791-
* You can pass callback function as a third parameter of `getPreviousCell` method.
5792-
* The callback function accepts IgxColumnComponent as a param
5793-
* @example
5794-
* ```typescript
5795-
* const previousEditableCellPosition = this.grid.getPreviousCell(0, 3, (column) => column.editable);
5796-
* ```
5797-
*/
5789+
/**
5790+
* Returns `ICellPosition` which defines the previous cell,
5791+
* according to the current position, that match specific criteria.
5792+
* @remarks
5793+
* You can pass callback function as a third parameter of `getPreviousCell` method.
5794+
* The callback function accepts IgxColumnComponent as a param
5795+
* @example
5796+
* ```typescript
5797+
* const previousEditableCellPosition = this.grid.getPreviousCell(0, 3, (column) => column.editable);
5798+
* ```
5799+
*/
57985800
public getPreviousCell(currRowIndex: number, curVisibleColIndex: number,
57995801
callback: (IgxColumnComponent) => boolean = null): ICellPosition {
58005802
const columns = this.columnList.filter(col => !col.columnGroup && col.visibleIndex >= 0);
@@ -5865,9 +5867,9 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
58655867
}
58665868
// find next/prev record that is editable.
58675869
const nextRowIndex = previous ? this.findPrevEditableDataRowIndex(currentRowIndex) :
5868-
this.dataView.findIndex((rec, index) =>
5869-
index > currentRowIndex && this.isEditableDataRecordAtIndex(index));
5870-
return nextRowIndex !== -1 ? nextRowIndex : currentRowIndex ;
5870+
this.dataView.findIndex((rec, index) =>
5871+
index > currentRowIndex && this.isEditableDataRecordAtIndex(index));
5872+
return nextRowIndex !== -1 ? nextRowIndex : currentRowIndex;
58715873
}
58725874

58735875
/**
@@ -5893,7 +5895,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
58935895
private isEditableDataRecordAtIndex(dataViewIndex) {
58945896
const rec = this.dataView[dataViewIndex];
58955897
return !rec.expression && !rec.summaries && !rec.childGridsData && !rec.detailsData &&
5896-
!this.isGhostRecordAtIndex(dataViewIndex);
5898+
!this.isGhostRecordAtIndex(dataViewIndex);
58975899
}
58985900

58995901
/**
@@ -6261,7 +6263,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
62616263
private configureRowEditingOverlay(rowID: any, useOuter = false) {
62626264
this.rowEditSettings.outlet = useOuter ? this.parentRowOutletDirective : this.rowOutletDirective;
62636265
this.rowEditPositioningStrategy.settings.container = this.tbody.nativeElement;
6264-
const pinned = this._pinnedRecordIDs.indexOf(rowID) !== -1;
6266+
const pinned = this._pinnedRecordIDs.indexOf(rowID) !== -1;
62656267
const targetRow = !pinned ? this.gridAPI.get_row_by_key(rowID) : this.pinnedRows.find(x => x.rowID === rowID);
62666268
if (!targetRow) {
62676269
return;

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,6 @@ export class IgxHierarchicalGridBaseDirective extends IgxGridBaseDirective {
209209
}
210210
return this.hgridAPI.getChildGrid(path);
211211
}
212-
213-
/**
214-
* @hidden @internal
215-
*/
216-
public get outletDirective() {
217-
return this.rootGrid._outletDirective;
218-
}
219212
}
220213

221214
function flatten(arr: any[]) {

0 commit comments

Comments
 (0)