Skip to content

Commit 46810ed

Browse files
authored
Merge branch 'master' into rkaraivanov/toolbar-token-fix
2 parents 474f2d4 + da45fe8 commit 46810ed

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@ All notable changes for each version of this project will be documented in this
8080
Use `IgxGridToolbarComponent`, `IgxGridToolbarHidingComponent`, `IgxGridToolbarPinningComponent` instead.
8181
- **Breaking Change** - The `rowSelected` event is renamed to `rowSelectionChanging` to better reflect its function.
8282
- **Breaking Change** - The `columnSelected` event is renamed to `columnSelectionChanging` to better reflect its function.
83-
- **Breaking Change** - `columnsCollection` is removed. Use `columns` instead.
83+
- **Breaking Change** - `columnsCollection` is removed. Use `columns` instead. If at certain ocasions `columns` return empty array, query the columns using `ViewChildren` and access those in `ngAfterViewInit`:
84+
```ts
85+
@ViewChildren(IgxColumnComponent, { read: IgxColumnComponent })
86+
public columns: QueryList<IgxColumnComponent>;
87+
```
8488
- `RowType`, `IgxRowDirective`
8589
- **Breaking Change** - `rowData` and `rowID` deprecated properties are now removed. Use `data` and `key` instead. Use `ng update` for automatic migration.
8690
- `igxRowSelector`

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ export interface RowType {
105105
delete?: () => any;
106106
pin?: () => void;
107107
unpin?: () => void;
108-
toggle?: () => void;
109108
}
110109

111110
export interface ColumnType {

projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-moving.component.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ export class IgxExcelStyleMovingComponent {
8080
return columns[index];
8181
}
8282
}
83+
return columns[0];
8384
} else {
8485
while (index < columns.length - 1) {
8586
index++;

projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,13 +520,15 @@ export class IgxGridNavigationService {
520520
}
521521
} else if (!row.expanded && ROW_EXPAND_KEYS.has(key)) {
522522
if (row.key === undefined) {
523-
row.toggle();
523+
// TODO use expanded row.expanded = !row.expanded;
524+
(row as any).toggle();
524525
} else {
525526
this.grid.gridAPI.set_row_expansion_state(row.key, true, event);
526527
}
527528
} else if (row.expanded && ROW_COLLAPSE_KEYS.has(key)) {
528529
if (row.key === undefined) {
529-
row.toggle();
530+
// TODO use expanded row.expanded = !row.expanded;
531+
(row as any).toggle();
530532
} else {
531533
this.grid.gridAPI.set_row_expansion_state(row.key, false, event);
532534
}

src/app/shared/financialData.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -895,12 +895,10 @@ export class FinancialData {
895895

896896
/** Updates values in random records */
897897
public static updateRandomPrices(data: any[]): any[] {
898-
const newData = data.slice();
899-
// fixing a strange bug where newData has more elements than data, but all of those "explicit" items are undefined
900898
for (let i = Math.round(Math.random() * 10); i < data.length; i += Math.round(Math.random() * 10)) {
901-
newData.push(this.randomizeObjectData(newData[i]));
899+
this.randomizeObjectData(data[i]);
902900
}
903-
return newData;
901+
return Array.from(data);
904902
}
905903

906904
/*** Genrates additional financial data fields */

0 commit comments

Comments
 (0)