Skip to content

Commit c12e4b5

Browse files
authored
fix(paginator): fix select baseline; support mobile (#7610)
* fix(paginator): fix select baseline; support mobile * use margin variable * Update paginator.html
1 parent 717f252 commit c12e4b5

File tree

2 files changed

+59
-43
lines changed

2 files changed

+59
-43
lines changed

src/lib/paginator/paginator.html

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,47 @@
1-
<div class="mat-paginator-page-size">
2-
<div class="mat-paginator-page-size-label">
3-
{{_intl.itemsPerPageLabel}}
4-
</div>
1+
<div class="mat-paginator-container">
2+
<div class="mat-paginator-page-size">
3+
<div class="mat-paginator-page-size-label">
4+
{{_intl.itemsPerPageLabel}}
5+
</div>
56

6-
<mat-form-field
7-
*ngIf="_displayedPageSizeOptions.length > 1"
8-
class="mat-paginator-page-size-select">
9-
<mat-select
10-
[value]="pageSize"
11-
[aria-label]="_intl.itemsPerPageLabel"
12-
(change)="_changePageSize($event.value)">
13-
<mat-option *ngFor="let pageSizeOption of _displayedPageSizeOptions" [value]="pageSizeOption">
14-
{{pageSizeOption}}
15-
</mat-option>
16-
</mat-select>
17-
</mat-form-field>
7+
<mat-form-field
8+
*ngIf="_displayedPageSizeOptions.length > 1"
9+
class="mat-paginator-page-size-select">
10+
<mat-select
11+
[value]="pageSize"
12+
[aria-label]="_intl.itemsPerPageLabel"
13+
(change)="_changePageSize($event.value)">
14+
<mat-option *ngFor="let pageSizeOption of _displayedPageSizeOptions" [value]="pageSizeOption">
15+
{{pageSizeOption}}
16+
</mat-option>
17+
</mat-select>
18+
</mat-form-field>
1819

19-
<div *ngIf="_displayedPageSizeOptions.length <= 1">{{pageSize}}</div>
20-
</div>
20+
<div *ngIf="_displayedPageSizeOptions.length <= 1">{{pageSize}}</div>
21+
</div>
2122

22-
<div class="mat-paginator-range-label">
23-
{{_intl.getRangeLabel(pageIndex, pageSize, length)}}
24-
</div>
23+
<div class="mat-paginator-range-actions">
24+
<div class="mat-paginator-range-label">
25+
{{_intl.getRangeLabel(pageIndex, pageSize, length)}}
26+
</div>
2527

26-
<button mat-icon-button type="button"
27-
class="mat-paginator-navigation-previous"
28-
(click)="previousPage()"
29-
[attr.aria-label]="_intl.previousPageLabel"
30-
[matTooltip]="_intl.previousPageLabel"
31-
[matTooltipPosition]="'above'"
32-
[disabled]="!hasPreviousPage()">
33-
<div class="mat-paginator-increment"></div>
34-
</button>
35-
<button mat-icon-button type="button"
36-
class="mat-paginator-navigation-next"
37-
(click)="nextPage()"
38-
[attr.aria-label]="_intl.nextPageLabel"
39-
[matTooltip]="_intl.nextPageLabel"
40-
[matTooltipPosition]="'above'"
41-
[disabled]="!hasNextPage()">
42-
<div class="mat-paginator-decrement"></div>
43-
</button>
28+
<button mat-icon-button type="button"
29+
class="mat-paginator-navigation-previous"
30+
(click)="previousPage()"
31+
[attr.aria-label]="_intl.previousPageLabel"
32+
[matTooltip]="_intl.previousPageLabel"
33+
[matTooltipPosition]="'above'"
34+
[disabled]="!hasPreviousPage()">
35+
<div class="mat-paginator-increment"></div>
36+
</button>
37+
<button mat-icon-button type="button"
38+
class="mat-paginator-navigation-next"
39+
(click)="nextPage()"
40+
[attr.aria-label]="_intl.nextPageLabel"
41+
[matTooltip]="_intl.nextPageLabel"
42+
[matTooltipPosition]="'above'"
43+
[disabled]="!hasNextPage()">
44+
<div class="mat-paginator-decrement"></div>
45+
</button>
46+
</div>
47+
</div>

src/lib/paginator/paginator.scss

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
$mat-paginator-height: 56px;
22
$mat-paginator-padding: 0 8px;
33

4+
$mat-paginator-page-size-margin-right: 8px;
5+
46
$mat-paginator-items-per-page-label-margin: 0 4px;
5-
$mat-paginator-selector-margin: 0 4px;
7+
$mat-paginator-selector-margin: 6px 4px 0 4px;
68
$mat-paginator-selector-trigger-min-width: 56px;
79

8-
$mat-paginator-range-label-margin: 0 32px;
10+
$mat-paginator-range-actions-min-height: 48px;
11+
12+
$mat-paginator-range-label-margin: 0 32px 0 24px;
913

1014
$mat-paginator-button-margin: 8px;
1115
$mat-paginator-button-icon-height: 8px;
@@ -14,17 +18,19 @@ $mat-paginator-button-icon-width: 8px;
1418
$mat-paginator-button-decrement-icon-margin: 12px;
1519
$mat-paginator-button-increment-icon-margin: 16px;
1620

17-
.mat-paginator {
21+
.mat-paginator-container {
1822
display: flex;
1923
align-items: center;
2024
justify-content: flex-end;
2125
min-height: $mat-paginator-height;
2226
padding: $mat-paginator-padding;
27+
flex-wrap: wrap-reverse;
2328
}
2429

2530
.mat-paginator-page-size {
2631
display: flex;
27-
align-items: center;
32+
align-items: baseline;
33+
margin-right: $mat-paginator-page-size-margin-right;
2834
}
2935

3036
.mat-paginator-page-size-label {
@@ -76,3 +82,9 @@ $mat-paginator-button-increment-icon-margin: 16px;
7682
margin-right: $mat-paginator-button-increment-icon-margin;
7783
}
7884
}
85+
86+
.mat-paginator-range-actions {
87+
display: flex;
88+
align-items: center;
89+
min-height: $mat-paginator-range-actions-min-height;
90+
}

0 commit comments

Comments
 (0)