Skip to content

Commit a37f68a

Browse files
Merge branch 'main' into fix-tests
2 parents 14af580 + 1fba7c5 commit a37f68a

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

projects/assets-library/src/icons/icon-type.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ export const enum IconType {
9797
Refresh = 'refresh',
9898
Remove = 'remove',
9999
RemoveCircle = 'remove_circle',
100+
Restore = 'restore',
100101
Search = 'svg:search',
101102
Settings = 'settings',
102103
Share = 'share',

projects/components/src/select/select.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ export class SelectComponent<V> implements ControlValueAccessor, AfterContentIni
341341
return undefined;
342342
}
343343

344-
return this.items.find(item => item.value === value);
344+
return this.items.find(item => isEqual(item.value, value));
345345
}
346346

347347
public getStyleClassesForSelectItem(size: SelectSize, item: SelectOptionComponent<V>): string[] {

projects/components/src/table/header/table-header-cell-renderer.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ export class TableHeaderCellRendererComponent implements OnInit, OnChanges {
199199
return this.indeterminateRowsSelected
200200
? 'Some rows are selected'
201201
: this.allRowsSelected
202-
? 'All rows in the current page are selected'
203-
: 'None of the rows in the current page are selected';
202+
? 'All rows in the table are selected'
203+
: 'None of the rows in the table are selected';
204204
}
205205

206206
private buildClasses(): string[] {

0 commit comments

Comments
 (0)