Skip to content

Commit d4bcb15

Browse files
authored
Merge branch 'master' into master
2 parents c255fe4 + d83f0de commit d4bcb15

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @cal-smith @zvonimirfras @magedhennawy @youda97
1+
* @cal-smith @zvonimirfras @youda97

src/pagination/pagination.component.ts

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,12 @@ import { ExperimentalService } from "./../experimental.module";
6262
[id]="itemsPerPageSelectId"
6363
[(ngModel)]="itemsPerPage"
6464
class="bx--select-input">
65-
<option class="bx--select-option" value="10">10</option>
66-
<option class="bx--select-option" value="20">20</option>
67-
<option class="bx--select-option" value="30">30</option>
68-
<option class="bx--select-option" value="40">40</option>
69-
<option class="bx--select-option" value="50">50</option>
65+
<option
66+
class="bx--select-option"
67+
*ngFor="let option of itemsPerPageOptions"
68+
[value]="option">
69+
{{ option }}
70+
</option>
7071
</select>
7172
<ibm-icon-chevron-down16
7273
style="display: inherit;"
@@ -192,6 +193,13 @@ export class Pagination {
192193
}
193194
}
194195

196+
/**
197+
* Options for items per page select
198+
*
199+
* A default array of options will be defined: [10, 20, 30, 40, 50]
200+
*/
201+
@Input() itemsPerPageOptions: number[] = [10, 20, 30, 40, 50];
202+
195203
/**
196204
* Emits the new page number.
197205
*

0 commit comments

Comments
 (0)